Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e05407602 | |||
| bd71738df3 |
4 changed files with 26 additions and 3 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.6
|
||||||
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') }}"
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,29 @@ server {
|
||||||
# Also provide "_hidden" for by, since it's not relevant.
|
# Also provide "_hidden" for by, since it's not relevant.
|
||||||
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
||||||
|
|
||||||
|
# temporary until we can upgrade keycloak stb 2026-08-25
|
||||||
|
allow 185.161.129.134/32; # z9
|
||||||
|
allow 2a07:c480:0:100::/56; # z9
|
||||||
|
allow 2a07:c481:1::/48; # z9 new ipv6
|
||||||
|
allow 213.240.180.39/32; # stb home
|
||||||
|
allow 2a01:170:118b:f701::1/64; # stb home
|
||||||
|
|
||||||
|
# Wieske
|
||||||
|
allow 212.12.48.0/24;
|
||||||
|
allow 2a00:14b0:4200:3000::/64;
|
||||||
|
allow 172.31.18.0/24;
|
||||||
|
allow 172.31.17.0/25;
|
||||||
|
allow 172.31.17.128/25;
|
||||||
|
allow 212.12.51.128/28;
|
||||||
|
allow 2a00:14b0:4200:3500::130:0/112;
|
||||||
|
allow 2a00:14b0:f000:23::/64;
|
||||||
|
allow 10.32.2.0/24;
|
||||||
|
allow 2a00:14b0:42:102::/64;
|
||||||
|
allow 212.12.50.208/29;
|
||||||
|
allow 2a00:14b0:42:105::/64;
|
||||||
|
|
||||||
|
deny all;
|
||||||
|
|
||||||
# Redirect a user opening any not set location on id.hamburg.ccc.de to the account management page.
|
# Redirect a user opening any not set location on id.hamburg.ccc.de to the account management page.
|
||||||
location ^~ / {
|
location ^~ / {
|
||||||
return 307 https://id.hamburg.ccc.de/realms/ccchh/account/;
|
return 307 https://id.hamburg.ccc.de/realms/ccchh/account/;
|
||||||
|
|
|
||||||
|
|
@ -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…
Reference in a new issue