From 9d1b08c15f348cd08472f2c04f6e94dbca2c9f59 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 14 Apr 2015 18:06:53 +0100 Subject: [PATCH] Minor corrections --- 3_conf_base.sh | 2 +- 4_adjust_ssl_conf.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/3_conf_base.sh b/3_conf_base.sh index a92c552..0b3c0f7 100755 --- a/3_conf_base.sh +++ b/3_conf_base.sh @@ -132,7 +132,7 @@ if [ $port == 'y' ]; read -e -p "Hit ENTER to pursue... "; else # Open port in firewall - yunohost firewall allow TCP $port; + echo -e "\n" ; yunohost firewall allow TCP $port; sed -i "s/Port 22/Port $port/g" /etc/ssh/sshd_config; echo -e "\n$ok SSH port changed to $port\n"; fi; diff --git a/4_adjust_ssl_conf.sh b/4_adjust_ssl_conf.sh index 0b26213..19d6a20 100755 --- a/4_adjust_ssl_conf.sh +++ b/4_adjust_ssl_conf.sh @@ -66,17 +66,16 @@ if [ $nginx == 'y' ]; then echo -e "\n" ; read -e -p "Indicate dhparam value (2048 or 4096) : " -i "2048" param; if [[ $param =~ ^[-+]?[0-9]+$ ]]; then openssl dhparam -out /etc/ssl/private/dh$param$domain.pem -outform PEM -2 $param; - echo -e "\n$ok dhparam$param$domain.pem generated"; + echo -e "\n$ok dh$param$domain.pem generated"; # Adjustment of ngingx.conf for domain dom_nginx=/etc/nginx/conf.d/$domain.conf; sed -i "s|#ssl_dhparam|ssl_dhparam|g" $dom_nginx; sed -i "s|private/dh2048|private/dh$param$domain|g" $dom_nginx; - echo -e "\n$ok Configuring nginx to use dhparam$param$domain.pem"; + echo -e "\n$ok Configuring nginx to use dh$param$domain.pem"; else echo -e "\n$failed Value must be an integer (multiple of 2) \n"; echo -e "\nAborting before doing anything\n"; - read -p "Hit ENTER to end this script... "; - exit ; + read -p "Hit ENTER to skip to next step... "; fi; else echo -e "\n$info Aborting before doing anything\n"; read -p "Hit ENTER to end this script... ";