X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fbuildbot%2Fdefault.nix;h=47e30fc03b6f1ae069867c7db5ffa6fe5b71725b;hb=60d328e2558e982d441f64b54e089b0e1f6b70f9;hp=fa6a6f20f3c4a17d3c6c2cc2bb59a4e2149c6fde;hpb=8d213e2b1c934f6861f76aad5eb7c11097fa97de;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix
index fa6a6f2..47e30fc 100644
--- a/modules/private/buildbot/default.nix
+++ b/modules/private/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
 let
   varDir = "/var/lib/buildbot";
   buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
@@ -24,8 +24,11 @@ in
   };
 
   config = lib.mkIf config.myServices.buildbot.enable {
-    ids.uids.buildbot = myconfig.env.buildbot.user.uid;
-    ids.gids.buildbot = myconfig.env.buildbot.user.gid;
+    services.duplyBackup.profiles.buildbot = {
+      rootDir = varDir;
+    };
+    ids.uids.buildbot = config.myEnv.buildbot.user.uid;
+    ids.gids.buildbot = config.myEnv.buildbot.user.gid;
 
     users.groups.buildbot.gid = config.ids.gids.buildbot;
     users.users.buildbot = {
@@ -37,7 +40,11 @@ in
       extraGroups = [ "keys" ];
     };
 
-    services.websites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
+    services.websites.env.tools.watchPaths = lib.attrsets.mapAttrsToList
+      (k: project: "/var/secrets/buildbot/${project.name}/webhook-httpd-include")
+      config.myEnv.buildbot.projects;
+
+    services.websites.env.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
         RedirectMatch permanent "^/buildbot/${project.name}$" "/buildbot/${project.name}/"
         RewriteEngine On
         RewriteRule ^/buildbot/${project.name}/ws(.*)$   unix:///run/buildbot/${project.name}.sock|ws://git.immae.eu/ws$1 [P,NE,QSA,L]
@@ -57,12 +64,16 @@ in
             Include /var/secrets/buildbot/${project.name}/webhook-httpd-include
           </RequireAny>
         </Location>
-        '') myconfig.env.buildbot.projects;
+        '') config.myEnv.buildbot.projects;
 
     system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       deps = [ "users" "wrappers" ];
-      text = project.activationScript;
-    }) myconfig.env.buildbot.projects;
+      text = ''
+        install -m 755 -o buildbot -g buildbot -d ${varDir}/${project.name}
+
+        ${project.activationScript}
+        '';
+    }) config.myEnv.buildbot.projects;
 
     secrets.keys = (
       lib.lists.flatten (
@@ -81,31 +92,39 @@ in
               permissions = "0600";
               user = "wwwrun";
               group = "wwwrun";
-              text = lib.optionalString (lib.attrsets.hasAttr "webhookTokens" project) ''
+              text = lib.optionalString (project.webhookTokens != null) ''
                 Require expr "req('Access-Key') in { ${builtins.concatStringsSep ", " (map (x: "'${x}'") project.webhookTokens)} }"
                 '';
               dest = "buildbot/${project.name}/webhook-httpd-include";
             }
           ]
-        ) myconfig.env.buildbot.projects
+        ) config.myEnv.buildbot.projects
       )
     ) ++ [
       {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
-        text = myconfig.env.buildbot.ldap.password;
+        text = config.myEnv.buildbot.ldap.password;
         dest = "buildbot/ldap";
       }
       {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
-        text = builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key";
+        text = builtins.readFile "${config.myEnv.privateFiles}/buildbot_ssh_key";
         dest = "buildbot/ssh_key";
       }
     ];
 
+    services.filesWatcher = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
+      restart = true;
+      paths = [
+        "/var/secrets/buildbot/ldap"
+        "/var/secrets/buildbot/ssh_key"
+      ] ++ lib.attrsets.mapAttrsToList (k: v: "/var/secrets/buildbot/${project.name}/${k}") project.secrets;
+    }) config.myEnv.buildbot.projects;
+
     systemd.services = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       description = "Buildbot Continuous Integration Server ${project.name}.";
       after = [ "network-online.target" ];
@@ -163,7 +182,10 @@ in
       )}
       '';
       environment = let
-        project_env = lib.attrsets.mapAttrs' (k: v: lib.attrsets.nameValuePair "BUILDBOT_${k}" v) project.environment;
+        project_env = with lib.attrsets;
+          mapAttrs' (k: v: nameValuePair "BUILDBOT_${k}" v) project.environment //
+          mapAttrs' (k: v: nameValuePair "BUILDBOT_PATH_${k}" (v pkgs)) (attrByPath ["builderPaths"] {} project) //
+          { BUILDBOT_PROJECT_DIR = ./projects + "/${project.name}"; };
         buildbot_config = pkgs.python3Packages.buildPythonPackage (rec {
           name = "buildbot_config-${project.name}";
           src = ./projects + "/${project.name}";
@@ -193,6 +215,6 @@ in
         WorkingDirectory = "${varDir}/${project.name}";
         ExecStart = "${buildbot}/bin/buildbot start";
       };
-    }) myconfig.env.buildbot.projects;
+    }) config.myEnv.buildbot.projects;
   };
 }