more polish

scripts/ssh-server-check.sh

@@ -133,6 +133,7 @@ check_ssh_config_files() {
     case "$status" in
         missing) CREATE_USER_CA=1;;
     esac
+    echo
 }
 
 ssh_fingerprint() {
@@ -172,31 +173,34 @@ EOF
     }
 
     if [[ ! -e $cfg_path ]]; then
-        prompt_user "sshd config" "Do you want to configure sshd?"
+        prompt_user "sshd" "Currently unconfigured for certs. Do you want to configure?"
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             install_cert_config
-            update_prompt $GREEN_CHECK "Configured sshd"
+            update_prompt $GREEN_CHECK "sshd" "Configured to use and accept certs"
         fi
     fi
+
     restart_sshd
+    echo
 }
 
 restart_sshd() {
-    if ! systemctl is-active --quiet sshd; then
-        prompt_user "sshd.service" "sshd.service is not active. Restart?"
-        if [[ $REPLY =~ ^[Yy]$ ]]; then
-            systemctl restart sshd
-            local sshd_pid=$(systemctl show --property	MainPID --value sshd)
-            update_prompt $GREEN_CHECK "Restarted sshd.service on PID: $sshd_pid"
-        fi
+    echo -en "$YELLOW_BANG Restarting sshd..."
+    systemctl restart sshd
+    if [[ $? -eq 0 ]]; then
+        local sshd_pid=$(systemctl show --property MainPID --value sshd)
+        update_prompt $GREEN_CHECK "sshd" "Restarted sshd.service on PID: $sshd_pid"
     else
-        local sshd_pid=$(systemctl show --property	MainPID --value sshd)
-        echo -e "$GREEN_CHECK sshd.service is active on PID: $sshd_pid"
+        update_prompt $RED_X "sshd" "Failed to restart sshd.service"
+        exit 1
     fi
 }
 
 create_files() {
+    local wrote_lines=0
+
     if [[ $CREATE_HOST_CERT -eq 1 ]]; then
+        wrote_lines=1
         prompt_user "SSH Host" "Cert missing. Sign the ssh host cert?"
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             update_prompt $YELLOW_BANG "Signing ssh host cert"
@@ -207,6 +211,7 @@ create_files() {
     fi
 
     if [[ $CREATE_USER_CA -eq 1 ]]; then
+        wrote_lines=1
         prompt_user "SSH Host" "Create the trusted keys file?"
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             (step ssh config --roots > "$path")
@@ -215,18 +220,18 @@ create_files() {
             update_prompt $RED_X
         fi
     fi
+
+    if [[ $wrote_lines -eq 1 ]]; then echo; fi
 }
 
 
 # Run Process
 
 check_cert_config "certs.conf"
-echo
 check_ssh_config_files
-
 create_files
 
-title_msg "\nSSH Host Cert" "$SSH_HOST_CERT\n"
+title_msg "SSH Host Cert" "$SSH_HOST_CERT\n"
 CERT_INFO=$(ssh-keygen -Lf "$SSH_HOST_CERT")
 echo -e "$CERT_INFO" | grep "Public key"
 echo -e "$CERT_INFO" | grep "Valid"