From 227698b83d1ebd17ea3089420779c9adfecf52d8 Mon Sep 17 00:00:00 2001
From: Steven Mondji-Lerider <squidly@nnx.com>
Date: Mon, 18 Feb 2013 16:31:51 +0000
Subject: [PATCH] Templatising postfix.cf for the maildir_base variable +
 moving it to the postfix directory

---
 .gitattributes                                       | 4 ++--
 etc/alternc/{ => templates/postfix}/postfix-slave.cf | 0
 etc/alternc/{ => templates/postfix}/postfix.cf       | 3 ++-
 install/alternc.install                              | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename etc/alternc/{ => templates/postfix}/postfix-slave.cf (100%)
 rename etc/alternc/{ => templates/postfix}/postfix.cf (95%)

diff --git a/.gitattributes b/.gitattributes
index 211cdbd6..2b46a6cb 100644
--- a/.gitattributes
+++ b/.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
diff --git a/etc/alternc/postfix-slave.cf b/etc/alternc/templates/postfix/postfix-slave.cf
similarity index 100%
rename from etc/alternc/postfix-slave.cf
rename to etc/alternc/templates/postfix/postfix-slave.cf
diff --git a/etc/alternc/postfix.cf b/etc/alternc/templates/postfix/postfix.cf
similarity index 95%
rename from etc/alternc/postfix.cf
rename to etc/alternc/templates/postfix/postfix.cf
index 8fcd97c8..5993d973 100644
--- a/etc/alternc/postfix.cf
+++ b/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
diff --git a/install/alternc.install b/install/alternc.install
index 96798ff9..9e000271 100644
--- a/install/alternc.install
+++ b/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"