Changeset 2424

Timestamp:

10/23/08 20:37:40 (5 years ago)

Author:

anarcat

Message:

configure alternc-slave as a primary MX for the main server

this aims to resolve a lot of mail problems we are having on our deployment at Koumbit

Location:

alternc/trunk

Files:

• debian/alternc-slave.postinst (modified) (1 diff)
• etc/alternc/postfix-slave.cf (copied) (copied from alternc/trunk/etc/alternc/postfix.cf) (1 diff)
• etc/alternc/templates/postfix/myrelay.cf (copied) (copied from alternc/trunk/etc/alternc/templates/postfix/myvirtual.cf) (1 diff)
• install/alternc.install (modified) (5 diffs)

alternc/trunk/debian/alternc-slave.postinst

@@ -180 +180 @@
 
     echo "running alternc.install"
-    alternc.install
+    alternc.install -s
     ;;
 

alternc/trunk/etc/alternc/postfix-slave.cf

@@ -24 +24 @@
 enable_sasl_authentification = yes
 broken_sasl_auth_clients = yes
-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
+alias_maps = hash:/etc/aliases
+virtual_maps = 
+virtual_mailbox_maps = 
+virtual_mailbox_base = 
+virtual_gid_maps = 
+virtual_uid_maps = 
+default_privs = nobody
+transport_maps=proxy:mysql:/etc/postfix/myrelay.cf
+relay_domains=proxy:mysql:/etc/postfix/myrelay.cf
+relay_recipients_map=proxy:mysql:/etc/postfix/myvirtual.cf
 smtpd_recipient_restrictions = reject_unlisted_recipient, permit_mynetworks, permit_sasl_authenticated, reject_non_fqdn_recipient, reject_unauth_destination, check_policy_service inet:127.0.0.1:60000, reject_rbl_client zen.spamhaus.org

alternc/trunk/etc/alternc/templates/postfix/myrelay.cf

@@ -7 +7 @@
 hosts =%%dbhost%%
 dbname = %%dbname%%
-table = mail_users
-select_field = path
-where_field = alias
+table = mail_domain
+# this should by %%primary_mx%%
+select_field = relay:[%%mx%%]
+where_field = mail
 

alternc/trunk/install/alternc.install

@@ -11 +11 @@
 set -e 
 
+opts=`getopt "sf" $*`
+if [ $? -ne 0 ]; then
+    echo invalid syntax: $?
+fi
+set -- $opts
+for i; do
+    case "$i" in
+        -f|--force)
+            force=1; shift;;
+        -s|--slave)
+            slave=1; shift;;
+        --)
+            break;;
+        *)
+            echo "unknown option $i"; shift;;
+    esac
+done
+
 . /usr/lib/alternc/functions.sh
 
@@ -33 +51 @@
 fi
 if [ -d /etc/postfix ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/postfix/myalias.cf
+    CONFIG_FILES="$CONFIG_FILES etc/postfix/myalias.cf etc/postfix/myrelay.cf
                   etc/postfix/mydomain.cf etc/postfix/mygid.cf
                   etc/postfix/myvirtual.cf etc/postfix/sasl/smtpd.conf"
@@ -57 +75 @@
               grep -v 'postfix/main.cf' | grep -v 'Uid differs'|grep -v 'Gid differs'  |grep -v 'Mode differs' | 
               sed -e 's/^\([^:]*\).*/    \1/' | sort -u`"
+    # " shutup emacs
     if [ ! -z "$CHANGED" ]; then
         echo "The following configuration files has changed since last AlternC"
@@ -62 +81 @@
         echo "$CHANGED"
         echo ""
-        if [ "$1" = "force" ]; then
+        if [ "$force" = "1" ]; then
             echo "Replacing them as you requested."
         else
@@ -247 +266 @@
 
 # Attribute the correct rights to critical postfix files
-if [ -e /etc/postfix/myalias.cf -o -e /etc/postfix/mydomain.cf -o -e /etc/postfix/mygid.cf -o -e /etc/postfix/myvirtual.cf ]; then
+if [ -e /etc/postfix/myalias.cf -o -e /etc/postfix/mydomain.cf -o -e /etc/postfix/mygid.cf -o -e /etc/postfix/myvirtual.cf -o -e /etc/postfix/myrelay.cf ]; then
     chown root:postfix /etc/postfix/my*
     chmod 640 /etc/postfix/my*
 fi
 
-# configure postfix appropriatly for our needs"
+# configure postfix appropriatly for our needs
+if [ "$slave" = "1" ]; then
+    postfix_conf=/etc/alternc/postfix-slave.cf
+else
+    postfix_conf=/etc/alternc/postfix.cf
+fi
 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
+done < $postfix_conf
 
 if [ -e /etc/courier/authmysqlrc ] ; then