Disentangle vmail from the mail node, Prepare for dovecot support

[hcoop/domtool2.git] / scripts / domtool-publish

diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index b9f6ffc..9eea020 100755 (executable)
--- a/scripts/domtool-publish
+++ b/scripts/domtool-publish
@@ -40,8 +40,8 @@ case $1 in
                /usr/bin/rsync -r --delete /var/domtool/zones/ /etc/bind/zones/
                /bin/chown -R bind /etc/bind/zones
                /bin/cp /var/domtool/named.conf.local /etc/bind/
-               /bin/chown root:bind_config /etc/bind/named.conf.local
-               /bin/chmod u=rw,g=rw,o=r /etc/bind/named.conf.local
+               /bin/chown root:bind /etc/bind/named.conf.local
+               /bin/chmod 644 /etc/bind/named.conf.local
                /etc/init.d/bind9 restart
        ;;
        exim)
@@ -57,6 +57,12 @@ case $1 in
                redo_exim
        ;;
        courier)
+               VMAILDB=`domtool-config -path vmaildb`
+               if [ -z "$VMAILDB" ]; then
+                   echo "domtool-config not found, not syncing courier vmail userdb"
+                   exit 1
+               fi
+               /usr/bin/rsync -r --delete ${VMAILDB}/ /etc/courier/userdb
                /usr/sbin/makeuserdb
                /bin/chown -R domtool.nogroup /etc/courier/userdb
                /bin/cat /etc/courier/userdb/* >/etc/courier/exim
@@ -79,6 +85,11 @@ case $1 in
                /etc/init.d/apache2 reload
         ;;
         firewall)
+              # Ideally this would check if the config worked first
+              # (ferm failing just uses the previous config at
+              # least). Does it need to chown/chmod the generated
+              # rules?
+              /bin/cp /var/domtool/firewall/*.conf /etc/ferm/
               /etc/init.d/ferm reload
        ;;
        *)