From 8d63790f864457a701d5ce35c48be37fa327d4bb Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 6 Oct 2021 03:21:22 +0200 Subject: [PATCH] c3d2-web: separate vhost for datenspuren.de --- hosts/containers/c3d2-web/default.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/hosts/containers/c3d2-web/default.nix b/hosts/containers/c3d2-web/default.nix index 0711c27e..dc6e92ed 100644 --- a/hosts/containers/c3d2-web/default.nix +++ b/hosts/containers/c3d2-web/default.nix @@ -26,14 +26,15 @@ in "c3dd.de" "www.c3dd.de" "cccdd.de" "www.cccdd.de" "dresden.ccc.de" "www.dresden.ccc.de" - "datenspuren.de" "www.datenspuren.de" ]; + # TODO: # enableACME = true; # forceSSL = true; root = "${webroot}/c3d2"; + extraConfig = '' + index portal.html; + ''; locations = { - # webhook - "/hooks/".proxyPass = "http://localhost:9000/hooks/"; # SpaceAPI "/status.png".proxyPass = "http://[${hostRegistry.hosts.spaceapi.ip6}]:3000/status.png"; "/spaceapi.json".proxyPass = "http://[${hostRegistry.hosts.spaceapi.ip6}]:3000/spaceapi.json"; @@ -44,6 +45,20 @@ in }; }; + "datenspuren.de" = { + serverAliases = [ + "www.datenspuren.de" + ]; + # TODO: + # enableACME = true; + # forceSSL = true; + root = "${webroot}/c3d2/datenspuren"; + extraConfig = '' + index index.html; + rewrite ^/$ /2021/ redirect; + ''; + }; + "c3d2-web.serv.zentralwerk.org" = { enableACME = true; forceSSL = true;