upload mdified files

This commit is contained in:
2024-07-28 21:56:52 +01:00
parent 8b9c11d383
commit 22e2c141fc
3 changed files with 122 additions and 67 deletions
+16 -8
View File
@@ -1,3 +1,7 @@
############################################
# config file for django
############################################
upstream django_backend {
server webserver.django-python.svc:8000;
server 1.1.1.1 backup;
@@ -7,6 +11,7 @@ server {
server_name django.tryton.geeraert.eu www.django.tryton.geeraert.eu;
location / {
proxy_pass http://django_backend;
location ~* \.(html|css|jpg|gif|ico|js)$ {
proxy_cache cache;
proxy_cache_key $host$uri$is_args$args;
@@ -20,28 +25,31 @@ server {
root /var/www/certbot;
}
listen 443 ssl; # managed by Certbot
http2 on;
ssl_protocols TLSv1.2;
listen 443 ssl;
ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;
}
server {
if ($host = www.django.tryton.geeraert.eu) {
return 301 https://$host$request_uri;
} # managed by Certbot
}
if ($host = django.tryton.geeraert.eu) {
return 301 https://$host$request_uri;
} # managed by Certbot
}
server_name www.django.tryton.geeraert.eu django.tryton.geeraert.eu;
listen 80;
return 404; # managed by Certbot
return 404;
}
+39 -2
View File
@@ -1,6 +1,9 @@
############################################
# config file for echo
############################################
upstream echo_backend {
server echo-server.echo-server.svc:80;
#server 192.168.88.52:8080;
server 1.1.1.1 backup;
}
@@ -8,11 +11,45 @@ server {
server_name echo.tryton.geeraert.eu www.echo.tryton.geeraert.eu;
location / {
proxy_pass http://echo_backend;
location ~* \.(html|css|jpg|gif|ico|js)$ {
proxy_cache cache;
proxy_cache_key $host$uri$is_args$args;
proxy_cache_valid 200 301 302 30m;
expires 30m;
proxy_pass http://echo_backend;
}
}
location /.well-known/acme-challenge/ {
root /var/www/certbot;
}
listen 80 ;
http2 on;
ssl_protocols TLSv1.2;
listen 443 ssl;
ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;
}
server {
if ($host = www.echo.tryton.geeraert.eu) {
return 301 https://$host$request_uri;
}
if ($host = echo.tryton.geeraert.eu) {
return 301 https://$host$request_uri;
}
server_name www.echo.tryton.geeraert.eu echo.tryton.geeraert.eu;
listen 80;
return 404;
}
+30 -20
View File
@@ -1,10 +1,9 @@
############################################
# config file for gitlab
############################################
upstream gitlab_backend {
#k8s pod
server webserver.gitlab.svc:443;
#server gitlab-nginx-ingress-controller.gitlab.svc;
#server gitlab-kas.gitlab.svc:8150;
#docker pod
#server 192.168.88.50:4887;
server webserver.gitlab.svc;
server 1.1.1.1 backup;
}
@@ -12,39 +11,50 @@ server {
server_name gitlab.tryton.geeraert.eu www.gitlab.tryton.geeraert.eu;
location / {
proxy_pass https://gitlab_backend;
proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection "upgrade";
proxy_http_version 1.1;
location ~* \.(html|css|jpg|gif|ico|js)$ {
proxy_cache cache;
proxy_cache_key $host$uri$is_args$args;
proxy_cache_valid 200 301 302 30m;
expires 30m;
proxy_pass https://gitlab_backend;
}
}
location /.well-known/acme-challenge/ {
root /var/www/certbot;
}
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;
client_max_body_size 20m;
proxy_request_buffering off;
#include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
#ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
http2 on;
ssl_protocols TLSv1.2;
listen 443 ssl;
ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;
}
server {
if ($host = www.gitlab.tryton.geeraert.eu) {
return 301 https://$host$request_uri;
} # managed by Certbot
}
if ($host = gitlab.tryton.geeraert.eu) {
return 301 https://$host$request_uri;
} # managed by Certbot
}
server_name www.gitlab.tryton.geeraert.eu gitlab.tryton.geeraert.eu;
listen 80;
return 404; # managed by Certbot
return 404;
}