Migrate Engelsystem from ThinkCCCluster to Chaosknoten

This commit is contained in:
June 2023-08-11 00:39:55 +02:00 committed by julian
parent 993e2f2b81
commit 373b219031
7 changed files with 12 additions and 11 deletions

View file

@ -1,4 +1,4 @@
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'z9/configs/engelsystem/compose.yaml.j2') }}" docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/engelsystem/compose.yaml.j2') }}"
docker_compose__configuration_files: [] docker_compose__configuration_files: []
certbot__version_spec: "" certbot__version_spec: ""
@ -9,4 +9,4 @@ certbot__certificate_domains:
nginx__version_spec: "" nginx__version_spec: ""
nginx__configurations: nginx__configurations:
- name: aes.ccchh.net - name: aes.ccchh.net
content: "{{ lookup('ansible.builtin.file', 'z9/configs/engelsystem/nginx/aes.ccchh.net.conf') }}" content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/engelsystem/nginx/aes.ccchh.net.conf') }}"

View file

@ -5,6 +5,7 @@ all:
cloud: cloud:
pad: pad:
keycloak: keycloak:
engelsystem:
debian_12: debian_12:
hosts: hosts:
cloud: cloud:
@ -25,11 +26,16 @@ all:
ansible_host: keycloak-intern.hamburg.ccc.de ansible_host: keycloak-intern.hamburg.ccc.de
ansible_user: chaos ansible_user: chaos
ansible_ssh_common_args: -J ssh://public-reverse-proxy.hamburg.ccc.de:42666 ansible_ssh_common_args: -J ssh://public-reverse-proxy.hamburg.ccc.de:42666
engelsystem:
ansible_host: aes-intern.hamburg.ccc.de
ansible_user: chaos
ansible_ssh_common_args: -J ssh://public-reverse-proxy.hamburg.ccc.de:42666
docker_compose_hosts: docker_compose_hosts:
hosts: hosts:
cloud: cloud:
pad: pad:
keycloak: keycloak:
engelsystem:
nextcloud_hosts: nextcloud_hosts:
hosts: hosts:
cloud: cloud:
@ -39,6 +45,7 @@ all:
pad: pad:
public-reverse-proxy: public-reverse-proxy:
keycloak: keycloak:
engelsystem:
public_reverse_proxy_hosts: public_reverse_proxy_hosts:
hosts: hosts:
public-reverse-proxy: public-reverse-proxy:

View file

@ -29,9 +29,6 @@ all:
mailserver-endpoint: mailserver-endpoint:
ansible_host: mailserver-endpoint.ccchh.net ansible_host: mailserver-endpoint.ccchh.net
ansible_user: chaos ansible_user: chaos
engelsystem:
ansible_host: engelsystem.z9.ccchh.net
ansible_user: chaos
debian_12: debian_12:
hosts: hosts:
public-reverse-proxy: public-reverse-proxy:
@ -44,7 +41,6 @@ all:
zigbee2mqtt: zigbee2mqtt:
light: light:
wiki: wiki:
engelsystem:
public_reverse_proxy_hosts: public_reverse_proxy_hosts:
hosts: hosts:
public-reverse-proxy: public-reverse-proxy:
@ -55,15 +51,11 @@ all:
esphome: esphome:
zigbee2mqtt: zigbee2mqtt:
wiki: wiki:
engelsystem:
ssh_server_config_hosts: ssh_server_config_hosts:
hosts: hosts:
public-reverse-proxy: public-reverse-proxy:
wiki: wiki:
mailserver-endpoint: mailserver-endpoint:
docker_compose_hosts:
hosts:
engelsystem:
esphome_hosts: esphome_hosts:
hosts: hosts:
esphome: esphome:

View file

@ -7,7 +7,7 @@ server {
# $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.
# First set our proxy protocol proxy as trusted. # First set our proxy protocol proxy as trusted.
set_real_ip_from 10.31.206.14; set_real_ip_from 172.31.17.140;
# Then tell the realip_module to get the addreses from the proxy protocol # Then tell the realip_module to get the addreses from the proxy protocol
# header. # header.
real_ip_header proxy_protocol; real_ip_header proxy_protocol;

View file

@ -3,6 +3,7 @@ map $host $upstream_acme_challenge_host {
pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:31820; pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:31820;
id.hamburg.ccc.de 172.31.17.144:31820; id.hamburg.ccc.de 172.31.17.144:31820;
keycloak-admin.hamburg.ccc.de 172.31.17.144:31820; keycloak-admin.hamburg.ccc.de 172.31.17.144:31820;
aes.ccchh.net 172.31.17.145:31820;
default ""; default "";
} }

View file

@ -22,6 +22,7 @@ stream {
pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:8443; pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:8443;
id.hamburg.ccc.de 172.31.17.144:8443; id.hamburg.ccc.de 172.31.17.144:8443;
keycloak-admin.hamburg.ccc.de 172.31.17.144:8444; keycloak-admin.hamburg.ccc.de 172.31.17.144:8444;
aes.ccchh.net 172.31.17.145:8443;
} }
server { server {