Templatising postfix.cf for the maildir_base variable + moving it to the postfix directory

.gitattributes

@@ -457,8 +457,6 @@ etc/alternc/apache_logformat.conf -text
 etc/alternc/dbusers.cnf.sample -text
 etc/alternc/functions_hosting/hosting_massvhost.sh -text
 etc/alternc/phpmyadmin.inc.php -text
-etc/alternc/postfix-slave.cf -text
-etc/alternc/postfix.cf -text
 etc/alternc/templates/alternc/apache2.conf -text
 etc/alternc/templates/alternc/bureau.conf -text
 etc/alternc/templates/apache2/panel.conf -text
@@ -486,6 +484,8 @@ etc/alternc/templates/postfix/myrelay-domain.cf -text
 etc/alternc/templates/postfix/myrelay.cf -text
 etc/alternc/templates/postfix/mytransport.cf -text
 etc/alternc/templates/postfix/myvirtual.cf -text
+etc/alternc/templates/postfix/postfix-slave.cf -text
+etc/alternc/templates/postfix/postfix.cf -text
 etc/alternc/templates/postfix/sasl/smtpd.conf -text
 etc/alternc/templates/proftpd/modules.conf -text
 etc/alternc/templates/proftpd/proftpd.conf -text

etc/alternc/templates/postfix/postfix.cf

@@ -1,5 +1,6 @@
 # Postfix Configuration options
 # Used by alternc.install with postconf
+# CAREFULL this script is not used directly by postfix.
 home_mailbox = Maildir/
 smtpd_banner = $myhostname ESMTP
 header_checks = regexp:/etc/postfix/header_checks
@@ -37,7 +38,7 @@ virtual_alias_domains =
 virtual_mailbox_domains = proxy:mysql:/etc/postfix/mydomain.cf
 virtual_mailbox_maps = proxy:mysql:/etc/postfix/myvirtual.cf
 virtual_mailbox_limit_maps = proxy:mysql:/etc/postfix/myquota.cf
-virtual_mailbox_base = /var/alternc/mail
+virtual_mailbox_base = %%ALTERNC_MAIL%%
 virtual_minimum_uid = 2000
 virtual_gid_maps = proxy:mysql:/etc/postfix/mygid.cf
 virtual_uid_maps = proxy:mysql:/etc/postfix/mygid.cf

install/alternc.install

@@ -346,9 +346,9 @@ fi
 
 # configure Postfix appropriatly for our needs
 if [ "$slave" = "1" ]; then
-    postfix_conf=/etc/alternc/postfix-slave.cf
+    postfix_conf=/etc/alternc/postfix/postfix-slave.cf
 else
-    postfix_conf=/etc/alternc/postfix.cf
+    postfix_conf=/etc/alternc/postfix/postfix.cf
 fi
 grep -v '^\ *#' $postfix_conf |while read line ; do
    postconf -e "$line"