fixes/updates to sshd_enable.sh

Author: andrewdelman

ECCO-ACCESS/Cloud_access_to_ECCO_datasets/jupyter_env_setup.sh

@@ -1,16 +1,17 @@
 #!/bin/bash
 
-# # Shell script for setting up conda, jupyter, essential Python packages on an AWS EC2 instance.
-# # Assumes that the ECCO-v4-Python-Tutorial Github repository has already been downloaded using:
-# sudo dnf update -y
-# sudo dnf install git -y
-# cd ~
-# git clone https://github.com/ECCO-GROUP/ECCO-v4-Python-Tutorial.git
-
-# # Then run this script:
-# sudo chmod 755 ~/ECCO-v4-Python-Tutorial/ECCO-ACCESS/Cloud_access_to_ECCO_datasets/jupyter_env_setup.sh
-# ~/ECCO-v4-Python-Tutorial/ECCO-ACCESS/Cloud_access_to_ECCO_datasets/jupyter_env_setup.sh
+# Shell script for setting up conda, jupyter, essential Python packages on an AWS EC2 instance.
+# Assumes that the ECCO-v4-Python-Tutorial Github repository has already been downloaded using:
+# 
+# $ sudo dnf update -y
+# $ sudo dnf install git -y
+# $ cd ~
+# $ git clone https://github.com/ECCO-GROUP/ECCO-v4-Python-Tutorial.git
 
+# Then run this script:
+# 
+# $ sudo chmod 755 ~/ECCO-v4-Python-Tutorial/ECCO-ACCESS/Cloud_access_to_ECCO_datasets/jupyter_env_setup.sh
+# $ ~/ECCO-v4-Python-Tutorial/ECCO-ACCESS/Cloud_access_to_ECCO_datasets/jupyter_env_setup.sh
 
 
 # # Start body of script
@@ -118,6 +119,6 @@ if [ $earthdata_cred_stored -eq 0 ]; then
     read -sp 'NASA Earthdata password: ' passvar
     echo -e "machine urs.earthdata.nasa.gov\n    login ${uservar}\n    password ${passvar}\n" >> ~/.netrc
 
-    echo -e "\n${red_start}NASA Earthdata authentication info archived in ~\/.netrc${nocolor_start}"
+    echo -e "\n${red_start}NASA Earthdata authentication info archived in ~/.netrc${nocolor_start}"
 fi
 sudo chmod 400 ~/.netrc

ECCO-ACCESS/Cloud_access_to_ECCO_datasets/sshd_enable.sh

@@ -1,18 +1,16 @@
 #!/bin/bash
 
-# # Script to enable ssh connections,
-# # on EC2 instances where they are disabled by default
-# # (e.g., with JPL AMIs).
-# # 
-# # Once this script runs successfully,
-# # it should be possible to login to the instance using ssh, e.g.:
+# Script to enable ssh connections,
+# on EC2 instances where they are disabled by default
+# (e.g., with JPL AMIs).
+# 
+# Once this script runs successfully,
+# it should be possible to login to the instance using ssh, e.g.:
 #
-# ssh -i "~/.ssh/your_key_pair.pem" jpluser@your_private_ip_address
+# $ ssh -i "~/.ssh/key_pair.pem" jpluser@private_ip_address
+
 
 
-# Become root
-sudo -s
- 
 # Try to enable sshd
 systemctl enable sshd
 if [ $? -eq 0 ]; then
@@ -25,22 +23,40 @@ else
 
         # Re-try enabling sshd
         systemctl enable sshd
-        if [ $? -eq 0] ; then
+        if [ $? -eq 0 ] ; then
             echo "Enabled sshd successfully"
         else
             echo "Error: symlink deletion did not allow sshd to be enabled"
             exit 1
+        fi
     else
         echo "Error: sshd not enabled successfully"
+    fi
 fi
 
 # Create symlink to the service (if it does not already exist)
-ln -s /etc/systemd/system/multi-user.target.wants/sshd.service /usr/lib/systemd/system/sshd.service
-echo "Created symlink to sshd.service"
+if [ ! -f /usr/lib/systemd/system/sshd.service ]; then
+    ln -s /etc/systemd/system/multi-user.target.wants/sshd.service /usr/lib/systemd/system/sshd.service
+    echo "Created symlink to sshd.service"
 
 # create new ssh keys
 ssh-keygen -q -N "" -t rsa -b 4096 -f /etc/ssh/ssh_host_rsa_key
 echo "Created new ssh keys"
 
 # start sshd service
 systemctl start sshd
+echo "Started sshd"
+echo "Now you can login to your instance using ssh, e.g.:"
+echo '$ ssh -i "~/.ssh/your_key_pair.pem" jpluser@private_ip_address'
+
+
+# move git repo to ssh user's directory and change ownership (if requested)
+read -p 'Move ECCO-v4-Python-Tutorial repo to different user? [Y/N] ' move_opt
+if [ $move_opt == "Y"] || [ $move_opt == "y" ]; then
+    read -p 'User name of new owner [jpluser for JPL]: ' ssh_user
+    cd /home
+    mv ./ssm-user/ECCO-v4-Python-Tutorial ./${ssh_user}/
+    echo "Moved ECCO-v4-Python-Tutorial repo to /home/${ssh_user}/"
+    chown -R ${ssh_user}:${ssh_user} ./{ssh_user}/ECCO-v4-Python-Tutorial
+    echo "Changed owner and group of git repo to ${ssh_user}"
+fi