From 66162375fd1b6b84864a4b6744babd8c4d05ad43 Mon Sep 17 00:00:00 2001
From: isscbta <53144593+isscbta@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:23:15 +0100
Subject: [PATCH] Minor fix for install-rocket-nginx.sh

---
 .../tools/rocket-nginx-templates/wprocket-force-htpps.stpl  | 5 +++--
 .../tools/rocket-nginx-templates/wprocket-force-htpps.tpl   | 1 -
 .../tools/rocket-nginx-templates/wprocket-hosting.stpl      | 5 ++++-
 .../tools/rocket-nginx-templates/wprocket-hosting.tpl       | 6 ++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.stpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.stpl
index 05ba994a..f82368cb 100644
--- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.stpl
+++ b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.stpl
@@ -6,11 +6,13 @@ server {
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
+    root           %sdocroot%;
+    # Rocket-Nginx configuration
+    include rocket-nginx/conf.d/default.conf;
 
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
-            root           %sdocroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
@@ -37,5 +39,4 @@ server {
 
     include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
     include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*;
-    include rocket-nginx/conf.d/default.conf;
 }
diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.tpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.tpl
index 0c877632..851ac0dc 100644
--- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.tpl
+++ b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.tpl
@@ -5,5 +5,4 @@ server {
         rewrite ^(.*) https://%domain_idn%$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
-include rocket-nginx/conf.d/default.conf;
 }
diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl
index 2610efc4..51c4fffc 100644
--- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl
+++ b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl
@@ -6,10 +6,13 @@ server {
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
+    root           %sdocroot%;
+    # Rocket-Nginx configuration
+    include rocket-nginx/conf.d/default.conf;
+
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
-            root           %sdocroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl
index 521348ae..8840c051 100644
--- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl
+++ b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl
@@ -3,10 +3,13 @@ server {
     server_name %domain_idn% %alias_idn%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
+    root           %docroot%;
+    # Rocket-Nginx configuration
+    include rocket-nginx/conf.d/default.conf;
+
     location / {
         proxy_pass      http://%ip%:%web_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
-            root           %docroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
@@ -32,5 +35,4 @@ server {
     disable_symlinks if_not_owner from=%docroot%;
 
     include %home%/%user%/conf/web/nginx.%domain%.conf*;
-    include rocket-nginx/conf.d/default.conf;
 }