Adding gpg-mailgate support on squeeze

diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-squeeze.erb
index 9ce32647bd769e40e9836d878d5bbfb9fa47cf3a..b51e907a1110a85c010027c2f62293c82c8270ff 100644 (file)
--- a/templates/master.cf.debian-squeeze.erb
+++ b/templates/master.cf.debian-squeeze.erb
@@ -115,7 +115,7 @@ amavis unix - - - - 2 smtp
         -o smtp_send_xforward_command=yes
 
 127.0.0.1:10025 inet n - - - - smtpd
-        -o content_filter=
+        -o content_filter=<%- if use_gpg_mailgate == 'yes' %>gpg-mailgate<% end %>
         -o local_recipient_maps=
         -o relay_recipient_maps=
         -o smtpd_restriction_classes=
@@ -152,7 +152,20 @@ firma  unix  -       n       n       -       -       pipe
 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=nobody 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 -%>