2 files changed, 8 insertions, 54 deletions
diff --git a/system/linde.nix b/system/linde.nix
index 31aa5766..7fd8337a 100644
--- a/system/linde.nix
+++ b/system/linde.nix
@@ -480,7 +480,7 @@ in
     };
     acceptTerms = true;
     certs."alanpearce.eu" = {
-      extraDomainNames = [ "*.alanpearce.eu" "*.linde.alanpearce.eu" ];
+      domain = "*.alanpearce.eu";
     };
     certs."stats.alanpearce.eu" = {
       extraDomainNames = [ "*.stats.alanpearce.eu" ];
@@ -509,19 +509,6 @@ in
         "http://" = {
           # Needed for HTTP->HTTPS servers
         };
-        "alanpearce.eu" = {
-          serverAliases = [
-            "www.alanpearce.eu"
-            "alanpearce.uk"
-            "www.alanpearce.uk"
-            "aln.pe"
-            "test.alanpearce.eu"
-          ];
-          useACMEHost = "alanpearce.eu";
-          extraConfig = ''
-            reverse_proxy http://localhost:8080
-          '';
-        };
         "${hostname}.alanpearce.eu" = {
           serverAliases = [ "https://" ];
           useACMEHost = "alanpearce.eu";
@@ -547,20 +534,6 @@ in
             reverse_proxy http://${config.services.dex.settings.web.http}
           '';
         };
-        "dns.alanpearce.eu" = {
-          useACMEHost = "alanpearce.eu";
-          extraConfig = ''
-            log {
-              output discard
-            }
-            encode zstd gzip
-            reverse_proxy localhost:443 {
-              transport http {
-                tls_server_name dns.alanpearce.eu
-              }
-            }
-          '';
-        };
         "files.alanpearce.eu" = {
           useACMEHost = "alanpearce.eu";
           extraConfig = ''
@@ -583,7 +556,6 @@ in
         };
         "searchix.alanpearce.eu" = {
           useACMEHost = "alanpearce.eu";
-          serverAliases = [ "searchix.linde.alanpearce.eu" ];
           extraConfig = ''
             reverse_proxy localhost:${toString config.services.searchix.settings.web.port} {
               health_uri /health
@@ -911,7 +883,7 @@ in
   services.searchix = {
     enable = true;
     environment = {
-      GOMEMLIMIT = "2000MiB";
+      GOMEMLIMIT = "1000MiB";
     };
     settings = {
       web =
@@ -983,6 +955,10 @@ in
       };
     };
   };
+  systemd.services.searchix.serviceConfig = {
+    MemoryHigh = "750M";
+    MemoryMax = "1G";
+  };
 
   programs.git = {
     enable = true;
@@ -1041,28 +1017,6 @@ in
       enable = true;
     };
   };
-  virtualisation.oci-containers = {
-    containers.website = {
-      image = "ko.local/server:latest";
-      ports = [
-        "8080:8080"
-        "8443:8443"
-      ];
-      volumes = [
-        "data:/data"
-      ];
-      environmentFiles = [
-        config.age.secrets.powerdns.path
-      ];
-      environment = {
-        SERVER_LISTEN_ADDRESS = "::";
-        SERVER_TLS = "false";
-        WEBSITE_SOURCE = "/data/website";
-        WEBSITE_DESTINATION = "/data/public";
-        WEBSITE_REMOTE_VCS_URL = "https://git.alanpearce.eu/website";
-      };
-    };
-  };
 
   fileSystems."/srv/transmission" = {
     device = "//u439959-sub4.your-storagebox.de/u439959-sub4";
diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix
index 1d7df1e5..f46ba068 100644
--- a/system/settings/services/git-server.nix
+++ b/system/settings/services/git-server.nix
@@ -24,8 +24,8 @@ let
   };
 
   repoMirrors = {
-    nixfiles = [ "sourcehut" ];
-    searchix = [ "sourcehut" ];
+    nixfiles = [ "sourcehut" "codeberg" ];
+    searchix = [ "sourcehut" "codeberg" ];
     website = [ "sourcehut" ];
     homestead = [ "sourcehut" ];
     gomponents = [ "sourcehut" "github" ];