tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of bitbucket.org:tmakinen/puppet

Browse source
This commit is contained in:
Timo Makinen 2014-01-22 21:38:30 +02:00
commit c47158727e
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
psacct/manifests/init.pp
View file

@ -23,20 +23,15 @@ class psacct {
class psacct::linux { class psacct::linux {
package { "psacct": package { "psacct":
ensure => installed,
name => $::operatingsystem ? { name => $::operatingsystem ? {
"debian" => "acct", "debian" => "acct",
"ubuntu" => "acct", "ubuntu" => "acct",
default => "psacct", default => "psacct",
}, },
ensure => installed,
} }
service { "psacct": service { "psacct":
name => $::operatingsystem ? {
"debian" => "acct",
"ubuntu" => "acct",
default => "psacct",
},
ensure => $::operatingsystem ? { ensure => $::operatingsystem ? {
"debian" => undef, "debian" => undef,
"ubuntu" => undef, "ubuntu" => undef,
@ -44,6 +39,11 @@ class psacct::linux {
}, },
enable => true, enable => true,
hasstatus => true, hasstatus => true,
name => $::operatingsystem ? {
"debian" => "acct",
"ubuntu" => "acct",
default => "psacct",
},
require => Package["psacct"], require => Package["psacct"],
} }
@ -54,9 +54,16 @@ class psacct::linux {
# #
class psacct::openbsd { class psacct::openbsd {
file { "/var/account":
ensure => directory,
mode => "0750",
owner => "root",
group => "wheel",
}
file { "/var/account/acct": file { "/var/account/acct":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "wheel", group => "wheel",
notify => Exec["accton"], notify => Exec["accton"],