From 63223f6b516562e91e525629b292e91373aefbea Mon Sep 17 00:00:00 2001 From: Daniel Lawrence Date: Fri, 25 Apr 2014 00:31:37 +1000 Subject: [PATCH] Install openssh-server to ensure that the end result is consistent across all Mail-in-a-Boxes. --- scripts/start.sh | 11 ----------- scripts/system.sh | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 6536ec00..f464a297 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -13,17 +13,6 @@ if [ "`lsb_release -d | sed 's/.*:\s*//'`" != "Ubuntu 14.04 LTS" ]; then exit fi -# Check that SSH login with password is disabled. Stop if it's enabled. -if grep -q "^PasswordAuthentication yes" /etc/ssh/sshd_config \ - || ! grep -q "^PasswordAuthentication no" /etc/ssh/sshd_config ; then - echo - echo "The SSH server on this machine permits password-based login." - echo "Add your SSH public key to $HOME/.ssh/authorized_keys, check" - echo "check that you can log in without a password, set the option" - echo "'PasswordAuthentication no' in /etc/ssh/sshd_config, and then" - echo "restart the machine." - exit -fi # Gather information from the user about the hostname and public IP # address of this host. diff --git a/scripts/system.sh b/scripts/system.sh index 648c736f..648e5826 100755 --- a/scripts/system.sh +++ b/scripts/system.sh @@ -3,6 +3,21 @@ apt-get -q -q update apt-get -q -y upgrade +# Install openssh-server to ensure that the end result is consistent across all Mail-in-a-Boxes. +apt-get -q -y install openssh-server + +# Check that SSH login with password is disabled. Stop if it's enabled. +if grep -q "^PasswordAuthentication yes" /etc/ssh/sshd_config \ + || ! grep -q "^PasswordAuthentication no" /etc/ssh/sshd_config ; then + echo + echo "The SSH server on this machine permits password-based login." + echo "Add your SSH public key to $HOME/.ssh/authorized_keys, check" + echo "check that you can log in without a password, set the option" + echo "'PasswordAuthentication no' in /etc/ssh/sshd_config, and then" + echo "restart the openssh via 'sudo service ssh restart'" + exit +fi + apt-get -q -y install python3 # Turn on basic services: