From 2cf57ee94fc17c796735d8afbd7d0fc4ae7166d2 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 23 Jun 2011 00:22:25 +0300
Subject: [PATCH] renamed nginx templates

---
 ...gingx_vhost-default.descr => ngingx_vhost_default.descr} | 0
 .../{ngingx_vhost-default.tpl => ngingx_vhost_default.tpl}  | 6 ++++--
 func/shared_func.sh                                         | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename data/templates/{ngingx_vhost-default.descr => ngingx_vhost_default.descr} (100%)
 rename data/templates/{ngingx_vhost-default.tpl => ngingx_vhost_default.tpl} (83%)

diff --git a/data/templates/ngingx_vhost-default.descr b/data/templates/ngingx_vhost_default.descr
similarity index 100%
rename from data/templates/ngingx_vhost-default.descr
rename to data/templates/ngingx_vhost_default.descr
diff --git a/data/templates/ngingx_vhost-default.tpl b/data/templates/ngingx_vhost_default.tpl
similarity index 83%
rename from data/templates/ngingx_vhost-default.tpl
rename to data/templates/ngingx_vhost_default.tpl
index ecc21114b..5a989e9ea 100644
--- a/data/templates/ngingx_vhost-default.tpl
+++ b/data/templates/ngingx_vhost_default.tpl
@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:80;
+    listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias%;
     server_name_in_redirect off;
     #error_log  /var/log/httpd/domains/%domain%.error.log error;
@@ -17,7 +17,7 @@ server {
     }
 
     location = /error/ {
-        root    %error_docroot%;
+        root    %home%/%user%/domains/%domain%/document_errors/;
         try_files      $uri @fallback;
     }
 
@@ -27,4 +27,6 @@ server {
 
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
+
+    Include %home%/%user%/conf/%domain%.nginx.*
 }
diff --git a/func/shared_func.sh b/func/shared_func.sh
index 3c36bab69..9473ee16a 100644
--- a/func/shared_func.sh
+++ b/func/shared_func.sh
@@ -590,9 +590,9 @@ is_template_valid() {
     }
 
     proxy_template() {
-        tpl="$V_WEBTPL/ngingx_vhost-$template.tpl"
-        descr="$V_WEBTPL/ngingx_vhost-$template.descr"
-        ssl="$V_WEBTPL/ngingx_vhost-$template.ssl.tpl"
+        tpl="$V_WEBTPL/ngingx_vhost_$template.tpl"
+        descr="$V_WEBTPL/ngingx_vhost_$template.descr"
+        ssl="$V_WEBTPL/ngingx_vhost_$template.ssl.tpl"
 
         if [ ! -e $tpl ] || [ ! -e $descr ] || [ ! -e $ssl ]; then
             echo "Error: template not found"