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

smtpd: Fix service resource names

Browse source
This commit is contained in:
Ossi Salmi 2016-02-23 11:37:53 +02:00
parent 2e28f7dfbd
commit 23dbd80fe1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
smtpd/manifests/init.pp
View file

@ -172,7 +172,7 @@ class smtpd(
owner => 'root', owner => 'root',
group => 'wheel', group => 'wheel',
source => $ssl_key, source => $ssl_key,
notify => Service['smtpd'], notify => Service[$service],
} }
file { "${ssl::certs}/smtpd.crt": file { "${ssl::certs}/smtpd.crt":
ensure => present, ensure => present,
@ -180,7 +180,7 @@ class smtpd(
owner => 'root', owner => 'root',
group => 'wheel', group => 'wheel',
source => $ssl_cert, source => $ssl_cert,
notify => Service['smtpd'], notify => Service[$service],
} }
} }
@ -196,7 +196,7 @@ class smtpd(
mode => '0700', mode => '0700',
owner => 'root', owner => 'root',
group => 'wheel', group => 'wheel',
before => Service['smtpd'], before => Service[$service],
} }
if $gecos == true { if $gecos == true {
@ -233,7 +233,7 @@ class smtpd(
cwd => '/etc/mail', cwd => '/etc/mail',
path => '/bin:/usr/bin:/sbin:/usr/sbin', path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File['/etc/mail/aliases'], subscribe => File['/etc/mail/aliases'],
before => Service['smtpd'], before => Service[$service],
} }
file { '/etc/mail/clients': file { '/etc/mail/clients':
@ -252,7 +252,7 @@ class smtpd(
cwd => '/etc/mail', cwd => '/etc/mail',
path => '/bin:/usr/bin:/sbin:/usr/sbin', path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File['/etc/mail/clients'], subscribe => File['/etc/mail/clients'],
before => Service['smtpd'], before => Service[$service],
} }
if $domains { if $domains {
@ -297,7 +297,7 @@ define smtpd::aliases($gecos) {
cwd => '/etc/mail', cwd => '/etc/mail',
path => '/bin:/usr/bin:/sbin:/usr/sbin', path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File["/etc/mail/aliases.${name}"], subscribe => File["/etc/mail/aliases.${name}"],
before => Service['smtpd'], before => Service[$smtpd::service],
} }
} }
@ -323,7 +323,7 @@ define smtpd::virtual() {
cwd => '/etc/mail', cwd => '/etc/mail',
path => '/bin:/usr/bin:/sbin:/usr/sbin', path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File["/etc/mail/virtual.${name}"], subscribe => File["/etc/mail/virtual.${name}"],
before => Service['smtpd'], before => Service[$smtpd::service],
} }
} }