Compare commits
2 commits
d3c7f43f38
...
c47f7eeee2
| Author | SHA1 | Date | |
|---|---|---|---|
| c47f7eeee2 | |||
| 0788fde69d |
7 changed files with 36 additions and 36 deletions
60
.sops.yaml
60
.sops.yaml
|
|
@ -43,170 +43,170 @@ keys:
|
||||||
|
|
||||||
creation_rules:
|
creation_rules:
|
||||||
## group vars
|
## group vars
|
||||||
- path_regex: inventories/chaosknoten/group_vars/all.*
|
- path_regex: "inventories/chaosknoten/group_vars/.+\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
*host_chaosknoten_age_keys
|
*host_chaosknoten_age_keys
|
||||||
- path_regex: inventories/external/group_vars/all.*
|
- path_regex: "inventories/external/group_vars/.+\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
*host_external_age_keys
|
*host_external_age_keys
|
||||||
- path_regex: inventories/z9/group_vars/all.*
|
- path_regex: "inventories/z9/group_vars/.+\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
## host vars
|
## host vars
|
||||||
# chaosknoten hosts
|
# chaosknoten hosts
|
||||||
- path_regex: inventories/chaosknoten/host_vars/acmedns.*
|
- path_regex: "inventories/chaosknoten/host_vars/acmedns\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_acmedns_ansible_pull_age_key
|
- *host_acmedns_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/cloud.*
|
- path_regex: "inventories/chaosknoten/host_vars/cloud\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_cloud_ansible_pull_age_key
|
- *host_cloud_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/keycloak.*
|
- path_regex: "inventories/chaosknoten/host_vars/keycloak\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_keycloak_ansible_pull_age_key
|
- *host_keycloak_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/grafana.*
|
- path_regex: "inventories/chaosknoten/host_vars/grafana\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_grafana_ansible_pull_age_key
|
- *host_grafana_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/pad.*
|
- path_regex: "inventories/chaosknoten/host_vars/pad\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_pad_ansible_pull_age_key
|
- *host_pad_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/ccchoir.*
|
- path_regex: "inventories/chaosknoten/host_vars/ccchoir\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_ccchoir_ansible_pull_age_key
|
- *host_ccchoir_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/pretalx.*
|
- path_regex: "inventories/chaosknoten/host_vars/pretalx\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_pretalx_ansible_pull_age_key
|
- *host_pretalx_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/netbox.*
|
- path_regex: "inventories/chaosknoten/host_vars/netbox\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_netbox_ansible_pull_age_key
|
- *host_netbox_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/tickets.*
|
- path_regex: "inventories/chaosknoten/host_vars/tickets\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_tickets_ansible_pull_age_key
|
- *host_tickets_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/onlyoffice.*
|
- path_regex: "inventories/chaosknoten/host_vars/onlyoffice\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_onlyoffice_ansible_pull_age_key
|
- *host_onlyoffice_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/zammad.*
|
- path_regex: "inventories/chaosknoten/host_vars/zammad\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_zammad_ansible_pull_age_key
|
- *host_zammad_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/ntfy.*
|
- path_regex: "inventories/chaosknoten/host_vars/ntfy\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_ntfy_ansible_pull_age_key
|
- *host_ntfy_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/eh22-wiki.*
|
- path_regex: "inventories/chaosknoten/host_vars/eh22-wiki\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_eh22_wiki_ansible_pull_age_key
|
- *host_eh22_wiki_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/sunders.*
|
- path_regex: "inventories/chaosknoten/host_vars/sunders\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_sunders_ansible_pull_age_key
|
- *host_sunders_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/wiki.*
|
- path_regex: "inventories/chaosknoten/host_vars/wiki\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_wiki_ansible_pull_age_key
|
- *host_wiki_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/renovate.*
|
- path_regex: "inventories/chaosknoten/host_vars/renovate\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_renovate_ansible_pull_age_key
|
- *host_renovate_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/lists.*
|
- path_regex: "inventories/chaosknoten/host_vars/lists\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_lists_ansible_pull_age_key
|
- *host_lists_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/mumble.*
|
- path_regex: "inventories/chaosknoten/host_vars/mumble\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_mumble_ansible_pull_age_key
|
- *host_mumble_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/public-reverse-proxy.*
|
- path_regex: "inventories/chaosknoten/host_vars/public-reverse-proxy\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_public_reverse_proxy_ansible_pull_age_key
|
- *host_public_reverse_proxy_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/spaceapiccc.*
|
- path_regex: "inventories/chaosknoten/host_vars/spaceapiccc\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_spaceapiccc_ansible_pull_age_key
|
- *host_spaceapiccc_ansible_pull_age_key
|
||||||
- path_regex: inventories/chaosknoten/host_vars/mjolnir.*
|
- path_regex: "inventories/chaosknoten/host_vars/mjolnir\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_mjolnir_ansible_pull_age_key
|
- *host_mjolnir_ansible_pull_age_key
|
||||||
# external hosts
|
# external hosts
|
||||||
- path_regex: inventories/external/host_vars/status.*
|
- path_regex: "inventories/external/host_vars/status\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
age:
|
age:
|
||||||
- *host_status_ansible_pull_age_key
|
- *host_status_ansible_pull_age_key
|
||||||
# z9 hosts
|
# z9 hosts
|
||||||
- path_regex: inventories/z9/host_vars/dooris.*
|
- path_regex: "inventories/z9/host_vars/dooris\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
- path_regex: inventories/z9/host_vars/yate.*
|
- path_regex: "inventories/z9/host_vars/yate\\.sops\\..+"
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp:
|
- pgp:
|
||||||
*admin_gpg_keys
|
*admin_gpg_keys
|
||||||
# general
|
# general
|
||||||
- key_groups:
|
- path_regex: ".+\\.sops\\..+"
|
||||||
- pgp:
|
key_groups:
|
||||||
*admin_gpg_keys
|
- pgp: *admin_gpg_keys
|
||||||
|
|
||||||
stores:
|
stores:
|
||||||
yaml:
|
yaml:
|
||||||
|
|
|
||||||
|
|
@ -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.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') }}"
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ services:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:15.15
|
image: docker.io/library/postgres:18.3
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- keycloak
|
- keycloak
|
||||||
|
|
|
||||||
|
|
@ -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=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 }}"
|
||||||
|
|
|
||||||
|
|
@ -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