sendmail: Removed non-functional OpenBSD stuff from sendmail::server
This commit is contained in:
parent
8b92526dde
commit
0872915da6
1 changed files with 45 additions and 80 deletions
|
@ -280,49 +280,24 @@ class sendmail::server inherits sendmail::common {
|
|||
|
||||
}
|
||||
|
||||
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 => "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":
|
||||
file { "/etc/mail/sendmail.mc":
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => $::operatingsystem ? {
|
||||
"openbsd" => "/usr/share/sendmail/cf/sendmail.cf",
|
||||
default => undef,
|
||||
},
|
||||
require => Exec["make sendmail.cf"],
|
||||
before => Service["sendmail"],
|
||||
content => template("sendmail/sendmail.mc.erb"),
|
||||
notify => Exec["make sendmail.cf"],
|
||||
require => Package["sendmail"],
|
||||
}
|
||||
exec { "make sendmail.cf":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail",
|
||||
cwd => "/etc/mail",
|
||||
refreshonly => true,
|
||||
notify => Service["sendmail"],
|
||||
}
|
||||
|
||||
file { "/etc/aliases":
|
||||
ensure => present,
|
||||
name => $::operatingsystem ? {
|
||||
"openbsd" => "/etc/mail/aliases",
|
||||
default => "/etc/aliases",
|
||||
},
|
||||
source => [
|
||||
"puppet:///files/mail/aliases.${fqdn}",
|
||||
"puppet:///files/mail/aliases",
|
||||
|
@ -332,6 +307,7 @@ class sendmail::server inherits sendmail::common {
|
|||
owner => "root",
|
||||
group => "root",
|
||||
notify => Exec["newaliases"],
|
||||
require => Package["sendmail"],
|
||||
}
|
||||
exec { "newaliases":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
|
@ -339,20 +315,17 @@ class sendmail::server inherits sendmail::common {
|
|||
}
|
||||
|
||||
file { "/etc/mail/access":
|
||||
ensure => present,
|
||||
source => [
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => [
|
||||
"puppet:///files/mail/access.${fqdn}",
|
||||
"puppet:///files/mail/access",
|
||||
"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":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
|
@ -362,20 +335,17 @@ class sendmail::server inherits sendmail::common {
|
|||
}
|
||||
|
||||
file { "/etc/mail/genericstable":
|
||||
ensure => present,
|
||||
source => [
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => [
|
||||
"puppet:///files/mail/genericstable.${fqdn}",
|
||||
"puppet:///files/mail/genericstable",
|
||||
"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":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
|
@ -385,20 +355,17 @@ class sendmail::server inherits sendmail::common {
|
|||
}
|
||||
|
||||
file { "/etc/mail/mailertable":
|
||||
ensure => present,
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => [
|
||||
"puppet:///files/mail/mailertable.${fqdn}",
|
||||
"puppet:///files/mail/mailertable",
|
||||
"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":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
|
@ -408,20 +375,17 @@ class sendmail::server inherits sendmail::common {
|
|||
}
|
||||
|
||||
file { "/etc/mail/virtusertable":
|
||||
ensure => present,
|
||||
source => [
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => [
|
||||
"puppet:///files/mail/virtusertable.${fqdn}",
|
||||
"puppet:///files/mail/virtusertable",
|
||||
"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":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
|
@ -431,16 +395,17 @@ class sendmail::server inherits sendmail::common {
|
|||
}
|
||||
|
||||
file { "/etc/mail/local-host-names":
|
||||
ensure => present,
|
||||
source => [
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => [
|
||||
"puppet:///files/mail/local-host-names.${fqdn}",
|
||||
"puppet:///files/mail/local-host-names",
|
||||
"puppet:///modules/sendmail/empty",
|
||||
],
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
notify => Service["sendmail"],
|
||||
notify => Service["sendmail"],
|
||||
require => Package["sendmail"],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue