Compare commits

..
Author SHA1 Message Date
5d3c47375d Document the restore process for VMs
All checks were successful
/ build (pull_request) Successful in 32s
/ Ansible Lint (push) Successful in 2m27s
/ Ansible Lint (pull_request) Successful in 2m26s
2026-11-15 14:06:07 +01:00
24 changed files with 98 additions and 405 deletions

View file

@ -11,7 +11,7 @@ jobs:
build: build:
runs-on: docker runs-on: docker
container: container:
image: docker.io/library/python:3.15-trixie image: docker.io/library/python:3.14-trixie
steps: steps:
- name: Pipeline info - name: Pipeline info
run: | run: |

View file

@ -24,7 +24,7 @@ jobs:
# work in our environmnet. # work in our environmnet.
# Rather manually setup python (pip) before instead. # Rather manually setup python (pip) before instead.
- name: Run ansible-lint - name: Run ansible-lint
uses: https://github.com/ansible/ansible-lint@v26.11.0 uses: https://github.com/ansible/ansible-lint@v26.6.0
with: with:
setup_python: "false" setup_python: "false"
requirements_file: "requirements.yml" requirements_file: "requirements.yml"

View file

@ -0,0 +1,38 @@
---
title: Create a new VM on Chaosknoten
---
!!! success "Goal"
Re-create a VM from a backup.
## VM is still defined in chaosknoten, and the backup is available in `pbs-local`.
1. Locate the VM that you want to restore in Proxmox
If the VM is still configured in Proxmox, locate it in the web interface and go to the Backups tab.
1. Select `pbs-local` as the storage
We have these storages defined for backups:
* `pbs-local`: Proxmox Backup Server running on chaosknoten
* `z9-pbs`: Proxmox Backup Server at the Club
* `local`: local file system, should be unused
The quickest and easiest way is to restore from `pbs-local`.
1. Select the backup that you want to restore and click Restore
2. Decide on the way you want the VM restored
If oyu want to be able to start using the VM immediately, choose Live Restore. This will start the VM within a minute, and any access to a disk block that has not been restored will be retrieved from the backup. The VM will run with reduced I/O capacity, but it will run immediately.
## VM is defined, but restore must come from `z9-pbs`
Storage `z9-pbs` is a mirror of `pbs-local`. Any backup will be encrypted with the key for `pbs-local`.
The key configured for `z9-pbs` is different from the one for `pbs-local`, so we cannot directly restore. The solution is unclear, please see issue [Unable to restore backup on Chaosknoten from z9-pbs #188](https://git.hamburg.ccc.de/CCCHH/ansible-infra/issues/188).
## VM is no longer defined
Go to Datacenter > chaosknoten > Storage pbs-local, and browse the backups there. Once you have located the desired backup, follow the same steps as above.

View file

@ -1,7 +1,5 @@
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2') }}" docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2') }}"
docker_compose__configuration_files: docker_compose__configuration_files: [ ]
- name: php-custom.ini
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/ccchoir/docker_compose/php-custom.ini') }}"
certbot__acme_account_email_address: le-admin@hamburg.ccc.de certbot__acme_account_email_address: le-admin@hamburg.ccc.de
certbot__certificate_domains: certbot__certificate_domains:

View file

@ -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.20 nextcloud__postgres_version: 15.18
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') }}"

View file

@ -1,5 +1,5 @@
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox # renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
netbox__version: "v4.7.5" netbox__version: "v4.6.4"
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}" netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
netbox__custom_pipeline_oidc_group_and_role_mapping: true netbox__custom_pipeline_oidc_group_and_role_mapping: true

View file

@ -13,4 +13,4 @@ nginx__configurations:
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf') }}" content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf') }}"
# renovate: datasource=docker depName=quay.io/hedgedoc/hedgedoc # renovate: datasource=docker depName=quay.io/hedgedoc/hedgedoc
host_pad__docker_compose__hedgedoc_version: 1.12.0 host_pad__docker_compose__hedgedoc_version: 1.11.1

View file

@ -2,26 +2,6 @@ docker_compose__compose_file_content: "{{ lookup('ansible.builtin.file', 'resour
docker_compose__env_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/zammad/docker_compose/.env.j2') }}" docker_compose__env_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/zammad/docker_compose/.env.j2') }}"
docker_compose__configuration_files: [ ] docker_compose__configuration_files: [ ]
# Upstream compose file resources/chaosknoten/zammad/docker_compose/compose.yaml was taken from.
# Not used by Ansible; Renovate opens a PR on new upstream tags as a reminder to replace the
# compose file (update its "Version:" header too).
# renovate: datasource=github-tags depName=zammad/zammad-docker-compose
zammad__compose_upstream_version: "v17.5.9"
# Image versions, passed to compose via .env.j2.
# Tags look like 7.2.3-0015; versioning is set in renovate.json.
# renovate: datasource=docker depName=ghcr.io/zammad/zammad
zammad__version: "7.2.3-0015"
# renovate: datasource=docker depName=docker.io/library/elasticsearch
zammad__elasticsearch_version: "9.5.5"
# renovate: datasource=docker depName=docker.io/library/memcached
zammad__memcached_version: "1.6.45-alpine"
# Major upgrades need a dump/restore, see renovate.json.
# renovate: datasource=docker depName=docker.io/library/postgres
zammad__postgres_version: "15.20-alpine"
# renovate: datasource=docker depName=docker.io/library/redis
zammad__redis_version: "8.10.3-alpine"
certbot__acme_account_email_address: le-admin@hamburg.ccc.de certbot__acme_account_email_address: le-admin@hamburg.ccc.de
certbot__certificate_domains: certbot__certificate_domains:
- "zammad.hamburg.ccc.de" - "zammad.hamburg.ccc.de"

View file

@ -48,10 +48,7 @@
}, },
{ {
"matchDatasources": ["docker"], "matchDatasources": ["docker"],
"matchPackageNames": [ "matchPackageNames": ["docker.io/pretix/standalone"],
"docker.io/pretix/standalone",
"git.hamburg.ccc.de/ccchh/oci-images/pretix"
],
"matchUpdateTypes": ["minor"], "matchUpdateTypes": ["minor"],
"groupName": null "groupName": null
}, },
@ -60,32 +57,6 @@
"matchPackageNames": ["docker.io/pretalx/standalone"], "matchPackageNames": ["docker.io/pretalx/standalone"],
"matchUpdateTypes": ["minor"], "matchUpdateTypes": ["minor"],
"groupName": null "groupName": null
},
// Zammad: Postgres major upgrades need a dump/restore, never offer them automatically
{
"matchFileNames": ["inventories/chaosknoten/host_vars/zammad.yaml"],
"matchDepNames": ["docker.io/library/postgres"],
"matchUpdateTypes": ["major"],
"enabled": false
},
// We update the compose.yaml by manually copying it from the Zammad repo. This
// is basically a reminder PR.
{
"matchDepNames": ["ghcr.io/zammad/zammad", "zammad/zammad-docker-compose"],
"automerge": false,
"groupName": null
},
// Zammad image tags carry a build number (7.2.3-0015), which docker versioning would
// treat as a fixed suffix.
{
"matchDepNames": ["ghcr.io/zammad/zammad"],
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(-(?<build>\\d+))?$"
},
// Every Jitsi stable-NNNNN release is a major update.
{
"matchDepNames": ["jitsi/docker-jitsi-meet"],
"automerge": false,
"groupName": null
} }
], ],
"customManagers": [ "customManagers": [
@ -96,7 +67,7 @@
"/^inventories/.*?_vars/.*?\\.ya?ml$/" "/^inventories/.*?_vars/.*?\\.ya?ml$/"
], ],
"matchStrings": [ "matchStrings": [
"# renovate: datasource=(?<datasource>[a-zA-Z0-9-._]+?) depName=(?<depName>[^\\s]+?)(?: packageName=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?\\s+.+?\\s*:\\s*[\"']?(?<currentValue>.+?)[\"']?\\s" "# renovate: datasource=(?<datasource>[a-zA-Z0-9-._]+?) depName=(?<depName>[^\\s]+?)(?: packageName=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?\\s*.+?\\s*:\\s*[\"']?(?<currentValue>.+?)[\"']?\\s"
] ]
} }
], ],

View file

@ -19,7 +19,7 @@ $TTL 600
;autoconfig IN CNAME cow.hamburg.ccc.de ;autoconfig IN CNAME cow.hamburg.ccc.de
IN TXT "v=spf1 mx ip4:144.76.16.19/32 ip4:212.12.51.133/32 ip6:2a01:4f8:191:331::2/128 ip6:2a00:14b0:f000:23:51:133:0:1/128 ~all" IN TXT "v=spf1 mx ip4:144.76.16.19/32 ip4:212.12.51.133/32 ip6:2a01:4f8:191:331::2/128 ip6:2a00:14b0:f000:23:51:133:0:1/128 ~all"
_dmarc IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" ;_dmarc IN TXT **TODO**
dkim._domainkey IN TXT ( "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhk" dkim._domainkey IN TXT ( "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhk"
"iG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoWo7mbis3REqBURP3ZQZwOY7RSsS7" "iG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoWo7mbis3REqBURP3ZQZwOY7RSsS7"

View file

@ -34,7 +34,7 @@ dkim._domainkey IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"j3hCMHmyjE8mn8lYnS0QfSnV8NlqKwOhF+iwqfrhMI2bZFCQ+td03RtQjaXw5W+" "j3hCMHmyjE8mn8lYnS0QfSnV8NlqKwOhF+iwqfrhMI2bZFCQ+td03RtQjaXw5W+"
"30NMcOv6Se4vPDl4nUIBJZ/wP3CBz1k66VShHB+un7SxoUQuW0+oDqN4QHH338b" "30NMcOv6Se4vPDl4nUIBJZ/wP3CBz1k66VShHB+un7SxoUQuW0+oDqN4QHH338b"
"2dDOoBJndwIDAQAB") "2dDOoBJndwIDAQAB")
_dmarc IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" _dmarc IN TXT "v=DMARC1;p=none;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
localhost IN A 127.0.0.1 localhost IN A 127.0.0.1
@ -126,7 +126,6 @@ dkim._domainkey.lists IN TXT ("v=DKIM1; h=sha256; k=r
"8KuSNAx9ycTO0urNkz4In1I2srmK8qPTfqfPU7y5kjHM1oC31+LwVNiyzeIQl" "8KuSNAx9ycTO0urNkz4In1I2srmK8qPTfqfPU7y5kjHM1oC31+LwVNiyzeIQl"
"cdW00DMTHfzkQAjtdDXgKG5db4Dqw+2wtZfLGvBFOSfV0RspZmSDSN6ON81dk" "cdW00DMTHfzkQAjtdDXgKG5db4Dqw+2wtZfLGvBFOSfV0RspZmSDSN6ON81dk"
"lVABMMOA7Vd8wwIj0ms/gb/+AB0IQIDAQAB" ) "lVABMMOA7Vd8wwIj0ms/gb/+AB0IQIDAQAB" )
_dmarc.lists IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
ccchoir-intern IN A 172.31.17.156 ccchoir-intern IN A 172.31.17.156
cow IN A 212.12.51.133 cow IN A 212.12.51.133
@ -146,7 +145,6 @@ dkim._domainkey.cowtest IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"jRLI8r48pASg6IoiByV8kR3r7OZw9dzmNgbTCOEyKaicB4KJDjgJvQut8af8g" "jRLI8r48pASg6IoiByV8kR3r7OZw9dzmNgbTCOEyKaicB4KJDjgJvQut8af8g"
"sYQYTCSPVqkwb5Y+yJNKhQmsYBwUX23x5Yng2gDBY/pjGeWl28SxdGhm8C23a" "sYQYTCSPVqkwb5Y+yJNKhQmsYBwUX23x5Yng2gDBY/pjGeWl28SxdGhm8C23a"
"0wVCz4kQGNvcULnrzifwIDAQAB") "0wVCz4kQGNvcULnrzifwIDAQAB")
_dmarc.cowtest IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
_autodiscover._tcp.cowtest IN SRV 0 1 443 cow _autodiscover._tcp.cowtest IN SRV 0 1 443 cow
_caldavs._tcp.cowtest IN SRV 0 1 443 cow _caldavs._tcp.cowtest IN SRV 0 1 443 cow
_caldavs._tcp.cowtest IN TXT "path=/SOGo/dav/" _caldavs._tcp.cowtest IN TXT "path=/SOGo/dav/"
@ -193,7 +191,6 @@ dkim._domainkey.id IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"genmqXgBopvmnTeXa+kQnoVgrMyWE41zdWaXrDAtoYye3e31j0Nxhnfg+I7vO" "genmqXgBopvmnTeXa+kQnoVgrMyWE41zdWaXrDAtoYye3e31j0Nxhnfg+I7vO"
"XPfmatTH7yieDaLG+3kHjbA3WFyAkb/ZAqZaFM8k6cQJEZb7jDzdKlm1fuPrk" "XPfmatTH7yieDaLG+3kHjbA3WFyAkb/ZAqZaFM8k6cQJEZb7jDzdKlm1fuPrk"
"YUrfZ1V3pglzdm0QbM4wIDAQAB") "YUrfZ1V3pglzdm0QbM4wIDAQAB")
_dmarc.id IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
matrix-intern IN A 172.31.17.150 matrix-intern IN A 172.31.17.150
; have this for compatibility (like references in CI) ; have this for compatibility (like references in CI)
@ -216,7 +213,6 @@ dkim._domainkey.design IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"TRTV4LM/n5Jm7Mm1F5DwJ+7Ie9s/WvTWKKKUExmoa5SNheGcfybC+sqnJu7L0" "TRTV4LM/n5Jm7Mm1F5DwJ+7Ie9s/WvTWKKKUExmoa5SNheGcfybC+sqnJu7L0"
"F5dWFwk0zzQDcVSY2m9qFWPEuO2fZmiB4IoG4yXkooSY2sH9Z8eX2+6i3k/ub" "F5dWFwk0zzQDcVSY2m9qFWPEuO2fZmiB4IoG4yXkooSY2sH9Z8eX2+6i3k/ub"
"qx58Mav6VlkTxsOAdbbQIDAQAB") "qx58Mav6VlkTxsOAdbbQIDAQAB")
_dmarc.design IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
regio-stage IN A 212.12.51.142 regio-stage IN A 212.12.51.142
AAAA 2a00:14b0:f000:23:51:142:0:1 AAAA 2a00:14b0:f000:23:51:142:0:1
@ -307,7 +303,6 @@ dkim._domainkey.git IN TXT ("v=DKIM1;k=rsa;t=s;s=e
"qwD8/pYvMLOqvCStVHM5Zi+j1Jr0BC8mxU8pIY6rfOVt+h/V3wh0F6dL0z9nw" "qwD8/pYvMLOqvCStVHM5Zi+j1Jr0BC8mxU8pIY6rfOVt+h/V3wh0F6dL0z9nw"
"ZhDE53K8frGp2CC5dW/A37FrfMJv+ODw2tX8EdyL2hDBshBQ4r8WiYJTtIMPL" "ZhDE53K8frGp2CC5dW/A37FrfMJv+ODw2tX8EdyL2hDBshBQ4r8WiYJTtIMPL"
"50A9UzZndyiLAHoeLrZQIDAQAB") "50A9UzZndyiLAHoeLrZQIDAQAB")
_dmarc.git IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
hackertours IN A 212.12.48.125 hackertours IN A 212.12.48.125
IN AAAA 2a00:14b0:4200:3000:125::1 IN AAAA 2a00:14b0:4200:3000:125::1
MX 10 cow.hamburg.ccc.de. MX 10 cow.hamburg.ccc.de.
@ -319,7 +314,6 @@ dkim._domainkey.hackertours IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"YmhHorgnxR3HbHeUmaxIe4WM2wWRYiD+9tpY1f0O/NEEoHxmFecRhU9SVmuhLgiOyF" "YmhHorgnxR3HbHeUmaxIe4WM2wWRYiD+9tpY1f0O/NEEoHxmFecRhU9SVmuhLgiOyF"
"AWpPYBMOsKEHoKREENc+4VBj6H2GYTKIs+dYKDNEmVVdnRkgtAVO3FrjCkedBJ7RbR" "AWpPYBMOsKEHoKREENc+4VBj6H2GYTKIs+dYKDNEmVVdnRkgtAVO3FrjCkedBJ7RbR"
"RNHIqdt9u8AF+Vrs1Oq72ZQrNVR0ezEyBScJaxy5JphvBWkMSYSoDpvXLwIDAQAB") "RNHIqdt9u8AF+Vrs1Oq72ZQrNVR0ezEyBScJaxy5JphvBWkMSYSoDpvXLwIDAQAB")
_dmarc.hackertours IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
staging.hackertours IN A 212.12.48.125 staging.hackertours IN A 212.12.48.125
IN AAAA 2a00:14b0:4200:3000:125::1 IN AAAA 2a00:14b0:4200:3000:125::1
grafana IN A 212.12.48.125 grafana IN A 212.12.48.125
@ -358,7 +352,6 @@ dkim._domainkey.cloud IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"7+HQs9BuDo4PKQs1/mE5BEWQ0ISEKZ4bk1p8U0ZsfcdQ8o9X53Tj+JxvJHgxi" "7+HQs9BuDo4PKQs1/mE5BEWQ0ISEKZ4bk1p8U0ZsfcdQ8o9X53Tj+JxvJHgxi"
"h7yHMr4y9hCOAkvZTFZ/Z/r3KU+N+t9NrVYm995KEernSxE3MXYIsdaFKBDvX" "h7yHMr4y9hCOAkvZTFZ/Z/r3KU+N+t9NrVYm995KEernSxE3MXYIsdaFKBDvX"
"Xq837yzJmv7D9S9We3YwIDAQAB") "Xq837yzJmv7D9S9We3YwIDAQAB")
_dmarc.cloud IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
; Mail: hosts.hamburg.ccc.de ; Mail: hosts.hamburg.ccc.de
hosts IN MX 10 cow hosts IN MX 10 cow
IN TXT "v=spf1 mx -all" IN TXT "v=spf1 mx -all"
@ -370,7 +363,6 @@ dkim._domainkey.hosts IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"RMs3ECvcCVgsyhRPJahs8tzbKjhnp956ru6Jda3Yo/ubhy4AztP/7ZQayCv/W" "RMs3ECvcCVgsyhRPJahs8tzbKjhnp956ru6Jda3Yo/ubhy4AztP/7ZQayCv/W"
"06PfZNo/i2711F98L2ATQaDsOCKWhpskyrCRcR1nTWNSL7qYhOPD1hZonsd5I" "06PfZNo/i2711F98L2ATQaDsOCKWhpskyrCRcR1nTWNSL7qYhOPD1hZonsd5I"
"f5WwrR4meWD3wmXbX29wIDAQAB") "f5WwrR4meWD3wmXbX29wIDAQAB")
_dmarc.hosts IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
; Mail: hosts-external.hamburg.ccc.de ; Mail: hosts-external.hamburg.ccc.de
external-hosts IN MX 10 cow external-hosts IN MX 10 cow
IN TXT "v=spf1 mx -all" IN TXT "v=spf1 mx -all"
@ -382,7 +374,6 @@ dkim._domainkey.external-hosts IN TXT ("v=DKIM1;k=rsa;t=s;s=em
"/dL73spDajlDx4VRMUpZQq/PAoPPwCFdw/HNnzxBYBIdVloeJx91qBRaNyUIb" "/dL73spDajlDx4VRMUpZQq/PAoPPwCFdw/HNnzxBYBIdVloeJx91qBRaNyUIb"
"C/to8YSDVi2aMHiXhTBfoNd1VcxjlBYWqEZtdUhecUjwmbbAO4f0ECO4bs0Yz" "C/to8YSDVi2aMHiXhTBfoNd1VcxjlBYWqEZtdUhecUjwmbbAO4f0ECO4bs0Yz"
"d/EgJB70ry1quA0MqgZQIDAQAB") "d/EgJB70ry1quA0MqgZQIDAQAB")
_dmarc.external-hosts IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1"
; for thw: ; for thw:
orga IN A 212.12.51.130 orga IN A 212.12.51.130

View file

@ -26,7 +26,6 @@ services:
- "WORDPRESS_DB_PASSWORD={{ secret__wordpress_db_password }}" - "WORDPRESS_DB_PASSWORD={{ secret__wordpress_db_password }}"
volumes: volumes:
- wordpress:/var/www/html/wp-content - wordpress:/var/www/html/wp-content
- /ansible_docker_compose/configs/php-custom.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
ports: ports:
- "127.0.0.1:3000:80" - "127.0.0.1:3000:80"
networks: networks:

View file

@ -1,2 +0,0 @@
# mitigate https://www.php.net/archive/2026.php#2026-11-18-1
session.upload_progress.enabled = 0

View file

@ -2,7 +2,7 @@
services: services:
prometheus: prometheus:
image: docker.io/prom/prometheus:v3.16.0 image: docker.io/prom/prometheus:v3.13.1
container_name: prometheus container_name: prometheus
command: command:
- '--config.file=/etc/prometheus/prometheus.yml' - '--config.file=/etc/prometheus/prometheus.yml'
@ -19,7 +19,7 @@ services:
- prom_data:/prometheus - prom_data:/prometheus
alertmanager: alertmanager:
image: docker.io/prom/alertmanager:v0.35.0 image: docker.io/prom/alertmanager:v0.33.1
container_name: alertmanager container_name: alertmanager
command: command:
- '--config.file=/etc/alertmanager/alertmanager.yaml' - '--config.file=/etc/alertmanager/alertmanager.yaml'
@ -32,7 +32,7 @@ services:
- alertmanager_data:/alertmanager - alertmanager_data:/alertmanager
grafana: grafana:
image: docker.io/grafana/grafana:13.3.1 image: docker.io/grafana/grafana:13.1.0
container_name: grafana container_name: grafana
ports: ports:
- 3000:3000 - 3000:3000
@ -46,7 +46,7 @@ services:
- graf_data:/var/lib/grafana - graf_data:/var/lib/grafana
pve-exporter: pve-exporter:
image: docker.io/prompve/prometheus-pve-exporter:3.12.0 image: docker.io/prompve/prometheus-pve-exporter:3.9.0
container_name: pve-exporter container_name: pve-exporter
ports: ports:
- 9221:9221 - 9221:9221

View file

@ -84,7 +84,7 @@ services:
# Renders the PDF handouts (HTML to PDF with Chromium); needs internet access for the map tiles. # Renders the PDF handouts (HTML to PDF with Chromium); needs internet access for the map tiles.
gotenberg: gotenberg:
image: docker.io/gotenberg/gotenberg:8.40.0 image: docker.io/gotenberg/gotenberg:8.38.1
command: ["gotenberg", "--api-timeout=60s", "--libreoffice-disable-routes"] command: ["gotenberg", "--api-timeout=60s", "--libreoffice-disable-routes"]
networks: networks:
frontend: frontend:

View file

@ -42,7 +42,6 @@ services:
KC_HOSTNAME_ADMIN: https://keycloak-admin.hamburg.ccc.de KC_HOSTNAME_ADMIN: https://keycloak-admin.hamburg.ccc.de
KC_PROXY_HEADERS: xforwarded KC_PROXY_HEADERS: xforwarded
KC_HTTP_ENABLED: true KC_HTTP_ENABLED: true
JAVA_OPTS_APPEND: "-XX:-UseBASE64Intrinsics"
ports: ports:
- "8080:8080" - "8080:8080"

View file

@ -1,7 +1,7 @@
--- ---
services: services:
ntfy: ntfy:
image: docker.io/binwiederhier/ntfy:v2.38.1 image: docker.io/binwiederhier/ntfy:v2.26.0
container_name: ntfy container_name: ntfy
command: command:
- serve - serve

View file

@ -15,7 +15,7 @@ services:
- pretalx_net - pretalx_net
redis: redis:
image: docker.io/library/redis:8.10.3 image: docker.io/library/redis:8.8.0
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- redis:/data - redis:/data
@ -23,7 +23,7 @@ services:
- pretalx_net - pretalx_net
static: static:
image: docker.io/library/nginx:1.31.9 image: docker.io/library/nginx:1.31.8
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- public:/usr/share/nginx/html - public:/usr/share/nginx/html

View file

@ -13,7 +13,7 @@ services:
restart: unless-stopped restart: unless-stopped
redis: redis:
image: docker.io/library/redis:8.10.3 image: docker.io/library/redis:8.8.0
ports: ports:
- "6379:6379" - "6379:6379"
volumes: volumes:
@ -25,7 +25,7 @@ services:
backend: backend:
pretix: pretix:
image: git.hamburg.ccc.de/ccchh/oci-images/pretix:2026.9 image: git.hamburg.ccc.de/ccchh/oci-images/pretix:2026.8
command: ["all"] command: ["all"]
ports: ports:
- "8345:80" - "8345:80"

View file

@ -1,8 +1,4 @@
POSTGRES_PASS={{ secret__zammad_db_password }} POSTGRES_PASS={{ secret__zammad_db_password }}
POSTGRES_VERSION=15-alpine
REDIS_VERSION=7-alpine
NGINX_SERVER_SCHEME=https NGINX_SERVER_SCHEME=https
VERSION={{ zammad__version }}
ELASTICSEARCH_VERSION={{ zammad__elasticsearch_version }}
MEMCACHE_VERSION={{ zammad__memcached_version }}
POSTGRES_VERSION={{ zammad__postgres_version }}
REDIS_VERSION={{ zammad__redis_version }}

Some files were not shown because too many files have changed in this diff Show more