extract go vanity package serving to role
2 files changed, 36 insertions(+), 26 deletions(-)
changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -20,7 +20,6 @@ net-ip6 = "${prefix6}::1"; net-mask6 = 64; net-gw6 = "fe80::1"; domain = "alin.ovh"; - oldDomain = "alanpearce.eu"; in { imports = [@@ -34,6 +33,7 @@ ../roles/binary-cache.nix ../roles/calendar-anonymiser.nix ../roles/file-server.nix ../roles/forgejo-runner.nix + ../roles/go-vanity.nix ../roles/goatcounter.nix ../roles/mailer.nix ../roles/nix-remote-builder.nix@@ -167,29 +167,4 @@ services.powerdns.extraConfig = '' local-address=${net-ip4} ${net-ip6} ''; - - services.caddy = { - virtualHosts = - let - inherit (import ../../lib/caddy.nix { inherit lib; }) security-headers; - in - { - "go.${domain}" = { - extraConfig = '' - encode zstd gzip - ${security-headers { }} - root * /srv/http/go.alin.ovh - file_server - ''; - }; - "go.${oldDomain}" = { - extraConfig = '' - encode zstd gzip - ${security-headers { }} - root * /srv/http/go - file_server - ''; - }; - }; - }; }
A system/roles/go-vanity.nix
@@ -0,0 +1,35 @@ +{ + config, + lib, + ... +}: +let + domain = config.networking.domain; + oldDomain = "alanpearce.eu"; +in +{ + services.caddy = { + virtualHosts = + let + inherit (import ../../lib/caddy.nix { inherit lib; }) security-headers; + in + { + "go.${domain}" = { + extraConfig = '' + encode zstd gzip + ${security-headers { }} + root * /srv/http/go.alin.ovh + file_server + ''; + }; + "go.${oldDomain}" = { + extraConfig = '' + encode zstd gzip + ${security-headers { }} + root * /srv/http/go + file_server + ''; + }; + }; + }; +}