firma and gpg_mailgate on wheezy's mater.cf

diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-wheezy.erb
index 2c43844ff4b6cff2c4bd2bedb2d00ede43390782..c62abcd30e1606698de108c9e8e89d3e5a41fcf5 100644 (file)
--- a/templates/master.cf.debian-wheezy.erb
+++ b/templates/master.cf.debian-wheezy.erb
@@ -150,7 +150,26 @@ sympabounce  unix  -       n       n       -       -       pipe
 mlmmj   unix  -       n       n       -       -       pipe
   flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
 <%- end -%>
+<% if use_firma == 'yes' %>
+firma  unix  -       n       n       -       -       pipe
+  flags=DRhu user=firma argv=/var/lib/firma/firma -p ${user}
+firmarequest  unix  -       n       n       -       -       pipe
+  flags=DRhu user=firma argv=/var/lib/firma/firma -e ${user}
+<% end %>
+<%- if use_gpg_mailgate == 'yes' %>
+gpg-mailgate   unix    -       n       n       -       -       pipe
+       flags= user=gpg_mailgate argv=/usr/local/bin/gpg-mailgate.py
 
+127.0.0.1:10028        inet    n       -       n       -       10      smtpd
+        -o content_filter=
+        -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
+        -o smtpd_helo_restrictions=
+        -o smtpd_client_restrictions=
+        -o smtpd_sender_restrictions=
+        -o smtpd_recipient_restrictions=permit_mynetworks,reject
+        -o mynetworks=127.0.0.0/8
+        -o smtpd_authorized_xforward_hosts=127.0.0.0/8
+<%end %>
 <%- unless mastercf_tail.to_s.empty? then -%>
 <%= mastercf_tail %>
 <%- end -%>