add ccchoir

inventories/chaosknoten/host_vars/ccchoir.yaml

@@ -0,0 +1,15 @@
+docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/ccchoir/compose.yaml.j2') }}"
+docker_compose__configuration_files: []
+
+certbot__version_spec: ""
+certbot__acme_account_email_address: le-admin@hamburg.ccc.de
+certbot__certificate_domains:
+  - "ccchoir.de"
+  - "www.ccchoir.de"
+certbot__new_cert_commands:
+  - "systemctl reload nginx.service"
+
+nginx__version_spec: ""
+nginx__configurations:
+  - name: ccchoir.de
+    content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf') }}"

inventories/chaosknoten/hosts.yaml

@@ -2,6 +2,11 @@ all:
   children:
     debian_12:
       hosts:
+        ccchoir:
+          ansible_host: ccchoir-intern.hamburg.ccc.de
+          ansible_port: 42666
+          ansible_user: chaos
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
         cloud:
           ansible_host: cloud-intern.hamburg.ccc.de
           ansible_user: chaos
@@ -52,6 +57,7 @@ all:
           ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
     docker_compose_hosts:
       hosts:
+        ccchoir:
         grafana:
         hackertours:
         keycloak:
@@ -64,6 +70,7 @@ all:
         cloud:
     nginx_hosts:
       hosts:
+        ccchoir:
         grafana:
         hackertours:
         keycloak:
@@ -83,6 +90,7 @@ all:
         wiki:
     certbot_hosts:
       hosts:
+        ccchoir:
         grafana:
         hackertours:
         keycloak:
@@ -94,6 +102,7 @@ all:
         zammad:
     infrastructure_authorized_keys_hosts:
       hosts:
+        ccchoir:
         grafana:
         hackertours:
         cloud:

playbooks/files/chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf

@@ -0,0 +1,83 @@
+# 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 ccchoir.de;
+
+    ssl_certificate /etc/letsencrypt/live/ccchoir.de/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/ccchoir.de/privkey.pem;
+    # verify chain of trust of OCSP response using Root CA and Intermediate certs
+    ssl_trusted_certificate /etc/letsencrypt/live/ccchoir.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://127.0.0.1:3000/;
+    }
+}
+
+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 www.ccchoir.de;
+
+    ssl_certificate /etc/letsencrypt/live/www.ccchoir.de/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/www.ccchoir.de/privkey.pem;
+    # verify chain of trust of OCSP response using Root CA and Intermediate certs
+    ssl_trusted_certificate /etc/letsencrypt/live/www.ccchoir.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://127.0.0.1:3000/;
+    }
+}

playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf

@@ -2,6 +2,8 @@
 map $host $upstream_acme_challenge_host {
     branding-resources.hamburg.ccc.de 172.31.17.151:31820;
     c3cat.de 172.31.17.151:31820;
+    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;
     element.hamburg.ccc.de 172.31.17.151:31820;
     git.hamburg.ccc.de 172.31.17.154:31820;
@@ -57,6 +59,7 @@ map $host $upstream_acme_challenge_host {
 
 server {
     listen 80 default_server;
+    resolver 212.12.50.158 192.76.134.90;
 
     location /.well-known/acme-challenge/ {
         proxy_pass http://$upstream_acme_challenge_host;

playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf

@@ -18,6 +18,8 @@ stream {
     resolver 212.12.50.158 192.76.134.90;
 
     map $ssl_preread_server_name $address {
+        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;
         pad.hamburg.ccc.de pad-intern.hamburg.ccc.de:8443;
         id.hamburg.ccc.de 172.31.17.144:8443;

playbooks/templates/chaosknoten/configs/ccchoir/compose.yaml.j2

@@ -0,0 +1,46 @@
+---
+# see https://github.com/hedgedoc/container/blob/master/docker-compose.yml
+version: "3.6"
+
+services:
+  database:
+    image: docker.io/library/mariadb:11
+    environment:
+      - "MARIADB_DATABASE=wordpress"
+      - "MARIADB_ROOT_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/ccchoir/DB_ROOT_PASSWORD", create=false, missing="error") }}"
+      - "MARIADB_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/ccchoir/DB_PASSWORD", create=false, missing="error") }}"
+      - "MARIADB_USER=wordpress"
+      - "MARIADB_AUTO_UPGRADE=yes"
+    volumes:
+      - database:/var/lib/mysql
+    networks:
+      backend:
+    restart: always
+
+  app:
+    image: docker.io/library/wordpress:6-php8.1
+    environment:
+      - "WORDPRESS_DB_HOST=database"
+      - "WORDPRESS_DB_NAME=wordpress"
+      - "WORDPRESS_DB_USER=wordpress"
+      - "WORDPRESS_TABLE_PREFIX=wp_"
+      - "WORDPRESS_DB_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/ccchoir/DB_PASSWORD", create=false, missing="error") }}"
+    volumes:
+      - wordpress:/var/www/html
+    ports:
+      - "127.0.0.1:3000:80"
+    networks:
+      backend:
+      frontend:
+    restart: always
+    depends_on:
+      - database
+
+volumes:
+  database: {}
+  wordpress: {}
+
+networks:
+  backend:
+    internal: true
+  frontend: