Merge pull request #3 from CloudStationTeam/dev

Dev

configure_web_server.sh

@@ -29,4 +29,4 @@ sudo systemctl start backgroundtasks.service
 echo "Running docker (redis)"
 sudo systemctl start docker
 sudo systemctl enable docker
-sudo docker run -p 6379:6379 -d redis:2.8
+sudo docker run -p 6379:6379 -d redis:7.2.3

setup_server.sh

@@ -1,121 +1,206 @@
 #!/bin/bash 
 
+# Define function first
+
+
+function inputMapBoxkeyandInsertintosettings {
+    read -p "To begin with the installation type in the mapbox key:" mbkey
+
+    echo "You entered:"
+    echo $mbkey
+
+    read -p "If this is correct, enter "yes": " out
+
+    if ! [ "$out" = "yes" ]
+    then
+        echo "You did not type in 'yes'. Exiting....Mapbox key not in yet. Please check documentation."
+        exit 1
+    fi
+
+
+    echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+
+    echo "Editing settings.py to put Mapbox key in that you entered above."
+
+    # mbkey was entered above
+    #sed -i 's/=""/="$mbkey"/g' ~/cloud_station_web/webgms/settings.py
+    sed -i "s/=\"\"/=\"$mbkey\"/g" ~/cloud_station_web/webgms/settings.py
+    #sed -i "s/=\"\"/=\"$var\"/g" your_file
+}
+
+
+function inputGoogleMapsKeyandSaveToEnv {
+    read -p "To begin with the installation type in the google maps key:" gmkey
+
+    echo "You entered:"
+    echo $gmkey
+
+    read -p "If this is correct, enter "yes": " out
+
+    if ! [ "$out" = "yes" ]
+    then
+        echo "You did not type in 'yes'. Exiting....Google maps key not in yet. Please check documentation."
+        exit 1
+    fi
+
+
+    echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+
+    echo "Editing ~/cloud_station_web/.env to put google maps key in that you entered above."
+
+    touch ~/cloud_station_web/.env
+    echo GOOGLE_MAP_API_KEY=$gmkey>~/cloud_station_web/.env
+}
+
+
+# get mapbox API key from command line (easier long run)
+
+
+# Check if an API key is provided as a command-line argument
+if [ "$#" -eq 1 ]; then
+    api_key="$1"
+    echo "Using provided MB API key: $api_key"
+else
+    # If no API key is provided, prompt the user to enter one
+    read -p "Enter your MB API key: " api_key
+fi
+
+# Now you can use the $api_key variable in your script
+echo "API key: $api_key"
+
+# Rest of your script goes here...
+
+start_time="$(date -u +%s)"
+
+
 echo "######### Setting up server #########"
 echo "For Amazon Web Services (AWS) Amazon Machine Image (AMI) Linux Ubuntu Server 22.04 LTS (HVM)"
 
 echo "1. Updating Ubuntu"
 # Update package database
 sudo apt-get update -y
 
-# Set non-interactive frontend for apt (this will avoid prompts during the upgrade)
-export DEBIAN_FRONTEND=noninteractive
-
 # Configure needrestart to automatically restart services
 sudo sed -i 's/^#\$nrconf{restart}.*$/$nrconf{restart} = '\''a'\'';/' /etc/needrestart/needrestart.conf
 
-# Run needrestart to check if a restart is needed and handle it as per configuration
-sudo needrestart -y
-
 # Upgrade packages
 sudo apt-get upgrade -y
 
-echo "Updating package lists"
-sudo apt-get autoremove --yes
-sudo apt clean 
-sudo apt-get update
+# Install EMACS, Professor Burke's favorite text editor
+sudo apt-get install emacs -y
+sudo apt-get install emacs -y
 
 echo "2. Installing NGINX and docker"
 echo "Installing NGINX"
 sudo apt-get --yes install nginx
+echo "Configuring nginx.conf"
+#curl http://checkip.amazonaws.com # our public IP address
+sed -i "s/www\.example\.com/$(curl -s http://checkip.amazonaws.com)/g" ~/cloud_station_deployment/nginx.conf
+sudo usermod -a -G ubuntu www-data
 
 echo "Removing any old Docker installations"
 sudo apt-get --yes remove docker docker-engine docker.io containerd runc
 
-echo "Cleaning up unnecessary packages and cache"
-sudo apt-get autoremove --yes
-sudo apt clean
-sudo apt update
-
+# use https://stackoverflow.com/questions/71393595/installing-docker-in-ubuntu-from-repo-cant-find-a-repo
+sudo apt-get update
+
 echo "Installing dependencies for Docker installation"
 sudo apt-get --yes install apt-transport-https ca-certificates curl gnupg lsb-release
-sudo apt-get update
 
 echo "Adding Docker's official GPG key"
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 
-# Once the key is imported, update your package lists:
-sudo apt-get update
-
 echo "Setting up the Docker stable repository"
-#echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-sudo apt --yes install docker.io
-
-echo "Updating package lists to include Docker packages from the new repository"
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt-get update
 
 echo "Installing Docker CE, Docker CE CLI, and containerd.io"
-#sudo apt-get install docker-ce docker-ce-cli containerd.io
-bash ./docker.sh
-
-echo "Updating package lists"
-sudo apt-get update
+sudo apt --yes install docker.io
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+#bash ./docker.sh Legacy from v 3.0. But file docker.sh not here yet, why run it now?
 
+# Temporary clone the dev branch
 echo "3. Cloning CloudStation web app source code"
-git clone https://github.com/CloudStationTeam/cloud_station_web.git
-
-# Checkout release if specified
-for arg in "$@"
-do
-    case $arg in
-        --tag=*)
-		TAG="${arg#*=}"
-		echo "Checkout out release $TAG"
-		cd ~/cloud_station_web
-        git checkout $TAG
-        cd ~
-        shift # Remove --cache= from processing
-        ;;
-        *)
-        shift # Remove generic argument from processing
-        ;;
-    esac
-done
+#git clone https://github.com/CloudStationTeam/cloud_station_web.git
+git clone https://github.com/CloudStationTeam/cloud_station_web.git --branch dev --single-branch
+
+# Checkout release if specified Temporary removed until dev branch committed to release.
+#for arg in "$@"
+#do
+#    case $arg in
+#        --tag=*)
+#		TAG="${arg#*=}"
+#		echo "Checkout out release $TAG"
+#		cd ~/cloud_station_web
+#       git checkout $TAG
+#        cd ~
+#        shift # Remove --cache= from processing
+#        ;;
+#        *)
+#        shift # Remove generic argument from processing
+#        ;;
+#    esac
+#done
 
 echo "4. Setting up Python virtual environment"
 sudo apt-get --yes install python3-venv
 mkdir ~/ENV
-python3 -m venv ~/ENV
-source ~/ENV/bin/activate
+python3 -m venv ~/ENV # Creates python virtual environment.
+source ~/ENV/bin/activate # Activates python virtual environment.
 
 # These dependencies are required for pymavlink
-sudo apt-get update
 sudo apt-get --yes install libxml2-dev libxslt-dev python3-dev
 sudo apt-get --yes install libffi-dev
 sudo apt-get --yes install python3-lxml #Now install python3-lxml
-sudo apt-get update
-
-# It's a good practice to check if an installation command was successful before proceeding
-if [ $? -ne 0 ]; then
-    echo "Dependency installation failed 1"
-    exit 1
-fi
 
-# Update pip, setuptools, and wheel to their latest versions
-pip3 install --upgrade pip setuptools wheel
 # Install requirements from your requirements.txt file without using cache
-# If encounter errors, update some packages in ~/cloud_station_web/requirements.txt to the latest versions 
-# For example, pymavlink 
-# Instead of downgrade setuptools 
 pip3 install -r ~/cloud_station_web/requirements.txt --no-cache-dir
 
-# Check if the pip installations were successful
-if [ $? -ne 0 ]; then
-    echo "Pip installation failed 2"
-    exit 1
-fi
+#echo "getting mapbox key"
+#inputMapBoxkeyandInsertintosettings
+
+echo "Editing settings.py to put Mapbox key in that you entered above."
+sed -i "s/=\"\"/=\"$api_key\"/g" ~/cloud_station_web/webgms/settings.py
+
+echo "Changing server IP to ALLOWED_HOSTS to everything in cloud_station_web/webgms/settings.py"
+#sed -i 's/\[\]/\[\*\]/g' ~/cloud_station_web/webgms/settings.py
+sed -i "s/\[\]/['*']/g" ~/cloud_station_web/webgms/settings.py
+echo "Turning off debug mode in cloud_station_web/webgms/settings.py"
+sed -i 's/DEBUG = True/DEBUG = False/g' ~/cloud_station_web/webgms/settings.py
+
+# echo "getting google maps key"
+# inputGoogleMapsKeyandSaveToEnv
+
+
+
+# Command to add to the last line of bashrc
+command_to_add="export PROMPT_COMMAND='history -a'"
+
+# Append the command to the last line of ~/.bashrc
+echo "$command_to_add" >> ~/.bashrc
+
+# Reload the bashrc
+source ~/.bashrc
+
+echo "Command added to the last line of ~/.bashrc and bashrc reloaded."
+
 
-# git config --global core.editor "vim"
 echo "Finished setting up server!"
-echo "**Now, please add server IP to ALLOWED_HOSTS in cloud_station_web/webgms/settings.py**"
+echo "now running bash ~/cloud_station_deployment/configure_web_server.sh "
+bash ~/cloud_station_deployment/configure_web_server.sh
+
+echo "Finished running configure_web_server server!"
+end_time="$(date -u +%s)"
+
+elapsed="$(($end_time-$start_time))"
+echo "Total of $elapsed seconds elapsed for the entire process"
+
+
+minutes=$((elapsed / 60))
+seconds=$((elapsed % 60))
+echo "Ellapsed time ${minutes} minutes ${seconds} seconds"
+
+
+