renamed nginx templates

serghey-rodin · serghey-rodin · commit 2cf57ee94fc1 · 2011-06-23T00:23:02.000+03:00
diff --git a/data/templates/ngingx_vhost_default.descr b/data/templates/ngingx_vhost_default.descr
diff --git 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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`server {`
`2`		`- listen %ip%:80;`
	`2`	`+ listen %ip%:%proxy_port%;`
`3`	`3`	`server_name %domain_idn% %alias%;`
`4`	`4`	`server_name_in_redirect off;`
`5`	`5`	`#error_log /var/log/httpd/domains/%domain%.error.log error;`
`@@ -17,7 +17,7 @@ server {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`location = /error/ {`
`20`		`- root %error_docroot%;`
	`20`	`+ root %home%/%user%/domains/%domain%/document_errors/;`
`21`	`21`	`try_files $uri @fallback;`
`22`	`22`	`}`
`23`	`23`
`@@ -27,4 +27,6 @@ server {`
`27`	`27`
`28`	`28`	`location ~ /\.ht {deny all;}`
`29`	`29`	`location ~ /.svn/ {deny all;}`
	`30`	`+`
	`31`	`+ Include %home%/%user%/conf/%domain%.nginx.*`
`30`	`32`	`}`