X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fbuildbot%2Fdefault.nix;h=89a0dea10610ff371049201d0f384eb26f608c7f;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=057b58ba1d336b0c8b6d5cd6509cc83814769f30;hpb=6984f454ea1c476169b3721721529c2c5bb13eb9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index 057b58b..89a0dea 100644
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -1,41 +1,6 @@
 { lib, pkgs, config, myconfig, mylibs, ... }:
 let
   varDir = "/var/lib/buildbot";
-  buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json;
-  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
-    name = "buildslist-yarn-modules";
-    pname = name;
-    inherit (pkgs.buildbot-pkg) version;
-    packageJSON = "${buildslist_src.src}/package.json";
-    yarnLock = "${buildslist_src.src}/yarn.lock";
-  };
-  buildslist_bower = pkgs.buildBowerComponents {
-    name = "buildslist";
-    generated = ./bower.nix;
-    src = "${buildslist_src.src}/guanlecoja/";
-  };
-
-  buildslist = pkgs.python3Packages.buildPythonPackage rec {
-    pname = "buildbot-buildslist";
-    inherit (pkgs.buildbot-pkg) version;
-
-    preConfigure = ''
-      export HOME=$PWD
-      cp -a ${buildslist_yarn}/node_modules .
-      chmod -R u+w node_modules
-      cp -a ${buildslist_bower}/bower_components ./libs
-      chmod -R u+w libs
-      '';
-    propagatedBuildInputs = with pkgs.python3Packages; [
-      (klein.overridePythonAttrs(old: { checkPhase = ""; }))
-      buildbot-pkg
-    ];
-    nativeBuildInputs = with pkgs; [ yarn nodejs ];
-    buildInputs = [ buildslist_yarn buildslist_bower ];
-
-    doCheck = false;
-    src = buildslist_src.src;
-  };
   buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
     name = "buildbot_common";
     src = ./common;
@@ -45,7 +10,7 @@ let
       cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common
       '';
   };
-  buildbot = pkgs.python3Packages.buildbot-full.withPlugins ([ buildslist ]);
+  buildbot = pkgs.python3Packages.buildbot-full;
 in
 {
   options = {
@@ -59,33 +24,6 @@ in
   };
 
   config = lib.mkIf config.services.buildbot.enable {
-    nixpkgs.overlays = [ (self: super: rec {
-      python3 = super.python3.override {
-        packageOverrides = python-self: python-super: {
-          wokkel = python-self.buildPythonPackage rec {
-            pname = "wokkel";
-            version = "18.0.0";
-            src = python-self.fetchPypi {
-              inherit pname version;
-              sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016";
-            };
-            propagatedBuildInputs = with python-self; [ twisted.extras.tls twisted incremental dateutil ];
-            doChecks = false;
-          };
-          apprise = python-self.buildPythonPackage rec {
-            pname = "apprise";
-            version = "0.7.4";
-            src = (mylibs.fetchedGithub ./apprise.json).src;
-            propagatedBuildInputs = with python-self; [ decorator
-            requests requests_oauthlib oauthlib urllib3 six click
-            markdown pyyaml sleekxmpp
-            ];
-            doChecks = false;
-          };
-        };
-      };
-    }) ];
-
     ids.uids.buildbot = myconfig.env.buildbot.user.uid;
     ids.gids.buildbot = myconfig.env.buildbot.user.gid;
 
@@ -99,7 +37,7 @@ in
       extraGroups = [ "keys" ];
     };
 
-    services.myWebsites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
+    services.websites.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]
@@ -116,66 +54,61 @@ in
           <RequireAny>
             Require local
             Require ldap-group cn=users,ou=${project.name},cn=buildbot,ou=services,dc=immae,dc=eu
-            Include /run/keys/buildbot/${project.name}/buildbot-${project.name}-webhook-httpd-include
+            Include /var/secrets/buildbot/${project.name}/webhook-httpd-include
           </RequireAny>
         </Location>
         '') myconfig.env.buildbot.projects;
 
     system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       deps = [ "users" "wrappers" ];
-      text = ''
-      install -m 0755 -o buildbot -g buildbot -d /run/buildbot/
-      install -m 0755 -o buildbot -g buildbot -d ${varDir}
-      ${project.activationScript}
-      '';
+      text = project.activationScript;
     }) myconfig.env.buildbot.projects;
 
-    deployment.keys = lib.attrsets.listToAttrs (
+    secrets.keys = (
       lib.lists.flatten (
         lib.attrsets.mapAttrsToList (k: project:
           lib.attrsets.mapAttrsToList (k: v:
-            lib.attrsets.nameValuePair "buildbot-${project.name}-${k}" {
+            {
               permissions = "0600";
               user = "buildbot";
               group = "buildbot";
               text = v;
-              destDir = "/run/keys/buildbot/${project.name}";
+              dest = "buildbot/${project.name}/${k}";
             }
           ) project.secrets
           ++ [
-            (lib.attrsets.nameValuePair "buildbot-${project.name}-webhook-httpd-include" {
+            {
               permissions = "0600";
               user = "wwwrun";
               group = "wwwrun";
               text = lib.optionalString (lib.attrsets.hasAttr "webhookTokens" project) ''
                 Require expr "req('Access-Key') in { ${builtins.concatStringsSep ", " (map (x: "'${x}'") project.webhookTokens)} }"
                 '';
-              destDir = "/run/keys/buildbot/${project.name}";
-            })
+              dest = "buildbot/${project.name}/webhook-httpd-include";
+            }
           ]
         ) myconfig.env.buildbot.projects
       )
-    ) // {
-      buildbot-ldap = {
+    ) ++ [
+      {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
         text = myconfig.env.buildbot.ldap.password;
-        destDir = "/run/keys/buildbot";
-      };
-      buildbot-ssh-key = {
+        dest = "buildbot/ldap";
+      }
+      {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
         text = builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key";
-        destDir = "/run/keys/buildbot";
-      };
-    };
+        dest = "buildbot/ssh_key";
+      }
+    ];
 
     systemd.services = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       description = "Buildbot Continuous Integration Server ${project.name}.";
-      after = [ "network-online.target" "keys.target" ];
-      wants = [ "keys.target" ];
+      after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgs);
       preStart = let
@@ -220,12 +153,13 @@ in
         rm -f ${varDir}/${project.name}/buildbot.tac
       fi
       ln -sf ${tac_file} ${varDir}/${project.name}/buildbot.tac
-      install -Dm600 -o buildbot -g buildbot -T /run/keys/buildbot/buildbot-ssh-key ${varDir}/buildbot_key
+      # 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
       buildbot_secrets=${varDir}/${project.name}/secrets
       install -m 0700 -o buildbot -g buildbot -d $buildbot_secrets
-      install -Dm600 -o buildbot -g buildbot -T /run/keys/buildbot/buildbot-ldap $buildbot_secrets/ldap
+      install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/ldap $buildbot_secrets/ldap
       ${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList
-        (k: v: "install -Dm600 -o buildbot -g buildbot -T /run/keys/buildbot/${project.name}/buildbot-${project.name}-${k} $buildbot_secrets/${k}") project.secrets
+        (k: v: "install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/${project.name}/${k} $buildbot_secrets/${k}") project.secrets
       )}
       '';
       environment = let
@@ -252,6 +186,9 @@ in
         Type = "forking";
         User = "buildbot";
         Group = "buildbot";
+        RuntimeDirectory = "buildbot";
+        RuntimeDirectoryPreserve = "yes";
+        StateDirectory = "buildbot";
         SupplementaryGroups = "keys";
         WorkingDirectory = "${varDir}/${project.name}";
         ExecStart = "${buildbot}/bin/buildbot start";