Update templates to support new conf path for force ssl function.

ScIT-Raphael · ScIT-Raphael · commit 441bf01347ba · 2019-04-15T10:43:58.000+02:00
diff --git a/bin/v-add-web-domain-ssl-force b/bin/v-add-web-domain-ssl-force
@@ -47,12 +47,12 @@ if [ ! -z "$PROXY_SYSTEM" ] || [ ! -z "$PROXY" ]; then
     if ! grep --quiet "forcessl" $HESTIA/data/templates/web/nginx/default.tpl; then
         $BIN/v-update-web-templates
     fi
-    forcessl="/home/$user/conf/web/$domain/$PROXY_SYSTEM.force-ssl.conf"
+    forcessl="/home/$user/conf/web/$domain/forcessl.$PROXY_SYSTEM.conf"
 else
     if ! grep --quiet "forcessl" $HESTIA/data/templates/web/nginx/default.tpl; then
         $BIN/v-update-web-templates
     fi
-    forcessl="/home/$user/conf/web/$domain/$WEB_SYSTEM.force-ssl.conf"
+    forcessl="/home/$user/conf/web/$domain/forcessl.$WEB_SYSTEM.conf"
 fi
 
 # Insert redirect commands
diff --git a/install/deb/multiphp/nginx/PHP-56.tpl b/install/deb/multiphp/nginx/PHP-56.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
 
diff --git a/install/deb/multiphp/nginx/PHP-70.tpl b/install/deb/multiphp/nginx/PHP-70.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
 
diff --git a/install/deb/multiphp/nginx/PHP-71.tpl b/install/deb/multiphp/nginx/PHP-71.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
 
diff --git a/install/deb/multiphp/nginx/PHP-72.tpl b/install/deb/multiphp/nginx/PHP-72.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
 
diff --git a/install/deb/multiphp/nginx/PHP-73.tpl b/install/deb/multiphp/nginx/PHP-73.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
 
diff --git a/install/deb/templates/web/apache2/default.tpl b/install/deb/templates/web/apache2/default.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/deb/templates/web/apache2/hosting.tpl b/install/deb/templates/web/apache2/hosting.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/deb/templates/web/apache2/phpcgi.tpl b/install/deb/templates/web/apache2/phpcgi.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/deb/templates/web/apache2/phpfcgid.tpl b/install/deb/templates/web/apache2/phpfcgid.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/deb/templates/web/nginx/caching.tpl b/install/deb/templates/web/nginx/caching.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
diff --git a/install/deb/templates/web/nginx/default.tpl b/install/deb/templates/web/nginx/default.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
diff --git a/install/deb/templates/web/nginx/hosting.tpl b/install/deb/templates/web/nginx/hosting.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
diff --git a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         try_files $uri $uri/ /index.php?page=$request_uri;
diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         try_files $uri $uri/ /index.php;
diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         try_files $uri $uri/ /index.php;
diff --git a/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last;
diff --git a/install/deb/templates/web/nginx/php-fpm/default.tpl b/install/deb/templates/web/nginx/php-fpm/default.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
 
diff --git a/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         index doku.php;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal6.tpl b/install/deb/templates/web/nginx/php-fpm/drupal6.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location = /favicon.ico {
         log_not_found off;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal7.tpl b/install/deb/templates/web/nginx/php-fpm/drupal7.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location = /favicon.ico {
         log_not_found off;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal8.tpl b/install/deb/templates/web/nginx/php-fpm/drupal8.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location = /favicon.ico {
         log_not_found off;
diff --git a/install/deb/templates/web/nginx/php-fpm/joomla.tpl b/install/deb/templates/web/nginx/php-fpm/joomla.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location / {
         try_files $uri $uri/ /index.php?$args;
diff --git a/install/deb/templates/web/nginx/php-fpm/laravel.tpl b/install/deb/templates/web/nginx/php-fpm/laravel.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
     location / {
         try_files $uri $uri/ /index.php?$query_string;
         location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
diff --git a/install/deb/templates/web/nginx/php-fpm/magento.tpl b/install/deb/templates/web/nginx/php-fpm/magento.tpl
@@ -13,7 +13,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     # PHP entry point for setup application
     location ~* ^/setup($|/) {
diff --git a/install/deb/templates/web/nginx/php-fpm/modx.tpl b/install/deb/templates/web/nginx/php-fpm/modx.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 #   if you need to rewrite www to non-www uncomment bellow
 #   if ($host != '%domain%' ) {
 #       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
diff --git a/install/deb/templates/web/nginx/php-fpm/moodle.tpl b/install/deb/templates/web/nginx/php-fpm/moodle.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last;
 
diff --git a/install/deb/templates/web/nginx/php-fpm/no-php.tpl b/install/deb/templates/web/nginx/php-fpm/no-php.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     types {
             text/html   html htm shtml php php5;
diff --git a/install/deb/templates/web/nginx/php-fpm/odoo.tpl b/install/deb/templates/web/nginx/php-fpm/odoo.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
     
     proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
     proxy_redirect          off;
diff --git a/install/deb/templates/web/nginx/php-fpm/opencart.tpl b/install/deb/templates/web/nginx/php-fpm/opencart.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
     location / {
         try_files $uri $uri/ @opencart;
         location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
diff --git a/install/deb/templates/web/nginx/php-fpm/owncloud.tpl b/install/deb/templates/web/nginx/php-fpm/owncloud.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location = /favicon.ico {
         log_not_found off;
diff --git a/install/deb/templates/web/nginx/php-fpm/piwik.tpl b/install/deb/templates/web/nginx/php-fpm/piwik.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location = /favicon.ico {
         try_files /favicon.ico =204;
diff --git a/install/deb/templates/web/nginx/php-fpm/pyrocms.tpl b/install/deb/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location /installer {
             try_files $uri $uri/ /installer/index.php?$query_string;
diff --git a/install/deb/templates/web/nginx/php-fpm/sendy.tpl b/install/deb/templates/web/nginx/php-fpm/sendy.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
 
     location = /favicon.ico {
         log_not_found off;
diff --git a/install/deb/templates/web/nginx/php-fpm/wordpress.tpl b/install/deb/templates/web/nginx/php-fpm/wordpress.tpl
@@ -7,7 +7,7 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
         
-    include %home%/%user%/conf/web/forcessl.nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/forcessl.nginx.conf*;
     location = /favicon.ico {
         log_not_found off;
         access_log off;
