Merge pull request 'Update bootstrap.sh' (#11) from dev into prod

Reviewed-on: #11

bootstrap.sh

@@ -18,8 +18,6 @@ TEMP_SCRIPT_CLEANER="/root/firstlogincleaner.sh"
 #################. ALIASES
 echo "alias ll='ls -l --color=auto'" >> ~/.bashrc
 echo "alias l='ls -lAh --color=auto'" >> ~/.bashrc
-echo "" >> ~/.bashrc
-echo 'PS1="\u\[\e[0m\]@\[\e[31m\]\h\[\e[0m\]:\[\e[34m\]\w\[\e[0m\]# "' >> ~/.bashrc
 source ~/.bashrc
 
 
@@ -91,7 +89,7 @@ sed -i 's/^#\?PasswordAuthentication.*/PasswordAuthentication no/' /etc/ssh/sshd
 systemctl restart sshd
 
 # Nettoyage différé
-nohup /root/firstlogincleaner.sh >/dev/null 2>&1 &
+nohup /root/first-login-cleaner.sh >/dev/null 2>&1 &
 exit 0
 EOF
 chmod +x $TEMP_SCRIPT
@@ -101,8 +99,8 @@ chmod +x $TEMP_SCRIPT
 cat << 'EOF' > $TEMP_SCRIPT_WRAPPER
 #!/bin/bash
 
-if [ -f /root/firstlogin.sh ]; then
-    /root/firstlogin.sh
+if [ -f /root/first-login.sh ]; then
+    /root/first-login.sh
 fi
 
 exit 0
@@ -114,22 +112,21 @@ cat << 'EOF' > $TEMP_SCRIPT_CLEANER
 #!/bin/bash
 
 # Attendre la fin du login
-sleep 2
+sleep 10
 
 # Supprimer la ligne PAM
-sed -i '/firstloginwrapper.sh/d' /etc/pam.d/sshd
+sed -i '/first-login-wrapper.sh/d' /etc/pam.d/sshd
 
 # Supprimer les scripts
-rm -f /root/firstlogin.sh
-rm -f /root/firstloginwrapper.sh
-rm -f /root/firstlogincleaner.sh
-rm -f /root/bootstrap.sh
+rm -f /root/first-login.sh
+rm -f /root/first-login-wrapper.sh
+rm -f /root/first-login-cleaner.sh
 
 exit 0
 EOF
 chmod +x $TEMP_SCRIPT_CLEANER
 
-echo "auth optional pam_exec.so stdout /root/firstloginwrapper.sh" >> /etc/pam.d/sshd
+echo "auth optional pam_exec.so stdout /root/first-login-wrapper.sh" >> /etc/pam.d/sshd
 
 
 #################. Hardening binaries
@@ -138,7 +135,6 @@ mv $REBOOTBIN $REBOOTBINOLD
 cat << 'EOF' > $REBOOTBIN
 #!/bin/bash
 touch /var/log/restart-flag
-echo "[REBOOT] Rebooting server..."
 sleep 1
 /usr/sbin/reboot.old
 EOF
@@ -148,7 +144,6 @@ chmod +x $REBOOTBIN
 cat << 'EOF' > $SHUTBIN
 #!/bin/bash
 touch /var/log/restart-flag
-echo "[SHUTDOWN] Stopping server..."
 sleep 1
 shutdown -h now
 EOF
@@ -214,5 +209,4 @@ chmod 600 /root/.ssh/authorized_keys
 
 rm -fr /etc/systemd/system/bootstrap.service
 rm -fr /etc/systemd/system/multi-user.target.wants/bootstrap.service
-rm -fr /root/run-bootstrap.sh
 systemctl daemon-reload