smtpd: Added relaying for clients

smtpd/manifests/init.pp

@@ -173,6 +173,25 @@ class smtpd::server(
         before      => Service["smtpd"],
     }
 
+    file { "/etc/mail/clients":
+        ensure => present,
+        mode   => "0644",
+        owner  => "root",
+        group  => "wheel",
+        source => [
+            "puppet:///files/mail/clients.${::homename}",
+            "puppet:///files/mail/clients",
+            "puppet:///modules/smtpd/empty",
+        ],
+    }
+    exec { "makemap -t set clients":
+        refreshonly => true,
+        cwd         => "/etc/mail",
+        path        => "/bin:/usr/bin:/sbin:/usr/sbin",
+        subscribe   => File["/etc/mail/clients"],
+        before      => Service["smtpd"],
+    }
+
     if $domains {
         smtpd::aliases { $domains:
             gecos     => $gecos,

smtpd/templates/server.conf.erb

@@ -1,9 +1,7 @@
 listen on egress port smtp tls certificate server
 listen on egress port submission tls-require certificate server auth
-<% if @domains or @virtual -%>
 
-# alias and virtual maps
-<% end -%>
+table clients db:/etc/mail/clients.db
 <% @domains.each do |domain| -%>
 table aliases.<%= domain %> db:/etc/mail/aliases.<%= domain %>.db
 <% end if @domains -%>
@@ -35,5 +33,6 @@ accept from any for domain { "<%= domain %>", "*.<%= domain %>" } \
 <%   end -%>
 <% end -%>
 
-# relay for local and authenticated users
+# relay for remote clients and local users
+accept from <clients> for any relay<% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
 accept from local for any relay<% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>