From 4bfa6af3ae44abcb7f3fa882ec88cf7b9574ef6c Mon Sep 17 00:00:00 2001
From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sun, 22 Apr 2018 23:16:09 -0400
Subject: [PATCH 1/1] domtool-publish: use `service' instead of `/etc/init.d'

More compatible with sysvinit and systemd
---
 scripts/domtool-publish | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index 3450703..c40bb19 100755
--- a/scripts/domtool-publish
+++ b/scripts/domtool-publish
@@ -10,31 +10,31 @@ 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/
@@ -42,7 +42,7 @@ case $1 in
 		/bin/cp /var/domtool/named.conf.local /etc/bind/
 		/bin/chown root:bind /etc/bind/named.conf.local
 		/bin/chmod 644 /etc/bind/named.conf.local
-		/etc/init.d/bind9 restart
+		service bind9 restart
 	;;
 	exim)
 		/bin/cp /var/domtool/aliases /etc/aliases.hosted
@@ -53,7 +53,7 @@ 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)
@@ -86,7 +86,7 @@ case $1 in
         ;;
         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
@@ -94,14 +94,14 @@ case $1 in
 	       # least). Does it need to chown/chmod the generated
 	       # rules?
 	       /bin/cp /var/domtool/firewall/*.conf /etc/ferm/
-	       /etc/init.d/ferm reload
+	       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
-		   /etc/init.d/ferm reload
+		   service ferm reload
 		   exit
 	       fi
 	       if ( /usr/sbin/ferm --noexec /etc/ferm/ferm.conf ); then
-- 
2.20.1