X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/73b9542320e82ad398689b66bc1938c78cc53be0..07dd1e373a527f319c15744bf9f9f9162ac93d4d:/scripts/domtool-publish

diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index 7518281..cd5e196 100755
--- 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,28 +57,43 @@ 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.domtool /etc/courier/userdb
+		/bin/chown -R domtool:nogroup /etc/courier/userdb
 		/bin/cat /etc/courier/userdb/* >/etc/courier/exim
 		/bin/chmod o-r /etc/courier/exim
 		/usr/sbin/exim_dbmbuild /etc/courier/exim /etc/courier/exim.dat
 		/bin/chgrp mail /etc/courier/exim.dat
 		/bin/chmod o-r /etc/courier/exim.dat
 	;;
+        spamassassin)
+	        SHAREDROOT=`domtool-config -path shared-root`
+		/usr/bin/rsync -r --delete ${SHAREDROOT}/email/spamassassin/addrs/ /etc/spamassassin/addrs
+	;;
 	smtplog)
 		/bin/grep $2 /var/log/exim4/mainlog
 	;;
         apache-fixperms)
-                /bin/chown -R domtool.domtool /var/log/apache2/user
+                /bin/chown -R domtool:nogroup /var/log/apache2/user
         ;;
         apache1.3-fixperms)
-                /bin/chown -R domtool.domtool /var/log/apache/user
+                /bin/chown -R domtool:nogroup /var/log/apache/user
         ;;
         users)
                 /bin/cp /var/domtool/waklog.conf /etc/apache2/
 		/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
 	;;
 	*)