From dd2f3178db2cdc5728e31387e35cd2496ea101ae Mon Sep 17 00:00:00 2001 From: June Date: Tue, 28 Apr 2026 23:30:00 +0200 Subject: [PATCH] public-web-static(host): move to new network and to v6 --- .../hosts/public-web-static/configuration.nix | 5 +- config/hosts/public-web-static/networking.nix | 8 +-- .../branding-resources.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/c3cat.de.nix | 16 ++++++ .../virtualHosts/c3dog.de.nix | 16 ++++++ .../virtualHosts/cpu.ccc.de.nix | 30 ++++++++-- .../virtualHosts/cryptoparty-hamburg.de.nix | 16 ++++++ .../virtualHosts/diday.org.nix | 16 ++++++ .../virtualHosts/docs.c3voc.de.nix | 10 ++++ .../element-admin.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/element.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/hacker.tours.nix | 12 +++- .../hackertours.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/historic-easterhegg/eh03.nix | 56 +++++++++++++------ .../virtualHosts/historic-easterhegg/eh05.nix | 56 +++++++++++++------ .../virtualHosts/historic-easterhegg/eh07.nix | 56 +++++++++++++------ .../virtualHosts/historic-easterhegg/eh09.nix | 56 +++++++++++++------ .../virtualHosts/historic-easterhegg/eh11.nix | 56 +++++++++++++------ .../virtualHosts/historic-easterhegg/eh20.nix | 54 ++++++++++++------ .../virtualHosts/spaceapi.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/staging.c3cat.de.nix | 10 ++++ .../virtualHosts/staging.c3dog.de.nix | 10 ++++ .../staging.cryptoparty-hamburg.de.nix | 16 ++++++ .../virtualHosts/staging.diday.org.nix | 6 ++ .../virtualHosts/staging.docs.c3voc.de.nix | 10 ++++ .../virtualHosts/staging.hacker.tours.nix | 10 ++++ .../staging.hackertours.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/staging.hamburg.ccc.de.nix | 10 ++++ .../virtualHosts/www.hamburg.ccc.de.nix | 10 ++++ deployment_configuration.json | 3 - 31 files changed, 502 insertions(+), 116 deletions(-) diff --git a/config/hosts/public-web-static/configuration.nix b/config/hosts/public-web-static/configuration.nix index 9e2aebc..a8e5f29 100644 --- a/config/hosts/public-web-static/configuration.nix +++ b/config/hosts/public-web-static/configuration.nix @@ -1,7 +1,10 @@ { ... }: { - networking.hostName = "public-web-static"; + networking = { + hostName = "public-web-static"; + domain = "hosts.hamburg.ccc.de"; + }; system.stateVersion = "23.05"; } diff --git a/config/hosts/public-web-static/networking.nix b/config/hosts/public-web-static/networking.nix index cb22d40..2758338 100644 --- a/config/hosts/public-web-static/networking.nix +++ b/config/hosts/public-web-static/networking.nix @@ -3,14 +3,14 @@ { networking = { interfaces.net0 = { - ipv4.addresses = [ + ipv6.addresses = [ { - address = "172.31.17.151"; - prefixLength = 25; + address = "2a00:14b0:42:102::17"; + prefixLength = 64; } ]; }; - defaultGateway = "172.31.17.129"; + defaultGateway6 = "2a00:14b0:42:102::1"; nameservers = [ "212.12.50.158" "192.76.134.90" ]; search = [ "hamburg.ccc.de" ]; }; diff --git a/config/hosts/public-web-static/virtualHosts/branding-resources.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/branding-resources.hamburg.ccc.de.nix index a28f77c..edeca47 100644 --- a/config/hosts/public-web-static/virtualHosts/branding-resources.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/branding-resources.hamburg.ccc.de.nix @@ -14,6 +14,10 @@ in serverName = "branding-resources.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -26,6 +30,12 @@ in useACMEHost = "branding-resources.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/c3cat.de.nix b/config/hosts/public-web-static/virtualHosts/c3cat.de.nix index 95f9b59..54b7462 100644 --- a/config/hosts/public-web-static/virtualHosts/c3cat.de.nix +++ b/config/hosts/public-web-static/virtualHosts/c3cat.de.nix @@ -16,6 +16,10 @@ in { ]; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -28,6 +32,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; @@ -61,6 +71,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/c3dog.de.nix b/config/hosts/public-web-static/virtualHosts/c3dog.de.nix index 16fedd5..dcca75a 100644 --- a/config/hosts/public-web-static/virtualHosts/c3dog.de.nix +++ b/config/hosts/public-web-static/virtualHosts/c3dog.de.nix @@ -16,6 +16,10 @@ in { ]; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -28,6 +32,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; @@ -57,6 +67,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/cpu.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/cpu.ccc.de.nix index d2e779a..79f6fb4 100644 --- a/config/hosts/public-web-static/virtualHosts/cpu.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/cpu.ccc.de.nix @@ -17,6 +17,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -30,6 +34,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; @@ -81,12 +91,20 @@ in "local.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://cpu.ccc.de"; diff --git a/config/hosts/public-web-static/virtualHosts/cryptoparty-hamburg.de.nix b/config/hosts/public-web-static/virtualHosts/cryptoparty-hamburg.de.nix index 37d95b9..59934eb 100644 --- a/config/hosts/public-web-static/virtualHosts/cryptoparty-hamburg.de.nix +++ b/config/hosts/public-web-static/virtualHosts/cryptoparty-hamburg.de.nix @@ -16,6 +16,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -28,6 +32,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; @@ -55,6 +65,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/diday.org.nix b/config/hosts/public-web-static/virtualHosts/diday.org.nix index 547c797..42117bf 100644 --- a/config/hosts/public-web-static/virtualHosts/diday.org.nix +++ b/config/hosts/public-web-static/virtualHosts/diday.org.nix @@ -16,6 +16,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -28,6 +32,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; @@ -50,6 +60,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/docs.c3voc.de.nix b/config/hosts/public-web-static/virtualHosts/docs.c3voc.de.nix index 5c257da..956baf4 100644 --- a/config/hosts/public-web-static/virtualHosts/docs.c3voc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/docs.c3voc.de.nix @@ -11,6 +11,10 @@ in { serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -23,6 +27,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix index 670b191..f30e9a7 100644 --- a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix @@ -40,6 +40,10 @@ in serverName = "element-admin.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -52,6 +56,12 @@ in useACMEHost = "element-admin.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix index 360fb76..b8a014f 100644 --- a/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix @@ -24,6 +24,10 @@ in serverName = "element.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -36,6 +40,12 @@ in useACMEHost = "element.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/hacker.tours.nix b/config/hosts/public-web-static/virtualHosts/hacker.tours.nix index 20bb644..dd6fc90 100644 --- a/config/hosts/public-web-static/virtualHosts/hacker.tours.nix +++ b/config/hosts/public-web-static/virtualHosts/hacker.tours.nix @@ -12,6 +12,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -22,12 +26,18 @@ in "${domain}" = { forceSSL = true; useACMEHost = "${domain}"; - + locations."/shop" = { return = "302 https://tickets.hamburg.ccc.de"; }; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix index eeb7778..269aa92 100644 --- a/config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix @@ -12,6 +12,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -24,6 +28,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix index 1c967c9..abbf5aa 100644 --- a/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix @@ -7,6 +7,10 @@ serverName = "hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -20,6 +24,12 @@ default = true; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh03.nix b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh03.nix index 2c5dd86..bb8bd6e 100644 --- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh03.nix +++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh03.nix @@ -25,10 +25,16 @@ in "easterhegg2003.hamburg.ccc.de" "www.easterhegg2003.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 31820; - }]; + listen = [ + { + addr = "[::]"; + port = 31820; + } + { + addr = "0.0.0.0"; + port = 31820; + } + ]; }; "easterhegg2003.hamburg.ccc.de" = { @@ -40,12 +46,20 @@ in "www.easterhegg2003.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://eh03.easterhegg.eu"; @@ -65,18 +79,26 @@ in forceSSL = true; useACMEHost = "eh03.easterhegg.eu"; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/" = { index = "index.html"; root = eh03; extraConfig = '' - # Set default_type to html + # Set default_type to html default_type text/html; # Enable SSI ssi on; diff --git a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh05.nix b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh05.nix index 37cb893..a6b6f80 100644 --- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh05.nix +++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh05.nix @@ -25,10 +25,16 @@ in "easterhegg2005.hamburg.ccc.de" "www.easterhegg2005.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 31820; - }]; + listen = [ + { + addr = "[::]"; + port = 31820; + } + { + addr = "0.0.0.0"; + port = 31820; + } + ]; }; "easterhegg2005.hamburg.ccc.de" = { @@ -40,12 +46,20 @@ in "www.easterhegg2005.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://eh05.easterhegg.eu"; @@ -65,18 +79,26 @@ in forceSSL = true; useACMEHost = "eh05.easterhegg.eu"; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/" = { index = "index.shtml"; root = eh05; extraConfig = '' - # Set default_type to html + # Set default_type to html default_type text/html; # Enable SSI ssi on; diff --git a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh07.nix b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh07.nix index ebfa712..80a404b 100644 --- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh07.nix +++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh07.nix @@ -29,10 +29,16 @@ in "easterhegg2007.hamburg.ccc.de" "www.easterhegg2007.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 31820; - }]; + listen = [ + { + addr = "[::]"; + port = 31820; + } + { + addr = "0.0.0.0"; + port = 31820; + } + ]; }; "easterhegg2007.hamburg.ccc.de" = { @@ -46,12 +52,20 @@ in "www.easterhegg2007.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://eh07.easterhegg.eu"; @@ -71,18 +85,26 @@ in forceSSL = true; useACMEHost = "eh07.easterhegg.eu"; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/" = { index = "index.shtml"; root = eh07; extraConfig = '' - # Set default_type to html + # Set default_type to html default_type text/html; # Enable SSI ssi on; diff --git a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh09.nix b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh09.nix index ea274af..f2720f4 100644 --- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh09.nix +++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh09.nix @@ -29,10 +29,16 @@ in "easterhegg2009.hamburg.ccc.de" "www.easterhegg2009.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 31820; - }]; + listen = [ + { + addr = "[::]"; + port = 31820; + } + { + addr = "0.0.0.0"; + port = 31820; + } + ]; }; "easterhegg2009.hamburg.ccc.de" = { @@ -46,12 +52,20 @@ in "www.easterhegg2009.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://eh09.easterhegg.eu"; @@ -71,18 +85,26 @@ in forceSSL = true; useACMEHost = "eh09.easterhegg.eu"; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/" = { index = "index.shtml"; root = eh09; extraConfig = '' - # Set default_type to html + # Set default_type to html default_type text/html; # Enable SSI ssi on; diff --git a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh11.nix b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh11.nix index 39d7fad..e44d0f5 100644 --- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh11.nix +++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh11.nix @@ -29,10 +29,16 @@ in "easterhegg2011.hamburg.ccc.de" "www.easterhegg2011.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 31820; - }]; + listen = [ + { + addr = "[::]"; + port = 31820; + } + { + addr = "0.0.0.0"; + port = 31820; + } + ]; }; "easterhegg2011.hamburg.ccc.de" = { @@ -46,12 +52,20 @@ in "www.easterhegg2011.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://eh11.easterhegg.eu"; @@ -71,18 +85,26 @@ in forceSSL = true; useACMEHost = "eh11.easterhegg.eu"; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/" = { index = "index.shtml"; root = eh11; extraConfig = '' - # Set default_type to html + # Set default_type to html default_type text/html; # Enable SSI ssi on; diff --git a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh20.nix b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh20.nix index afc93c1..c72a72b 100644 --- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh20.nix +++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh20.nix @@ -21,10 +21,16 @@ in "www.eh20.easterhegg.eu" "eh20.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 31820; - }]; + listen = [ + { + addr = "[::]"; + port = 31820; + } + { + addr = "0.0.0.0"; + port = 31820; + } + ]; }; "www.eh20.easterhegg.eu" = { @@ -34,12 +40,20 @@ in "eh20.hamburg.ccc.de" ]; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/".return = "302 https://eh20.easterhegg.eu"; @@ -59,12 +73,20 @@ in forceSSL = true; useACMEHost = "eh20.easterhegg.eu"; - listen = [{ - addr = "0.0.0.0"; - port = 8443; - ssl = true; - proxyProtocol = true; - }]; + listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + { + addr = "0.0.0.0"; + port = 8443; + ssl = true; + proxyProtocol = true; + } + ]; locations."/" = { index = "start.html"; diff --git a/config/hosts/public-web-static/virtualHosts/spaceapi.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/spaceapi.hamburg.ccc.de.nix index 7852639..105c0e5 100644 --- a/config/hosts/public-web-static/virtualHosts/spaceapi.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/spaceapi.hamburg.ccc.de.nix @@ -7,6 +7,10 @@ serverName = "spaceapi.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -19,6 +23,12 @@ useACMEHost = "spaceapi.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.c3cat.de.nix b/config/hosts/public-web-static/virtualHosts/staging.c3cat.de.nix index c91d283..3f9f7a3 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.c3cat.de.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.c3cat.de.nix @@ -11,6 +11,10 @@ in { serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -23,6 +27,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.c3dog.de.nix b/config/hosts/public-web-static/virtualHosts/staging.c3dog.de.nix index d69ad2b..697ac69 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.c3dog.de.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.c3dog.de.nix @@ -11,6 +11,10 @@ in { serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -23,6 +27,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.cryptoparty-hamburg.de.nix b/config/hosts/public-web-static/virtualHosts/staging.cryptoparty-hamburg.de.nix index 6733dad..21ef153 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.cryptoparty-hamburg.de.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.cryptoparty-hamburg.de.nix @@ -16,6 +16,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -28,6 +32,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; @@ -55,6 +65,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.diday.org.nix b/config/hosts/public-web-static/virtualHosts/staging.diday.org.nix index b165348..7ff72b8 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.diday.org.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.diday.org.nix @@ -21,6 +21,12 @@ in forceSSL = true; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.docs.c3voc.de.nix b/config/hosts/public-web-static/virtualHosts/staging.docs.c3voc.de.nix index 2170f8c..b70af70 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.docs.c3voc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.docs.c3voc.de.nix @@ -11,6 +11,10 @@ in { serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -23,6 +27,12 @@ in { useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix b/config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix index 14ede9b..7e44a84 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix @@ -12,6 +12,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -24,6 +28,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix index 79ca38c..0c7cd28 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix @@ -12,6 +12,10 @@ in serverName = "${domain}"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -24,6 +28,12 @@ in useACMEHost = "${domain}"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/staging.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/staging.hamburg.ccc.de.nix index f7e0752..624b632 100644 --- a/config/hosts/public-web-static/virtualHosts/staging.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/staging.hamburg.ccc.de.nix @@ -7,6 +7,10 @@ serverName = "staging.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -19,6 +23,12 @@ useACMEHost = "staging.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/config/hosts/public-web-static/virtualHosts/www.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/www.hamburg.ccc.de.nix index a29fbd2..4f241f1 100644 --- a/config/hosts/public-web-static/virtualHosts/www.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/www.hamburg.ccc.de.nix @@ -7,6 +7,10 @@ serverName = "www.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 31820; + } { addr = "0.0.0.0"; port = 31820; @@ -19,6 +23,12 @@ useACMEHost = "www.hamburg.ccc.de"; listen = [ + { + addr = "[::]"; + port = 8443; + ssl = true; + proxyProtocol = true; + } { addr = "0.0.0.0"; port = 8443; diff --git a/deployment_configuration.json b/deployment_configuration.json index 3ae44cc..9a768bf 100644 --- a/deployment_configuration.json +++ b/deployment_configuration.json @@ -6,9 +6,6 @@ "matrix": { "targetHostname": "matrix-intern.hamburg.ccc.de" }, - "public-web-static": { - "targetHostname": "public-web-static-intern.hamburg.ccc.de" - }, "git": { "targetHostname": "git.hamburg.ccc.de" },