diff --git a/.ansible-lint b/.ansible-lint index e750c579..1ad596e4 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -3,7 +3,11 @@ skip_list: - "name[casing]" exclude_paths: + - .ansible/ - .forgejo/ - "**/*.sops.yaml" - ansible_collections/ + - collections/ - galaxy_roles/ + - docs/ + - resources/ diff --git a/.yamllint.yaml b/.yamllint.yaml index 7ad950c9..bf9c1e24 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -1,5 +1,6 @@ rules: brackets: + forbid: false min-spaces-inside: 1 max-spaces-inside: 1 min-spaces-inside-empty: 1 diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone index 5cdb7a8f..f3512af1 100644 --- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone @@ -228,7 +228,10 @@ rproxy-intern IN A 172.31.17.180 IN AAAA 2a00:14b0:f000:23::80 IN MX 10 cow.hamburg.ccc.de. -bildungsurlaub IN CNAME public-reverse-proxy +bildungsurlaub IN CNAME rproxy +doku IN CNAME rproxy +test IN CNAME rproxy +www.test IN CNAME rproxy eh2003 IN CNAME public-reverse-proxy www.eh2003 IN CNAME public-reverse-proxy easterhegg2003 IN CNAME public-reverse-proxy @@ -507,6 +510,8 @@ pretalx.hosts IN AAAA 2a00:14b0:42:102::10 ntfy.hosts IN AAAA 2a00:14b0:42:102::11 spaceapiccc.hosts IN AAAA 2a00:14b0:42:102::12 acmedns.hosts IN AAAA 2a00:14b0:42:102::13 +www2.hosts IN AAAA 2a00:14b0:42:102::14 +www3.hosts IN AAAA 2a00:14b0:42:102::15 diday-staging-runner.hosts IN AAAA 2a00:14b0:42:102::16 public-web-static.hosts IN AAAA 2a00:14b0:42:102::17 forgejo-actions-runner.hosts IN AAAA 2a00:14b0:42:102::18 diff --git a/resources/chaosknoten/draupnir/docker_compose/config.yaml.j2 b/resources/chaosknoten/draupnir/docker_compose/config.yaml.j2 index 12ae7e2c..20a73959 100644 --- a/resources/chaosknoten/draupnir/docker_compose/config.yaml.j2 +++ b/resources/chaosknoten/draupnir/docker_compose/config.yaml.j2 @@ -15,9 +15,6 @@ automaticallyRedactForReasons: - "porn" - "harassmet" -# set to low value to have Draupnir chain consecutive backgrounded operations faster -backgroundDelayMS: 10 - # currently not working because /_synapse is not routed via reverse proxy pollReports: false diff --git a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 index 05d1c7e5..f08c7994 100644 --- a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 @@ -59,7 +59,7 @@ services: - /dev/null:/etc/prometheus/pve.yml loki: - image: docker.io/grafana/loki:3.7.8 + image: docker.io/grafana/loki:3.7.3 container_name: loki ports: - 13100:3100 diff --git a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 index 72d02544..e321b2f3 100644 --- a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 @@ -22,7 +22,7 @@ services: keycloak: - image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.7.4 + image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.7.2 pull_policy: always restart: unless-stopped command: start --optimized diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index 0d5e34ec..3c6e5daa 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -23,7 +23,7 @@ services: - pretalx_net static: - image: docker.io/library/nginx:1.31.6 + image: docker.io/library/nginx:1.31.2 restart: unless-stopped volumes: - public:/usr/share/nginx/html diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index be0a2665..2513b7c8 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -92,7 +92,6 @@ map $host $upstream_acme_challenge_host { ueberwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:31820; überwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:31820; xn--berwachungsfrei-yvb.eu public-web-static.hosts.hamburg.ccc.de:31820; - bildungsurlaub.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; default ""; } diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf index 04b310a1..01d0b5d6 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -3,7 +3,6 @@ user nginx; worker_processes auto; -worker_rlimit_nofile 2050; # should be worker_connections*2 at least error_log /var/log/nginx/error.log notice; pid /var/run/nginx.pid; @@ -116,7 +115,6 @@ stream { ueberwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:8443; überwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:8443; xn--berwachungsfrei-yvb.eu public-web-static.hosts.hamburg.ccc.de:8443; - bildungsurlaub.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; } server {