From 61cf87f12bf7cdedf1b628df9f48e96137c23f70 Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Thu, 9 Jul 2026 21:14:09 +0200
Subject: [PATCH] deploy didays.de and didays.de staging on public-web-static

---
 .../virtualHosts/default.nix                  |  2 +
 .../virtualHosts/didays.de.nix                | 73 +++++++++++++++++++
 .../virtualHosts/staging.didays.de.nix        | 72 ++++++++++++++++++
 3 files changed, 147 insertions(+)
 create mode 100644 config/hosts/public-web-static/virtualHosts/didays.de.nix
 create mode 100644 config/hosts/public-web-static/virtualHosts/staging.didays.de.nix

diff --git a/config/hosts/public-web-static/virtualHosts/default.nix b/config/hosts/public-web-static/virtualHosts/default.nix
index 61008d2..de252b3 100644
--- a/config/hosts/public-web-static/virtualHosts/default.nix
+++ b/config/hosts/public-web-static/virtualHosts/default.nix
@@ -28,5 +28,7 @@
     ./staging.diday.org.nix
     ./historic-easterhegg
     ./ueberwachungsfrei-kundgebung.nix
+    ./didays.de.nix
+    ./staging.didays.de.nix
   ];
 }
diff --git a/config/hosts/public-web-static/virtualHosts/didays.de.nix b/config/hosts/public-web-static/virtualHosts/didays.de.nix
new file mode 100644
index 0000000..6874e4f
--- /dev/null
+++ b/config/hosts/public-web-static/virtualHosts/didays.de.nix
@@ -0,0 +1,73 @@
+{ pkgs, ... }:
+
+let
+  domain = "didays.de";
+  dataDir = "/var/www/${domain}";
+  deployUser = "didays-deploy";
+in {
+  services.nginx.virtualHosts = {
+    "acme-${domain}" = {
+      enableACME = true;
+      serverName = "${domain}";
+
+      listen = [
+        {
+          addr = "[::]";
+          port = 31820;
+        }
+        {
+          addr = "0.0.0.0";
+          port = 31820;
+        }
+      ];
+    };
+
+    "${domain}" = {
+      forceSSL = true;
+      useACMEHost = "${domain}";
+
+      listen = [
+        {
+          addr = "[::]";
+          port = 8443;
+          ssl = true;
+          proxyProtocol = true;
+        }
+        {
+          addr = "0.0.0.0";
+          port = 8443;
+          ssl = true;
+          proxyProtocol = true;
+        }
+      ];
+
+      root = "${dataDir}";
+
+      extraConfig = ''
+        # Make use of the ngx_http_realip_module to set the $remote_addr and
+        # $remote_port to the client address and client port, when using proxy
+        # protocol.
+        # First set our proxy protocol proxy as trusted.
+        set_real_ip_from 172.31.17.140;
+        # Then tell the realip_module to get the addreses from the proxy protocol
+        # header.
+        real_ip_header proxy_protocol;
+
+        port_in_redirect off;
+      '';
+    };
+  };
+
+  systemd.tmpfiles.rules = [
+    "d ${dataDir} 0755 ${deployUser} ${deployUser}"
+  ];
+
+  users.users."${deployUser}" = {
+    isNormalUser = true;
+    group = "${deployUser}";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEcEfs6qiUwjlqsHwzS1WvaVQOPEhRRup5RE+K1wZ72 deploy key for didays"
+    ];
+  };
+  users.groups."${deployUser}" = { };
+}
diff --git a/config/hosts/public-web-static/virtualHosts/staging.didays.de.nix b/config/hosts/public-web-static/virtualHosts/staging.didays.de.nix
new file mode 100644
index 0000000..82d84a9
--- /dev/null
+++ b/config/hosts/public-web-static/virtualHosts/staging.didays.de.nix
@@ -0,0 +1,72 @@
+{ pkgs, ... }:
+
+let
+  domain = "staging.didays.de";
+  dataDir = "/var/www/${domain}";
+  deployUser = "didays-deploy";
+in {
+  services.nginx.virtualHosts = {
+    "acme-${domain}" = {
+      enableACME = true;
+      serverName = "${domain}";
+
+      listen = [
+        {
+          addr = "[::]";
+          port = 31820;
+        }
+        {
+          addr = "0.0.0.0";
+          port = 31820;
+        }
+      ];
+    };
+
+    "${domain}" = {
+      forceSSL = true;
+      useACMEHost = "${domain}";
+
+      listen = [
+        {
+          addr = "[::]";
+          port = 8443;
+          ssl = true;
+          proxyProtocol = true;
+        }
+        {
+          addr = "0.0.0.0";
+          port = 8443;
+          ssl = true;
+          proxyProtocol = true;
+        }
+      ];
+
+      root = "${dataDir}";
+
+      # Disallow *, since this is staging and doesn't need to be in any search
+      # results.
+      locations."/robots.txt" = {
+        return = "200 \"User-agent: *\\nDisallow: *\\n\"";
+      };
+
+      extraConfig = ''
+        # Make use of the ngx_http_realip_module to set the $remote_addr and
+        # $remote_port to the client address and client port, when using proxy
+        # protocol.
+        # First set our proxy protocol proxy as trusted.
+        set_real_ip_from 172.31.17.140;
+        # Then tell the realip_module to get the addreses from the proxy protocol
+        # header.
+        real_ip_header proxy_protocol;
+
+        port_in_redirect off;
+      '';
+    };
+  };
+
+  systemd.tmpfiles.rules = [
+    "d ${dataDir} 0755 ${deployUser} ${deployUser}"
+  ];
+
+  # didays deploy user already defined in didays.de.nix.
+}