CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues Pull requests 2 Wiki Activity

configure diday.org on public-static-web

Browse source
This commit is contained in:
lilly 2026-02-26 18:01:34 +01:00
commit 99efc60fce
Signed by: lilly
SSH key fingerprint: SHA256:y9T5GFw2A20WVklhetIxG1+kcg/Ce0shnQmbu1LQ37g
3 changed files with 144 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/hosts/public-web-static/virtualHosts/default.nix
View file

@ -19,7 +19,7 @@
./staging.hamburg.ccc.de.nix ./staging.hamburg.ccc.de.nix
./www.hamburg.ccc.de.nix ./www.hamburg.ccc.de.nix
./staging.did.hamburg.ccc.de.nix ./staging.did.hamburg.ccc.de.nix
./did.hamburg.ccc.de.nix ./diday.org.nix
./historic-easterhegg ./historic-easterhegg
]; ];
} }

24
config/hosts/public-web-static/virtualHosts/did.hamburg.ccc.de.nix → config/hosts/public-web-static/virtualHosts/diday.org.nix
View file

@ -1,12 +1,14 @@
{ ... }: { ... }:
let let
domain = "did.hamburg.ccc.de"; domain = "diday.org";
dataDir = "/var/www/${domain}"; dataDir = "/var/www/${domain}";
deployUser = "diday-website-deploy"; deployUser = "diday-website-deploy";
in in
{ {
# security.acme.certs."${domain}".extraDomainNames = []; security.acme.certs."${domain}".extraDomainNames = [
"did.hamburg.ccc.de"
];
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"acme-${domain}" = { "acme-${domain}" = {
@ -21,6 +23,24 @@ in
]; ];
}; };
"did.hamburg.ccc.de" = {
forceSSL = true;
useACMEHost = "${domain}";
listen = [
{
addr = "0.0.0.0";
port = 8443;
ssl = true;
proxyProtocol = true;
}
];
extraConfig = ''
return 301 https://diday.org;
'';
};
"${domain}" = { "${domain}" = {
forceSSL = true; forceSSL = true;
useACMEHost = "${domain}"; useACMEHost = "${domain}";