Migrate Engelsystem from ThinkCCCluster to Chaosknoten

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

View file

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

View file

@ -5,6 +5,7 @@ all:
cloud:
pad:
keycloak:
engelsystem:
debian_12:
hosts:
cloud:
@ -25,11 +26,16 @@ all:
ansible_host: keycloak-intern.hamburg.ccc.de
ansible_user: chaos
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:
hosts:
cloud:
pad:
keycloak:
engelsystem:
nextcloud_hosts:
hosts:
cloud:
@ -39,6 +45,7 @@ all:
pad:
public-reverse-proxy:
keycloak:
engelsystem:
public_reverse_proxy_hosts:
hosts:
public-reverse-proxy:

View file

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

View file

@ -0,0 +1,42 @@
# 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 172.31.17.140;
# Then tell the realip_module to get the addreses from the proxy protocol
# header.
real_ip_header proxy_protocol;
server_name aes.ccchh.net;
ssl_certificate /etc/letsencrypt/live/aes.ccchh.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/aes.ccchh.net/privkey.pem;
# verify chain of trust of OCSP response using Root CA and Intermediate certs
ssl_trusted_certificate /etc/letsencrypt/live/aes.ccchh.net/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://127.0.0.1:5080/;
}
}

View file

@ -3,6 +3,7 @@ map $host $upstream_acme_challenge_host {
pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:31820;
id.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 "";
}

View file

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

View file

@ -0,0 +1,51 @@
---
version: "3.6"
services:
es_server:
image: es_server
build:
context: /home/chaos/engelsystem
dockerfile: /home/chaos/engelsystem/docker/Dockerfile
environment:
MYSQL_HOST: es_database
MYSQL_USER: engelsystem
MYSQL_PASSWORD: engelsystem
MYSQL_DATABASE: engelsystem
APP_NAME: CCCamp2023 Alternative Engelsystem
APP_URL: https://aes.ccchh.net
CONTACT_EMAIL: mailto:aes@hamburg.ccc.de
GOODIE_TYPE: none
ENABLE_VOUCHER: false
MAIL_DRIVER: smtp
MAIL_FROM_ADDRESS: aes@send-only-mail.ccchh.net
MAIL_HOST: send-only-mailserver.ccchh.net
MAIL_PORT: 465
MAIL_ENCRYPTION: tls
MAIL_USERNAME: aes
MAIL_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/engelsystem/MAIL_PASSWORD", create=false, missing="error") }}
ports:
- "5080:80"
networks:
- database
- internet
depends_on:
- es_database
es_database:
image: mariadb:10.2
environment:
MYSQL_DATABASE: engelsystem
MYSQL_USER: engelsystem
MYSQL_PASSWORD: engelsystem
MYSQL_RANDOM_ROOT_PASSWORD: 1
MYSQL_INITDB_SKIP_TZINFO: "yes"
volumes:
- db:/var/lib/mysql
networks:
- database
volumes:
db: {}
networks:
database:
internal: true
internet: