From f51a4b7aaf50f5879e61008d963ad0b0c22866f6 Mon Sep 17 00:00:00 2001 From: vv01f Date: Mon, 25 Apr 2022 10:52:00 +0200 Subject: [PATCH 1/4] add mime and accept header for wkd --- hosts/containers/c3d2-web/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosts/containers/c3d2-web/default.nix b/hosts/containers/c3d2-web/default.nix index 151587e7..062d6b7c 100644 --- a/hosts/containers/c3d2-web/default.nix +++ b/hosts/containers/c3d2-web/default.nix @@ -51,6 +51,13 @@ in "/status.png".proxyPass = "http://[${config.c3d2.hosts.spaceapi.ip6}]:3000/status.png"; "/spaceapi.json".proxyPass = "http://[${config.c3d2.hosts.spaceapi.ip6}]:3000/spaceapi.json"; }; + # WKD: Web Key Directory for PGP Keys + location ^~ /.well-known/openpgpkey { + #location /.well-known/openpgpkey/hu/ { + autoindex off; + default_type "application/octet-stream"; + add_header Access-Control-Allow-Origin * always; + } }; # datenspuren From 131d0f1ac8e30f2f9fc6d5db74ea9374e7861b67 Mon Sep 17 00:00:00 2001 From: vv01f Date: Mon, 25 Apr 2022 11:02:17 +0200 Subject: [PATCH 2/4] alias als subdomain --- hosts/containers/c3d2-web/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/containers/c3d2-web/default.nix b/hosts/containers/c3d2-web/default.nix index 062d6b7c..2a8de657 100644 --- a/hosts/containers/c3d2-web/default.nix +++ b/hosts/containers/c3d2-web/default.nix @@ -35,10 +35,11 @@ in default = true; serverAliases = [ "c3d2.de" - "c3dd.de" "www.c3dd.de" + "c3dd.de" "www.c3dd.de" "openpgpkey.c3d2.de" "cccdd.de" "www.cccdd.de" "dresden.ccc.de" "www.dresden.ccc.de" "netzbiotop.org" "www.netzbiotop.org" + "netzbiotop.org" "www.netzbiotop.org" ]; enableACME = true; forceSSL = true; From cf8c8f46945468bacdec0aa42a635a093684e5e2 Mon Sep 17 00:00:00 2001 From: vv01f Date: Mon, 25 Apr 2022 11:20:35 +0200 Subject: [PATCH 3/4] rm double line --- hosts/containers/c3d2-web/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/containers/c3d2-web/default.nix b/hosts/containers/c3d2-web/default.nix index 2a8de657..aa54730f 100644 --- a/hosts/containers/c3d2-web/default.nix +++ b/hosts/containers/c3d2-web/default.nix @@ -39,7 +39,6 @@ in "cccdd.de" "www.cccdd.de" "dresden.ccc.de" "www.dresden.ccc.de" "netzbiotop.org" "www.netzbiotop.org" - "netzbiotop.org" "www.netzbiotop.org" ]; enableACME = true; forceSSL = true; From b3670610b191fd8ed488c41f5a3e91e2743c730b Mon Sep 17 00:00:00 2001 From: revol-xut Date: Thu, 28 Apr 2022 13:52:58 +0200 Subject: [PATCH 4/4] moved nginx config to the right place --- hosts/containers/c3d2-web/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/containers/c3d2-web/default.nix b/hosts/containers/c3d2-web/default.nix index aa54730f..2b8ead0b 100644 --- a/hosts/containers/c3d2-web/default.nix +++ b/hosts/containers/c3d2-web/default.nix @@ -50,14 +50,16 @@ in # SpaceAPI "/status.png".proxyPass = "http://[${config.c3d2.hosts.spaceapi.ip6}]:3000/status.png"; "/spaceapi.json".proxyPass = "http://[${config.c3d2.hosts.spaceapi.ip6}]:3000/spaceapi.json"; + + # WKD: Web Key Directory for PGP Keys + "/openpgp" = { + extraConfig = '' + autoindex off; + default_type "application/octet-stream"; + add_header Access-Control-Allow-Origin * always; + ''; + }; }; - # WKD: Web Key Directory for PGP Keys - location ^~ /.well-known/openpgpkey { - #location /.well-known/openpgpkey/hu/ { - autoindex off; - default_type "application/octet-stream"; - add_header Access-Control-Allow-Origin * always; - } }; # datenspuren