Compare commits

...
Author SHA1 Message Date
b22b59b4c1 Update all stable non-major dependencies
Some checks failed
/ build (pull_request) Successful in 32s
/ Ansible Lint (push) Failing after 3m13s
/ Ansible Lint (pull_request) Failing after 3m17s
2026-08-17 07:30:52 +00:00
e9a5b711ae Start migrating config to Ansible
All checks were successful
/ build (push) Successful in 25s
/ Ansible Lint (push) Successful in 2m31s
The real file still lives in /opt/mailman on the host for now, need to migrate whole config into Ansible.
2026-08-17 09:25:23 +02:00
548d761def Migrate officemail away
All checks were successful
/ build (push) Successful in 50s
/ Ansible Lint (push) Successful in 2m59s
2026-08-17 09:20:13 +02:00
11 changed files with 31 additions and 57 deletions

View file

@ -24,7 +24,7 @@ jobs:
# work in our environmnet. # work in our environmnet.
# Rather manually setup python (pip) before instead. # Rather manually setup python (pip) before instead.
- name: Run ansible-lint - name: Run ansible-lint
uses: https://github.com/ansible/ansible-lint@v26.6.0 uses: https://github.com/ansible/ansible-lint@v26.8.0
with: with:
setup_python: "false" setup_python: "false"
requirements_file: "requirements.yml" requirements_file: "requirements.yml"

View file

@ -1,7 +1,7 @@
# renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud # renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
nextcloud__version: 34 nextcloud__version: 34
# renovate: datasource=docker depName=docker.io/library/postgres # renovate: datasource=docker depName=docker.io/library/postgres
nextcloud__postgres_version: 15.18 nextcloud__postgres_version: 15.19
nextcloud__fqdn: cloud.hamburg.ccc.de nextcloud__fqdn: cloud.hamburg.ccc.de
nextcloud__data_dir: /data/nextcloud nextcloud__data_dir: /data/nextcloud
nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}" nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"

View file

@ -1,5 +1,5 @@
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox # renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
netbox__version: "v4.6.4" netbox__version: "v4.6.8"
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}" netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
netbox__custom_pipeline_oidc_group_and_role_mapping: true netbox__custom_pipeline_oidc_group_and_role_mapping: true

View file

@ -1,15 +1,7 @@
$TTL 7200 $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. ( @ IN SOA auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. (
2024012601 2024012601
10800 10800
3600 3600
3600000 3600000
@ -19,16 +11,18 @@ $TTL 7200
@ NS erfadns.ber.ccc.de. @ NS erfadns.ber.ccc.de.
IN MX 5 nomail.ccc.de. IN MX 5 nomail.ccc.de.
; IN MX 10 local-mail.hamburg.ccc.de.
IN MX 23 nomail2.ccc.de. IN MX 23 nomail2.ccc.de.
IN MX 42 nomail3.ccc.de. IN MX 42 nomail3.ccc.de.
; public-reverse-proxy
IN A 212.12.48.125 IN A 212.12.48.125
IN AAAA 2a00:14b0:4200:3000:125::1 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-Server:
dmz-net IN A 212.12.50.208 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 gate IN A 212.12.51.129
END-212-12-51-143 IN A 212.12.51.143 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"

View file

@ -2,7 +2,7 @@
services: services:
prometheus: prometheus:
image: docker.io/prom/prometheus:v3.13.1 image: docker.io/prom/prometheus:v3.13.2
container_name: prometheus container_name: prometheus
command: command:
- '--config.file=/etc/prometheus/prometheus.yml' - '--config.file=/etc/prometheus/prometheus.yml'
@ -19,7 +19,7 @@ services:
- prom_data:/prometheus - prom_data:/prometheus
alertmanager: alertmanager:
image: docker.io/prom/alertmanager:v0.33.1 image: docker.io/prom/alertmanager:v0.34.0
container_name: alertmanager container_name: alertmanager
command: command:
- '--config.file=/etc/alertmanager/alertmanager.yaml' - '--config.file=/etc/alertmanager/alertmanager.yaml'
@ -32,7 +32,7 @@ services:
- alertmanager_data:/alertmanager - alertmanager_data:/alertmanager
grafana: grafana:
image: docker.io/grafana/grafana:13.1.0 image: docker.io/grafana/grafana:13.1.3
container_name: grafana container_name: grafana
ports: ports:
- 3000:3000 - 3000:3000
@ -46,7 +46,7 @@ services:
- graf_data:/var/lib/grafana - graf_data:/var/lib/grafana
pve-exporter: pve-exporter:
image: docker.io/prompve/prometheus-pve-exporter:3.9.0 image: docker.io/prompve/prometheus-pve-exporter:3.10.0
container_name: pve-exporter container_name: pve-exporter
ports: ports:
- 9221:9221 - 9221:9221
@ -59,7 +59,7 @@ services:
- /dev/null:/etc/prometheus/pve.yml - /dev/null:/etc/prometheus/pve.yml
loki: loki:
image: docker.io/grafana/loki:3.7.3 image: docker.io/grafana/loki:3.7.6
container_name: loki container_name: loki
ports: ports:
- 13100:3100 - 13100:3100

View file

@ -37,7 +37,6 @@ services:
- database:database - database:database
volumes: volumes:
- /opt/mailman/web:/opt/mailman-web-data - /opt/mailman/web:/opt/mailman-web-data
- ./configs/mailman-extra.cfg:/opt/mailman/core/mailman-extra.cfg
- ./configs/settings_local.py:/opt/mailman-web/settings_local.py - ./configs/settings_local.py:/opt/mailman-web/settings_local.py
- ./files/templates:/opt/mailman-web/templates - ./files/templates:/opt/mailman-web/templates
environment: environment:

View file

@ -4,3 +4,16 @@
[mailman] [mailman]
pending_request_life: 7d 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

View file

@ -1,7 +1,7 @@
--- ---
services: services:
ntfy: ntfy:
image: docker.io/binwiederhier/ntfy:v2.26.0 image: docker.io/binwiederhier/ntfy:v2.27.0
container_name: ntfy container_name: ntfy
command: command:
- serve - serve

View file

@ -15,7 +15,7 @@ services:
- pretalx_net - pretalx_net
redis: redis:
image: docker.io/library/redis:8.8.0 image: docker.io/library/redis:8.10.0
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- redis:/data - redis:/data
@ -23,7 +23,7 @@ services:
- pretalx_net - pretalx_net
static: static:
image: docker.io/library/nginx:1.31.2 image: docker.io/library/nginx:1.31.3
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- public:/usr/share/nginx/html - public:/usr/share/nginx/html

View file

@ -13,7 +13,7 @@ services:
restart: unless-stopped restart: unless-stopped
redis: redis:
image: docker.io/library/redis:8.8.0 image: docker.io/library/redis:8.10.0
ports: ports:
- "6379:6379" - "6379:6379"
volumes: volumes:

View file

@ -4,7 +4,7 @@
services: services:
database: database:
image: docker.io/library/postgres:18.4 image: docker.io/library/postgres:18.6
restart: always restart: always
volumes: volumes:
- ./database:/var/lib/postgresql - ./database:/var/lib/postgresql