Compare commits

...
Author SHA1 Message Date
64eaa53412 Update all stable non-major dependencies
All checks were successful
/ build (pull_request) Successful in 30s
/ Ansible Lint (push) Successful in 3m45s
/ Ansible Lint (pull_request) Successful in 4m11s
2026-08-11 19:01:09 +00:00
379aa7c451
add configuration required for dooris -> spaceapid integration
All checks were successful
/ build (pull_request) Successful in 28s
/ cleanup-staging (pull_request) Successful in 7s
/ build (push) Successful in 27s
/ Ansible Lint (pull_request) Successful in 2m37s
/ Ansible Lint (push) Successful in 2m34s
2026-08-11 20:54:27 +02:00
10 changed files with 36 additions and 12 deletions

View file

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

View file

@ -1,6 +1,7 @@
dooris__static_api_token: ENC[AES256_GCM,data:pXmjn36FnOwA7fWAd3Go4W1CiMeRbbAiquj9KI/pQEDy1qDuobBbBft25m3uSAo6VI02PW2oZ4koY8uoPDUwNA==,iv:TNaZjwGBHvIbmF7VPIOo5mYzH1NEIyKIgjzkrobNCoI=,tag:4dHZepMxUGcvBYEp0kNwYQ==,type:str]
dooris__openid_client_secret: ENC[AES256_GCM,data:PqmtHR6LCGXcK5dyqKihUqU6+lydW0mJf7kMMf41qh4=,iv:ZjIl8jwB2lfJHjwcDEFFCbafMBnpzkccxBvvsjg+ia8=,tag:+eCnr9ojv9uUoO9k5khY6w==,type:str]
dooris__ccujack_password: ENC[AES256_GCM,data:FBbrdoQRdVZ+1n8WZg42jZz/xvQ=,iv:GLuen+LiB4MrvU71gEdVYWbdHKaDcEKify3vPePuoO0=,tag:nuqkP0cJLsvNAieWDNY3HA==,type:str]
dooris__spaceapid_password: ENC[AES256_GCM,data:3MLPzV7NxvOLQSHoBgPdR1WeGGhDZVnxDHDNviPseOQDkFkqUXFGPtfPQqI/pjs0VV607ehw+SfF3T8tMhorgA==,iv:U5j0SmM9rNsQTSxuLSiuG6zyMxVjfdNnu9BPXcaDjko=,tag:glvUmu79iCFEXmGDvm7Vuw==,type:str]
dooris__acmedns:
subdomain: ENC[AES256_GCM,data:XncJZ7qT51dLSkvfIc0Nc3SFxK1y/ip1cO4HA9CJMFtQy+mP,iv:mgwfx0QMzHadvUDZDYCzsiP1Oh+P/5DekbZ4M6y08t4=,tag:4oyXvAJEOFlw7wrrrhwspQ==,type:str]
apiUser: ENC[AES256_GCM,data:YLhXPrrts+JtwRMLrU2oM8hLTiFvZuqrlLrNKtgoL8IUdTxe,iv:L2R0YNRNoMuWGMYvgwRLP0RZwxqmMfQL4REyMX6VIuo=,tag:LegIPuVqMcxpIL1ZksIgbg==,type:str]
@ -17,8 +18,8 @@ sops:
aHvFML6xynRtBrMsp9IebicBxZKSWLi7uHi+LuAzkIcqpAlJUUBAbg==
-----END AGE ENCRYPTED FILE-----
recipient: age1j0876shgsn7f2thxh9kx9x5uwnh45z6sy2jlk2qz5jhgedm26g5srn9kax
lastmodified: "2026-07-29T12:14:25Z"
mac: ENC[AES256_GCM,data:rBtCeee53GXl+upHXGP4TTpUvszMzV0r1eQqzE7jG3WP/ywqfWqsM+sp3124wQzHTZoMxJc0m95YAseSdA+7EFSAQPRRdpfzMxTpoKQBFHS0BfgM/14ppB+kDER1ucNKT521+PyOjbmB86ovTc8MfR2vsHDZ+FrIopUGzPpcBPs=,iv:JiSoJxPt9JW/kWy0aVz6jGNOoQPkZKG/vTkdis/fKSo=,tag:0V6hicsuT6/qLjGb/+fJPw==,type:str]
lastmodified: "2026-08-11T14:12:13Z"
mac: ENC[AES256_GCM,data:yFvVk8J3Kjf7hYQ5E7tN0Dpa8943n2OLcVKEQWcyMFrl991cYjpti+a766Bx79KgaBqSW70E7Y13KfdXw0wpETte+KwpXEmlh54/3UihdvcavcH0ep7zZhyXEtoBfDTKoFMkvDgmQbljnOOWbWpW0X60lyWe0/xHIHJonlZ7PuY=,iv:9HdGaa4CXKJfI7LgY7oSsLU0VPZZ+dSW+k1s9v5xZkk=,tag:g4BSo09RAslC3H1djw6B2Q==,type:str]
pgp:
- created_at: "2026-05-20T02:08:48Z"
enc: |-
@ -191,4 +192,4 @@ sops:
-----END PGP MESSAGE-----
fp: 41FFAF3D519CF5C039FBD8414BCC213729AF0E49
unencrypted_suffix: _unencrypted
version: 3.13.2
version: 3.13.3

View file

@ -1,5 +1,7 @@
dooris__hostname: "dooris.ccchh.net"
dooris__openid_client_id: "dooris"
dooris__ccujack_user: "dooris"
dooris__spaceapid_user: "dooris"
dooris__main_lock: ~ # add "Hautpraum" once we have built it
certbot__acme_account_email_address: le-admin@hamburg.ccc.de

View file

@ -2,7 +2,7 @@
services:
prometheus:
image: docker.io/prom/prometheus:v3.13.1
image: docker.io/prom/prometheus:v3.13.2
container_name: prometheus
command:
- '--config.file=/etc/prometheus/prometheus.yml'
@ -32,7 +32,7 @@ services:
- alertmanager_data:/alertmanager
grafana:
image: docker.io/grafana/grafana:13.1.0
image: docker.io/grafana/grafana:13.1.3
container_name: grafana
ports:
- 3000:3000
@ -46,7 +46,7 @@ services:
- graf_data:/var/lib/grafana
pve-exporter:
image: docker.io/prompve/prometheus-pve-exporter:3.9.0
image: docker.io/prompve/prometheus-pve-exporter:3.10.0
container_name: pve-exporter
ports:
- 9221:9221
@ -59,7 +59,7 @@ services:
- /dev/null:/etc/prometheus/pve.yml
loki:
image: docker.io/grafana/loki:3.7.3
image: docker.io/grafana/loki:3.7.6
container_name: loki
ports:
- 13100:3100

View file

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

View file

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

View file

@ -13,7 +13,7 @@ services:
restart: unless-stopped
redis:
image: docker.io/library/redis:8.8.0
image: docker.io/library/redis:8.10.0
ports:
- "6379:6379"
volumes:

View file

@ -11,6 +11,9 @@ For an exact description of host requirements, see the README of dooris itself.
- `dooris__openid_client_id`: Client-ID in CCCHH ID for dooris
- `dooris__openid_client_secret`: Client-Secret in CCCHH ID for dooris
- `dooris__static_api_token`: A static token that is valid on the servers API and can operate locks
- `dooris__spaceapid_user`: Username for authentication against our spaceapid
- `dooris__spaceapid_password`: Password for authentication against our spaceapid
- `dooris__main_lock`: Name or ID of the main lock whose status gets pushed to spaceapid
- `dooris__acmedns`: Configuration of ACMEDNS domain + credentials for dooris.
Must be a dict with keys `subdomain`, `apiUser`, `apiKey` which are shown when creating a domain in ACMEDNS.

View file

@ -31,6 +31,21 @@ argument_specs:
required: true
type: str
dooris__spaceapid_user:
description: "Username for authentication against out spaceapid"
required: true
type: str
dooris__spaceapid_password:
description: "Password for authentication against out spaceapid"
required: true
type: str
dooris__main_lock:
description: "Name or ID of the main lock whose status gets pushed to spaceapid"
required: true
type: str
dooris__acmedns:
description: "Configuration of ACMEDNS domain + credentials for dooris"
required: true

View file

@ -11,6 +11,9 @@ services:
DOORIS_CCUJACK_PASSWORD: "{{ dooris__ccujack_password }}"
DOORIS_AUTHORIZED_KEYS_FILE: "/srv/state/dooris_authorized_keys"
DOORIS_STATIC_API_TOKENS: "{{ dooris__static_api_token }}"
DOORIS_SPACEAPID_USER: "{{ dooris__spaceapid_user }}"
DOORIS_SPACEAPID_PASSWORD: "{{ dooris__spaceapid_password }}"
DOORIS_MAIN_LOCK: "{{ dooris__main_lock }}"
network_mode: host
restart: unless-stopped
volumes: