Fixed a few issues in the user installation script.

auracheeze · auracheeze · commit e1ca37c11032 · 2021-07-06T16:11:08.000+08:00
- Added redirection of output to file.
- Added code to comment out replacement values in sshd_config
diff --git a/terra/root2.sh b/terra/root2.sh
@@ -11,7 +11,7 @@ if [[ -d /root/.ssh ]]
 then
   echo -n "> Copying SSH keys to new user account..."
 
-  cp -r .ssh  /home/$TERRA_USER
+  cp -r /root/.ssh  /home/$TERRA_USER
   chown -R $TERRA_USER:$TERRA_USER /home/$TERRA_USER/.ssh
   chmod 644 /home/$TERRA_USER/.ssh/authorized_keys
 
@@ -33,6 +33,8 @@ echo "  done."
 
 echo -n "> Changing default SSH port, password login, and root configurations..."
 
+sed -i'.bak1' -e 's/^PasswordAuthentication /#PasswordAuthentication /' /etc/ssh/sshd_config
+sed -i'.bak2' -e 's/^PermitRootLogin /#PermitRootLogin /' /etc/ssh/sshd_config
 echo "Port 9560" >> /etc/ssh/sshd_config
 echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
 echo "PermitRootLogin no" >> /etc/ssh/sshd_config
diff --git a/terra/user1.sh b/terra/user1.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+exec 3>&1 4>&2 >user1.sh.log 2>&1
+
 ## Update the repos.
 echo "Updating the system"
 echo "==================="
@@ -19,9 +21,7 @@ echo "============="
 echo -n "Updating bash profile..."
 echo "export GOROOT=$GOROOT" >> ~/.profile
 echo "export GOPATH=$GOPATH" >> ~/.profile
-source ~/.profile
 echo "export PATH=$GOPATH/bin:$GOROOT/bin:$PATH" >> ~/.profile
-source ~/.profile
 echo "  done."
 
 echo "Software installation"
@@ -34,8 +34,9 @@ echo "-------------"
 cd /home/$USER/downloads
 curl -o go1.16.3.linux-amd64.tar.gz https://dl.google.com/go/go1.16.3.linux-amd64.tar.gz
 sudo tar -C /usr/local -zxvf go1.16.3.linux-amd64.tar.gz
+source ~/.profile
 echo -n "Installed "
-/usr/local/go/bin/go version
+go version
 
 # Installation of terrad
 echo "Installing terrad"
@@ -100,3 +101,4 @@ cd /home/$USER/oracle-feeder/price-server
 echo "Making a default configuration file. REMEMBER TO CHANGE config/default.js"
 cp config/default-sample.js config/default.js
 
+exec 1>&3 2>&4
