all repos — nixfiles @ 739ba7d7f1101679f79cfa455ae2cee9e207f631

System and user configuration, managed by nix and home-manager

git-server: move domain/hostname to variables

Alan Pearce
commit

739ba7d7f1101679f79cfa455ae2cee9e207f631

parent

6bf6c36855052ab442c70546d072da979fb17b34

1 file changed, 7 insertions(+), 6 deletions(-)

changed files
M system/settings/services/git-server.nixsystem/settings/services/git-server.nix
@@ -7,6 +7,8 @@ let
inherit (lib) pipe flatten concatMapAttrs mapAttrsToList; inherit (import ../../../lib/caddy.nix { inherit lib; }) security-headers; + domain = "alanpearce.eu"; + serverName = "git.${domain}"; gitoliteCfg = config.services.gitolite; repos = "${gitoliteCfg.dataDir}/repositories";
@@ -92,7 +94,7 @@ services.elgit = {
enable = true; group = gitoliteCfg.group; settings = { - server.name = "git.alanpearce.eu"; + server.name = serverName; repo = { root = gitoliteCfg.dataDir; };
@@ -107,7 +109,7 @@ basePath = repos;
}; services.caddy.virtualHosts = { - "git.alanpearce.eu" = + "${serverName}" = let settings = config.services.elgit.settings; server = settings.server;
@@ -130,12 +132,11 @@ }}
reverse_proxy ${server.host}:${toString server.port} ''; }; - - "legit.alanpearce.eu" = { - serverAliases = [ "elgit.alanpearce.eu" ]; + "legit.${domain}" = { + serverAliases = [ "elgit.${domain}" ]; extraConfig = '' encode zstd gzip - redir https://git.alanpearce.eu{uri} permanent + redir https://${serverName}{uri} permanent ''; }; };