Compare commits
5 commits
41fc55ea3a
...
4f540150de
| Author | SHA1 | Date | |
|---|---|---|---|
| 4f540150de | |||
|
5f94d7f284 |
|||
|
66e0095070 |
|||
|
8ca5d82d39 |
|||
|
3a09c107b9 |
14 changed files with 74 additions and 25 deletions
|
|
@ -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.3.0
|
uses: https://github.com/ansible/ansible-lint@v26.4.0
|
||||||
with:
|
with:
|
||||||
setup_python: "false"
|
setup_python: "false"
|
||||||
requirements_file: "requirements.yml"
|
requirements_file: "requirements.yml"
|
||||||
|
|
|
||||||
|
|
@ -19,29 +19,34 @@ knot__catalog_zones:
|
||||||
knot__zones:
|
knot__zones:
|
||||||
- domain: "hh.ccc.de."
|
- domain: "hh.ccc.de."
|
||||||
catalog_member: "hamburg.ccc.de.catalog."
|
catalog_member: "hamburg.ccc.de.catalog."
|
||||||
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone') }}"
|
||||||
|
|
||||||
- domain: "ccchh.net."
|
- domain: "ccchh.net."
|
||||||
catalog_member: "hamburg.ccc.de.catalog."
|
catalog_member: "hamburg.ccc.de.catalog."
|
||||||
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/ccchh.net.zone') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/ccchh.net.zone') }}"
|
||||||
|
|
||||||
- domain: "hamburg.ccc.de."
|
- domain: "hamburg.ccc.de."
|
||||||
catalog_member: "hamburg.ccc.de.catalog."
|
catalog_member: "hamburg.ccc.de.catalog."
|
||||||
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone') }}"
|
||||||
|
|
||||||
- domain: "eh20.easterhegg.eu."
|
- domain: "eh20.easterhegg.eu."
|
||||||
catalog_member: "hamburg.ccc.de.catalog."
|
catalog_member: "hamburg.ccc.de.catalog."
|
||||||
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone') }}"
|
||||||
|
|
||||||
- domain: "eh22.easterhegg.eu."
|
- domain: "eh22.easterhegg.eu."
|
||||||
catalog_member: "hamburg.ccc.de.catalog."
|
catalog_member: "hamburg.ccc.de.catalog."
|
||||||
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone') }}"
|
||||||
|
|
||||||
|
- domain: "diday.org."
|
||||||
|
catalog_member: "hamburg.ccc.de.catalog."
|
||||||
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/diday.org.zone') }}"
|
||||||
|
|
||||||
- domain: "3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa."
|
- domain: "3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa."
|
||||||
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone') }}"
|
||||||
|
|
|
||||||
|
|
@ -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.5.5"
|
netbox__version: "v4.6.2"
|
||||||
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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
oauth2-proxy:
|
oauth2-proxy:
|
||||||
container_name: oauth2-proxy
|
container_name: oauth2-proxy
|
||||||
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.1
|
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
|
||||||
command: --config /oauth2-proxy.cfg
|
command: --config /oauth2-proxy.cfg
|
||||||
hostname: oauth2-proxy
|
hostname: oauth2-proxy
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
45
resources/chaosknoten/auth-dns/zones/diday.org.zone
Normal file
45
resources/chaosknoten/auth-dns/zones/diday.org.zone
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
$TTL 3600 ; 1 minutes
|
||||||
|
@ SOA auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. (
|
||||||
|
1 ; serial (overwritten by knot automatically)
|
||||||
|
10800 ; refresh
|
||||||
|
3600 ; retry
|
||||||
|
3600000 ; expire
|
||||||
|
86400 ; minimum/negative ttl
|
||||||
|
)
|
||||||
|
|
||||||
|
@ NS auth-dns.hamburg.ccc.de.
|
||||||
|
@ NS ns.vie.ccc.de.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
;
|
||||||
|
; Main Site
|
||||||
|
;
|
||||||
|
*.diday.org. A 212.12.48.125
|
||||||
|
*.diday.org. AAAA 2a00:14b0:4200:3000:125::1
|
||||||
|
diday.org. A 212.12.48.125
|
||||||
|
diday.org. AAAA 2a00:14b0:4200:3000:125::1
|
||||||
|
diday.org. TXT "google-site-verification=pJq0LANnNJlkIflKgwbBOOt8GLuU5ywlW6RXhtPwdmE"
|
||||||
|
|
||||||
|
;
|
||||||
|
; Mail Setup
|
||||||
|
;
|
||||||
|
diday.org. MX 10 cow.hamburg.ccc.de.
|
||||||
|
diday.org. TXT "v=spf1 mx ip4:212.12.51.133 ip6:2a00:14b0:f000:23:51:133:0:1 ip4:212.12.48.122 ip6:2a00:14b0:4200:3000:122::1 -all"
|
||||||
|
_dmarc.diday.org. TXT "v=DMARC1; p=none"
|
||||||
|
dkim._domainkey.diday.org. TXT "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2YlBjR5oNm7eDeMXmQF6Izx1A17+vBHNapHlV2Rlj3N4Cjo9kSn0y8rlrqkASUKszDgToGrh1vkHhtYN6EE5QS5iVVSnXcWPiHnBzrxK4OmhVZZtrgGsM17pq9udAEEapc371dQQsL3WhXOvilGGSIQ9u5VDlc+y/ApXi79J6DHSf66t0JUU1e8vLn8ZI8hcXe3nsHXqbW4ot24rk8EvaugsK40jbhqxZ+BrJTBq/iP8w5RsF6KdYjTaqPfr/D4dbvUU6fc8jLyy3OWZgSkkOmv7m0UdbOm2Kk6c+1hNjQJZVEhQrpGrpAcjE37/v8ZNbQMgaasiugH6ElnKb13ZQIDAQAB
|
||||||
|
"
|
||||||
|
|
||||||
|
events.diday.org. A 91.98.167.209
|
||||||
|
events.diday.org. AAAA 2a01:4f8:c2c:44b::1
|
||||||
|
termine.diday.org. CNAME events.diday.org.
|
||||||
|
|
||||||
|
|
||||||
|
;
|
||||||
|
; Local Delegation or sub-sites
|
||||||
|
;
|
||||||
|
darmstadt.diday.org. DS 60883 14 2 351d5314bd499060db6de802dc06104cc9ef54ce91c783def8d20e2e9cd99b99
|
||||||
|
darmstadt.diday.org. DS 60883 14 4 4dc93f94c226ecdbb0adbae32064c5ff9a52e9be80973a2ff99218e7bc5af19ab50d9f13f552f1a7900f781fbd7e8205
|
||||||
|
darmstadt.diday.org. NS jerry.hax404.de.
|
||||||
|
darmstadt.diday.org. NS summer.hax404.de.
|
||||||
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
image: docker.io/prom/prometheus:v3.10.0
|
image: docker.io/prom/prometheus:v3.12.0
|
||||||
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.31.1
|
image: docker.io/prom/alertmanager:v0.32.2
|
||||||
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.0.1
|
image: docker.io/grafana/grafana:13.0.2
|
||||||
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.8.2
|
image: docker.io/prompve/prometheus-pve-exporter:3.9.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.1
|
image: docker.io/grafana/loki:3.7.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
ports:
|
ports:
|
||||||
- 13100:3100
|
- 13100:3100
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
keycloak:
|
keycloak:
|
||||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.5.7
|
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.0
|
||||||
pull_policy: always
|
pull_policy: always
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: start --optimized
|
command: start --optimized
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
ntfy:
|
ntfy:
|
||||||
image: docker.io/binwiederhier/ntfy:v2.20.1
|
image: docker.io/binwiederhier/ntfy:v2.24.0
|
||||||
container_name: ntfy
|
container_name: ntfy
|
||||||
command:
|
command:
|
||||||
- serve
|
- serve
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
image: docker.io/onlyoffice/documentserver:9.3.1
|
image: docker.io/onlyoffice/documentserver:9.4.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/library/redis:8.6.2
|
image: docker.io/library/redis:8.8.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.29.7
|
image: docker.io/library/nginx:1.31.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- public:/usr/share/nginx/html
|
- public:/usr/share/nginx/html
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
image: mariadb:12.2.2
|
image: mariadb:12.3.2
|
||||||
command: --max_allowed_packet=3250585600
|
command: --max_allowed_packet=3250585600
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: "{{ secret__sunders_db_root_password }}"
|
MYSQL_ROOT_PASSWORD: "{{ secret__sunders_db_root_password }}"
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/library/redis:8.6.2
|
image: docker.io/library/redis:8.8.0
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "6379:6379"
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:18.3
|
image: docker.io/library/postgres:18.4
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./database:/var/lib/postgresql
|
- ./database:/var/lib/postgresql
|
||||||
|
|
@ -16,7 +16,7 @@ services:
|
||||||
- gatus
|
- gatus
|
||||||
|
|
||||||
gatus:
|
gatus:
|
||||||
image: ghcr.io/twin/gatus:v5.35.0
|
image: ghcr.io/twin/gatus:v5.36.0
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
network:
|
network:
|
||||||
ethernets:
|
ethernets:
|
||||||
{%- for i_iface_name in ansible_interfaces -%}
|
{%- for i_iface_name in ansible_facts["interfaces"] -%}
|
||||||
{%- if i_iface_name != "lo" -%}
|
{%- if i_iface_name != "lo" -%}
|
||||||
{%- set i_iface = ansible_facts[i_iface_name] %}
|
{%- set i_iface = ansible_facts[i_iface_name] %}
|
||||||
|
|
||||||
|
|
@ -11,4 +11,3 @@ network:
|
||||||
accept-ra: false
|
accept-ra: false
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue