Compare commits
2 commits
3fdbbbef90
...
ca406d0c0b
| Author | SHA1 | Date | |
|---|---|---|---|
| ca406d0c0b | |||
|
fa6e280594 |
14 changed files with 17 additions and 119 deletions
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
# work in our environmnet.
|
||||
# Rather manually setup python (pip) before instead.
|
||||
- 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:
|
||||
setup_python: "false"
|
||||
requirements_file: "requirements.yml"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
||||
netbox__version: "v4.5.5"
|
||||
netbox__version: "v4.6.2"
|
||||
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
||||
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
nginx__version_spec: ""
|
||||
nginx__configurations:
|
||||
- name: diday.org
|
||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/www2/nginx/diday.org.conf') }}"
|
||||
|
|
@ -90,14 +90,6 @@ all:
|
|||
ansible_host: acmedns.hosts.hamburg.ccc.de
|
||||
ansible_user: chaos
|
||||
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||
www2:
|
||||
ansible_host: www2.hosts.hamburg.ccc.de
|
||||
ansible_user: chaos
|
||||
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||
www3:
|
||||
ansible_host: www3.hosts.hamburg.ccc.de
|
||||
ansible_user: chaos
|
||||
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||
auth-dns:
|
||||
ansible_host: auth-dns.hamburg.ccc.de
|
||||
ansible_user: chaos
|
||||
|
|
@ -129,8 +121,6 @@ base_config_hosts:
|
|||
renovate:
|
||||
spaceapiccc:
|
||||
mjolnir:
|
||||
www2:
|
||||
www3:
|
||||
auth-dns:
|
||||
systemd_networkd_hosts:
|
||||
hosts:
|
||||
|
|
@ -178,8 +168,6 @@ nginx_hosts:
|
|||
ntfy:
|
||||
sunders:
|
||||
spaceapiccc:
|
||||
www2:
|
||||
www3:
|
||||
public_reverse_proxy_hosts:
|
||||
hosts:
|
||||
public-reverse-proxy:
|
||||
|
|
@ -222,8 +210,6 @@ alloy_hosts:
|
|||
router:
|
||||
sunders:
|
||||
spaceapiccc:
|
||||
www2:
|
||||
www3:
|
||||
auth-dns:
|
||||
infrastructure_authorized_keys_hosts:
|
||||
hosts:
|
||||
|
|
@ -246,8 +232,6 @@ infrastructure_authorized_keys_hosts:
|
|||
renovate:
|
||||
spaceapiccc:
|
||||
mjolnir:
|
||||
www2:
|
||||
www3:
|
||||
auth-dns:
|
||||
lists:
|
||||
wiki_hosts:
|
||||
|
|
@ -283,8 +267,6 @@ ansible_pull_hosts:
|
|||
ntfy:
|
||||
spaceapiccc:
|
||||
mjolnir:
|
||||
# www2:
|
||||
# www3:
|
||||
auth-dns:
|
||||
msmtp_hosts:
|
||||
hosts:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
services:
|
||||
oauth2-proxy:
|
||||
container_name: oauth2-proxy
|
||||
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.1
|
||||
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
|
||||
command: --config /oauth2-proxy.cfg
|
||||
hostname: oauth2-proxy
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
services:
|
||||
|
||||
prometheus:
|
||||
image: docker.io/prom/prometheus:v3.10.0
|
||||
image: docker.io/prom/prometheus:v3.12.0
|
||||
container_name: prometheus
|
||||
command:
|
||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||
|
|
@ -19,7 +19,7 @@ services:
|
|||
- prom_data:/prometheus
|
||||
|
||||
alertmanager:
|
||||
image: docker.io/prom/alertmanager:v0.31.1
|
||||
image: docker.io/prom/alertmanager:v0.32.1
|
||||
container_name: alertmanager
|
||||
command:
|
||||
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
||||
|
|
@ -32,7 +32,7 @@ services:
|
|||
- alertmanager_data:/alertmanager
|
||||
|
||||
grafana:
|
||||
image: docker.io/grafana/grafana:13.0.1
|
||||
image: docker.io/grafana/grafana:13.0.2
|
||||
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.8.2
|
||||
image: docker.io/prompve/prometheus-pve-exporter:3.9.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.1
|
||||
image: docker.io/grafana/loki:3.7.2
|
||||
container_name: loki
|
||||
ports:
|
||||
- 13100:3100
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
services:
|
||||
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
|
||||
restart: unless-stopped
|
||||
command: start --optimized
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
services:
|
||||
ntfy:
|
||||
image: docker.io/binwiederhier/ntfy:v2.20.1
|
||||
image: docker.io/binwiederhier/ntfy:v2.23.0
|
||||
container_name: ntfy
|
||||
command:
|
||||
- serve
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
services:
|
||||
onlyoffice:
|
||||
image: docker.io/onlyoffice/documentserver:9.3.1
|
||||
image: docker.io/onlyoffice/documentserver:9.4.0
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ services:
|
|||
- pretalx_net
|
||||
|
||||
redis:
|
||||
image: docker.io/library/redis:8.6.2
|
||||
image: docker.io/library/redis:8.8.0
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- redis:/data
|
||||
|
|
@ -23,7 +23,7 @@ services:
|
|||
- pretalx_net
|
||||
|
||||
static:
|
||||
image: docker.io/library/nginx:1.29.7
|
||||
image: docker.io/library/nginx:1.31.1
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- public:/usr/share/nginx/html
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
services:
|
||||
db:
|
||||
image: mariadb:12.2.2
|
||||
image: mariadb:12.3.2
|
||||
command: --max_allowed_packet=3250585600
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: "{{ secret__sunders_db_root_password }}"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ services:
|
|||
restart: unless-stopped
|
||||
|
||||
redis:
|
||||
image: docker.io/library/redis:8.6.2
|
||||
image: docker.io/library/redis:8.8.0
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
http2 on;
|
||||
|
||||
server_name diday.org;
|
||||
|
||||
# use our router as resolver
|
||||
resolver 10.31.208.1;
|
||||
|
||||
# configure the ngx_http_realip_module to set $remote_addr and $remote_port to the
|
||||
# information passed through from public-reverse-proxy.hamburg.ccc.de via proxy-protocol
|
||||
set_real_ip_from 2a00:14b0:4200:3000:125::1;
|
||||
real_ip_header proxy_protocol;
|
||||
|
||||
# configure tls trustchain
|
||||
ssl_certificate /dev/null;
|
||||
ssl_certificate_key /dev/null;
|
||||
ssl_trusted_certificate /dev/null;
|
||||
|
||||
#
|
||||
# configure site
|
||||
#
|
||||
root /var/www/diday.org;
|
||||
error_page 404 /404.html;
|
||||
index index.html;
|
||||
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||
|
||||
# return a redirect based on the map loaded from the webroot
|
||||
if ($did_redirect_target ~ ^301:(.*)$) {
|
||||
return 301 $1;
|
||||
}
|
||||
if ($did_redirect_target ~ ^302:(.*)$) {
|
||||
return 302 $1;
|
||||
}
|
||||
|
||||
# deny access to the redirects config file
|
||||
location = /nginx-redirects.conf {
|
||||
deny all;
|
||||
return 404;
|
||||
}
|
||||
|
||||
# dynamically redirect the user to the language they prefer
|
||||
location = / {
|
||||
set $lang "de";
|
||||
if ($http_accept_language ~* "^en") {
|
||||
set $lang "en";
|
||||
}
|
||||
return 302 /$lang/;
|
||||
}
|
||||
|
||||
# configure decap-cms content-type and caching rules
|
||||
location = /admin/cms.js {
|
||||
expires -1;
|
||||
add_header Cache-Control "no-store";
|
||||
}
|
||||
location = /admin/config.yml {
|
||||
expires -1;
|
||||
add_header Cache-Control "no-store";
|
||||
types { }
|
||||
default_type text/yaml;
|
||||
}
|
||||
|
||||
# configure asset caching
|
||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
|
||||
expires 1y;
|
||||
add_header Cache-Control "public, immutable";
|
||||
}
|
||||
|
||||
# we are using the Astro Image Pipeline, therefore DecapCMS can't access image previews
|
||||
location /admin/src/ {
|
||||
log_not_found off;
|
||||
return 404;
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
services:
|
||||
database:
|
||||
image: docker.io/library/postgres:18.3
|
||||
image: docker.io/library/postgres:18.4
|
||||
restart: always
|
||||
volumes:
|
||||
- ./database:/var/lib/postgresql
|
||||
|
|
@ -16,7 +16,7 @@ services:
|
|||
- gatus
|
||||
|
||||
gatus:
|
||||
image: ghcr.io/twin/gatus:v5.35.0
|
||||
image: ghcr.io/twin/gatus:v5.36.0
|
||||
restart: always
|
||||
ports:
|
||||
- "8080:8080"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue