Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix/service misdirection (#711)

Browse Source
This commit is contained in:
Keagan McClelland
2021-10-20 21:18:02 -06:00
committed by Aiden McClelland
parent 9df65e12ad
commit 9c1d2ed96d
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appmgr/src/net/nginx-standard.conf.template
View File

@@ -7,7 +7,7 @@ map $http_x_forwarded_proto $real_proto {{
}} }}
server {{ server {{
listen 443 ssl; listen 443 ssl;
server_name {hostname}.local; server_name .{hostname}.local;
ssl_certificate /root/appmgr/apps/{app_id}/cert-local.fullchain.crt.pem; ssl_certificate /root/appmgr/apps/{app_id}/cert-local.fullchain.crt.pem;
ssl_certificate_key /root/appmgr/apps/{app_id}/cert-local.key.pem; ssl_certificate_key /root/appmgr/apps/{app_id}/cert-local.key.pem;
location / {{ location / {{
@@ -23,6 +23,6 @@ server {{
}} }}
server {{ server {{
listen 80; listen 80;
server_name {hostname}.local; server_name .{hostname}.local;
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
}} }}

3
appmgr/src/net/nginx.conf.template
View File

@@ -1,6 +1,7 @@
server {{ server {{
listen {listen_args}; listen {listen_args};
server_name {hostname}.local; listen [::]:{listen_args_ipv6};
server_name .{hostname}.local;
{ssl_certificate_line} {ssl_certificate_line}
{ssl_certificate_key_line} {ssl_certificate_key_line}
location / {{ location / {{

1
appmgr/src/net/nginx.rs
View File

@@ -154,6 +154,7 @@ impl NginxControllerInner {
format!( format!(
include_str!("nginx.conf.template"), include_str!("nginx.conf.template"),
listen_args = listen_args, listen_args = listen_args,
listen_args_ipv6 = listen_args,
hostname = meta.dns_base, hostname = meta.dns_base,
ssl_certificate_line = ssl_certificate_line, ssl_certificate_line = ssl_certificate_line,
ssl_certificate_key_line = ssl_certificate_key_line, ssl_certificate_key_line = ssl_certificate_key_line,

12
appmgr/src/nginx/main-ui.conf.template
View File

@@ -8,7 +8,7 @@ server {{
index index.html index.htm index.nginx-debian.html; index index.html index.htm index.nginx-debian.html;
server_name {lan_hostname}; server_name .{lan_hostname};
proxy_buffering off; proxy_buffering off;
proxy_request_buffering off; proxy_request_buffering off;
@@ -25,7 +25,7 @@ server {{
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
}} }}
location /public/ {{ location /public/ {{
proxy_pass http://127.0.0.1:5961/; proxy_pass http://127.0.0.1:5961/;
}} }}
@@ -41,7 +41,7 @@ server {{
server {{ server {{
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name {lan_hostname}; server_name .{lan_hostname};
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
}} }}
server {{ server {{
@@ -54,7 +54,7 @@ server {{
index index.html index.htm index.nginx-debian.html; index index.html index.htm index.nginx-debian.html;
server_name {tor_hostname}; server_name .{tor_hostname};
proxy_buffering off; proxy_buffering off;
proxy_request_buffering off; proxy_request_buffering off;
@@ -71,7 +71,7 @@ server {{
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
}} }}
location /public/ {{ location /public/ {{
proxy_pass http://127.0.0.1:5961/; proxy_pass http://127.0.0.1:5961/;
}} }}
@@ -87,6 +87,6 @@ server {{
server {{ server {{
listen 443 ssl; listen 443 ssl;
listen [::]:443; listen [::]:443;
server_name {tor_hostname}; server_name .{tor_hostname};
return 301 http://$host$request_uri; return 301 http://$host$request_uri;
}} }}