diff --git a/inventories/z9/hosts.yaml b/inventories/z9/hosts.yaml index ebbab18f..66519db7 100644 --- a/inventories/z9/hosts.yaml +++ b/inventories/z9/hosts.yaml @@ -15,7 +15,7 @@ all: ansible_host: waybackproxy.ccchh.net ansible_user: chaos yate: - ansible_host: yate.z9.ccchh.net + ansible_host: yate.ccchh.net ansible_user: chaos z9-router: ansible_host: z9-router.ccchh.net diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone index c501167f..e5c1d251 100644 --- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone +++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone @@ -134,6 +134,10 @@ octopi A 10.89.212.31 ;cisco-slm248p A 10.89.208.27 +waybackproxy A 10.89.212.33 + +alnair A 10.89.210.23 + TXT "Sun SparcStation 4 Retro" ; ; Public Club Services diff --git a/resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf b/resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf index 1420e43d..bd819118 100644 --- a/resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf +++ b/resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf @@ -41,7 +41,7 @@ server { # Also provide "_hidden" for by, since it's not relevant. proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden"; - allow 185.161.129.132/32; # z9 + 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 diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index 2a7ffdd8..7a109e8c 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 @@ -80,9 +80,12 @@ services: - LIST_ATTRIBUTES=chaos@lists.hamburg.ccc.de:mailinglist-chaos,intern@lists.hamburg.ccc.de:mailinglist-intern - MAILMAN_API_PASSWORD={{ secret__lists__rest_password }} - MAILMAN_API_URL=http://mailman-core:8001/3.1 + - MANUAL_SUBSCRIBER_LISTS=/manual-subscriber-lists image: git.hamburg.ccc.de/ccchh/mailman-subscription-sync:latest networks: mailman: + volumes: + - /home/chaos/mailman-manual-subscriber-lists:/manual-subscriber-lists networks: mailman: