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

Minor fix for install-rocket-nginx.sh

Browse source
This commit is contained in:
isscbta 2023-01-31 16:23:15 +01:00
commit 66162375fd
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.stpl
View file

@ -6,11 +6,13 @@ server {
ssl_certificate_key %ssl_key%; ssl_certificate_key %ssl_key%;
error_log /var/log/%web_system%/domains/%domain%.error.log error; error_log /var/log/%web_system%/domains/%domain%.error.log error;
root %sdocroot%;
# Rocket-Nginx configuration
include rocket-nginx/conf.d/default.conf;
location / { location / {
proxy_pass https://%ip%:%web_ssl_port%; proxy_pass https://%ip%:%web_ssl_port%;
location ~* ^.+\.(%proxy_extentions%)$ { location ~* ^.+\.(%proxy_extentions%)$ {
root %sdocroot%;
access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.log combined;
access_log /var/log/%web_system%/domains/%domain%.bytes bytes; access_log /var/log/%web_system%/domains/%domain%.bytes bytes;
expires max; expires max;
@ -37,5 +39,4 @@ server {
include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*;
include rocket-nginx/conf.d/default.conf;
} }

1
src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-htpps.tpl
View file

@ -5,5 +5,4 @@ server {
rewrite ^(.*) https://%domain_idn%$1 permanent; rewrite ^(.*) https://%domain_idn%$1 permanent;
} }
include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
include rocket-nginx/conf.d/default.conf;
} }

5
src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl
View file

@ -6,10 +6,13 @@ server {
ssl_certificate_key %ssl_key%; ssl_certificate_key %ssl_key%;
error_log /var/log/%web_system%/domains/%domain%.error.log error; error_log /var/log/%web_system%/domains/%domain%.error.log error;
root %sdocroot%;
# Rocket-Nginx configuration
include rocket-nginx/conf.d/default.conf;
location / { location / {
proxy_pass https://%ip%:%web_ssl_port%; proxy_pass https://%ip%:%web_ssl_port%;
location ~* ^.+\.(%proxy_extentions%)$ { location ~* ^.+\.(%proxy_extentions%)$ {
root %sdocroot%;
access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.log combined;
access_log /var/log/%web_system%/domains/%domain%.bytes bytes; access_log /var/log/%web_system%/domains/%domain%.bytes bytes;
expires max; expires max;

6
src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl
View file

@ -3,10 +3,13 @@ server {
server_name %domain_idn% %alias_idn%; server_name %domain_idn% %alias_idn%;
error_log /var/log/%web_system%/domains/%domain%.error.log error; error_log /var/log/%web_system%/domains/%domain%.error.log error;
root %docroot%;
# Rocket-Nginx configuration
include rocket-nginx/conf.d/default.conf;
location / { location / {
proxy_pass http://%ip%:%web_port%; proxy_pass http://%ip%:%web_port%;
location ~* ^.+\.(%proxy_extentions%)$ { location ~* ^.+\.(%proxy_extentions%)$ {
root %docroot%;
access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.log combined;
access_log /var/log/%web_system%/domains/%domain%.bytes bytes; access_log /var/log/%web_system%/domains/%domain%.bytes bytes;
expires max; expires max;
@ -32,5 +35,4 @@ server {
disable_symlinks if_not_owner from=%docroot%; disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain%.conf*;
include rocket-nginx/conf.d/default.conf;
} }