Compare commits
3 commits
ab26ae7907
...
86bdf2095c
| Author | SHA1 | Date | |
|---|---|---|---|
| 86bdf2095c | |||
|
1d2d03e4b3 |
|||
|
f4c9d203da |
6 changed files with 29 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: 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.3
|
||||||
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') }}"
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ services:
|
||||||
- POSTGRES_DB=mailmandb
|
- POSTGRES_DB=mailmandb
|
||||||
- POSTGRES_USER=mailman
|
- POSTGRES_USER=mailman
|
||||||
- POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz
|
- POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz
|
||||||
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,6 +6,7 @@ map $host $upstream_acme_challenge_host {
|
||||||
staging.c3cat.de 172.31.17.151:31820;
|
staging.c3cat.de 172.31.17.151:31820;
|
||||||
c3dog.de 172.31.17.151:31820;
|
c3dog.de 172.31.17.151:31820;
|
||||||
www.c3dog.de 172.31.17.151:31820;
|
www.c3dog.de 172.31.17.151:31820;
|
||||||
|
staging.c3dog.de 172.31.17.151:31820;
|
||||||
ccchoir.de ccchoir.hosts.hamburg.ccc.de:31820;
|
ccchoir.de ccchoir.hosts.hamburg.ccc.de:31820;
|
||||||
www.ccchoir.de ccchoir.hosts.hamburg.ccc.de:31820;
|
www.ccchoir.de ccchoir.hosts.hamburg.ccc.de:31820;
|
||||||
cloud.hamburg.ccc.de cloud.hosts.hamburg.ccc.de:31820;
|
cloud.hamburg.ccc.de cloud.hosts.hamburg.ccc.de:31820;
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ stream {
|
||||||
staging.c3cat.de 172.31.17.151:8443;
|
staging.c3cat.de 172.31.17.151:8443;
|
||||||
c3dog.de 172.31.17.151:8443;
|
c3dog.de 172.31.17.151:8443;
|
||||||
www.c3dog.de 172.31.17.151:8443;
|
www.c3dog.de 172.31.17.151:8443;
|
||||||
|
staging.c3dog.de 172.31.17.151:8443;
|
||||||
git.hamburg.ccc.de 172.31.17.154:8443;
|
git.hamburg.ccc.de 172.31.17.154:8443;
|
||||||
eh03.easterhegg.eu 172.31.17.151:8443;
|
eh03.easterhegg.eu 172.31.17.151:8443;
|
||||||
eh05.easterhegg.eu 172.31.17.151:8443;
|
eh05.easterhegg.eu 172.31.17.151:8443;
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,14 @@ endpoints:
|
||||||
- "[CERTIFICATE_EXPIRATION] > 48h"
|
- "[CERTIFICATE_EXPIRATION] > 48h"
|
||||||
- "[BODY] == pat(*Cat Ears Operation Center*)"
|
- "[BODY] == pat(*Cat Ears Operation Center*)"
|
||||||
|
|
||||||
|
- name: c3dog.de
|
||||||
|
url: "https://c3dog.de"
|
||||||
|
<<: *websites_defaults
|
||||||
|
conditions:
|
||||||
|
- "[STATUS] == 200"
|
||||||
|
- "[CERTIFICATE_EXPIRATION] > 48h"
|
||||||
|
- "[BODY] == pat(*Dog Ears Operation Center*)"
|
||||||
|
|
||||||
- name: cpu.ccc.de
|
- name: cpu.ccc.de
|
||||||
url: "https://cpu.ccc.de"
|
url: "https://cpu.ccc.de"
|
||||||
<<: *websites_defaults
|
<<: *websites_defaults
|
||||||
|
|
@ -127,6 +135,14 @@ endpoints:
|
||||||
- "[CERTIFICATE_EXPIRATION] > 48h"
|
- "[CERTIFICATE_EXPIRATION] > 48h"
|
||||||
- "[BODY] == pat(*c3cat.de Staging Environment*)"
|
- "[BODY] == pat(*c3cat.de Staging Environment*)"
|
||||||
|
|
||||||
|
- name: staging.c3dog.de
|
||||||
|
url: "https://staging.c3dog.de"
|
||||||
|
<<: *websites_staging_defaults
|
||||||
|
conditions:
|
||||||
|
- "[STATUS] == 200"
|
||||||
|
- "[CERTIFICATE_EXPIRATION] > 48h"
|
||||||
|
- "[BODY] == pat(*c3dog.de Staging Environment*)"
|
||||||
|
|
||||||
- name: staging.cryptoparty-hamburg.de
|
- name: staging.cryptoparty-hamburg.de
|
||||||
url: "https://staging.cryptoparty-hamburg.de"
|
url: "https://staging.cryptoparty-hamburg.de"
|
||||||
<<: *websites_staging_defaults
|
<<: *websites_staging_defaults
|
||||||
|
|
@ -168,6 +184,14 @@ endpoints:
|
||||||
- "[CERTIFICATE_EXPIRATION] > 48h"
|
- "[CERTIFICATE_EXPIRATION] > 48h"
|
||||||
- "[BODY] == pat(*Cat Ears Operation Center*)"
|
- "[BODY] == pat(*Cat Ears Operation Center*)"
|
||||||
|
|
||||||
|
- name: www.c3dog.de
|
||||||
|
url: "https://www.c3dog.de"
|
||||||
|
<<: *websites_redirects_defaults
|
||||||
|
conditions:
|
||||||
|
- "[STATUS] == 200"
|
||||||
|
- "[CERTIFICATE_EXPIRATION] > 48h"
|
||||||
|
- "[BODY] == pat(*Dog Ears Operation Center*)"
|
||||||
|
|
||||||
- name: cryptoparty.hamburg.ccc.de
|
- name: cryptoparty.hamburg.ccc.de
|
||||||
url: "https://cryptoparty.hamburg.ccc.de"
|
url: "https://cryptoparty.hamburg.ccc.de"
|
||||||
<<: *websites_redirects_defaults
|
<<: *websites_redirects_defaults
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue