Small fixes

* fix ACME setup
* use correct port number
* use correct email sender

inventories/chaosknoten/hosts.yaml

@@ -8,6 +8,7 @@ all:
           ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
         hackertours:
           ansible_host: hackertours-intern.hamburg.ccc.de
+          ansible_port: 42666
           ansible_user: chaos
           ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
         keycloak:

playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf

@@ -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 hackertours.hamburg.ccc.de;
+
+    ssl_certificate /etc/letsencrypt/live/hackertours.hamburg.ccc.de/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/hackertours.hamburg.ccc.de/privkey.pem;
+    # verify chain of trust of OCSP response using Root CA and Intermediate certs
+    ssl_trusted_certificate /etc/letsencrypt/live/hackertours.hamburg.ccc.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:8345/;
+    }
+}

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

@@ -6,6 +6,7 @@ map $host $upstream_acme_challenge_host {
     aes.ccchh.net 172.31.17.145:31820;
     wiki.ccchh.net 172.31.17.146:31820;
     onlyoffice.hamburg.ccc.de 172.31.17.147:31820;
+    hackertours.hamburg.ccc.de 172.31.17.148:31820;
     netbox.hamburg.ccc.de 172.31.17.149:31820;
     matrix.hamburg.ccc.de 172.31.17.150:31820;
     element.hamburg.ccc.de 172.31.17.151:31820;

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

@@ -25,6 +25,7 @@ stream {
         aes.ccchh.net 172.31.17.145:8443;
         wiki.ccchh.net 172.31.17.146:8443;
         onlyoffice.hamburg.ccc.de 172.31.17.147:8443;
+        hackertours.hamburg.ccc.de 172.31.17.148:8443;
         netbox.hamburg.ccc.de 172.31.17.149:8443;
         matrix.hamburg.ccc.de 172.31.17.150:8443;
         element.hamburg.ccc.de 172.31.17.151:8443;

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

@@ -23,9 +23,14 @@ services:
     # run redis-server, save a snapshot every 60 seconds if there has been at least 1 write
     command: ["redis-server", "--save", "60", "1"]
     restart: always
+    networks:
+      backend:
 
   pretix:
     image: gitlab-cr.hamburg.ccc.de/ccchh/ccchh-pretix/ccchh-pretix:23.10.0
+    command: ["all"]
+    ports:
+      - "8345:80"
     environment:
       - "PRETIX_INSTANCE_NAME=CCCHH Hackertours"
       - "PRETIX_URL=http://hackertours.hamburg.ccc.de"
@@ -34,7 +39,7 @@ services:
       - "DATABASE_USER=pretix"
       - "DATABASE_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/hackertours/DB_PASSWORD", create=false, missing="error") }}"
       - "DATABASE_HOST=database"
-      - "MAIL_FROM=foo@example.com"
+      - "MAIL_FROM=ticket@hackertours.hamburg.ccc.de"
       - "MAIL_HOST=cow-intern.hamburg.ccc.de"
       - "REDIS_LOCATION=redis://redis/0"
       - "CELERY_BACKEND=redis://redis/0"
@@ -42,6 +47,9 @@ services:
     volumes:
       - pretix:/rdata
     restart: always
+    networks:
+      backend:
+      frontend:
 
 
 volumes: