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

Fixing puppet-lint errors.

Browse source
This commit is contained in:
Timo Mkinen 2012-03-27 14:41:39 +03:00
parent 2f83cb7d4a
commit 34c36045fa
59 changed files with 995 additions and 990 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sendmail/manifests/init.pp
View file

@ -8,8 +8,8 @@ class sendmail::common {
if $operatingsystem != "OpenBSD" {
package { "sendmail":
name => [ "sendmail", "sendmail-cf", ],
ensure => installed,
name => [ "sendmail", "sendmail-cf", ],
}
service { "sendmail":
ensure => running,
@ -68,8 +68,8 @@ class sendmail::client inherits sendmail::common {
}
exec { "make submit.cf":
path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail",
cwd => $operatingsystem ? {
path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail",
cwd => $operatingsystem ? {
"openbsd" => "/usr/share/sendmail/cf",
default => "/etc/mail",
},
@ -133,9 +133,11 @@ class sendmail::server inherits sendmail::common {
}
}
file { "sendmail.mc": name => $operatingsystem ? {
"openbsd" => "/usr/share/sendmail/cf/sendmail.mc",
default => "/etc/mail/sendmail.mc", },
file { "sendmail.mc":
name => $operatingsystem ? {
"openbsd" => "/usr/share/sendmail/cf/sendmail.mc",
default => "/etc/mail/sendmail.mc",
},
content => template("sendmail/sendmail.mc.erb"),
owner => "root",
group => $group,
@ -143,21 +145,21 @@ class sendmail::server inherits sendmail::common {
notify => Exec["make sendmail.cf"],
}
file { "/etc/aliases":
file { "/etc/aliases":
ensure => present,
notify => Exec["newaliases"],
notify => Exec["newaliases"],
owner => "root",
group => $group,
mode => 0644,
}
}
exec { "make sendmail.cf":
path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => $operatingsystem ? {
path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => $operatingsystem ? {
openbsd => "/usr/share/sendmail/cf",
default => "/etc/mail",
},
require => $operatingsystem ? {
require => $operatingsystem ? {
openbsd => undef,
default => Package["sendmail"],
},
@ -174,11 +176,11 @@ class sendmail::server inherits sendmail::common {
default => undef,
},
require => Exec["make sendmail.cf"],
notify => Service["sendmail"],
notify => Service["sendmail"],
}
exec { "newaliases":
path => "/bin:/usr/bin:/sbin:/usr/sbin",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true,
}
}