From ca0427624bad62325531aadd55f8a87d409a4f77 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sun, 22 Jan 2012 20:24:21 +0200
Subject: [PATCH] Added sendmail::client::msa for sending mail using submission
 port

---
 sendmail/manifests/init.pp           | 52 ++++++++++++++++------------
 sendmail/templates/submit.mc.erb     |  3 --
 sendmail/templates/submit.mc.msa.erb |  1 +
 sendmail/templates/submit.mc.msp.erb |  1 +
 4 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 sendmail/templates/submit.mc.msa.erb
 create mode 100644 sendmail/templates/submit.mc.msp.erb

diff --git a/sendmail/manifests/init.pp b/sendmail/manifests/init.pp
index 17ce84e..f0c2f75 100644
--- a/sendmail/manifests/init.pp
+++ b/sendmail/manifests/init.pp
@@ -47,28 +47,24 @@ class sendmail::client inherits sendmail::common {
         $mail_server = "127.0.0.1"
     }
 
-    case $operatingsystem {
-        "openbsd": {
-            file { "/usr/share/sendmail/cf/submit.mc":
-                ensure  => present,
-                content => template("sendmail/submit.mc.erb"),
-                owner   => "root",
-                group   => "bin",
-                mode    => 0444,
-                notify  => Exec["make submit.cf"],
-            }
-        }
-        default: {
-            file { "/etc/mail/submit.mc":
-                ensure  => present,
-                content => template("sendmail/submit.mc.erb"),
-                owner   => "root",
-                group   => "root",
-                mode    => 0644,
-                notify  => Exec["make submit.cf"],
-                require => Package["sendmail"],
-            }
-        }
+    file { "/etc/mail/submit.mc":
+        path    => $operatingsystem ? {
+            "openbsd" => "/usr/share/sendmail/cf/submit.mc",
+            default   => "/etc/mail/submit.mc",
+        },
+        ensure  => present,
+        content => template("sendmail/submit.mc.erb", "sendmail/submit.mc.msp.erb"),
+        owner   => "root",
+        group   => $operatingsystem ? {
+            "openbsd" => "bin",
+            default   => "root",
+        },
+        mode    => 0644,
+        notify  => Exec["make submit.cf"],
+        require => $operatingsystem ? {
+            "openbsd" => undef,
+            default   => Package["sendmail"],
+        },
     }
 
     exec { "make submit.cf":
@@ -102,6 +98,18 @@ class sendmail::client inherits sendmail::common {
 
 }
 
+
+# Configure Sendmail submission using port 587.
+#
+class sendmail::client::msa inherits sendmail::client {
+
+    File["/etc/mail/submit.mc"] {
+        content => template("sendmail/submit.mc.erb", "sendmail/submit.mc.msa.erb"),
+    }
+
+}
+
+
 # Configure Sendmail server.
 #
 #   $sendmail_domain:
diff --git a/sendmail/templates/submit.mc.erb b/sendmail/templates/submit.mc.erb
index 88187ef..b5409e4 100644
--- a/sendmail/templates/submit.mc.erb
+++ b/sendmail/templates/submit.mc.erb
@@ -35,6 +35,3 @@ define(`confDOMAIN_NAME', `<%= mail_domain %>')dnl
 define(`confPID_FILE', `/var/run/sm-client.pid')dnl
 <% end -%>
 FEATURE(`use_ct_file')dnl
-dnl
-dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
-FEATURE(`msp', `[<%= mail_server %>]')dnl
diff --git a/sendmail/templates/submit.mc.msa.erb b/sendmail/templates/submit.mc.msa.erb
new file mode 100644
index 0000000..dc9c392
--- /dev/null
+++ b/sendmail/templates/submit.mc.msa.erb
@@ -0,0 +1 @@
+FEATURE(`msp', `[<%= mail_server %>]', `MSA')dnl
diff --git a/sendmail/templates/submit.mc.msp.erb b/sendmail/templates/submit.mc.msp.erb
new file mode 100644
index 0000000..ec8fe84
--- /dev/null
+++ b/sendmail/templates/submit.mc.msp.erb
@@ -0,0 +1 @@
+FEATURE(`msp', `[<%= mail_server %>]')dnl