X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fbuildbot%2Fdefault.nix;h=3768bde552673d53ced9b3954d13ea5ed60b73ee;hb=587b9e340bb5cb14ca55e62a0498295e702b56c5;hp=cd5b2609e86484789f56f0a05604d720fd9f8541;hpb=9fb4205e2ceadb79a93cbe44bd77ebebe8c94625;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index cd5b260..3768bde 100644
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -1,21 +1,21 @@
-{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
   varDir = "/var/lib/buildbot";
   buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json;
-  buildslist_yarn = pkgsNext.yarn2nix.mkYarnModules {
+  buildslist_yarn = pkgs.yarn2nix.mkYarnModules {
     name = "buildslist-yarn-modules";
     packageJSON = "${buildslist_src.src}/package.json";
     yarnLock = "${buildslist_src.src}/yarn.lock";
   };
-  buildslist_bower = pkgsNext.buildBowerComponents {
+  buildslist_bower = pkgs.buildBowerComponents {
     name = "buildslist";
     generated = ./bower.nix;
     src = "${buildslist_src.src}/guanlecoja/";
   };
 
-  buildslist = pkgsNext.python3Packages.buildPythonPackage rec {
+  buildslist = pkgs.python3Packages.buildPythonPackage rec {
     pname = "buildbot-buildslist";
-    inherit (pkgsNext.buildbot-pkg) version;
+    inherit (pkgs.buildbot-pkg) version;
 
     preConfigure = ''
       export HOME=$PWD
@@ -24,24 +24,26 @@ let
       cp -a ${buildslist_bower}/bower_components ./libs
       chmod -R u+w libs
       '';
-    propagatedBuildInputs = with pkgsNext.python3Packages; [
+    propagatedBuildInputs = with pkgs.python3Packages; [
       (klein.overridePythonAttrs(old: { checkPhase = ""; }))
       buildbot-pkg
     ];
-    nativeBuildInputs = with pkgsNext; [ yarn nodejs ];
+    nativeBuildInputs = with pkgs; [ yarn nodejs ];
     buildInputs = [ buildslist_yarn buildslist_bower ];
 
     doCheck = false;
     src = buildslist_src.src;
   };
-  buildbot_common = pkgsNext.python3Packages.buildPythonPackage (mylibs.fetchedGitPrivate ./buildbot_common.json // rec {
+  buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
+    name = "buildbot_common";
+    src = ./common;
     format = "other";
     installPhase = ''
-      mkdir -p $out/${pkgsNext.python3.pythonForBuild.sitePackages}
-      cp -a $src $out/${pkgsNext.python3.pythonForBuild.sitePackages}/buildbot_common
+      mkdir -p $out/${pkgs.python3.pythonForBuild.sitePackages}
+      cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common
       '';
-  });
-  buildbot = pkgsNext.python3Packages.buildbot-full.withPlugins ([ buildslist ]);
+  };
+  buildbot = pkgs.python3Packages.buildbot-full.withPlugins ([ buildslist ]);
 in
 {
   options = {
@@ -75,7 +77,7 @@ in
         ProxyPassReverse /buildbot/${project.name}/      unix:///run/buildbot/${project.name}.sock|http://${project.name}-git.immae.eu/
         <Location /buildbot/${project.name}/>
           Use LDAPConnect
-          Require ldap-group cn=users,cn=buildbot,ou=services,dc=immae,dc=eu
+          Require ldap-group cn=users,ou=${project.name},cn=buildbot,ou=services,dc=immae,dc=eu
 
           SetEnvIf X-Url-Scheme https HTTPS=1
           ProxyPreserveHost On
@@ -88,16 +90,51 @@ in
     system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       deps = [ "users" "wrappers" ];
       text = let
-        master-cfg = "${buildbot_common}/${pkgsNext.python3.pythonForBuild.sitePackages}/buildbot_common/master.cfg";
-        puppet_notify = pkgs.writeText "puppet_notify" (builtins.readFile "${myconfig.privateFiles}/buildbot_puppet_notify");
+        master-cfg = "${buildbot_common}/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common/master.cfg";
+        buildbot_key = pkgs.writeText "buildbot_key" (builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key");
+        tac_file = pkgs.writeText "buildbot.tac" ''
+            import os
+
+            from twisted.application import service
+            from buildbot.master import BuildMaster
+
+            basedir = '${varDir}/${project.name}'
+            rotateLength = 10000000
+            maxRotatedFiles = 10
+            configfile = '${master-cfg}'
+
+            # Default umask for server
+            umask = None
+
+            # if this is a relocatable tac file, get the directory containing the TAC
+            if basedir == '.':
+                import os
+                basedir = os.path.abspath(os.path.dirname(__file__))
+
+            # note: this line is matched against to check that this is a buildmaster
+            # directory; do not edit it.
+            application = service.Application('buildmaster')
+            from twisted.python.logfile import LogFile
+            from twisted.python.log import ILogObserver, FileLogObserver
+            logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength,
+                                            maxRotatedFiles=maxRotatedFiles)
+            application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
+
+            m = BuildMaster(basedir, configfile, umask)
+            m.setServiceParent(application)
+            m.log_rotation.rotateLength = rotateLength
+            m.log_rotation.maxRotatedFiles = maxRotatedFiles
+          '';
       in ''
       install -m 0755 -o buildbot -g buildbot -d /run/buildbot/
       install -m 0755 -o buildbot -g buildbot -d ${varDir}
       if [ ! -f ${varDir}/${project.name}/buildbot.tac ]; then
         $wrapperDir/sudo -u buildbot ${buildbot}/bin/buildbot create-master -c "${master-cfg}" "${varDir}/${project.name}"
         rm -f ${varDir}/${project.name}/master.cfg.sample
+        rm -f ${varDir}/${project.name}/buildbot.tac
       fi
-      install -Dm600 -o buildbot -g buildbot -T ${puppet_notify} ${varDir}/puppet_notify
+      ln -sf ${tac_file} ${varDir}/${project.name}/buildbot.tac
+      install -Dm600 -o buildbot -g buildbot -T ${buildbot_key} ${varDir}/buildbot_key
       buildbot_secrets=${varDir}/${project.name}/secrets
       install -m 0600 -o buildbot -g buildbot -d $buildbot_secrets
       echo "${myconfig.env.buildbot.ldap.password}" > $buildbot_secrets/ldap
@@ -114,24 +151,24 @@ in
       description = "Buildbot Continuous Integration Server ${project.name}.";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgsNext);
+      path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgs);
       environment = let
         project_env = lib.attrsets.mapAttrs' (k: v: lib.attrsets.nameValuePair "BUILDBOT_${k}" v) project.environment;
-        buildbot_config = pkgsNext.python3Packages.buildPythonPackage (rec {
+        buildbot_config = pkgs.python3Packages.buildPythonPackage (rec {
           name = "buildbot_config-${project.name}";
-          src = "${./projects}/${project.name}";
+          src = ./projects + "/${project.name}";
           format = "other";
           installPhase = ''
-            mkdir -p $out/${pkgsNext.python3.pythonForBuild.sitePackages}
-            cp -a $src $out/${pkgsNext.python3.pythonForBuild.sitePackages}/buildbot_config
+            mkdir -p $out/${pkgs.python3.pythonForBuild.sitePackages}
+            cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_config
             '';
         });
         HOME = "${varDir}/${project.name}";
-        PYTHONPATH = "${buildbot.pythonModule.withPackages (self: project.pythonPackages self pkgsNext ++ [
-          pkgsNext.python3Packages.treq pkgsNext.python3Packages.ldap3 buildbot
-          pkgsNext.python3Packages.buildbot-worker
+        PYTHONPATH = "${buildbot.pythonModule.withPackages (self: project.pythonPackages self pkgs ++ [
+          pkgs.python3Packages.treq pkgs.python3Packages.ldap3 buildbot
+          pkgs.python3Packages.buildbot-worker
           buildbot_common buildbot_config
-        ])}/${buildbot.pythonModule.sitePackages}${if project.pythonPathHome then ":${varDir}/${project.name}/.local/${pkgsNext.python3.pythonForBuild.sitePackages}" else ""}";
+        ])}/${buildbot.pythonModule.sitePackages}${if project.pythonPathHome then ":${varDir}/${project.name}/.local/${pkgs.python3.pythonForBuild.sitePackages}" else ""}";
       in project_env // { inherit PYTHONPATH HOME; };
 
       serviceConfig = {