informatik c'est fantastik

Tagadda · Tagadda · commit 20a5937c59ac · 2025-05-06T17:23:05.000+02:00
diff --git a/conf/allowlist.conf.j2 b/conf/allowlist.conf.j2
@@ -1,5 +1,5 @@
 allow 127.0.0.1;
-{% for ip in ip_allowlist.split(',') %}
-allow {{ ip }};
-{% endfor %}
+{% if ip_allowlist.strip() != "" %}{% for ip in ip_allowlist.strip().split(',') %}
+allow {{ ip }};{% endfor %}{% endif %}
+
 deny all;
diff --git a/conf/basicauth.conf b/conf/basicauth.conf
@@ -1,2 +1,2 @@
 auth_basic "";
-auth_basic_user_file conf.d/$domain.d/$app.d/htpasswd;
+auth_basic_user_file conf.d/__DOMAIN__.d/__APP__.d/htpasswd;
diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -13,5 +13,5 @@ location __PATH__/ {
   proxy_set_header Upgrade $http_upgrade;
   proxy_set_header Connection "upgrade";
 
-  include /etc/nginx.d/conf.d/$domain.d/$app.d/*.conf;
+  include conf.d/__DOMAIN__.d/__APP__.d/*.conf;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`auth_basic "";`
`2`		`-auth_basic_user_file conf.d/$domain.d/$app.d/htpasswd;`
	`2`	`+auth_basic_user_file conf.d/__DOMAIN__.d/__APP__.d/htpasswd;`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ location __PATH__/ {`
`13`	`13`	`proxy_set_header Upgrade $http_upgrade;`
`14`	`14`	`proxy_set_header Connection "upgrade";`
`15`	`15`
`16`		`- include /etc/nginx.d/conf.d/$domain.d/$app.d/*.conf;`
	`16`	`+ include conf.d/__DOMAIN__.d/__APP__.d/*.conf;`
`17`	`17`	`}`