deploy-domtool: update for new servers and systemd

[hcoop/scripts.git] / deploy-domtool-on-host

diff --git a/deploy-domtool-on-host b/deploy-domtool-on-host
index 4fe939c..973ffe6 100755 (executable)
--- a/deploy-domtool-on-host
+++ b/deploy-domtool-on-host
@@ -5,21 +5,23 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-cd /afs/hcoop.net/common/domtool/build/$(hostname)/domtool2
+cd /afs/hcoop.net/common/domtool/build/$(hostname -s)/domtool2
 
 git checkout release # just in case
 git pull
 
-make -j2
+make
 
 if [ x"$2" = "x--bootstrap" ]; then
     sudo make install
     case $1 in
-       --server) 
-           sudo insserv domtool-server
+       --server)
+           sudo make install_systemd_dispatcher
+           sudo systemctl enable domtool-server
            ;;
        --slave)
-           sudo insserv domtool-slave
+           sudo make install_systemd_worker
+           sudo systemctl enable domtool-slave
            ;;
     esac
 fi
@@ -33,4 +35,4 @@ fi
 if [ "$1" = "--slave" ]; then
     echo "Installing Slave"
     sudo make install_slave
-fi
\ No newline at end of file
+fi