From b2cf891f52f0d5a8e7ee45103d42723026ff6299 Mon Sep 17 00:00:00 2001
From: bprieshof <bprieshof@noreply.example.org>
Date: Thu, 19 Sep 2019 12:00:02 +0200
Subject: [PATCH] Updated Nginx config

---
 installer.sh | 110 +--------------------------------------------------
 1 file changed, 2 insertions(+), 108 deletions(-)

diff --git a/installer.sh b/installer.sh
index 25e0d1f..cb7e5b2 100644
--- a/installer.sh
+++ b/installer.sh
@@ -133,114 +133,8 @@ msg "               Configuring Nginx"
 sleep 2
 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/config/nginx/nginx-default.conf -O /etc/nginx/nginx.conf
 
-cat <<EOF > /etc/nginx/sites-available/"$domain"
-#fastcgi_cache_path /etc/nginx/cache levels=1:2 keys_zone=MYAPP:100m max_size=10g inactive=1440m;
-
-server {
-    listen       80;
-    server_name   www.$domain;
-    return       301 http://$domain\$request_uri;
-}
-
-server {
-    listen 80;
-    listen [::]:80;
-    root /var/www/$domain/html;
-    index index.php index.html index.htm index.nginx-debian.html;
-    server_name $domain;
-    #return 301 \$scheme:/\$domain\$request_uri; Redirect to non-www
-    #return 301 https://domein.nl$request_uri; Redirect to other domain
-
-    #add_header X-Cache "\$upstream_cache_status";
-
-    #netdata here
-        
-    gzip on;
-    gzip_proxied any;
-    gzip_types text/plain text/css text/xml text/javascript application/javascript application/x-javascript image/svg image/svg+xml application/xml image/x-icon;
-    gzip_comp_level 2;
-    gzip_disable "msie6";
-    gzip_buffers 16 8k;
-
-#    location /rspamd {
-#    proxy_pass http://127.0.0.1:11334/;
-#    proxy_set_header Host \$host;
-#    proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-#}
-
-        location / {
-            #try_files \$uri \$uri/ =404;
-            try_files \$uri \$uri/ /index.php\$is_args\$args;
-            #try_files \$uri \$uri/ \$uri.html \$uri.php\$is_args\$query_string;
-        }
-
-        location = /favicon.ico { log_not_found off; access_log off; }
-        location = /robots.txt { log_not_found off; access_log off; allow all; }
-        location ~* \.(css|gif|ico|jpeg|jpg|js|png|svg|webp|eot|otf|woff|woff2|ttf|ogg)\$ {
-            expires max;
-            log_not_found off;
-            add_header Cache-Control "public, no-transform";
-        }
-
-        location ~ \.php\$ {
-            include snippets/fastcgi-php.conf;
-            fastcgi_pass unix:/var/run/php/php${phpver}-fpm.sock;
-            #fastcgi_cache MYAPP;
-            #fastcgi_cache_valid 200 302 301 1m;
-            #fastcgi_cache_valid 404 1m;
-            #fastcgi_cache_bypass \$no_cache;
-            #fastcgi_no_cache \$no_cache;
-            #fastcgi_cache_revalidate on;
-            #fastcgi_cache_background_update on;
-            #fastcgi_cache_lock on;
-            #fastcgi_cache_use_stale updating;
-            #fastcgi_buffer_size 128k;
-            #fastcgi_buffers 256 16k;
-            #fastcgi_busy_buffers_size 256k;
-            #fastcgi_temp_file_write_size 256k;
-        }
-
-        location ~ /\.ht {
-            deny all;
-        }
-
-        location /phpmyadmin {
-            index index.php;
-        }
-
-        #Cache everything by default
-        set \$no_cache 0;
-
-        #Don't cache POST requests
-        if (\$request_method = POST) {
-            set \$no_cache 1;
-        }
-
-        #Don't cache if the URL contains a query string
-        if (\$query_string != "") {
-            set \$no_cache 1;
-        }
-
-        #Don't cache the following URLs
-        if (\$request_uri ~* "/(administrator/|login.php)") {
-            set \$no_cache 1;
-        }
-
-        #Don't cache if there is a cookie called PHPSESSID
-        if (\$http_cookie = "PHPSESSID") {
-            set \$no_cache 1;
-        }
-        
-location ^~ /rainloop/data {
-  deny all;
-}
-
-location ^~ /data {
-  deny all;
-}
-
-    }
-EOF
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/stable/config/nginx/PostfixAdmin-site-unconfigured -O /etc/nginx/sites-available/"$domain"
+sed -i -e 's/DOMAINname/'$domain'/' -e 's/PHPver/'$phpver'/' /etc/nginx/sites-available/"$domain"
 
 ln -s /etc/nginx/sites-available/"$domain" /etc/nginx/sites-enabled/