From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sat, 15 Dec 2018 17:24:59 +0000 (-0500)
Subject: deploy-domtool: update for new servers and systemd
X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/commitdiff_plain/a17d41eddce90091f48aae1a928b402be620667f

deploy-domtool: update for new servers and systemd

Some servers now have insufficient memory to handle multiple instances
of mlton, but this isn't as big of a deal now with improved
single-threaded performance.
---

diff --git a/deploy-domtool b/deploy-domtool
index 7b5ff82..bf5c372 100755
--- a/deploy-domtool
+++ b/deploy-domtool
@@ -2,10 +2,9 @@
 
 # deploy domtool to all machines
 
-HOSTS_SERVER="fritz"
+HOSTS_SERVER="gibran"
 
-# todo: outpost (needs kerberos auth)
-HOSTS_SLAVE="deleuze navajos bog hopper mccarthy outpost" 
+HOSTS_SLAVE="outpost marsh minsky shelob lovelace"
 
 for master in $HOSTS_SERVER;
 do
@@ -24,9 +23,3 @@ function build_slave ()
 export -f build_slave
 
 echo $HOSTS_SLAVE | parallel -j 10 -d ' ' build_slave {}
-
-#for slave in $HOSTS_SLAVE;
-#do
-#  echo "##### Building SLAVE on $slave"
-#  ssh -K $slave ~clinton_admin/deploy-domtool-on-host.sh --slave
-#done
\ No newline at end of file
diff --git a/deploy-domtool-on-host b/deploy-domtool-on-host
index 4fe939c..973ffe6 100755
--- 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