webserver: Use SIGKILL instead of SIGTERM

configuration/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./services/gitea.nix
-    ./services/hydra.nix
     ./services/minecraft.nix
     ./services/nextcloud.nix
     ./services/webserver.nix
@@ -69,7 +68,6 @@
       "${domain}" = host 3002 { serverAliases = [ "www.${domain}" ]; };
       "gitea.${domain}" = host 3000 { };
       "nextcloud.${domain}" = host 3001 { };
-      "hydra.${domain}" = host config.services.hydra.port { };
     };
   };
 

configuration/services/hydra.nix

@@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  services.hydra = {
-    enable = true;
-    port = 3003;
-
-    hydraURL = "hydra.tlater.net";
-    notificationSender = "hydra@tlater.net";
-    extraConfig = ''
-      <gitea_authorization>
-
-      </gitea_authorization>
-    '';
-  };
-}

configuration/services/webserver.nix

@@ -36,7 +36,7 @@
     volumes = [ "tlaternet-mail:/srv/mail" ];
     extraOptions = [
       "--hostname=tlater.net"
-      # This can change with rocket 0.5.
+      # Rocket 0.4 doesn't support SIGTERM anyway, so SIGKILL is the cleanest exit possible.
       "--stop-signal=SIGKILL"
     ];
   };

flake.nix

@@ -68,7 +68,7 @@
             (import ./modules)
 
             (import ./configuration)
-            ({ config, lib, ... }: {
+            ({ lib, ... }: {
               users.users.tlater.password = "insecure";
 
               # Disable graphical tty so -curses works
@@ -78,18 +78,6 @@
               # can easily test locally with the VM.
               services.nginx.domain = lib.mkOverride 99 "localhost";
 
-              # Hydra uses X-Forwarded-Port to figure out how to
-              # include links to static files, but because we redirect
-              # 443 -> 3443 in the vm we need to explicitly set this
-              # (nginx can't see qemu's port redirection).
-              services.nginx.virtualHosts =
-                let domain = config.services.nginx.domain;
-                in {
-                  "hydra.${domain}".locations."/".extraConfig = ''
-                    proxy_set_header X-Forwarded-Port 3443;
-                  '';
-                };
-
               # # Set up VM settings to match real VPS
               # virtualisation.memorySize = 3941;
               # virtualisation.cores = 2;