github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed nginx templates

Browse source
This commit is contained in:
Serghey Rodin 2011-06-23 00:22:25 +03:00
commit 2cf57ee94f
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

0
data/templates/ngingx_vhost-default.descr → data/templates/ngingx_vhost_default.descr
View file

6
data/templates/ngingx_vhost-default.tpl → data/templates/ngingx_vhost_default.tpl
View file

@ -1,5 +1,5 @@
server { server {
listen %ip%:80; listen %ip%:%proxy_port%;
server_name %domain_idn% %alias%; server_name %domain_idn% %alias%;
server_name_in_redirect off; server_name_in_redirect off;
#error_log /var/log/httpd/domains/%domain%.error.log error; #error_log /var/log/httpd/domains/%domain%.error.log error;
@ -17,7 +17,7 @@ server {
} }
location = /error/ { location = /error/ {
root %error_docroot%; root %home%/%user%/domains/%domain%/document_errors/;
try_files $uri @fallback; try_files $uri @fallback;
} }
@ -27,4 +27,6 @@ server {
location ~ /\.ht {deny all;} location ~ /\.ht {deny all;}
location ~ /.svn/ {deny all;} location ~ /.svn/ {deny all;}
Include %home%/%user%/conf/%domain%.nginx.*
} }

6
func/shared_func.sh
View file

@ -590,9 +590,9 @@ is_template_valid() {
} }
proxy_template() { proxy_template() {
tpl="$V_WEBTPL/ngingx_vhost-$template.tpl" tpl="$V_WEBTPL/ngingx_vhost_$template.tpl"
descr="$V_WEBTPL/ngingx_vhost-$template.descr" descr="$V_WEBTPL/ngingx_vhost_$template.descr"
ssl="$V_WEBTPL/ngingx_vhost-$template.ssl.tpl" ssl="$V_WEBTPL/ngingx_vhost_$template.ssl.tpl"
if [ ! -e $tpl ] || [ ! -e $descr ] || [ ! -e $ssl ]; then if [ ! -e $tpl ] || [ ! -e $descr ] || [ ! -e $ssl ]; then
echo "Error: template not found" echo "Error: template not found"