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

sendmail: Removed non-functional OpenBSD stuff from sendmail::server

Browse source
This commit is contained in:
Ossi Salmi 2013-07-28 21:41:38 +03:00
parent 8b92526dde
commit 0872915da6
1 changed files with 45 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
sendmail/manifests/init.pp
View file

@ -280,49 +280,24 @@ class sendmail::server inherits sendmail::common {
} }
file { "sendmail.mc": file { "/etc/mail/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 => "root",
mode => "0644",
notify => Exec["make sendmail.cf"],
}
exec { "make sendmail.cf":
path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail",
cwd => $::operatingsystem ? {
"openbsd" => "/usr/share/sendmail/cf",
default => "/etc/mail",
},
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["sendmail"],
},
refreshonly => true,
notify => Service["sendmail"],
}
file { "/etc/mail/sendmail.cf":
ensure => present, ensure => present,
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
source => $::operatingsystem ? { content => template("sendmail/sendmail.mc.erb"),
"openbsd" => "/usr/share/sendmail/cf/sendmail.cf", notify => Exec["make sendmail.cf"],
default => undef, require => Package["sendmail"],
}, }
require => Exec["make sendmail.cf"], exec { "make sendmail.cf":
before => Service["sendmail"], path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail",
cwd => "/etc/mail",
refreshonly => true,
notify => Service["sendmail"],
} }
file { "/etc/aliases": file { "/etc/aliases":
ensure => present, ensure => present,
name => $::operatingsystem ? {
"openbsd" => "/etc/mail/aliases",
default => "/etc/aliases",
},
source => [ source => [
"puppet:///files/mail/aliases.${fqdn}", "puppet:///files/mail/aliases.${fqdn}",
"puppet:///files/mail/aliases", "puppet:///files/mail/aliases",
@ -332,6 +307,7 @@ class sendmail::server inherits sendmail::common {
owner => "root", owner => "root",
group => "root", group => "root",
notify => Exec["newaliases"], notify => Exec["newaliases"],
require => Package["sendmail"],
} }
exec { "newaliases": exec { "newaliases":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
@ -340,19 +316,16 @@ class sendmail::server inherits sendmail::common {
file { "/etc/mail/access": file { "/etc/mail/access":
ensure => present, ensure => present,
mode => "0644",
owner => "root",
group => "root",
source => [ source => [
"puppet:///files/mail/access.${fqdn}", "puppet:///files/mail/access.${fqdn}",
"puppet:///files/mail/access", "puppet:///files/mail/access",
"puppet:///modules/sendmail/empty", "puppet:///modules/sendmail/empty",
], ],
mode => "0644",
owner => "root",
group => "root",
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["sendmail"],
},
notify => Exec["make access.db"], notify => Exec["make access.db"],
require => Package["sendmail"],
} }
exec { "make access.db": exec { "make access.db":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
@ -363,19 +336,16 @@ class sendmail::server inherits sendmail::common {
file { "/etc/mail/genericstable": file { "/etc/mail/genericstable":
ensure => present, ensure => present,
mode => "0644",
owner => "root",
group => "root",
source => [ source => [
"puppet:///files/mail/genericstable.${fqdn}", "puppet:///files/mail/genericstable.${fqdn}",
"puppet:///files/mail/genericstable", "puppet:///files/mail/genericstable",
"puppet:///modules/sendmail/empty", "puppet:///modules/sendmail/empty",
], ],
mode => "0644",
owner => "root",
group => "root",
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["sendmail"],
},
notify => Exec["make genericstable.db"], notify => Exec["make genericstable.db"],
require => Package["sendmail"],
} }
exec { "make genericstable.db": exec { "make genericstable.db":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
@ -386,19 +356,16 @@ class sendmail::server inherits sendmail::common {
file { "/etc/mail/mailertable": file { "/etc/mail/mailertable":
ensure => present, ensure => present,
mode => "0644",
owner => "root",
group => "root",
source => [ source => [
"puppet:///files/mail/mailertable.${fqdn}", "puppet:///files/mail/mailertable.${fqdn}",
"puppet:///files/mail/mailertable", "puppet:///files/mail/mailertable",
"puppet:///modules/sendmail/empty", "puppet:///modules/sendmail/empty",
], ],
mode => "0644",
owner => "root",
group => "root",
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["sendmail"],
},
notify => Exec["make mailertable.db"], notify => Exec["make mailertable.db"],
require => Package["sendmail"],
} }
exec { "make mailertable.db": exec { "make mailertable.db":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
@ -409,19 +376,16 @@ class sendmail::server inherits sendmail::common {
file { "/etc/mail/virtusertable": file { "/etc/mail/virtusertable":
ensure => present, ensure => present,
mode => "0644",
owner => "root",
group => "root",
source => [ source => [
"puppet:///files/mail/virtusertable.${fqdn}", "puppet:///files/mail/virtusertable.${fqdn}",
"puppet:///files/mail/virtusertable", "puppet:///files/mail/virtusertable",
"puppet:///modules/sendmail/empty", "puppet:///modules/sendmail/empty",
], ],
mode => "0644",
owner => "root",
group => "root",
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["sendmail"],
},
notify => Exec["make virtusertable.db"], notify => Exec["make virtusertable.db"],
require => Package["sendmail"],
} }
exec { "make virtusertable.db": exec { "make virtusertable.db":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
@ -432,15 +396,16 @@ class sendmail::server inherits sendmail::common {
file { "/etc/mail/local-host-names": file { "/etc/mail/local-host-names":
ensure => present, ensure => present,
mode => "0644",
owner => "root",
group => "root",
source => [ source => [
"puppet:///files/mail/local-host-names.${fqdn}", "puppet:///files/mail/local-host-names.${fqdn}",
"puppet:///files/mail/local-host-names", "puppet:///files/mail/local-host-names",
"puppet:///modules/sendmail/empty", "puppet:///modules/sendmail/empty",
], ],
mode => "0644",
owner => "root",
group => "root",
notify => Service["sendmail"], notify => Service["sendmail"],
require => Package["sendmail"],
} }
} }