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

Fixed path for custom includes in caching template

Browse source
This commit is contained in:
Serghey Rodin 2014-02-11 16:38:15 +02:00
commit 31ef50228a
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install/debian/templates/web/nginx/caching.stpl
View file

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

2
install/debian/templates/web/nginx/caching.tpl
View file

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

8
install/rhel/templates/web/nginx/caching.stpl
View file

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

8
install/rhel/templates/web/nginx/caching.tpl
View file

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

2
install/ubuntu/templates/web/nginx/caching.stpl
View file

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

2
install/ubuntu/templates/web/nginx/caching.tpl
View file

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