diff options
Diffstat (limited to 'system')
-rw-r--r-- | system/linde.nix | 9 | ||||
-rw-r--r-- | system/settings/colmena-auto-upgrade.nix | 2 | ||||
-rw-r--r-- | system/settings/services/git-server.nix | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/system/linde.nix b/system/linde.nix index 578b31c6..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" ]; @@ -556,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 @@ -884,7 +883,7 @@ in services.searchix = { enable = true; environment = { - GOMEMLIMIT = "2000MiB"; + GOMEMLIMIT = "1000MiB"; }; settings = { web = @@ -956,6 +955,10 @@ in }; }; }; + systemd.services.searchix.serviceConfig = { + MemoryHigh = "750M"; + MemoryMax = "1G"; + }; programs.git = { enable = true; diff --git a/system/settings/colmena-auto-upgrade.nix b/system/settings/colmena-auto-upgrade.nix index b9b84e88..43789285 100644 --- a/system/settings/colmena-auto-upgrade.nix +++ b/system/settings/colmena-auto-upgrade.nix @@ -227,7 +227,7 @@ in ${lib.optionalString cfg.git.enable '' ${git} fetch --prune - ${git} checkout ${cfg.git.branch} + ${git} reset --hard ${cfg.git.branch} '' } 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" ]; |