X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fbuildbot%2Fdefault.nix;h=dc8a0d241bac99a294ba2e53df084cd991c7de5c;hb=4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0;hp=d6753e54ac23c7d09074083d8a617b5d6a2539b0;hpb=dcb8ad4c0358735ba97fe83071f79b294bed8967;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix
index d6753e5..dc8a0d2 100644
--- a/modules/private/buildbot/default.nix
+++ b/modules/private/buildbot/default.nix
@@ -42,7 +42,7 @@ in
     };
 
     services.websites.env.tools.watchPaths = lib.attrsets.mapAttrsToList
-      (k: project: "/var/secrets/buildbot/${project.name}/webhook-httpd-include")
+      (k: project: config.secrets.fullPaths."buildbot/${project.name}/webhook-httpd-include")
       config.myEnv.buildbot.projects;
 
     services.websites.env.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
@@ -62,7 +62,7 @@ in
           <RequireAny>
             Require local
             Require ldap-group cn=users,ou=${project.name},cn=buildbot,ou=services,dc=immae,dc=eu
-            Include /var/secrets/buildbot/${project.name}/webhook-httpd-include
+            Include ${config.secrets.fullPaths."buildbot/${project.name}/webhook-httpd-include"}
           </RequireAny>
         </Location>
         '') config.myEnv.buildbot.projects;
@@ -76,74 +76,82 @@ in
         '';
     }) config.myEnv.buildbot.projects;
 
-    secrets.keys = (
+    secrets.keys = lib.listToAttrs (
       lib.lists.flatten (
         lib.attrsets.mapAttrsToList (k: project:
           lib.attrsets.mapAttrsToList (k: v:
-            {
+            (lib.nameValuePair "buildbot/${project.name}/${k}" {
               permissions = "0600";
               user = "buildbot";
               group = "buildbot";
               text = v;
-              dest = "buildbot/${project.name}/${k}";
-            }
+            })
           ) project.secrets
           ++ [
-            {
+            (lib.nameValuePair "buildbot/${project.name}/webhook-httpd-include" {
               permissions = "0600";
               user = "wwwrun";
               group = "wwwrun";
               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";
-            }
-            {
+            })
+            (lib.nameValuePair "buildbot/${project.name}/environment_file" {
               permissions = "0600";
               user = "buildbot";
               group = "buildbot";
-              dest = "buildbot/${project.name}/environment_file";
               text = let
                 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_PROJECT_DIR = ./projects + "/${project.name}";
+                    BUILDBOT_WORKER_PORT = builtins.toString project.workerPort;
+                    BUILDBOT_HOST = config.hostEnv.fqdn;
+                    BUILDBOT_VIRT_URL = "qemu+ssh://libvirt@dilion.immae.eu/system";
+                  };
                 in builtins.concatStringsSep "\n"
                   (lib.mapAttrsToList (envK: envV: "${envK}=${envV}") project_env);
-            }
+            })
           ]
         ) config.myEnv.buildbot.projects
       )
-    ) ++ [
-      {
+    ) // {
+      "buildbot/ldap" = {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
         text = config.myEnv.buildbot.ldap.password;
-        dest = "buildbot/ldap";
-      }
-      {
+      };
+      "buildbot/worker_password" = {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
-        text = builtins.readFile "${config.myEnv.privateFiles}/buildbot_ssh_key";
-        dest = "buildbot/ssh_key";
-      }
-    ];
+        text = config.myEnv.buildbot.workerPassword;
+      };
+      "buildbot/ssh_key" = {
+        permissions = "0600";
+        user = "buildbot";
+        group = "buildbot";
+        text = config.myEnv.buildbot.ssh_key.private;
+      };
+    };
 
     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"
-        "/var/secrets/buildbot/${project.name}/environment_file"
-      ] ++ lib.attrsets.mapAttrsToList (k: v: "/var/secrets/buildbot/${project.name}/${k}") project.secrets;
+        config.secrets.fullPaths."buildbot/ldap"
+        config.secrets.fullPaths."buildbot/worker_password"
+        config.secrets.fullPaths."buildbot/ssh_key"
+        config.secrets.fullPaths."buildbot/${project.name}/environment_file"
+      ] ++ lib.attrsets.mapAttrsToList (k: v: config.secrets.fullPaths."buildbot/${project.name}/${k}") project.secrets;
     }) config.myEnv.buildbot.projects;
 
     systemd.slices.buildbot = {
       description = "buildbot slice";
     };
 
+    networking.firewall.allowedTCPPorts = lib.attrsets.mapAttrsToList (k: v: v.workerPort) 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" ];
@@ -192,12 +200,13 @@ in
       fi
       ln -sf ${tac_file} ${varDir}/${project.name}/buildbot.tac
       # different buildbots may be trying that simultaneously, add the || true to avoid complaining in case of race
-      install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/ssh_key ${varDir}/buildbot_key || true
+      install -Dm600 -o buildbot -g buildbot -T ${config.secrets.fullPaths."buildbot/ssh_key"} ${varDir}/buildbot_key || true
       buildbot_secrets=${varDir}/${project.name}/secrets
       install -m 0700 -o buildbot -g buildbot -d $buildbot_secrets
-      install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/ldap $buildbot_secrets/ldap
+      install -Dm600 -o buildbot -g buildbot -T ${config.secrets.fullPaths."buildbot/ldap"} $buildbot_secrets/ldap
+      install -Dm600 -o buildbot -g buildbot -T ${config.secrets.fullPaths."buildbot/worker_password"} $buildbot_secrets/worker_password
       ${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList
-        (k: v: "install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/${project.name}/${k} $buildbot_secrets/${k}") project.secrets
+        (k: v: "install -Dm600 -o buildbot -g buildbot -T ${config.secrets.fullPaths."buildbot/${project.name}/${k}"} $buildbot_secrets/${k}") project.secrets
       )}
       ${buildbot}/bin/buildbot upgrade-master ${varDir}/${project.name}
       '';
@@ -213,6 +222,7 @@ in
         });
         HOME = "${varDir}/${project.name}";
         PYTHONPATH = "${buildbot.pythonModule.withPackages (self: project.pythonPackages self pkgs ++ [
+          pkgs.python3Packages.libvirt
           pkgs.python3Packages.wokkel
           pkgs.python3Packages.treq pkgs.python3Packages.ldap3 buildbot
           pkgs.python3Packages.buildbot-worker
@@ -231,7 +241,7 @@ in
         SupplementaryGroups = "keys";
         WorkingDirectory = "${varDir}/${project.name}";
         ExecStart = "${buildbot}/bin/buildbot start";
-        EnvironmentFile = "/var/secrets/buildbot/${project.name}/environment_file";
+        EnvironmentFile = config.secrets.fullPaths."buildbot/${project.name}/environment_file";
       };
     }) config.myEnv.buildbot.projects;
   };