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 (executable)
--- a/deploy-domtool
+++ b/deploy-domtool
@@ -2,10 +2,9 @@
 
 # deploy domtool to all machines
 
 
 # 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
 
 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 {}
 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 (executable)
--- a/deploy-domtool-on-host
+++ b/deploy-domtool-on-host
@@ -5,21 +5,23 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
     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
 
 
 git checkout release # just in case
 git pull
 

-make -j2
+make

 
 if [ x"$2" = "x--bootstrap" ]; then
     sudo make install
     case $1 in
 
 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)
            ;;
        --slave)

-           sudo insserv domtool-slave
+           sudo make install_systemd_worker
+           sudo systemctl enable domtool-slave

            ;;
     esac
 fi
            ;;
     esac
 fi


@@ -33,4 +35,4 @@ fi
 if [ "$1" = "--slave" ]; then
     echo "Installing Slave"
     sudo make install_slave
 if [ "$1" = "--slave" ]; then
     echo "Installing Slave"
     sudo make install_slave

-fi
\ No newline at end of file
+fi