Fixed path for custom includes in caching template

Author: serghey-rodin

install/debian/templates/web/nginx/caching.stpl

@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/templates/web/nginx/caching.tpl

@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/rhel/templates/web/nginx/caching.stpl

@@ -4,7 +4,7 @@ server {
     ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
@@ -19,8 +19,8 @@ server {
         location ~* ^.+\.(%proxy_extentions%)$ {
             proxy_cache    off;
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/%web_system%/domains/%domain%.log combined;
+            access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/rhel/templates/web/nginx/caching.tpl

@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/%web_system%/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
@@ -16,8 +16,8 @@ server {
         location ~* ^.+\.(%proxy_extentions%)$ {
             proxy_cache    off;
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/%web_system%/domains/%domain%.log combined;
+            access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/ubuntu/templates/web/nginx/caching.stpl

@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/ubuntu/templates/web/nginx/caching.tpl

@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    include %home%/%user%/web/conf/nginx.%domain%.conf*;
 }