X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/563e77927eb5faaae4571bd2b0811de590368581..4bfa6af3ae44abcb7f3fa882ec88cf7b9574ef6c:/scripts/domtool-publish

diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index f11bc4c..c40bb19 100755
--- a/scripts/domtool-publish
+++ b/scripts/domtool-publish
@@ -10,39 +10,39 @@ redo_exim() {
 	/bin/echo -n "domainlist mm_domains = " >>/etc/exim4/conf.d/main/10_domtool-domains
 	/bin/cat /var/domtool/mailman_domains.cfg >>/etc/exim4/conf.d/main/10_domtool-domains
 	/bin/echo "" >>/etc/exim4/conf.d/main/10_domtool-domains
-	/etc/init.d/exim4 reload
+	service exim4 reload
 }
 
 case $1 in
 	apache)
 		/usr/bin/rsync -r --delete /var/domtool/vhosts/ /etc/apache2/vhosts/
-		/etc/init.d/apache2 reload
+		service apache2 reload
 	;;
 	apache-down)
-		/etc/init.d/apache2 stop
+		service apache2 stop
 	;;
 	apache-undown)
 		/usr/bin/rsync -r --delete /var/domtool/vhosts/ /etc/apache2/vhosts/
-		/etc/init.d/apache2 start
+		service apache2 start
 	;;
 	apache1.3)
 		/usr/bin/rsync -r --delete /var/domtool/vhosts/ /etc/apache/vhosts/
-		/etc/init.d/apache reload
+		service apache reload
 	;;
 	apache1.3-down)
-		/etc/init.d/apache stop
+		service apache stop
 	;;
 	apache1.3-undown)
 		/usr/bin/rsync -r --delete /var/domtool/vhosts/ /etc/apache/vhosts/
-		/etc/init.d/apache start
+		service apache start
 	;;
 	bind)
 		/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
-		/etc/init.d/bind9 restart
+		/bin/chown root:bind /etc/bind/named.conf.local
+		/bin/chmod 644 /etc/bind/named.conf.local
+		service bind9 restart
 	;;
 	exim)
 		/bin/cp /var/domtool/aliases /etc/aliases.hosted
@@ -53,32 +53,70 @@ case $1 in
                 /bin/echo "HCOOP_VHOSTS = {" >/etc/mailman/vhosts_cfg.py
 		/bin/cat /var/domtool/mailman.map >>/etc/mailman/vhosts_cfg.py
                 /bin/echo "}" >>/etc/mailman/vhosts_cfg.py
-		/etc/init.d/mailman reload
+		service mailman reload
 		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
+		service 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/
+	       service ferm reload
+	       ;;
+	firewallpuppet)
+	       # new firewall publishing method that integrates with puppet (sort of)
+	       /bin/cp /var/domtool/firewall/*.conf /etc/ferm/
+	       if [ ! -d /etc/puppetlabs ]; then
+		   # legacy node
+		   service ferm reload
+		   exit
+	       fi
+	       if ( /usr/sbin/ferm --noexec /etc/ferm/ferm.conf ); then
+		   for chain in FERM-INPUT FERM-OUTPUT; do
+		       /sbin/iptables -F $chain
+		       /sbin/ip6tables -F $chain
+
+		       /usr/sbin/ferm --domain ip  --noexec --lines /etc/ferm/ferm.conf | iptables-restore --noflush
+       		       /usr/sbin/ferm --domain ip6 --noexec --lines /etc/ferm/ferm.conf | ip6tables-restore --noflush
+		   done
+	       else
+		   echo "firewall: ferm failed, aborting regeneration."
+	       fi
+	;;
 	*)
-		echo "Usage: domtool-publish [apache|bind|courier|exim|mailman|smtplog STRING|users]"
+		echo "Usage: domtool-publish [apache|bind|courier|exim|mailman|smtplog STRING|users|firewall]"
 	;;
 esac