diff --git a/configuration/default.nix b/configuration/default.nix index 42e43ec..a12aceb 100644 --- a/configuration/default.nix +++ b/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 { }; }; }; diff --git a/configuration/services/hydra.nix b/configuration/services/hydra.nix deleted file mode 100644 index 2321407..0000000 --- a/configuration/services/hydra.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - services.hydra = { - enable = true; - port = 3003; - - hydraURL = "hydra.tlater.net"; - notificationSender = "hydra@tlater.net"; - extraConfig = '' - <gitea_authorization> - - </gitea_authorization> - ''; - }; -} diff --git a/configuration/services/webserver.nix b/configuration/services/webserver.nix index d912618..c1966a5 100644 --- a/configuration/services/webserver.nix +++ b/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" ]; }; diff --git a/flake.nix b/flake.nix index bf1c240..78a3cfb 100644 --- a/flake.nix +++ b/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;