CCCHH/ansible-infra
CCCHH/ansible-infra
3
2
Fork 2
Code Issues 7 Pull requests 3 Wiki Activity Actions

cloud(host): move to new network and hostname
Some checks failed
/ Ansible Lint (push) Failing after 2m0s
Details

Browse source
This commit is contained in:
June 2025-12-16 20:47:44 +01:00
commit 5a476f2103
Signed by: june
SSH key fingerprint: SHA256:o9EAq4Y9N9K0pBQeBTqhSDrND5E7oB+60ZNx0U1yPe0
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventories/chaosknoten/hosts.yaml
View file

@ -7,9 +7,9 @@ all:
chaosknoten: chaosknoten:
ansible_host: chaosknoten.hamburg.ccc.de ansible_host: chaosknoten.hamburg.ccc.de
cloud: cloud:
ansible_host: cloud-intern.hamburg.ccc.de ansible_host: cloud.hosts.hamburg.ccc.de
ansible_user: chaos ansible_user: chaos
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
eh22-wiki: eh22-wiki:
ansible_host: eh22-wiki-intern.hamburg.ccc.de ansible_host: eh22-wiki-intern.hamburg.ccc.de
ansible_user: chaos ansible_user: chaos

2
resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
View file

@ -6,7 +6,7 @@ map $host $upstream_acme_challenge_host {
staging.c3cat.de 172.31.17.151:31820; staging.c3cat.de 172.31.17.151:31820;
ccchoir.de ccchoir-intern.hamburg.ccc.de:31820; ccchoir.de ccchoir-intern.hamburg.ccc.de:31820;
www.ccchoir.de ccchoir-intern.hamburg.ccc.de:31820; www.ccchoir.de ccchoir-intern.hamburg.ccc.de:31820;
cloud.hamburg.ccc.de 172.31.17.143:31820; cloud.hamburg.ccc.de cloud.hosts.hamburg.ccc.de:31820;
element.hamburg.ccc.de 172.31.17.151:31820; element.hamburg.ccc.de 172.31.17.151:31820;
git.hamburg.ccc.de 172.31.17.154:31820; git.hamburg.ccc.de 172.31.17.154:31820;
grafana.hamburg.ccc.de 172.31.17.145:31820; grafana.hamburg.ccc.de 172.31.17.145:31820;

2
resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
View file

@ -20,7 +20,7 @@ stream {
map $ssl_preread_server_name $address { map $ssl_preread_server_name $address {
ccchoir.de ccchoir-intern.hamburg.ccc.de:8443; ccchoir.de ccchoir-intern.hamburg.ccc.de:8443;
www.ccchoir.de ccchoir-intern.hamburg.ccc.de:8443; www.ccchoir.de ccchoir-intern.hamburg.ccc.de:8443;
cloud.hamburg.ccc.de cloud-intern.hamburg.ccc.de:8443; cloud.hamburg.ccc.de cloud.hosts.hamburg.ccc.de:8443;
pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:8443; pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:8443;
pretalx.hamburg.ccc.de pretalx-intern.hamburg.ccc.de:8443; pretalx.hamburg.ccc.de pretalx-intern.hamburg.ccc.de:8443;
id.hamburg.ccc.de 172.31.17.144:8443; id.hamburg.ccc.de 172.31.17.144:8443;

1
roles/nextcloud/templates/nginx_nextcloud.conf.j2
View file

@ -4,6 +4,7 @@
server { server {
# Listen on a custom port for the proxy protocol. # Listen on a custom port for the proxy protocol.
listen 8443 ssl http2 proxy_protocol; listen 8443 ssl http2 proxy_protocol;
listen [::]:8443 ssl http2 proxy_protocol;
# Make use of the ngx_http_realip_module to set the $remote_addr and # 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 # $remote_port to the client address and client port, when using proxy
# protocol. # protocol.