Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ae314ea9b3 | |||
| a2eba1ac70 | |||
| 5ae8a3b186 | |||
| 6389a936c8 | |||
| 233131b612 | |||
|
a87c27b3d5 |
|||
| e9a5b711ae | |||
| 548d761def | |||
| 53c1801eba | |||
| e668c44273 |
8 changed files with 37 additions and 47 deletions
|
|
@ -1,5 +1,7 @@
|
|||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/lists/docker_compose/compose.yaml.j2') }}"
|
||||
docker_compose__configuration_files:
|
||||
- name: mailman-extra.cfg
|
||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/docker_compose/mailman-extra.cfg') }}"
|
||||
- name: settings_local.py
|
||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/docker_compose/settings_local.py') }}"
|
||||
docker_compose__files: resources/chaosknoten/lists/docker_compose/files
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
$TTL 7200
|
||||
|
||||
; es wird jetzt der hostname mail.hamburg.ccc.de nicht mehr
|
||||
; verwendet, sondern statt dessen local-mail.hamburg.ccc.de
|
||||
; die popeye fuehlt sich immer noch unter mail.hamburg.ccc.de
|
||||
; angesprochen, und nimmt daher keine mails mit absender-adressen
|
||||
; die sie nicht kennt an.
|
||||
; ich hoffe diese aenderung arbeitet um diesen bug herum.
|
||||
; - haegar 2001.11.14
|
||||
|
||||
@ IN SOA auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. (
|
||||
2024012601
|
||||
10800
|
||||
|
|
@ -19,16 +11,18 @@ $TTL 7200
|
|||
@ NS erfadns.ber.ccc.de.
|
||||
|
||||
IN MX 5 nomail.ccc.de.
|
||||
; IN MX 10 local-mail.hamburg.ccc.de.
|
||||
IN MX 23 nomail2.ccc.de.
|
||||
IN MX 42 nomail3.ccc.de.
|
||||
|
||||
; public-reverse-proxy
|
||||
IN A 212.12.48.125
|
||||
IN AAAA 2a00:14b0:4200:3000:125::1
|
||||
|
||||
localhost IN A 127.0.0.1
|
||||
; Migration von großem C officemail zu Infra in Berlin, ggf. mit vollkorn/haegar klären
|
||||
officemail IN CNAME officemail.office.ccc.de.
|
||||
|
||||
|
||||
; Alter Kram, sollte nach der Netzwerkumstellung auf Chaosknoten überflüssig sein
|
||||
; DMZ-Server:
|
||||
dmz-net IN A 212.12.50.208
|
||||
|
||||
|
|
@ -39,35 +33,3 @@ LAN-212-12-51-128 IN A 212.12.51.128
|
|||
gate IN A 212.12.51.129
|
||||
END-212-12-51-143 IN A 212.12.51.143
|
||||
|
||||
|
||||
; convience and email
|
||||
|
||||
backup IN A 172.31.16.3
|
||||
IN AAAA 2001:6f8:126f:1:16:20:0:3
|
||||
; IN MX 5 nomail.ccc.de.
|
||||
IN MX 10 local-mail.hamburg.ccc.de.
|
||||
|
||||
officemail IN A 172.31.17.131
|
||||
IN MX 5 nomail.ccc.de.
|
||||
; IN MX 10 local-mail.hamburg.ccc.de.
|
||||
IN MX 23 nomail2.ccc.de.
|
||||
IN MX 42 nomail3.ccc.de.
|
||||
|
||||
orga IN CNAME orga.hamburg.ccc.de.
|
||||
|
||||
|
||||
; Die alte World, aka popeye.crew-gmbh.de
|
||||
; Legacy-Names, do not delete
|
||||
world IN A 192.76.134.7
|
||||
IN MX 10 world
|
||||
popeye IN A 192.76.134.7
|
||||
IN MX 10 world
|
||||
uucp IN A 192.76.134.7
|
||||
|
||||
; ChaosVPN
|
||||
hack IN NS cvpn-dns.hack
|
||||
cvpn-dns.hack IN A 172.31.0.5
|
||||
|
||||
|
||||
; tmp test
|
||||
merz.leck.eier IN TXT "kann er mal"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
services:
|
||||
keycloak:
|
||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.7.2
|
||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.3
|
||||
pull_policy: always
|
||||
restart: unless-stopped
|
||||
command: start --optimized
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -77,12 +77,15 @@ services:
|
|||
- KEYCLOAK_CLIENT_SECRET={{ secret__lists__keycloak_client_secret }}
|
||||
- KEYCLOAK_REALM=ccchh
|
||||
- KEYCLOAK_URL=https://id.hamburg.ccc.de
|
||||
- LIST_ATTRIBUTES=chaos@lists.hamburg.ccc.de:mailinglist-chaos
|
||||
- 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:
|
||||
|
|
|
|||
19
resources/chaosknoten/lists/docker_compose/mailman-extra.cfg
Normal file
19
resources/chaosknoten/lists/docker_compose/mailman-extra.cfg
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# Override Mailman configuration settings
|
||||
# See https://github.com/maxking/docker-mailman#configuration
|
||||
# and https://docs.mailman3.org/projects/mailman/en/latest/src/mailman/config/docs/config.html
|
||||
|
||||
[mailman]
|
||||
pending_request_life: 7d
|
||||
|
||||
# This address is the "site owner" address. Certain messages which must be
|
||||
# delivered to a human, but which can't be delivered to a list owner (e.g. a
|
||||
# bounce from a list owner), will be sent to this address. It should point to
|
||||
# a human.
|
||||
site_owner: listops@hamburg.ccc.de
|
||||
|
||||
[mta]
|
||||
# remove any pre-existing DKIM headers from mails being forwarded through a
|
||||
# list
|
||||
remove_dkim_headers: yes
|
||||
|
||||
# eof
|
||||
Loading…
Reference in a new issue