From 5a4949a057367bdba60b20c45c9eb6e5ef14cdc3 Mon Sep 17 00:00:00 2001
From: bprieshof <bprieshof@noreply.example.org>
Date: Wed, 13 Feb 2019 13:01:33 +0100
Subject: [PATCH] Update 'NGINX-Installer.sh'

---
 NGINX-Installer.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/NGINX-Installer.sh b/NGINX-Installer.sh
index 39258bc..dc48283 100644
--- a/NGINX-Installer.sh
+++ b/NGINX-Installer.sh
@@ -240,20 +240,6 @@ if [ $redis = 1 ]; then
     # systemctl disable redis
 fi
 
-##-------------##
-#    Certbot    #
-##-------------##
-
-apt install -y python-certbot-nginx
-if [ $domainwww = 1 ]; then
-    certbot --nginx -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
-
-elif [ $domainwww = 0 ]; then
-    certbot --nginx -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
-fi
-sed -i 's/ssl ipv6only/ssl http2 ipv6only/g' /etc/nginx/sites-available/"$domain"
-sed -i 's/listen 443 ssl/listen 443 ssl http2/g' /etc/nginx/sites-available/"$domain"
-sed -i 's#include /etc/letsencrypt/options-ssl-nginx.conf;#ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;#g' /etc/nginx/sites-available/"$domain"
 
 ##---------------##
 #    Wordpress    #
@@ -315,12 +301,32 @@ require_once(ABSPATH . 'wp-settings.php');
 EOF
 fi
 
+##---------------##
+#    Nextcloud    #
+##---------------##
 
 if [ $nextcloud = 1 ]; then
 wget https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/config/nextcloud-config.sh -O nextcloud-config.sh
 source nextcloud-config.sh
 fi
 
+
+##-------------##
+#    Certbot    #
+##-------------##
+
+apt install -y python-certbot-nginx
+if [ $domainwww = 1 ]; then
+    certbot --nginx -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+
+elif [ $domainwww = 0 ]; then
+    certbot --nginx -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+fi
+sed -i 's/ssl ipv6only/ssl http2 ipv6only/g' /etc/nginx/sites-available/"$domain"
+sed -i 's/listen 443 ssl/listen 443 ssl http2/g' /etc/nginx/sites-available/"$domain"
+sed -i 's#include /etc/letsencrypt/options-ssl-nginx.conf;#ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;#g' /etc/nginx/sites-available/"$domain"
+
+
 ##-----------------##
 #    Opcache GUI    #
 ##-----------------##