Changeset 2322

Timestamp:

10/07/08 00:12:41 (1 month ago)

Author:

anarcat

Message:

do not override Postfix's main.cf: instead, we use a /etc/alternc/postfix.cf to hold our configuration changes and apply that on postinst.

Closes: #1029

Files:

• alternc/trunk/debian/changelog (modified) (2 diffs)
• alternc/trunk/debian/control (modified) (2 diffs)
• alternc/trunk/etc/alternc/postfix.cf (moved) (moved from alternc/trunk/etc/alternc/templates/postfix/main.cf) (3 diffs, 1 prop)
• alternc/trunk/install/alternc.install (modified) (2 diffs)

alternc/trunk/debian/changelog

@@ -11 +11 @@
-    * FTP/TLS is now working properly (config is RSA not DSA, and key AND
-      certif config must be BOTH populated)
+    * #1029: do not overwrite the main.cf from postfix
-  * new features:
-    * start logging IP addresses in logs
@@ -20 +21 @@
-    * make a new alternc-slave package that eases installation on NFS-backed
-      frontend nodes
+    * builtin postgrey and Spamhaus blacklisting configuration
-  * other changes:
-    * deprecate the mynetwork modification in Postfix, this is now left to the
-      admin
+    * note that even though main.cf is not directly overwritten (#1029, as
+      per Debian Policy), some settings are directly overwritten. those
+      settings are configured in /etc/alternc/postfix.cf.
-
- -- Antoine Beaupré <anarcat@koumbit.org>  Tue, 15 Apr 2008 11:52:56 -0400

alternc/trunk/debian/control

@@ -11 +11 @@
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-
+, postgrey
-Recommends: libapache-mod-gzip, apache-ssl, mysql-server
-Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4)
@@ -30 +30 @@
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-
+, postgrey
-Recommends: libapache-mod-gzip, apache-ssl
-Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc

alternc/trunk/etc/alternc/postfix.cf

@@ -1 @@
-#
-# Fichier de configuration de Postfix pour AlternC
-# $Id: main.cf,v 1.17 2006/01/12 06:50:15 anarcat Exp $
-# 
-# %%warning_message%% 
-# pour postfix SARGE v2
-
-queue_directory = /var/spool/postfix
-command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
-mail_owner = postfix
-# recipient_delimiter = +
-
-home_mailbox = Maildir/
-
-smtpd_banner = $myhostname ESMTP
-
-header_checks = regexp:/etc/postfix/header_checks
-body_checks = regexp:/etc/postfix/body_checks
-
-local_destination_concurrency_limit = 8
-default_destination_concurrency_limit = 10
-
-myhostname = %%fqdn%%
-myorigin = %%fqdn%%
-
-
-# Configuration TLS pour le serveur smtp : 
-smtpd_use_tls = yes
-smtpd_tls_dcert_file = /etc/courier/pop3d.pem
@@ -36 +14 @@
-smtpd_tls_received_header = yes
-smtpd_tls_session_cache_timeout = 3600s
-tls_random_source = dev:/dev/urandom
-
-# Configuration TLS pour le client smtp
-smtp_use_tls = yes
-smtp_tls_dcert_file = $smtpd_tls_dcert_file
-smtp_tls_dkey_file = $smtpd_tls_dcert_file
-smtp_tls_CApath = $smtpd_tls_CApath
-
-# Configuration SASL via sasldb (/etc/sasldb) uniquement en TLS.
-# Sinon le pass passe en clair et c'est mal !
-smtpd_tls_auth_only = yes
-smtpd_sasl_auth_enable = yes
@@ -52 +24 @@
-enable_sasl_authentification = yes
-broken_sasl_auth_clients = yes
-
-#queue_directory = /var/spool/postfix
-#command_directory = /usr/sbin
-#daemon_directory = /usr/lib/postfix
-#mail_owner = postfix
-#recipient_delimiter = +
-
-# Pour éviter certains vieux spammeurs.
-disable_vrfy_command = yes
-
-# On autorise le relai à : les authentifiés en saslet nos domaines.
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_invalid_hostname, reject_non_fqdn_hostname, reject_non_fqdn_sender, reject_non_fqdn_recipient, reject_unknown_sender_domain, reject_unknown_recipient_domain, reject_unauth_pipelining, reject_unauth_destination
-
-alias_maps = mysql:/etc/postfix/myalias.cf hash:/etc/aliases
-virtual_maps = proxy:mysql:/etc/postfix/mydomain.cf
-virtual_mailbox_maps = proxy:mysql:/etc/postfix/myvirtual.cf
-
-virtual_mailbox_base = /
-virtual_minimum_uid = 1000
-virtual_gid_maps = proxy:mysql:/etc/postfix/mygid.cf
-virtual_uid_maps = static:33
-
-default_privs = www-data
-
+

alternc/trunk/install/alternc.install

@@ -33 +33 @@
-fi
-if [ -d /etc/postfix ]; then
-ain.cf etc/postfix/m
+
-                  etc/postfix/mydomain.cf etc/postfix/mygid.cf
-                  etc/postfix/myvirtual.cf etc/postfix/sasl/smtpd.conf"
@@ -214 +214 @@
-fi
-
+# configure postfix appropriatly for our needs"
+while read line
+do
+   postconf -e $line
+done < /etc/alternc/postfix.cf
+
+while read line
+do
+   postconf -e $line
+done <<EOF
+myhostname = $FQDN
+myorigin = $FQDN
+EOF
+
-if [ -e /etc/courier/authmysqlrc ] ; then
-    chown root:root /etc/courier/authmysqlrc