hosts/luna/modules/services/gitea.nix

@@ -3,7 +3,6 @@
   fqdn,
   inputs,
   pkgs,
-  lib,
   ...
 }:
 let
@@ -138,17 +137,6 @@ in
     };
   };
 
-  # TODO: Upstream the below to Nixpkgs. If the runner is using the exact same url as the gitea
-  # service and both are on the same host, then the runner should have a systemd dependency on the
-  # gitea service.
-  systemd.services.gitea-actions-default.requires = lib.mkIf (
-    config.services.gitea.enable
-    && (
-      config.services.gitea-actions-runner.instances.default.url
-      == config.services.gitea.settings.server.ROOT_URL
-    )
-  ) [ "gitea.service" ];
-
   networking.firewall.allowedTCPPorts = [ config.services.gitea.settings.server.SSH_PORT ];
 
   environment.persistence.save.directories = [

hosts/luna/modules/services/nginx.nix

@@ -18,23 +18,16 @@
     defaults.email = "price@orion-technologies.io";
   };
 
-  services.nginx.virtualHosts = {
-    "blog.${fqdn}" = {
-      forceSSL = true;
-      enableACME = true;
-      globalRedirect = "price-hiller.com";
-    };
-    "price-hiller.com" = {
-      forceSSL = true;
-      enableACME = true;
-      root = inputs.blog.packages.${pkgs.system}.default;
-      locations."/".extraConfig = ''
-        if ($request_uri ~ ^/(.*)\.html(\?|$)) {
-            return 302 /$1;
-        }
-        try_files $uri $uri.html $uri/ =404;
-      '';
-      locations."/".index = "home.html";
-    };
+  services.nginx.virtualHosts."blog.${fqdn}" = {
+    forceSSL = true;
+    enableACME = true;
+    root = inputs.blog.packages.${pkgs.system}.default;
+    locations."/".extraConfig = ''
+      if ($request_uri ~ ^/(.*)\.html(\?|$)) {
+          return 302 /$1;
+      }
+      try_files $uri $uri.html $uri/ =404;
+    '';
+    locations."/".index = "home.html";
   };
 }