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

smtpd: Fix mailer.conf for OpenBSD 5.9.

Browse source
This commit is contained in:
Timo Makinen 2016-04-06 10:44:01 +03:00
parent 35027cedb0
commit 0e59055357
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smtpd/manifests/init.pp
View file

@ -111,7 +111,7 @@ class smtpd(
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => 'wheel', group => 'wheel',
source => 'puppet:///modules/smtpd/mailer.conf', content => template('smtpd/mailer.conf.erb'),
before => Service[$service], before => Service[$service],
} }

5
smtpd/files/mailer.conf → smtpd/templates/mailer.conf.erb
View file

@ -1,5 +1,10 @@
sendmail /usr/sbin/smtpctl sendmail /usr/sbin/smtpctl
send-mail /usr/sbin/smtpctl send-mail /usr/sbin/smtpctl
mailq /usr/sbin/smtpctl mailq /usr/sbin/smtpctl
<% if scope.function_versioncmp([@operatingsystemrelease, "5.8"]) > 0 -%>
makemap /usr/sbin/smtpctl
newaliases /usr/sbin/smtpctl
<% else -%>
makemap /usr/libexec/smtpd/makemap makemap /usr/libexec/smtpd/makemap
newaliases /usr/libexec/smtpd/makemap newaliases /usr/libexec/smtpd/makemap
<% end -%>