From 0e590553570f4f0c444a6eabc63319ea723eaf65 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Wed, 6 Apr 2016 10:44:01 +0300
Subject: [PATCH] smtpd: Fix mailer.conf for OpenBSD 5.9.

---
 smtpd/manifests/init.pp                              | 12 ++++++------
 .../{files/mailer.conf => templates/mailer.conf.erb} |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)
 rename smtpd/{files/mailer.conf => templates/mailer.conf.erb} (50%)

diff --git a/smtpd/manifests/init.pp b/smtpd/manifests/init.pp
index 01b5e72..d8fefbf 100644
--- a/smtpd/manifests/init.pp
+++ b/smtpd/manifests/init.pp
@@ -107,12 +107,12 @@ class smtpd(
       $mda = '/usr/local/bin/procmail -Y -t -f %{sender}'
 
       file { '/etc/mailer.conf':
-        ensure => present,
-        mode   => '0644',
-        owner  => 'root',
-        group  => 'wheel',
-        source => 'puppet:///modules/smtpd/mailer.conf',
-        before => Service[$service],
+        ensure  => present,
+        mode    => '0644',
+        owner   => 'root',
+        group   => 'wheel',
+        content => template('smtpd/mailer.conf.erb'),
+        before  => Service[$service],
       }
 
       service { 'sendmail':
diff --git a/smtpd/files/mailer.conf b/smtpd/templates/mailer.conf.erb
similarity index 50%
rename from smtpd/files/mailer.conf
rename to smtpd/templates/mailer.conf.erb
index 4cb477c..1f3b178 100644
--- a/smtpd/files/mailer.conf
+++ b/smtpd/templates/mailer.conf.erb
@@ -1,5 +1,10 @@
 sendmail	/usr/sbin/smtpctl
 send-mail	/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
 newaliases	/usr/libexec/smtpd/makemap
+<% end -%>