From 05e5e2d6a088507406d0d58498b28f2ca358e9b3 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Tue, 14 Nov 2023 16:53:04 +0100 Subject: [PATCH] pretix: add additional event domain --- group_vars/all/vars.yml | 1 + roles/pretix/templates/certs.j2 | 2 +- roles/pretix/templates/vhost.j2 | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 8b110b9..d3a7513 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -150,6 +150,7 @@ pretalx_dbpass: "{{ vault_pretalx_dbpass }}" pretalx_mail: pretalx@binary-kitchen.de pretix_domain: pretix.events.binary-kitchen.de +pretix_domainx: tickets.eh21.easterhegg.eu pretix_dbname: pretix pretix_dbuser: pretix pretix_dbpass: "{{ vault_pretix_dbpass }}" diff --git a/roles/pretix/templates/certs.j2 b/roles/pretix/templates/certs.j2 index 749c7e1..36140b9 100644 --- a/roles/pretix/templates/certs.j2 +++ b/roles/pretix/templates/certs.j2 @@ -1,6 +1,6 @@ --- -{{ pretix_domain }}: +{{ pretix_domain }} {{pretix_domainx }}: - path: /etc/nginx/ssl/{{ pretix_domain }}.key user: root group: root diff --git a/roles/pretix/templates/vhost.j2 b/roles/pretix/templates/vhost.j2 index 3bda4f3..705e13d 100644 --- a/roles/pretix/templates/vhost.j2 +++ b/roles/pretix/templates/vhost.j2 @@ -14,11 +14,27 @@ server { } } +server { + listen 80; + listen [::]:80; + + server_name {{ pretix_domainx }}; + + location /.well-known/acme-challenge { + default_type "text/plain"; + alias /var/www/acme-challenge; + } + + location / { + return 301 https://{{ pretix_domainx }}$request_uri; + } +} + server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name {{ pretix_domain }}; + server_name {{ pretix_domain }} {{ pretix_domainx }}; ssl_certificate_key /etc/nginx/ssl/{{ pretix_domain }}.key; ssl_certificate /etc/nginx/ssl/{{ pretix_domain }}.crt;