From 31ef50228a27229b995c365a175fdc06c991f5b7 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 11 Feb 2014 16:38:15 +0200
Subject: [PATCH] Fixed path for custom includes in caching template

---
 install/debian/templates/web/nginx/caching.stpl | 2 +-
 install/debian/templates/web/nginx/caching.tpl  | 2 +-
 install/rhel/templates/web/nginx/caching.stpl   | 8 ++++----
 install/rhel/templates/web/nginx/caching.tpl    | 8 ++++----
 install/ubuntu/templates/web/nginx/caching.stpl | 2 +-
 install/ubuntu/templates/web/nginx/caching.tpl  | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/install/debian/templates/web/nginx/caching.stpl b/install/debian/templates/web/nginx/caching.stpl
index 036dc6ee7..ca6cffe32 100755
--- a/install/debian/templates/web/nginx/caching.stpl
+++ b/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*;
 }
diff --git a/install/debian/templates/web/nginx/caching.tpl b/install/debian/templates/web/nginx/caching.tpl
index 04e38d445..36761b65c 100755
--- a/install/debian/templates/web/nginx/caching.tpl
+++ b/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*;
 }
diff --git a/install/rhel/templates/web/nginx/caching.stpl b/install/rhel/templates/web/nginx/caching.stpl
index 31f6111fa..ca6cffe32 100755
--- a/install/rhel/templates/web/nginx/caching.stpl
+++ b/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*;
 }
diff --git a/install/rhel/templates/web/nginx/caching.tpl b/install/rhel/templates/web/nginx/caching.tpl
index 8860be198..36761b65c 100755
--- a/install/rhel/templates/web/nginx/caching.tpl
+++ b/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*;
 }
diff --git a/install/ubuntu/templates/web/nginx/caching.stpl b/install/ubuntu/templates/web/nginx/caching.stpl
index 036dc6ee7..ca6cffe32 100755
--- a/install/ubuntu/templates/web/nginx/caching.stpl
+++ b/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*;
 }
diff --git a/install/ubuntu/templates/web/nginx/caching.tpl b/install/ubuntu/templates/web/nginx/caching.tpl
index 04e38d445..1462f9e1f 100755
--- a/install/ubuntu/templates/web/nginx/caching.tpl
+++ b/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*;
 }