modify script names

automated_deployment.sh

@@ -1,6 +1,5 @@
 #! /bin/bash
 
-# Load environment variables from .env file
 if [ -f .env ]; then
   source .env  # loads the variables into current shell session
 else
@@ -8,17 +7,45 @@ else
   exit 1
 fi
 
-# ssh into the vm
-# check that the code in installed and start up the product
-COMMAND="ssh -i ${CS2_KEY_PATH} -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE}"
 
-# clone the repo
+# Check if connection works with student-admin_key
+ssh -i ${STUDENT-ADMIN_KEY} -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE} "echo 'SSH connection with student-admin_key successfully'"
+
+# Create a unique key
+ssh-keygen -f cs2_key -t ed25519 -N ${KEY_PASSWORD}
+
+# Insert the key into the authorized_keys file on the server
+# One > creates
+cat mykey.pub > authorized_keys
+
+chmod 600 authorized_keys
+
+echo "checking that the authorized_keys file is correct"
+ls -l authorized_keys
+cat authorized_keys
+
+# Copy the authorized_keys file to the server
+scp -i ${STUDENT-ADMIN_KEY} -P ${PORT} -o StrictHostKeyChecking=no authorized_keys student-admin@${MACHINE}:~/.ssh/
+
+# Add the key to the ssh-agent
+eval "$(ssh-agent -s)"
+ssh-add cs2_key
+
+# Check the key file on the server
+echo "checking that the authorized_keys file is correct"
+ssh -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE} "cat ~/.ssh/authorized_keys"
+
+# make the prefix command
+COMMAND="ssh -i ${CS2_KEY} -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE}"
+# COMMAND="ssh -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE}"  # not including key is also okay
+
+# use the COMMAND to run git clone to clone the repo to VM
 ${COMMAND} "git clone https://github.com/jcai0o0/cs553-case-study-1.git"
-# install python3-venv
+# use the COMMAND to install python3-venv
 ${COMMAND} "sudo apt install -qq -y python3-venv"
 # use the COMMAND to the repo folder and create virtual environment named cs2_venv
 ${COMMAND} "cd cs553-case-study-1 && python3 -m venv cs2_venv"
-# use the COMMAND to cd to the repo folder, activate the cs2_venv virtual environment, and install all required packages
+# use the COMMAND to cd to the repo folder, activate the cs2_venv virtual environemt, and install all required packages
 ${COMMAND} "cd cs553-case-study-1 && source cs2_venv/bin/activate && pip install -r requirements.txt"
 # make the product up and run in the background, put running log in file log.txt
-${COMMAND} "nohup cs553-case-study-1/cs2_venv/bin/python3 cs553-case-study-1/app.py > log.txt 2>&1 &"
+${COMMAND} "nohup cs553-case-study-1/venv/bin/python3 CS553_example/app.py > log.txt 2>&1 &"

auto_first_deploy.sh → recovery-deployment.sh

@@ -1,5 +1,6 @@
 #! /bin/bash
 
+# Load environment variables from .env file
 if [ -f .env ]; then
   source .env  # loads the variables into current shell session
 else
@@ -7,45 +8,17 @@ else
   exit 1
 fi
 
+# ssh into the vm
+# check that the code in installed and start up the product
+COMMAND="ssh -i ${CS2_KEY_PATH} -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE}"
 
-# Check if connection works with student-admin_key
-ssh -i ${STUDENT-ADMIN_KEY} -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE} "echo 'SSH connection with student-admin_key successfully'"
-
-# Create a unique key
-ssh-keygen -f cs2_key -t ed25519 -N ${KEY_PASSWORD}
-
-# Insert the key into the authorized_keys file on the server
-# One > creates
-cat mykey.pub > authorized_keys
-
-chmod 600 authorized_keys
-
-echo "checking that the authorized_keys file is correct"
-ls -l authorized_keys
-cat authorized_keys
-
-# Copy the authorized_keys file to the server
-scp -i ${STUDENT-ADMIN_KEY} -P ${PORT} -o StrictHostKeyChecking=no authorized_keys student-admin@${MACHINE}:~/.ssh/
-
-# Add the key to the ssh-agent
-eval "$(ssh-agent -s)"
-ssh-add cs2_key
-
-# Check the key file on the server
-echo "checking that the authorized_keys file is correct"
-ssh -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE} "cat ~/.ssh/authorized_keys"
-
-# make the prefix command
-COMMAND="ssh -i ${CS2_KEY} -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE}"
-# COMMAND="ssh -p ${PORT} -o StrictHostKeyChecking=no student-admin@${MACHINE}"  # not including key is also okay
-
-# use the COMMAND to run git clone to clone the repo to VM
+# clone the repo
 ${COMMAND} "git clone https://github.com/jcai0o0/cs553-case-study-1.git"
-# use the COMMAND to install python3-venv
+# install python3-venv
 ${COMMAND} "sudo apt install -qq -y python3-venv"
 # use the COMMAND to the repo folder and create virtual environment named cs2_venv
 ${COMMAND} "cd cs553-case-study-1 && python3 -m venv cs2_venv"
-# use the COMMAND to cd to the repo folder, activate the cs2_venv virtual environemt, and install all required packages
+# use the COMMAND to cd to the repo folder, activate the cs2_venv virtual environment, and install all required packages
 ${COMMAND} "cd cs553-case-study-1 && source cs2_venv/bin/activate && pip install -r requirements.txt"
 # make the product up and run in the background, put running log in file log.txt
-${COMMAND} "nohup cs553-case-study-1/venv/bin/python3 CS553_example/app.py > log.txt 2>&1 &"
+${COMMAND} "nohup cs553-case-study-1/cs2_venv/bin/python3 cs553-case-study-1/app.py > log.txt 2>&1 &"

watcher.py

@@ -13,7 +13,7 @@ load_dotenv()
 VM_IP = os.getenv("MACHINE")
 GRADIO_UI_URL = "http://paffenroth-23.dyn.wpi.edu:8005/"
 CHECK_INTERVAL = 60   # 60 seconds
-RECOVERY_SCRIPT_PATH = 'automated_deployment.sh'
+RECOVERY_SCRIPT_PATH = 'recovery-deployment.sh'
 
 
 # Email settings (if EMAIL_ALERT is True)