all repos — nixfiles @ e2ac514d5c118fe42df10293c444626908ae9c7b

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

move git-server configuration to role

Alin
commit

e2ac514d5c118fe42df10293c444626908ae9c7b

parent

b54735d05c8b3a2951c0789e6b8b0c26595656d8

2 files changed, 18 insertions(+), 15 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -42,7 +42,7 @@ ../roles/readeck.nix
     ../roles/searchix.nix
     ../roles/sso.nix
     ../roles/video-library.nix
-    ../settings/services/git-server.nix
+    ../roles/git-server.nix
   ];
   age.secrets = {
     redis-website.file = ../../secrets/redis-website.age;

@@ -283,18 +283,6 @@
   services.powerdns.extraConfig = ''
     local-address=${net-ip4} ${net-ip6}
   '';
-
-  systemd.services.backup-gitolite = {
-    startAt = "daily";
-    path = with pkgs; [
-      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";
-    };
-  };
 
   security.acme = {
     certs."${oldDomain}" = {
M system/settings/services/git-server.nix → system/roles/git-server.nix
@@ -11,9 +11,11 @@ flatten
     concatMapAttrs
     mapAttrsToList
     ;
-  inherit (import ../../../lib/caddy.nix { inherit lib; }) security-headers;
+  inherit (import ../../lib/caddy.nix { inherit lib; }) security-headers;
 
+  hostname = config.networking.hostName;
   domain = "alin.ovh";
+  ts-domain = "fin-marlin.ts.net";
   serverName = "git.${domain}";
   gitoliteCfg = config.services.gitolite;
   repos = "${gitoliteCfg.dataDir}/repositories";

@@ -182,7 +184,6 @@ '';
     };
   };
 
-  systemd.services = concatMapAttrs createMirrorService mirrors;
   systemd.paths = concatMapAttrs createMirrorPath mirrors;
   systemd.targets.git-mirroring = {
     wantedBy = [ "multi-user.target" ];

@@ -190,5 +191,19 @@ wants = pipe repoMirrors [
       (mapAttrsToList mkMirrorWants)
       flatten
     ];
+  };
+
+  systemd.services = (concatMapAttrs createMirrorService mirrors) // {
+    backup-gitolite = {
+      startAt = "daily";
+      path = with pkgs; [
+        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";
+      };
+    };
   };
 }