Compare commits
2 commits
8647a0bd88
...
89e1ed016f
| Author | SHA1 | Date | |
|---|---|---|---|
| 89e1ed016f | |||
|
6bb09901a0 |
4 changed files with 12 additions and 9 deletions
|
|
@ -7,36 +7,39 @@ knot__dnssec_key_id: "auth-dns.hamburg.ccc.de-1"
|
||||||
knot__remotes:
|
knot__remotes:
|
||||||
- id: ns-intern.hamburg.ccc.de
|
- id: ns-intern.hamburg.ccc.de
|
||||||
address: [ "2a00:14b0:f000:23::53", "172.31.17.53" ]
|
address: [ "2a00:14b0:f000:23::53", "172.31.17.53" ]
|
||||||
|
- id: ns.vie.ccc.de
|
||||||
|
address: [ "2a02:1b8:10:31::228", "146.255.57.228" ]
|
||||||
|
|
||||||
knot__catalog_zones:
|
knot__catalog_zones:
|
||||||
- domain: "hamburg.ccc.de.catalog."
|
- domain: "hamburg.ccc.de.catalog."
|
||||||
|
notify_targets: [ "ns.vie.ccc.de" ]
|
||||||
|
|
||||||
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" ]
|
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.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" ]
|
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.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" ]
|
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.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" ]
|
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.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" ]
|
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.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: "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" ]
|
notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.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,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: 32
|
nextcloud__version: 32
|
||||||
# renovate: datasource=docker depName=docker.io/library/postgres
|
# renovate: datasource=docker depName=docker.io/library/postgres
|
||||||
nextcloud__postgres_version: 15.17
|
nextcloud__postgres_version: 18.4
|
||||||
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') }}"
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ services:
|
||||||
- POSTGRES_DB=mailmandb
|
- POSTGRES_DB=mailmandb
|
||||||
- POSTGRES_USER=mailman
|
- POSTGRES_USER=mailman
|
||||||
- "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
|
- "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
|
||||||
image: docker.io/library/postgres:12-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
volumes:
|
volumes:
|
||||||
- /opt/mailman/database:/var/lib/postgresql/data
|
- /opt/mailman/database:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:15-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
environment:
|
environment:
|
||||||
- "POSTGRES_USER=pretalx"
|
- "POSTGRES_USER=pretalx"
|
||||||
- "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"
|
- "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue