From 593e286e48c646ccb5f65b987275b7b0d254a041 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 4 Sep 2020 13:35:13 +0200 Subject: [PATCH] Updated ssl for AppendCMS --- AppendCMS.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/AppendCMS.sh b/AppendCMS.sh index 215a0f5..359ec66 100644 --- a/AppendCMS.sh +++ b/AppendCMS.sh @@ -203,11 +203,16 @@ fi if [ $sslenable = 1 ]; then msg " Setting up SSL" + if [ $webserv = nginx_nonphp ]; then + certwebserv=nginx + else + certwebserv=$webserv + fi site_ext=ssl if [ $domainwww = 1 ]; then - certbot --"$webserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos + certbot --"$certwebserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos elif [ $domainwww = 0 ]; then - certbot --"$webserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos + certbot --"$certwebserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos fi if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)