Compare commits
2 commits
02c5f957a5
...
5ac5625a66
| Author | SHA1 | Date | |
|---|---|---|---|
| 5ac5625a66 | |||
| 06ae220857 |
9 changed files with 49 additions and 93 deletions
|
|
@ -1,5 +1,5 @@
|
|||
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
||||
netbox__version: "v4.5.0"
|
||||
netbox__version: "v4.5.1"
|
||||
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
||||
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@ certbot__version_spec: ""
|
|||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||
certbot__certificate_domains:
|
||||
- "spaceapi.ccc.de"
|
||||
- "spaceapiccc.hamburg.ccc.de"
|
||||
certbot__new_cert_commands:
|
||||
- "systemctl reload nginx.service"
|
||||
|
||||
nginx__version_spec: ""
|
||||
nginx__configurations:
|
||||
- name: spaceapiccc.hamburg.ccc.de
|
||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/spaceapiccc/nginx/spaceapiccc.hamburg.ccc.de.conf') }}"
|
||||
- name: spaceapi.ccc.de
|
||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/spaceapiccc/nginx/spaceapi.ccc.de.conf') }}"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ services:
|
|||
- alertmanager_data:/alertmanager
|
||||
|
||||
grafana:
|
||||
image: docker.io/grafana/grafana:12.3.1
|
||||
image: docker.io/grafana/grafana:12.3.2
|
||||
container_name: grafana
|
||||
ports:
|
||||
- 3000:3000
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
services:
|
||||
ntfy:
|
||||
image: docker.io/binwiederhier/ntfy:v2.15.0
|
||||
image: docker.io/binwiederhier/ntfy:v2.16.0
|
||||
container_name: ntfy
|
||||
command:
|
||||
- serve
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ services:
|
|||
- pretalx_net
|
||||
|
||||
pretalx:
|
||||
image: docker.io/pretalx/standalone:v2025.1.0
|
||||
image: docker.io/pretalx/standalone:v2025.2.2
|
||||
entrypoint: gunicorn
|
||||
command:
|
||||
- "pretalx.wsgi"
|
||||
|
|
@ -78,7 +78,7 @@ services:
|
|||
- pretalx_net
|
||||
|
||||
celery:
|
||||
image: docker.io/pretalx/standalone:v2025.1.0
|
||||
image: docker.io/pretalx/standalone:v2025.2.2
|
||||
command:
|
||||
- taskworker
|
||||
restart: unless-stopped
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ map $host $upstream_acme_challenge_host {
|
|||
cryptoparty.hamburg.ccc.de 172.31.17.151:31820;
|
||||
staging.cryptoparty-hamburg.de 172.31.17.151:31820;
|
||||
staging.cryptoparty.hamburg.ccc.de 172.31.17.151:31820;
|
||||
spaceapiccc.hamburg.ccc.de spaceapiccc.hosts.hamburg.ccc.de:31820;
|
||||
spaceapi.ccc.de spaceapiccc.hosts.hamburg.ccc.de:31820;
|
||||
cpuccc.hamburg.ccc.de 172.31.17.151:31820;
|
||||
cpu.ccc.de 172.31.17.151:31820;
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ stream {
|
|||
cryptoparty.hamburg.ccc.de 172.31.17.151:8443;
|
||||
staging.cryptoparty-hamburg.de 172.31.17.151:8443;
|
||||
staging.cryptoparty.hamburg.ccc.de 172.31.17.151:8443;
|
||||
spaceapiccc.hamburg.ccc.de spaceapiccc.hosts.hamburg.ccc.de:8443;
|
||||
spaceapi.ccc.de spaceapiccc.hosts.hamburg.ccc.de:8443;
|
||||
cpuccc.hamburg.ccc.de 172.31.17.151:8443;
|
||||
cpu.ccc.de 172.31.17.151:8443;
|
||||
|
|
|
|||
|
|
@ -1,46 +1,5 @@
|
|||
# partly generated 2022-01-08, Mozilla Guideline v5.6, nginx 1.17.7, OpenSSL 1.1.1k, intermediate configuration
|
||||
# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6
|
||||
server {
|
||||
# Listen on a custom port for the proxy protocol.
|
||||
listen [::]:8443 ssl http2 proxy_protocol;
|
||||
# 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
|
||||
# protocol.
|
||||
# First set our proxy protocol proxy as trusted.
|
||||
set_real_ip_from 2a00:14b0:4200:3000:125::1;
|
||||
# Then tell the realip_module to get the addreses from the proxy protocol
|
||||
# header.
|
||||
real_ip_header proxy_protocol;
|
||||
|
||||
server_name spaceapiccc.hamburg.ccc.de;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/spaceapiccc.hamburg.ccc.de/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/spaceapiccc.hamburg.ccc.de/privkey.pem;
|
||||
# verify chain of trust of OCSP response using Root CA and Intermediate certs
|
||||
ssl_trusted_certificate /etc/letsencrypt/live/spaceapiccc.hamburg.ccc.de/chain.pem;
|
||||
|
||||
# HSTS (ngx_http_headers_module is required) (63072000 seconds)
|
||||
add_header Strict-Transport-Security "max-age=63072000" always;
|
||||
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Port 443;
|
||||
# This is https in any case.
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
# Hide the X-Forwarded header.
|
||||
proxy_hide_header X-Forwarded;
|
||||
# Assume we are the only Reverse Proxy (well using Proxy Protocol, but that
|
||||
# is transparent).
|
||||
# Also provide "_hidden" for by, since it's not relevant.
|
||||
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
||||
|
||||
location / {
|
||||
proxy_pass http://172.16.238.10/;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
# Listen on a custom port for the proxy protocol.
|
||||
listen [::]:8443 ssl http2 proxy_protocol;
|
||||
Loading…
Add table
Add a link
Reference in a new issue