Compare commits
3 commits
4588c42453
...
bc2f3b70d1
| Author | SHA1 | Date | |
|---|---|---|---|
| bc2f3b70d1 | |||
|
1d2d03e4b3 |
|||
|
f4c9d203da |
9 changed files with 33 additions and 7 deletions
|
|
@ -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.3.0
|
uses: https://github.com/ansible/ansible-lint@v26.4.0
|
||||||
with:
|
with:
|
||||||
setup_python: "false"
|
setup_python: "false"
|
||||||
requirements_file: "requirements.yml"
|
requirements_file: "requirements.yml"
|
||||||
|
|
|
||||||
|
|
@ -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.5.5"
|
netbox__version: "v4.5.7"
|
||||||
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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
image: docker.io/prom/prometheus:v3.10.0
|
image: docker.io/prom/prometheus:v3.11.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.31.1
|
image: docker.io/prom/alertmanager:v0.32.0
|
||||||
container_name: alertmanager
|
container_name: alertmanager
|
||||||
command:
|
command:
|
||||||
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
keycloak:
|
keycloak:
|
||||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.5.7
|
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.0
|
||||||
pull_policy: always
|
pull_policy: always
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: start --optimized
|
command: start --optimized
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
ntfy:
|
ntfy:
|
||||||
image: docker.io/binwiederhier/ntfy:v2.20.1
|
image: docker.io/binwiederhier/ntfy:v2.21.0
|
||||||
container_name: ntfy
|
container_name: ntfy
|
||||||
command:
|
command:
|
||||||
- serve
|
- serve
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
static:
|
static:
|
||||||
image: docker.io/library/nginx:1.29.7
|
image: docker.io/library/nginx:1.29.8
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- public:/usr/share/nginx/html
|
- public:/usr/share/nginx/html
|
||||||
|
|
|
||||||
|
|
@ -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