all repos — nixfiles @ d338a93056170044e347e2a26cad2327c844ffe2

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

centralise tailscale domain

Alin
commit

d338a93056170044e347e2a26cad2327c844ffe2

parent

dc7f669afd2b34b15f60b390b2cb5108a9cbb0b1

1 file changed, 4 insertions(+), 5 deletions(-)

changed files
M system/roles/git-server.nix → system/roles/git-server.nix
@@ -13,11 +13,10 @@ concatMapAttrs
     mapAttrsToList
     ;
   inherit (import ../../lib/caddy.nix { inherit lib; }) security-headers;
+  data = import ../../data;
 
   hostname = config.networking.hostName;
-  domain = "alin.ovh";
-  ts-domain = "fin-marlin.ts.net";
-  serverName = "git.${domain}";
+  serverName = "git.${data.pubnet}";
   gitoliteCfg = config.services.gitolite;
   repos = "${gitoliteCfg.dataDir}/repositories";
 

@@ -213,8 +212,8 @@ openssh
       ];
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup ${config.services.gitolite.dataDir} ${hostname}@r5.${ts-domain}::gitolite";
-        ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@r5.${ts-domain}::gitolite";
+        ExecStart = "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup ${config.services.gitolite.dataDir} ${hostname}@r5.${data.tailnet}::gitolite";
+        ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@r5.${data.tailnet}::gitolite";
       };
     };
   };