2 Commits
Author SHA1 Message Date
pierre.geeraert 080eed640d fix the misake 2026-10-12 19:43:10 +01:00
pierre.geeraert 96bdb57a8e revert back the config file 2026-10-12 19:26:45 +01:00
2 changed files with 65 additions and 39 deletions
+18 -29
View File
@@ -2,6 +2,12 @@
# config file for ${name_site} # config file for ${name_site}
############################################ ############################################
upstream ${name_site}_backend {
server ${name_service};
server 1.1.1.1 backup;
}
server { server {
server_name ${name_site}.tryton.geeraert.eu www.${name_site}.tryton.geeraert.eu; server_name ${name_site}.tryton.geeraert.eu www.${name_site}.tryton.geeraert.eu;
@@ -20,23 +26,12 @@ server {
%{ if redirect_to_root_domain != true } %{ if redirect_to_root_domain != true }
location / { location / {
set $backend_${name_site} "${name_service}"; proxy_pass %{ if proxy_pass_https}https%{else}http%{ endif }://${name_site}_backend;
proxy_pass %{ if proxy_pass_https}https%{else}http%{ endif }://$backend_${name_site}; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Host $host;
proxy_set_header Host $host; ${extra-value-location}
${extra-value-location}
proxy_intercept_errors on;
# 502 = DNS can't resolve / Service down
# 504 = Gateway Timeout
error_page 502 504 = @backup_site;
}
location @backup_site {
proxy_pass http://1.1.1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Host $host;
} }
location /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
root /var/www/certbot; root /var/www/certbot;
@@ -89,27 +84,21 @@ server {
# config file for ${name_site} # config file for ${name_site}
############################################ ############################################
upstream ${name_site}_backend_root {
server ${name_service};
server 1.1.1.1 backup;
}
server { server {
server_name ${name_site}.geeraert.eu www.${name_site}.geeraert.eu; server_name ${name_site}.geeraert.eu www.${name_site}.geeraert.eu;
location / { location / {
set $backend_root_${name_site} "${name_service}"; proxy_pass %{ if proxy_pass_https}https%{else}http%{ endif }://${name_site}_backend_root;
proxy_pass %{ if proxy_pass_https}https%{else}http%{ endif }://$backend_root_${name_site}; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Host $host;
proxy_set_header Host $host;
${extra-value-location} ${extra-value-location}
proxy_intercept_errors on;
# 502 = DNS can't resolve / Service down
# 504 = Gateway Timeout
error_page 502 504 = @backup_site;
}
location @backup_site {
proxy_pass http://1.1.1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Host $host;
} }
location /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
root /var/www/certbot; root /var/www/certbot;
+45 -8
View File
@@ -6,61 +6,79 @@ nginx_sites = {
} }
bookstack = { bookstack = {
enabled = false enabled = false
service = "bookstack-svc.bookstack.svc" service = "bookstack-svc.bookstack.svc"
proxy_cache = false proxy_cache = false
} }
django = { django = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
admin = { admin = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
redirect = { redirect = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
streaming = { streaming = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
stash = { stash = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
simpsons = { simpsons = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
kubernetes = { kubernetes = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
cloudmanager = { cloudmanager = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
podcast = { podcast = {
enabled = false
service = "django-svc.django:8000" service = "django-svc.django:8000"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
@@ -119,14 +137,16 @@ nginx_sites = {
http2_bool = true http2_bool = true
} }
echo = { echo = {
enabled = true enabled = true
service = "echo-svc.echo.svc" service = "echo-svc.echo.svc"
docker_service = "echo" docker_service = "echo-svc.echo.svc"
proxy_cache = true proxy_cache = true
http2_bool = true http2_bool = true
} }
sonarr = { sonarr = {
enabled = false
service = "sonarr-svc.servarr.svc:8989" service = "sonarr-svc.servarr.svc:8989"
geoip_allow = ["FR", "GB", "NL"] geoip_allow = ["FR", "GB", "NL"]
@@ -134,6 +154,8 @@ nginx_sites = {
nextcloud = { nextcloud = {
enabled = false
redirect_to_root_domain = false redirect_to_root_domain = false
service = "webserver.nextcloud.svc" service = "webserver.nextcloud.svc"
#service = "nextcloud-svc.next.svc" #service = "nextcloud-svc.next.svc"
@@ -160,13 +182,14 @@ nginx_sites = {
router = { router = {
enabled = false enabled = false
service = "192.168.88.1" service = "192.168.88.1"
authentication_required = true authentication_required = true
} }
octoprint = { octoprint = {
service = "192.168.0.32:5000" service = "192.168.0.32:5000"
extra-value-location = <<EOT extra-value-location = <<EOT
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
@@ -190,27 +213,35 @@ nginx_sites = {
paperless = { paperless = {
enabled = false
#service = "webserver.paperless.svc:8000" #service = "webserver.paperless.svc:8000"
service = "paperless-svc.paperless.svc:8000" service = "paperless-svc.paperless.svc:8000"
} }
pihole = { pihole = {
enabled = false
service = "172.16.0.60:8081" service = "172.16.0.60:8081"
enabled = false enabled = false
} }
prowlarr = { prowlarr = {
enabled = false
service = "prowlarr-svc.servarr.svc:9696" service = "prowlarr-svc.servarr.svc:9696"
geoip_allow = ["FR", "GB", "NL"] geoip_allow = ["FR", "GB", "NL"]
} }
qbittorrent = { qbittorrent = {
#enabled = false enabled = false
service = "qbittorrent-svc.servarr.svc:8080" service = "qbittorrent-svc.servarr.svc:8080"
geoip_allow = ["FR", "GB", "NL"] geoip_allow = ["FR", "GB", "NL"]
} }
radarr = { radarr = {
enabled = false
service = "radarr-svc.servarr.svc:7878" service = "radarr-svc.servarr.svc:7878"
geoip_allow = ["FR", "GB", "NL"] geoip_allow = ["FR", "GB", "NL"]
@@ -218,16 +249,22 @@ nginx_sites = {
unifi = { unifi = {
enabled = false
# service = "unifi.unifi.svc:8443" # service = "unifi.unifi.svc:8443"
service = "192.168.88.244:8443" service = "192.168.88.244:8443"
proxy_pass_https = true proxy_pass_https = true
} }
unifi-inform = { unifi-inform = {
enabled = false
service = "192.168.88.50:8082" service = "192.168.88.50:8082"
} }
immich = { immich = {
enabled = false
#service = "immich-server.immich.svc:2283" #service = "immich-server.immich.svc:2283"
service = "immich-svc.immich.svc:2283" service = "immich-svc.immich.svc:2283"
geoip_allow = ["FR", "GB", "NL"] geoip_allow = ["FR", "GB", "NL"]
@@ -275,7 +312,7 @@ proxy_set_header Connection "upgrade";
service = "192.168.88.29" service = "192.168.88.29"
} }
pihole = { pihole = {
enabled = false enabled = false
service = "web.piholenew.svc" service = "web.piholenew.svc"
} }
@@ -287,7 +324,7 @@ proxy_set_header Connection "upgrade";
gitea = { gitea = {
enabled = true enabled = true
service = "webserver.gitea.svc:3000" service = "webserver.gitea.svc:3000"
docker_service = "gitea:3000" docker_service = "gitea:3000"
redirect_to_root_domain = false redirect_to_root_domain = false
} }
@@ -316,7 +353,7 @@ proxy_set_header Connection "upgrade";
stash = { stash = {
# enabled = false enabled = false
service = "stash-svc.stash.svc:9999" service = "stash-svc.stash.svc:9999"
#geoip_blocking = false #geoip_blocking = false
#extra-value= <<EOT #extra-value= <<EOT