Merge branch 'master' of https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2

Scripts/EnableSSL.sh

@@ -14,6 +14,12 @@ if [ $webservice = apache ]; then
     ext=.conf
 fi
 
+#Correcting service name for nginx_nonphp
+if [ $webservice = nginx_nonphp ]; then
+    webservice=nginx
+    webserv=nginx
+fi
+
 #Backing-up and removing current config
 sed -n '/#beginConf/,/#endConf/p' /etc/"$webservice"/sites-available/"$sitename"_nossl"$ext" > /tmp/"$sitename"-config
 sed -n -i '/#beginConf/{:a;N;/#endConf/!ba;N;s/.*\n/#ConfHere\n/};p' /etc/"$webservice"/sites-available/"$sitename"_nossl"$ext"

installer.sh

@@ -542,13 +542,18 @@ done
 
 if [ $sslenable = 1 ]; then
     msg "                Setting up SSL" 8 78
+    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
-    certbot --"$webserv" certonly -n -d "$hostname" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+    certbot --"$certwebserv" certonly -n -d "$hostname" -m "$email" --hsts --redirect --no-eff-email --agree-tos
     if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
         sslfr=1 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
     fi