From bbf78716fdf8129ad2f56d744ae049615fc78a94 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Wed, 18 Nov 2015 09:47:09 -0500 Subject: [PATCH] during setup suppress the status line about generating an SSL certificate if we already have it --- setup/ssl.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/setup/ssl.sh b/setup/ssl.sh index 008cdb10..5d6143f5 100755 --- a/setup/ssl.sh +++ b/setup/ssl.sh @@ -24,9 +24,20 @@ source setup/functions.sh # load our functions source /etc/mailinabox.conf # load global vars -echo "Creating initial SSL certificate and perfect forward secrecy Diffie-Hellman parameters..." +# Show a status line if we are going to take any action in this file. +if [ ! -f /usr/bin/openssl ] \ + || [ ! -f $STORAGE_ROOT/ssl/ssl_private_key.pem ] \ + || [ ! -f $STORAGE_ROOT/ssl/ssl_certificate.pem ] \ + || [ ! -f $STORAGE_ROOT/ssl/dh2048.pem ]; then + echo "Creating initial SSL certificate and perfect forward secrecy Diffie-Hellman parameters..." +fi + +# Install openssl. + apt_install openssl +# Create a directory to store TLS-related things like "SSL" certificates. + mkdir -p $STORAGE_ROOT/ssl # Generate a new private key.