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

Changed remaining fqdn references to homename

Browse source
This commit is contained in:
Ossi Salmi 2013-08-03 00:06:03 +03:00
parent 74d93dae34
commit ebde843cc6
17 changed files with 48 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

40
sendmail/manifests/init.pp
View file

@ -302,14 +302,14 @@ class sendmail::server inherits sendmail::common {
file { "/etc/aliases":
ensure => present,
source => [
"puppet:///files/mail/aliases.${fqdn}",
"puppet:///files/mail/aliases",
"puppet:///modules/sendmail/aliases",
],
mode => "0644",
owner => "root",
group => "root",
source => [
"puppet:///files/mail/aliases.${::homename}",
"puppet:///files/mail/aliases",
"puppet:///modules/sendmail/aliases",
],
notify => Exec["newaliases"],
require => Package["sendmail"],
}
@ -324,9 +324,9 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/access.${fqdn}",
"puppet:///files/mail/access",
"puppet:///modules/sendmail/empty",
"puppet:///files/mail/access.${::homename}",
"puppet:///files/mail/access",
"puppet:///modules/sendmail/empty",
],
notify => Exec["make access.db"],
require => Package["sendmail"],
@ -344,9 +344,9 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/genericstable.${fqdn}",
"puppet:///files/mail/genericstable",
"puppet:///modules/sendmail/empty",
"puppet:///files/mail/genericstable.${::homename}",
"puppet:///files/mail/genericstable",
"puppet:///modules/sendmail/empty",
],
notify => Exec["make genericstable.db"],
require => Package["sendmail"],
@ -364,9 +364,9 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/mailertable.${fqdn}",
"puppet:///files/mail/mailertable",
"puppet:///modules/sendmail/empty",
"puppet:///files/mail/mailertable.${::homename}",
"puppet:///files/mail/mailertable",
"puppet:///modules/sendmail/empty",
],
notify => Exec["make mailertable.db"],
require => Package["sendmail"],
@ -384,9 +384,9 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/virtusertable.${fqdn}",
"puppet:///files/mail/virtusertable",
"puppet:///modules/sendmail/empty",
"puppet:///files/mail/virtusertable.${::homename}",
"puppet:///files/mail/virtusertable",
"puppet:///modules/sendmail/empty",
],
notify => Exec["make virtusertable.db"],
require => Package["sendmail"],
@ -404,9 +404,9 @@ class sendmail::server inherits sendmail::common {
owner => "root",
group => "root",
source => [
"puppet:///files/mail/local-host-names.${fqdn}",
"puppet:///files/mail/local-host-names",
"puppet:///modules/sendmail/empty",
"puppet:///files/mail/local-host-names.${::homename}",
"puppet:///files/mail/local-host-names",
"puppet:///modules/sendmail/empty",
],
notify => Service["sendmail"],
require => Package["sendmail"],