Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b2117b563e | |||
|
73760a9995 |
|||
|
39d8ff4ef8 |
7 changed files with 34 additions and 33 deletions
|
|
@ -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: 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 }}"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ kea_dhcp__dns_servers:
|
||||||
|
|
||||||
kea_dhcp__dhcp4:
|
kea_dhcp__dhcp4:
|
||||||
enable: true
|
enable: true
|
||||||
interfaces: ["netlan.51", "netlan.52", "netlan"]
|
interfaces: [ "netlan.51", "netlan.52", "netlan" ]
|
||||||
subnets:
|
subnets:
|
||||||
- id: 1
|
- id: 1
|
||||||
subnet: 10.89.208.0/22
|
subnet: 10.89.208.0/22
|
||||||
|
|
@ -234,7 +234,7 @@ kea_dhcp__dhcp4:
|
||||||
|
|
||||||
kea_dhcp__dhcp6:
|
kea_dhcp__dhcp6:
|
||||||
enable: true
|
enable: true
|
||||||
interfaces: ["netlan.51", "netlan.52", "netlan"]
|
interfaces: [ "netlan.51", "netlan.52", "netlan" ]
|
||||||
subnets:
|
subnets:
|
||||||
- id: 1
|
- id: 1
|
||||||
subnet: "2a07:c481:1:33::/64"
|
subnet: "2a07:c481:1:33::/64"
|
||||||
|
|
@ -246,7 +246,7 @@ kea_dhcp__dhcp6:
|
||||||
- pool: "2a07:c481:1:33::/64"
|
- pool: "2a07:c481:1:33::/64"
|
||||||
allocator: random
|
allocator: random
|
||||||
reservations:
|
reservations:
|
||||||
- ip-addresses: ["2a07:c481:1:33::1c"]
|
- ip-addresses: [ "2a07:c481:1:33::1c" ]
|
||||||
hostname: dooris
|
hostname: dooris
|
||||||
hw-address: "bc:24:11:b3:93:9c"
|
hw-address: "bc:24:11:b3:93:9c"
|
||||||
- id: 2
|
- id: 2
|
||||||
|
|
@ -258,7 +258,7 @@ kea_dhcp__dhcp6:
|
||||||
pools:
|
pools:
|
||||||
- pool: "2a07:c481:1:34::/64"
|
- pool: "2a07:c481:1:34::/64"
|
||||||
reservations:
|
reservations:
|
||||||
- ip-addresses: ["2a07:c481:1:34::66"]
|
- ip-addresses: [ "2a07:c481:1:34::66" ]
|
||||||
hostname: esphome
|
hostname: esphome
|
||||||
hw-address: "7e:3c:f0:77:8a:f4"
|
hw-address: "7e:3c:f0:77:8a:f4"
|
||||||
- id: 3
|
- id: 3
|
||||||
|
|
@ -270,45 +270,45 @@ kea_dhcp__dhcp6:
|
||||||
pools:
|
pools:
|
||||||
- pool: "2a07:c481:1:36::/64"
|
- pool: "2a07:c481:1:36::/64"
|
||||||
reservations:
|
reservations:
|
||||||
- ip-addresses: ["2a07:c481:1:36::2"]
|
- ip-addresses: [ "2a07:c481:1:36::2" ]
|
||||||
hostname: sw-rack-1
|
hostname: sw-rack-1
|
||||||
hw-address: "F0:9F:C2:10:C3:AA"
|
hw-address: "F0:9F:C2:10:C3:AA"
|
||||||
- ip-addresses: ["2a07:c481:1:36::3"]
|
- ip-addresses: [ "2a07:c481:1:36::3" ]
|
||||||
hostname: sw-rack-2-peo
|
hostname: sw-rack-2-peo
|
||||||
hw-address: "44:d9:e7:06:69:5d"
|
hw-address: "44:d9:e7:06:69:5d"
|
||||||
- ip-addresses: ["2a07:c481:1:36::4"]
|
- ip-addresses: [ "2a07:c481:1:36::4" ]
|
||||||
hostname: sw-main-1
|
hostname: sw-main-1
|
||||||
hw-address: "a8:9c:6c:16:df:cc"
|
hw-address: "a8:9c:6c:16:df:cc"
|
||||||
- ip-addresses: ["2a07:c481:1:36::5"]
|
- ip-addresses: [ "2a07:c481:1:36::5" ]
|
||||||
hostname: sw-main-2
|
hostname: sw-main-2
|
||||||
hw-address: "a8:9c:6c:16:e8:86"
|
hw-address: "a8:9c:6c:16:e8:86"
|
||||||
- ip-addresses: ["2a07:c481:1:36::6"]
|
- ip-addresses: [ "2a07:c481:1:36::6" ]
|
||||||
hostname: sw-shop-1
|
hostname: sw-shop-1
|
||||||
hw-address: "C0:4A:00:FB:DA:C5"
|
hw-address: "C0:4A:00:FB:DA:C5"
|
||||||
- ip-addresses: ["2a07:c481:1:36::7"]
|
- ip-addresses: [ "2a07:c481:1:36::7" ]
|
||||||
hostname: sw-shop-2-peo
|
hostname: sw-shop-2-peo
|
||||||
hw-address: "f4:e2:c6:bf:20:ee"
|
hw-address: "f4:e2:c6:bf:20:ee"
|
||||||
- ip-addresses: ["2a07:c481:1:36::8"]
|
- ip-addresses: [ "2a07:c481:1:36::8" ]
|
||||||
hostname: sw-shop-3-peo
|
hostname: sw-shop-3-peo
|
||||||
hw-address: "d8:b3:70:85:72:76"
|
hw-address: "d8:b3:70:85:72:76"
|
||||||
- ip-addresses: ["2a07:c481:1:36::b"]
|
- ip-addresses: [ "2a07:c481:1:36::b" ]
|
||||||
hostname: pve01
|
hostname: pve01
|
||||||
hw-address: "38:05:25:30:80:35"
|
hw-address: "38:05:25:30:80:35"
|
||||||
- ip-addresses: ["2a07:c481:1:36::c"]
|
- ip-addresses: [ "2a07:c481:1:36::c" ]
|
||||||
hostname: pve02
|
hostname: pve02
|
||||||
hw-address: "b8:85:84:b1:57:b6"
|
hw-address: "b8:85:84:b1:57:b6"
|
||||||
- ip-addresses: ["2a07:c481:1:36::d"]
|
- ip-addresses: [ "2a07:c481:1:36::d" ]
|
||||||
hostname: pve03
|
hostname: pve03
|
||||||
hw-address: "98:fa:9b:a2:ed:e8"
|
hw-address: "98:fa:9b:a2:ed:e8"
|
||||||
- ip-addresses: ["2a07:c481:1:36::f"]
|
- ip-addresses: [ "2a07:c481:1:36::f" ]
|
||||||
hostname: pbs
|
hostname: pbs
|
||||||
hw-address: "BC:24:11:D6:2C:81"
|
hw-address: "BC:24:11:D6:2C:81"
|
||||||
- ip-addresses: ["2a07:c481:1:36::21"]
|
- ip-addresses: [ "2a07:c481:1:36::21" ]
|
||||||
hostname: unifi
|
hostname: unifi
|
||||||
hw-address: "BC:24:11:25:77:60"
|
hw-address: "BC:24:11:25:77:60"
|
||||||
- ip-addresses: ["2a07:c481:1:36::31"]
|
- ip-addresses: [ "2a07:c481:1:36::31" ]
|
||||||
hostname: light
|
hostname: light
|
||||||
hw-address: "72:61:ea:e6:49:e3"
|
hw-address: "72:61:ea:e6:49:e3"
|
||||||
- ip-addresses: ["2a07:c481:1:36::32"]
|
- ip-addresses: [ "2a07:c481:1:36::32" ]
|
||||||
hostname: club-assistant
|
hostname: club-assistant
|
||||||
hw-address: "7a:55:61:c3:a2:89"
|
hw-address: "7a:55:61:c3:a2:89"
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ PresharedKeyFile = /etc/ansible_secrets/wireguard_wg55_peer_langoor_home_psk
|
||||||
[WireGuardPeer]
|
[WireGuardPeer]
|
||||||
# friendly_name = lilly-lillysLaptop
|
# friendly_name = lilly-lillysLaptop
|
||||||
AllowedIPs = 10.89.214.16/32,2a07:c481:1:37::16/128
|
AllowedIPs = 10.89.214.16/32,2a07:c481:1:37::16/128
|
||||||
PublicKey = IBsI+N8qUNpQnDc5HnqQ2Zo/1graFM0RMIecHmAF+Vk=
|
PublicKey = v0MiwjhCj1w4J3fKl2d18wNIdbdd9tvdjIRQTRjIeGY=
|
||||||
|
|
||||||
[WireGuardPeer]
|
[WireGuardPeer]
|
||||||
# friendly_name = bitwhisker
|
# friendly_name = bitwhisker
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ argument_specs:
|
||||||
interfaces:
|
interfaces:
|
||||||
type: "list"
|
type: "list"
|
||||||
elements: "str"
|
elements: "str"
|
||||||
default: []
|
default: [ ]
|
||||||
control-sockets:
|
control-sockets:
|
||||||
type: "list"
|
type: "list"
|
||||||
elements: "dict"
|
elements: "dict"
|
||||||
|
|
@ -107,7 +107,7 @@ argument_specs:
|
||||||
interfaces:
|
interfaces:
|
||||||
type: "list"
|
type: "list"
|
||||||
elements: "str"
|
elements: "str"
|
||||||
default: []
|
default: [ ]
|
||||||
control-sockets:
|
control-sockets:
|
||||||
type: "list"
|
type: "list"
|
||||||
elements: "dict"
|
elements: "dict"
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,13 @@ argument_specs:
|
||||||
type: list
|
type: list
|
||||||
required: false
|
required: false
|
||||||
secrets__folder:
|
secrets__folder:
|
||||||
owner:
|
options:
|
||||||
type: string
|
owner:
|
||||||
required: false
|
type: str
|
||||||
group:
|
required: false
|
||||||
type: string
|
group:
|
||||||
required: false
|
type: str
|
||||||
mode:
|
required: false
|
||||||
type: string
|
mode:
|
||||||
required: false
|
type: str
|
||||||
|
required: false
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue