Scripting for instance-agnostic setup

deploy.sh

@@ -2,28 +2,28 @@
 set -euo 
 #pipefail
 
+source instance
 
 mkdir -p uploads
 mkdir -p archive
 VERFILE=src/main/resources/buildno.txt
 VERSION=`cat $VERFILE`
-SERVER="50.57.81.82" 
-SERVERHOME="root@$SERVER:/root"
-KEYS="src2pdf20101223.pem"
-SCP="scp"
+#SERVER="50.57.81.82" 
+#SERVERHOME="root@$SERVER:/root"
+#KEYS="src2pdf20101223.pem"
 WARFILE=$1
 WARNAME=${WARFILE##*/}
-UP="$SCP uploads/* $SERVERHOME/download"
+UP="$SCP uploads/*"
 #echo "Have file $WARFILE, will $UP"
-GETLOGS="$SCP $SERVERHOME/tomcat/logs/* logs/"
-WEBAPPS="/var/lib/tomcat6/webapps"
+GETLOGS="$SCP $HOMETHERE/tomcat/logs/* logs/"
 echo `date`> "uploads/ready.flag"
 cp $WARFILE archive/$WARNAME.$VERSION
 cp $WARFILE uploads/presheaf.war
 echo "got version `cat src/main/resources/buildno.txt`"
-echo "presheaf-06062011-256MlU04JcS1o"
-$UP 
-#date 
+#echo "presheaf-06062011-256MlU04JcS1o"
+$SCP uploads/*.war
+$SCP uploads/ready.flag
+date 
 #sleep 600 
 #$GETLOGS
 

doit.sh

@@ -1,6 +1,5 @@
 # Generates images; pass file name without extension
-HOME=/root
-CACHE=$HOME/diagrams
+source instance
 NAME=$1
 SRC=$NAME.src
 TEX=$NAME.tex
@@ -10,7 +9,7 @@ IMG=$NAME.png
 
 grep -q -e "\\\\\\(tikz\\|draw\\|fill\\|filldraw\\|shade\\|path\\|node\\)" $CACHE/$SRC
 if [ "$?" -eq "0" ]; then
-  $HOME/dotikz.sh $1
+  $INSTANCE_HOME/dotikz.sh $1
 else
-  $HOME/doxy.sh $1
+  $INSTANCE_HOME/doxy.sh $1
 fi

dotikz.sh

@@ -1,6 +1,5 @@
 # Generates images; pass file name without extension
-HOME=/root
-CACHE=$HOME/diagrams
+source instance
 NAME=$1
 SRC=$NAME.src
 TEX=$NAME.tex

downloadScript

@@ -0,0 +1,2 @@
+curl https://raw.githubusercontent.com/vpatryshev/presheaf/master/$1 >$1
+chmod a+x,a+r $1

doxy.sh

@@ -1,7 +1,6 @@
 # Generates pdf and png from xypic; pass file name without extension
 # temporary name is dodoxy.sh; will be renamed back soon
-HOME=/root
-CACHE=$HOME/diagrams
+source instance
 NAME=$1
 TEX=$NAME.tex
 EPS=$NAME.eps

ec2setup

@@ -4,6 +4,8 @@ echo "deb-src http://us.archive.ubuntu.com/ubuntu/ maverick-updates multiverse"
 sudo cp tmp.tmp /etc/apt/sources.list
 rm tmp.tmp
 
+#see also CHEAP HOSTING: https://blog.online.net/2017/04/27/scaleway-disruptive-armv8-cloud-servers/
+
 echo "Creating a new user, 'presheaf', you sill need to set the password (you know it)"
 sudo useradd -d /home/presheaf -m presheaf
 sudo passwd presheaf
@@ -56,6 +58,19 @@ java -version
 #$GET tomcat6-examples
 #$GET tomcat6
 
+# how to mount volume on ec2
+#https://www.question-defense.com/2012/06/02/create-and-mount-amazon-aws-ec2-ebs-storage-to-aws-ec2-linux-instance
+
+# Have to create diagrams folder, connecting it to box.
+#http://www.math.cmu.edu/~gautam/sj/blog/20150807-box-webdav.html
+sudo apt-get install davfs2
+#???add https://dav.box.com/dav /home/ubuntu/net/box davfs user,rw,noauto 0 0
+#add https://www.box.com/dav /box davfs rw,user,noauto 0 0
+sudo nano /etc/fstab
+sudo gpasswd -a tomcat davfs2
+sudo gpasswd -a ubuntu davfs2
+nano ~/.davfs2/secrets
+
 #see https://www.digitalocean.com/community/tutorials/how-to-install-apache-tomcat-8-on-ubuntu-16-04
 
 export TOMCAT=/opt/tomcat
@@ -69,8 +84,17 @@ sudo iptables -t nat -A OUTPUT -d $THIS -p tcp --dport 80 -j REDIRECT --to-ports
 sudo iptables -t nat -A PREROUTING -d $THIS -p tcp --dport 80 -j REDIRECT --to-ports 8080
 ln -s $TOMCAT tomcat
 ln -s $TOMCAT tomcatlogs
-curl https://raw.githubusercontent.com/vpatryshev/presheaf/master/update.sh
 
+sudo systemctl daemon-reload
+sudo systemctl start tomcat
+sudo systemctl status tomcat
 
+curl https://raw.githubusercontent.com/vpatryshev/presheaf/master/downloadScript >downloadScript
+chmod a+x downloadScript
 
+call ./downloadScript instance
+call ./downloadScript update.sh
+call ./downloadScript doit.sh
+call ./downloadScript dotikz.sh
+call ./downloadScript doxy.sh
 

instance

@@ -1,6 +1,15 @@
 export INSTANCE_ID="i-08d6410cc134f48ce"
 export INSTANCE_URL="ec2-54-213-94-189.us-west-2.compute.amazonaws.com"
 export INSTANCE_IP="54.213.94.189"
+export INSTANCE_USER=ubuntu
+export METHERE="$INSTANCE_USER@$INSTANCE_IP"
+export INSTANCE_HOME=/home/ubuntu
+export CACHE=$INSTANCE_HOME/diagrams
+export HOMETHERE="$METHERE:$INSTANCE_HOME"
 export KEYNAME="presheaf_aws"
 export KEYFILE=~/.ssh/$KEYNAME.pem
-export SSH="ssh -i ~/.ssh/presheaf_aws.pem $1 ubuntu@$INSTANCE_URL"
+export SSH="ssh -i ~/.ssh/presheaf_aws.pem $METHERE"
+export WEBAPPS="/opt/tomcat/webapps"
+export SCP="./sendFile"
+
+

sendFile

@@ -1,2 +1,2 @@
 source ./instance
-scp -i $KEYFILE $1 ubuntu@$INSTANCE_URL:/home/ubuntu/`basename $1`
+scp -i $KEYFILE $1 $HOMETHERE/download/`basename $1`

src/main/resources/buildno.txt

@@ -1 +1 @@
-13
+14