Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e3798bf2f3 | |||
| 4540dc5516 |
3 changed files with 3 additions and 24 deletions
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
keycloak:
|
keycloak:
|
||||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.3
|
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.7.2
|
||||||
pull_policy: always
|
pull_policy: always
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: start --optimized
|
command: start --optimized
|
||||||
|
|
|
||||||
|
|
@ -46,28 +46,7 @@ server {
|
||||||
# Also provide "_hidden" for by, since it's not relevant.
|
# Also provide "_hidden" for by, since it's not relevant.
|
||||||
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
||||||
|
|
||||||
# temporary until we can upgrade keycloak stb 2026-08-25
|
allow all;
|
||||||
allow 185.161.129.134/32; # z9
|
|
||||||
allow 2a07:c480:0:100::/56; # z9
|
|
||||||
allow 2a07:c481:1::/48; # z9 new ipv6
|
|
||||||
allow 213.240.180.39/32; # stb home
|
|
||||||
allow 2a01:170:118b:f701::1/64; # stb home
|
|
||||||
|
|
||||||
# Wieske
|
|
||||||
allow 212.12.48.0/24;
|
|
||||||
allow 2a00:14b0:4200:3000::/64;
|
|
||||||
allow 172.31.18.0/24;
|
|
||||||
allow 172.31.17.0/25;
|
|
||||||
allow 172.31.17.128/25;
|
|
||||||
allow 212.12.51.128/28;
|
|
||||||
allow 2a00:14b0:4200:3500::130:0/112;
|
|
||||||
allow 2a00:14b0:f000:23::/64;
|
|
||||||
allow 10.32.2.0/24;
|
|
||||||
allow 2a00:14b0:42:102::/64;
|
|
||||||
allow 212.12.50.208/29;
|
|
||||||
allow 2a00:14b0:42:105::/64;
|
|
||||||
|
|
||||||
deny all;
|
|
||||||
|
|
||||||
# Redirect a user opening any not set location on id.hamburg.ccc.de to the account management page.
|
# Redirect a user opening any not set location on id.hamburg.ccc.de to the account management page.
|
||||||
location ^~ / {
|
location ^~ / {
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ services:
|
||||||
- POSTGRES_DB=mailmandb
|
- POSTGRES_DB=mailmandb
|
||||||
- POSTGRES_USER=mailman
|
- POSTGRES_USER=mailman
|
||||||
- "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
|
- "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
|
||||||
image: docker.io/library/postgres:12-alpine
|
image: docker.io/library/postgres:15-alpine
|
||||||
volumes:
|
volumes:
|
||||||
- /opt/mailman/database:/var/lib/postgresql/data
|
- /opt/mailman/database:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue