From 1decdd222e736bb44b6b2e7a9260f2976fa85407 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Sun, 22 Jun 2025 00:09:15 +0200 Subject: [PATCH 1/3] move xunuwu.xyz base site to rackserv --- hosts/hopper/profiles/lab/caddy.nix | 10 ---------- hosts/rackserv/profiles/caddy.nix | 13 +++++++++++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hosts/hopper/profiles/lab/caddy.nix b/hosts/hopper/profiles/lab/caddy.nix index d549397..1466ebf 100644 --- a/hosts/hopper/profiles/lab/caddy.nix +++ b/hosts/hopper/profiles/lab/caddy.nix @@ -1,8 +1,6 @@ { config, vars, - inputs, - pkgs, ... }: let inherit (vars) domain; @@ -61,14 +59,6 @@ in { glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}"; alertmanager = mkPrivateEntry "alerts" "${bridge}:${toString config.services.prometheus.alertmanager.port}"; - base = { - hostName = "${domain}:80"; - extraConfig = '' - root * ${inputs.own-website.packages.${pkgs.system}.default} - file_server - ''; - }; - other = { hostName = "*.${domain}:80"; extraConfig = '' diff --git a/hosts/rackserv/profiles/caddy.nix b/hosts/rackserv/profiles/caddy.nix index 561ef96..cbbd287 100644 --- a/hosts/rackserv/profiles/caddy.nix +++ b/hosts/rackserv/profiles/caddy.nix @@ -1,6 +1,8 @@ { vars, config, + pkgs, + inputs, ... }: let inherit (vars) domain; @@ -37,13 +39,20 @@ in { forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT; in { misc = { - hostName = "${domain}"; - serverAliases = ["*.${domain}"]; + hostName = "*.${domain}"; useACMEHost = domain; extraConfig = '' reverse_proxy ${hopper} ''; }; + base = { + hostName = "${domain}"; + useACMEHost = domain; + extraConfig = '' + root * ${inputs.own-website.packages.${pkgs.system}.default} + file_server + ''; + }; forgejo = { hostName = "git.${domain}"; useACMEHost = domain; From 5a0a9b98193815bd5fceff730e425dbf9b1e0d5a Mon Sep 17 00:00:00 2001 From: xunuwu Date: Sun, 22 Jun 2025 00:14:44 +0200 Subject: [PATCH 2/3] replace wildcard redirecting subdomains (rackserv -> hopper) with list --- hosts/rackserv/profiles/caddy.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hosts/rackserv/profiles/caddy.nix b/hosts/rackserv/profiles/caddy.nix index cbbd287..d40eafb 100644 --- a/hosts/rackserv/profiles/caddy.nix +++ b/hosts/rackserv/profiles/caddy.nix @@ -38,9 +38,16 @@ in { virtualHosts = let forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT; in { - misc = { - hostName = "*.${domain}"; + hopper = { + hostName = ""; + serverAliases = [ + "navidrome.${domain}" + "vw.${domain}" + "abs.${domain}" + "rss.${domain}" + ]; useACMEHost = domain; + logFormat = "output file ${config.services.caddy.logDir}/access-hopper.log"; extraConfig = '' reverse_proxy ${hopper} ''; From 67b829783d1e0eb1522dd4ae7b35c33db4ce7087 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Sun, 22 Jun 2025 04:30:03 +0200 Subject: [PATCH 3/3] remove nix gc cleaning script and disable keep-outputs instead --- sys/profiles/nix/gc.nix | 10 ---------- sys/profiles/nix/nix.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/sys/profiles/nix/gc.nix b/sys/profiles/nix/gc.nix index b7c88d1..73f2a68 100644 --- a/sys/profiles/nix/gc.nix +++ b/sys/profiles/nix/gc.nix @@ -8,14 +8,4 @@ options = "--delete-older-than 14d"; }; nix.optimise.automatic = true; - - systemd.services.remove-old-nix-gc-roots = let - beforeDate = "last month"; - in { - description = "Remove old nix gc roots"; - script = "exec ${lib.getExe pkgs.findutils} /nix/var/nix/gcroots/auto -not -newermt \"${beforeDate}\" -delete"; - serviceConfig.Type = "oneshot"; - before = ["nix-gc.service"]; - requiredBy = ["nix-gc.service"]; - }; } diff --git a/sys/profiles/nix/nix.nix b/sys/profiles/nix/nix.nix index adf3ab8..ceb613b 100644 --- a/sys/profiles/nix/nix.nix +++ b/sys/profiles/nix/nix.nix @@ -11,7 +11,6 @@ settings = { builders-use-substitutes = true; - keep-outputs = true; keep-derivations = true; accept-flake-config = true; use-xdg-base-directories = true;