fix: pluton upstream & fix mount setups
This commit is contained in:
parent
7ebeaa9891
commit
d537487b86
2 changed files with 55 additions and 20 deletions
|
|
@ -10,12 +10,12 @@ services:
|
||||||
# Configs folder, excluding modules subfolder. Since this is basically a linux mount, I can't
|
# Configs folder, excluding modules subfolder. Since this is basically a linux mount, I can't
|
||||||
# seem to find a way to prevent modules from creating on the host, so for now I'm just
|
# seem to find a way to prevent modules from creating on the host, so for now I'm just
|
||||||
# mapping each file and the conf.d directory individually (T_T)
|
# mapping each file and the conf.d directory individually (T_T)
|
||||||
- /home/hane/pihanepi/config/nginx/conf.d:/etc/nginx/conf.d:ro,Z
|
- /home/hane/pihanepi/config/nginx/conf.d:/etc/nginx/conf.d:ro,z
|
||||||
- /home/hane/pihanepi/config/nginx/uwsgi_params:/etc/nginx/uwsgi_params:ro,Z
|
- /home/hane/pihanepi/config/nginx/uwsgi_params:/etc/nginx/uwsgi_params:z
|
||||||
- /home/hane/pihanepi/config/nginx/scgi_params:/etc/nginx/scgi_params:ro,Z
|
- /home/hane/pihanepi/config/nginx/scgi_params:/etc/nginx/scgi_params:z
|
||||||
- /home/hane/pihanepi/config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro,Z
|
- /home/hane/pihanepi/config/nginx/nginx.conf:/etc/nginx/nginx.conf:z
|
||||||
- /home/hane/pihanepi/config/nginx/fastcgi_params:/etc/nginx/fastcgi_params:ro,Z
|
- /home/hane/pihanepi/config/nginx/fastcgi_params:/etc/nginx/fastcgi_params:z
|
||||||
- /home/hane/pihanepi/config/nginx/fastcgi.conf:/etc/nginx/fastcgi.conf:ro,Z
|
- /home/hane/pihanepi/config/nginx/fastcgi.conf:/etc/nginx/fastcgi.conf:z
|
||||||
# We also create and map a certs folder for TLS
|
# We also create and map a certs folder for TLS
|
||||||
- /home/hane/pihanepi/config/nginx/certs:/etc/nginx/certs/
|
- /home/hane/pihanepi/config/nginx/certs:/etc/nginx/certs/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,12 @@ http {
|
||||||
keepalive 2;
|
keepalive 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
upstream plutonio {
|
||||||
|
zone plutonio 64k;
|
||||||
|
server 192.168.1.45:8001;
|
||||||
|
keepalive 2;
|
||||||
|
}
|
||||||
|
|
||||||
# Needed to support websocket connections
|
# Needed to support websocket connections
|
||||||
# See: https://nginx.org/en/docs/http/websocket.html
|
# See: https://nginx.org/en/docs/http/websocket.html
|
||||||
# Instead of "close" as stated in the above link we send an empty value.
|
# Instead of "close" as stated in the above link we send an empty value.
|
||||||
|
|
@ -45,6 +51,21 @@ http {
|
||||||
'' "";
|
'' "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/CERTS.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/KEY.pem;
|
||||||
|
#cert.key
|
||||||
|
|
||||||
|
server {
|
||||||
|
server_name _;
|
||||||
|
listen [::]:80 default_server;
|
||||||
|
listen [::]:443 ssl default_server;
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/CERTS.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/KEY.pem;
|
||||||
|
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
|
@ -107,20 +128,33 @@ http {
|
||||||
|
|
||||||
# HTTPS server
|
# HTTPS server
|
||||||
#
|
#
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name localhost 192.168.1.45 internal.test;
|
server_name pluton.internal.test;
|
||||||
|
|
||||||
ssl_certificate /etc/nginx/certs/CERTS.pem;
|
|
||||||
ssl_certificate_key /etc/nginx/certs/KEY.pem;
|
|
||||||
#cert.key
|
|
||||||
|
|
||||||
ssl_session_cache shared:SSL:1m;
|
ssl_session_cache shared:SSL:1m;
|
||||||
ssl_session_timeout 5m;
|
ssl_session_timeout 5m;
|
||||||
|
|
||||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
ssl_prefer_server_ciphers on;
|
ssl_prefer_server_ciphers on;
|
||||||
rewrite ^/test(.*)$ / break;
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://plutonio;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name vault.internal.test;
|
||||||
|
|
||||||
|
ssl_session_cache shared:SSL:1m;
|
||||||
|
ssl_session_timeout 5m;
|
||||||
|
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
rewrite ^/test(.*)$ / break; #TODO: actually delete from URI too
|
||||||
|
|
||||||
|
|
||||||
#location /test {
|
#location /test {
|
||||||
|
|
@ -132,6 +166,7 @@ http {
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://vaultwarden-default;
|
proxy_pass http://vaultwarden-default;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue