Merge pull request 'remove-darkkirb-de-site' (#595) from remove-darkkirb-de-site into main

Reviewed-on: #595

config/nixos-8gb-fsn1-1.nix

@@ -17,7 +17,6 @@
     ./services/grafana.nix
     ./users/miifox.nix
     ./services/postgres.nix
-    ./services/old-homepage.nix
     ./services/dovecot.nix
     ./services/postfix.nix
     ./services/reverse-proxy.nix
@@ -206,4 +205,11 @@
   services.resolved.enable = false;
   services.bind.forwarders = lib.mkForce [];
   services.tailscale.useRoutingFeatures = "server";
+  services.caddy.virtualHosts."darkkirb.de" = {
+    useACMEHost = "darkkirb.de";
+    logFormat = pkgs.lib.mkForce "";
+    extraConfig = ''
+      redir https://lotte.chir.rs
+    '';
+  };
 }

config/services/old-homepage.nix

@@ -1,49 +0,0 @@
-{
-  system,
-  pkgs,
-  ...
-}: let
-  inherit (pkgs) old-homepage;
-in {
-  systemd.services.homepage-old = {
-    enable = true;
-    description = "darkkirb.de";
-    script = "${old-homepage}/homepage";
-    serviceConfig = {
-      WorkingDirectory = old-homepage;
-      EnvironmentFile = "/run/secrets/services/old-homepage";
-    };
-    wantedBy = ["multi-user.target"];
-  };
-  services.caddy.virtualHosts."darkkirb.de" = {
-    useACMEHost = "darkkirb.de";
-    logFormat = pkgs.lib.mkForce "";
-    extraConfig = ''
-      import baseConfig
-
-      reverse_proxy {
-        to http://localhost:3002
-        trusted_proxies private_ranges
-      }
-    '';
-  };
-  services.caddy.virtualHosts."static.darkkirb.de" = {
-    useACMEHost = "darkkirb.de";
-    logFormat = pkgs.lib.mkForce "";
-    extraConfig = ''
-      import baseConfig
-
-      rewrite * /file/darkkirb-de{path}
-
-      reverse_proxy {
-        to https://f000.backblazeb2.com
-        header_up Host {upstream_hostport}
-
-        transport http {
-          versions 1.1
-        }
-      }
-    '';
-  };
-  sops.secrets."services/old-homepage" = {};
-}

flake.nix

@@ -270,7 +270,6 @@ rec {
           plover-plugin-dotool-output
           plover-dict-didoesdigital
           miifox-net
-          old-homepage
           plover-plugin-python-dictionary
           plover-plugin-stenotype-extended
           asar-asm

overlays/default.nix

@@ -60,7 +60,6 @@ inputs: system: self: prev: let
     plover-plugin-lapwing-aio = self.python311Packages.callPackage ../packages/plover/plover-lapwing-aio.nix {};
     plover-dict-didoesdigital = self.callPackage ../packages/plover/didoesdigital-dictionary.nix {};
     miifox-net = self.python3Packages.callPackage ../packages/web/miifox-net.nix {};
-    old-homepage = self.callPackage ../packages/web/old-homepage.nix {};
     asar-asm = self.callPackage ../packages/compiler/asar {};
     bsnes-plus = self.libsForQt5.callPackage ../packages/emulator/bsnes-plus {};
     yiffstash = self.python3Packages.callPackage ../packages/python/yiffstash.nix {};

packages/web/old-homepage.nix

@@ -1,9 +0,0 @@
-{
-  fetchzip,
-  zstd,
-}:
-fetchzip {
-  url = "https://static.darkkirb.de/homepage.tar.zst";
-  sha256 = "sha256-T9fiDZSaAO9+YljPgQM7vEtJcs0tQF2Bd0BlsO4EyfE=";
-  nativeBuildInputs = [zstd];
-}

secrets/nixos-8gb-fsn1-1.yaml

@@ -25,7 +25,6 @@ services:
         access-key-id: ENC[AES256_GCM,data:qFc3bua0z3cCydNwoM0hA9T3zbI=,iv:zox8zBO7p+CpyHUbXt1WIbsXVtJd16L5UHRS2HAGLpU=,tag:Rv/F8TmcLm9gIz8YMrZlCQ==,type:str]
         secret-access-key: ENC[AES256_GCM,data:DiQmiDXGkSe1oFUrv1oDAAp0P5keo84BXMusSIGaRmeMNw2/cKy0tA==,iv:nEhRuPBgYY7/mHJwB86qzuZ9bgJBX3f5PJU+VdIRAuk=,tag:laAam0N7/0e8I7J/BiiNpg==,type:str]
         signing.key: ENC[AES256_GCM,data:9T89UI3fHxuxVoMhM0AEp6MIZIYHSdvEWHUFvXamnLtzKakEIkYatl0VeoZP/nQGTwoHZWwVaCbBCyc3V87ZV/Q4cFH8e7vKbWSYCzCm6f6N8YtzJtrB2XX3MQWFX5iacvoYntGKG5bdITREUcvyxNwB5w3KE0Lnd4OVpY0pyQh9PE8Vl9bqEIkbr9P8jQ==,iv:UdOGxGFKjqoLPn4Kiexgp16Civ9w00dXj1CFOthCaRQ=,tag:Os3TVbEfdyUpahZuuSWoYg==,type:str]
-    old-homepage: ENC[AES256_GCM,data:MYpqkUkk6y+OhaZu2VsmWocGIsTqxZN1fCk6viNYJSAdGTikK+XtBMj8KrWSwA/8wfcWth20goLvOwQuCJiSxdl86sdsUbc18/NqK52B6LS6h+Pw3GNsyAQUu+oaxfL7FtHRvViiSS8LVulKeSjL7osUPlrJVqEZfqOX4bNkPxiamOvZko1uHC+iWGY68BnAHQoEbdVNhNEUQqm2A8/vidNU4Z9VrmPXmr8nr/c+Ut+aF0iPZJGqSoxWS8+zFU6ubv/W2rA18wi8hOYPpV0=,iv:U245wbKo9e4AAGS6khhEV9lDB6y0ukAUtLMnihHC9T0=,tag:xqvUnSHuI7XeRkk4NtZZyQ==,type:str]
     dovecot:
         rspamd_password: ENC[AES256_GCM,data:E19GJ7zE3FMFVAd7P7rvcmxRMYs=,iv:Nn6VdFq0UIs3Oh9JUKyiDvnk1rkNeqLIhjFSxdOPtmU=,tag:oGE3Ht/d0jlheMKunhwEsQ==,type:str]
         dovecot-sql.conf.ext: ENC[AES256_GCM,data:1Uhyz+X9zDgBuO/CHnr4Ms+fK5gzNfjXb+LShLmtk087Pdr2F4CYZR4Bs3ZRlfEj6KRUx21grlLQ4zCbF6R/iA7I6ujvvpjicAd3/TCnxRBOvQif2kAiNjkLBIG4yaI6JMlQMPbH/EPFdnSE1lrNXi5duULzE66IdW0vEMG7ZJR3IXpJY162X75jNt1ufCTOMxe6f6wzuw+LlE4sbIvSU88HclST2ukIq/sUPTfalplKNFFJeBrfmiN+3KsxcFfqxvtuIazm8+4+fE6jPPtOdkBIcKjumDgof8KYgZqHIJDHyU0Tt3X8c+moAgCGf4gZtfeMmpy/l3Q9vvGzKMo/Tg/FWPW/+WnvsbO7TBv0P7qDKjGROdNXCKbHtdJ7jxIjZzk6hdWhN+sZqz9/m005CT52tEAGoY+MkQhzrKwrKkjItvU99YRGj9O1d7P256vpYOwAzgbz1HHPmmEjG/yLX/Fy9GSZfPOGu3j1kJtL/vfZh35jx3jx+bud8gAaDjke5XqKKE4M3mme8S31D3nmSC1vmRHSknGg4jg61dZ+awOgafWnB4Sxu0NHtw3f1EEcrmLW0H/G7pldMIbzextowlx+PlqvQU4s45EQLpSAB+lIYFrsGA/EofrILqA+R64bIsy0AqNxxsnnya9j60LL+vngCpY+3njsRn5u1yFobU5Tcdk2i0bjPYy8Ea8LFyXpDjRGtOKMLYwdDQ4qZG7Sg1bK7bkbbN213y1EApwwNKBo2ujAGbIOXsO/SveBfX6+z/CrvEiZWDib0IFbUN0PxRy2gnp2EsEMcD1KK2cS5t31fgTsGitSRL4rTV3I0bPDP/bBbzjlDQUFqm9OVN5tFsiJbxy+zFEBWGnReZkPk08jmL20Cu2SMDN0cvszDdJs5jndX9Rfahw=,iv:TMvVt1zakr5NupbYwszn+fB+Tckrfj/UHfZOI2lSKDc=,tag:8bVDCjAlQk9hQQalLhHWhw==,type:str]
@@ -82,8 +81,8 @@ sops:
             M0tUV1E2dndCTXRsOVJBU2ZNVHRFS2MKhBezoPFc0mdXassxViUfsmFTQCVbP1Js
             bEpByfdW69GUCjR0HmcjF3NX/Cd5N5uivy+yLp3IrincHAz8LBIXyw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-29T06:14:30Z"
+    lastmodified: "2024-10-19T06:15:43Z"
-    mac: ENC[AES256_GCM,data:oJRsfAWK/8AVgoh+NECePr223pwiP+LJNWAZiS+kHKcUwNdXtzH2DxkMot0urHdDCD9WnMCKXCl7RIgIScm8cRHy/Sm11MfIQ3FVcUn+hKCMbo8zJ3kOCvS69GVD+UsBPe4FGiFoH97dxJADNeLF4VlYnBNiRLm/TeUt4IQuYog=,iv:gzlMMVPa9YQN51O3gTRbySsm1Q266M3WfVR3CdiZ14E=,tag:sNiHoYzlnxpjZRT9x6DCug==,type:str]
+    mac: ENC[AES256_GCM,data:PVSHek+3yN4/r7r1DdmZ3juA/BUdt6xVXp7KqVvZVfumvrKt96YEse7ByA0rfbhsudvbkEJ27c/SFkq8wr9yTnuoC2G73ityy55mAwXAXoi4P1YlM0WsGam5YI+WEKAD8KFsGt0rhLaPSplJ3KChhaBHSIYBiPDRndFsIsodIr8=,iv:dHFvSrdnOzAw1D+lkHUzuxwphU/z7wiDKhEGrd8ZejU=,tag:957soHIZVrb+xv7JOvBwxg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0