r12: Fixes for package breakage, more postinst cleanup and

[amavisd-cn.git] / templates / sendmail-to-postfix.diff

diff --git a/templates/sendmail-to-postfix.diff b/templates/sendmail-to-postfix.diff
deleted file mode 100644 (file)
index 9ccdd7f..0000000
--- a/templates/sendmail-to-postfix.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- amavisd.conf.sendmail-template     2006-06-30 10:53:18.000000000 +0200
-+++ amavisd.conf.postfix-template      2006-06-30 13:07:57.000000000 +0200
-@@ -102,17 +102,17 @@
- # POSTFIX, or SENDMAIL in dual-MTA setup, or EXIM V4
- # (set host and port number as required; host can be specified
- # as IP address or DNS name (A or CNAME, but MX is ignored)
--#$forward_method = 'smtp:127.0.0.1:10025';  # where to forward checked mail
--#$notify_method = $forward_method;          # where to submit notifications
-+$forward_method = 'smtp:127.0.0.1:10025';  # where to forward checked mail
-+$notify_method = $forward_method;          # where to submit notifications
- 
- # NOTE: The defaults (above) are good for Postfix or dual-sendmail. You MUST
- #       uncomment the appropriate settings below if using other setups!
- 
- # SENDMAIL MILTER, using amavis-milter.c helper program:
- # SEE amavisd-new-milter package docs FOR DEBIAN INSTRUCTIONS
--$forward_method = undef;  # no explicit forwarding, sendmail does it by itself
-+#$forward_method = undef;  # no explicit forwarding, sendmail does it by itself
- # milter; option -odd is needed to avoid deadlocks
--$notify_method = 'pipe:flags=q argv=/usr/sbin/sendmail -Ac -i -odd -f ${sender} -- ${recipient}';
-+#$notify_method = 'pipe:flags=q argv=/usr/sbin/sendmail -Ac -i -odd -f ${sender} -- ${recipient}';
- # just a thought: can we use use -Am instead of -odd ?
- 
- # SENDMAIL (old non-milter setup, as relay):
-@@ -232,7 +232,7 @@
- 
- # SMTP SERVER (INPUT) PROTOCOL SETTINGS (e.g. with Postfix, Exim v4, ...)
- #   (used when MTA is configured to pass mail to amavisd via SMTP or LMTP)
--#$inet_socket_port = 10024;        # accept SMTP on this local TCP port
-+$inet_socket_port = 10024;        # accept SMTP on this local TCP port
-                                   # (default is undef, i.e. disabled)
- # multiple ports may be provided: $inet_socket_port = [10024, 10026, 10028];
- 
-@@ -240,7 +240,7 @@
- # - do not allow free access to the amavisd SMTP port !!!
- #
- # when MTA is at the same host, use the following (one or the other or both):
--#$inet_socket_bind = '127.0.0.1';  # limit socket bind to loopback interface
-+$inet_socket_bind = '127.0.0.1';  # limit socket bind to loopback interface
-                                   # (default is '127.0.0.1')
- #@inet_acl = qw( 127.0.0.1 );      # allow SMTP access only from localhost IP
-                                   # (default is qw( 127.0.0.1 ) )