Compare commits
4 commits
0d1e64c3a0
...
03606e109c
| Author | SHA1 | Date | |
|---|---|---|---|
| 03606e109c | |||
|
49e3ecb986 |
|||
|
a622f21b54 |
|||
|
40b67c6bc3 |
11 changed files with 18 additions and 18 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.15
|
nextcloud__postgres_version: 18.1
|
||||||
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') }}"
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,9 @@ all:
|
||||||
ansible_host: mumble.hamburg.ccc.de
|
ansible_host: mumble.hamburg.ccc.de
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
netbox:
|
netbox:
|
||||||
ansible_host: netbox-intern.hamburg.ccc.de
|
ansible_host: netbox.hosts.hamburg.ccc.de
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
ansible_host: onlyoffice.hosts.hamburg.ccc.de
|
ansible_host: onlyoffice.hosts.hamburg.ccc.de
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
|
|
@ -67,13 +67,13 @@ all:
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
|
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
|
||||||
sunders:
|
sunders:
|
||||||
ansible_host: sunders-intern.hamburg.ccc.de
|
ansible_host: sunders.hosts.hamburg.ccc.de
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
renovate:
|
renovate:
|
||||||
ansible_host: renovate-intern.hamburg.ccc.de
|
ansible_host: renovate.hosts.hamburg.ccc.de
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
hypervisors:
|
hypervisors:
|
||||||
hosts:
|
hosts:
|
||||||
chaosknoten:
|
chaosknoten:
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ services:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:15.15
|
image: docker.io/library/postgres:18.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- keycloak
|
- keycloak
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,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:
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6
|
# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6
|
||||||
server {
|
server {
|
||||||
# Listen on a custom port for the proxy protocol.
|
# Listen on a custom port for the proxy protocol.
|
||||||
listen 8443 ssl http2 proxy_protocol;
|
listen [::]:8443 ssl http2 proxy_protocol;
|
||||||
# Make use of the ngx_http_realip_module to set the $remote_addr and
|
# Make use of the ngx_http_realip_module to set the $remote_addr and
|
||||||
# $remote_port to the client address and client port, when using proxy
|
# $remote_port to the client address and client port, when using proxy
|
||||||
# protocol.
|
# protocol.
|
||||||
|
|
|
||||||
|
|
@ -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=hedgedoc"
|
- "POSTGRES_USER=hedgedoc"
|
||||||
- "POSTGRES_PASSWORD={{ secret__hedgedoc_db_password }}"
|
- "POSTGRES_PASSWORD={{ secret__hedgedoc_db_password }}"
|
||||||
|
|
|
||||||
|
|
@ -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 }}"
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ map $host $upstream_acme_challenge_host {
|
||||||
matrix.hamburg.ccc.de 172.31.17.150:31820;
|
matrix.hamburg.ccc.de 172.31.17.150:31820;
|
||||||
mas.hamburg.ccc.de 172.31.17.150:31820;
|
mas.hamburg.ccc.de 172.31.17.150:31820;
|
||||||
element-admin.hamburg.ccc.de 172.31.17.151:31820;
|
element-admin.hamburg.ccc.de 172.31.17.151:31820;
|
||||||
netbox.hamburg.ccc.de 172.31.17.167:31820;
|
netbox.hamburg.ccc.de netbox.hosts.hamburg.ccc.de:31820;
|
||||||
onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:31820;
|
onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:31820;
|
||||||
pad.hamburg.ccc.de pad.hosts.hamburg.ccc.de:31820;
|
pad.hamburg.ccc.de pad.hosts.hamburg.ccc.de:31820;
|
||||||
pretalx.hamburg.ccc.de 172.31.17.157:31820;
|
pretalx.hamburg.ccc.de 172.31.17.157:31820;
|
||||||
|
|
@ -29,7 +29,7 @@ map $host $upstream_acme_challenge_host {
|
||||||
wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:31820;
|
wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:31820;
|
||||||
www.hamburg.ccc.de 172.31.17.151:31820;
|
www.hamburg.ccc.de 172.31.17.151:31820;
|
||||||
tickets.hamburg.ccc.de 172.31.17.148:31820;
|
tickets.hamburg.ccc.de 172.31.17.148:31820;
|
||||||
sunders.hamburg.ccc.de 172.31.17.170:31820;
|
sunders.hamburg.ccc.de sunders.hosts.hamburg.ccc.de:31820;
|
||||||
zammad.hamburg.ccc.de 172.31.17.152:31820;
|
zammad.hamburg.ccc.de 172.31.17.152:31820;
|
||||||
eh03.easterhegg.eu 172.31.17.151:31820;
|
eh03.easterhegg.eu 172.31.17.151:31820;
|
||||||
eh05.easterhegg.eu 172.31.17.151:31820;
|
eh05.easterhegg.eu 172.31.17.151:31820;
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ stream {
|
||||||
onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:8443;
|
onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:8443;
|
||||||
hackertours.hamburg.ccc.de 172.31.17.151:8443;
|
hackertours.hamburg.ccc.de 172.31.17.151:8443;
|
||||||
staging.hackertours.hamburg.ccc.de 172.31.17.151:8443;
|
staging.hackertours.hamburg.ccc.de 172.31.17.151:8443;
|
||||||
netbox.hamburg.ccc.de 172.31.17.167:8443;
|
netbox.hamburg.ccc.de netbox.hosts.hamburg.ccc.de:8443;
|
||||||
matrix.hamburg.ccc.de 172.31.17.150:8443;
|
matrix.hamburg.ccc.de 172.31.17.150:8443;
|
||||||
mas.hamburg.ccc.de 172.31.17.150:8443;
|
mas.hamburg.ccc.de 172.31.17.150:8443;
|
||||||
element-admin.hamburg.ccc.de 172.31.17.151:8443;
|
element-admin.hamburg.ccc.de 172.31.17.151:8443;
|
||||||
|
|
@ -43,7 +43,7 @@ stream {
|
||||||
staging.hamburg.ccc.de 172.31.17.151:8443;
|
staging.hamburg.ccc.de 172.31.17.151:8443;
|
||||||
spaceapi.hamburg.ccc.de 172.31.17.151:8443;
|
spaceapi.hamburg.ccc.de 172.31.17.151:8443;
|
||||||
tickets.hamburg.ccc.de 172.31.17.148:8443;
|
tickets.hamburg.ccc.de 172.31.17.148:8443;
|
||||||
sunders.hamburg.ccc.de 172.31.17.170:8443;
|
sunders.hamburg.ccc.de sunders.hosts.hamburg.ccc.de:8443;
|
||||||
zammad.hamburg.ccc.de 172.31.17.152:8443;
|
zammad.hamburg.ccc.de 172.31.17.152:8443;
|
||||||
c3cat.de 172.31.17.151:8443;
|
c3cat.de 172.31.17.151:8443;
|
||||||
www.c3cat.de 172.31.17.151:8443;
|
www.c3cat.de 172.31.17.151:8443;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6
|
# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6
|
||||||
server {
|
server {
|
||||||
# Listen on a custom port for the proxy protocol.
|
# Listen on a custom port for the proxy protocol.
|
||||||
listen 8443 ssl http2 proxy_protocol;
|
listen [::]:8443 ssl http2 proxy_protocol;
|
||||||
# Make use of the ngx_http_realip_module to set the $remote_addr and
|
# Make use of the ngx_http_realip_module to set the $remote_addr and
|
||||||
# $remote_port to the client address and client port, when using proxy
|
# $remote_port to the client address and client port, when using proxy
|
||||||
# protocol.
|
# protocol.
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:15-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
environment:
|
environment:
|
||||||
- "POSTGRES_USER=pretix"
|
- "POSTGRES_USER=pretix"
|
||||||
- "POSTGRES_PASSWORD={{ secret__pretix_db_password }}"
|
- "POSTGRES_PASSWORD={{ secret__pretix_db_password }}"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue