-{ 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 = 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";
+ pkgConfig = {
+ all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
+ };
};
- 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
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 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 = {
group = "buildbot";
description = "Buildbot user";
home = varDir;
+ extraGroups = [ "keys" ];
};
services.myWebsites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
ProxyPreserveHost On
</Location>
<Location /buildbot/${project.name}/change_hook/base>
- Require local
+ <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
+ </RequireAny>
</Location>
'') myconfig.env.buildbot.projects;
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";
- buildbot_key = pkgs.writeText "buildbot_key" (builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key");
+ text = ''
+ install -m 0755 -o buildbot -g buildbot -d /run/buildbot/
+ install -m 0755 -o buildbot -g buildbot -d ${varDir}
+ ${project.activationScript}
+ '';
+ }) myconfig.env.buildbot.projects;
+
+ secrets.keys = (
+ lib.lists.flatten (
+ lib.attrsets.mapAttrsToList (k: project:
+ lib.attrsets.mapAttrsToList (k: v:
+ {
+ permissions = "0600";
+ user = "buildbot";
+ group = "buildbot";
+ text = v;
+ dest = "buildbot/${project.name}/${k}";
+ }
+ ) project.secrets
+ ++ [
+ {
+ 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)} }"
+ '';
+ dest = "buildbot/${project.name}/webhook-httpd-include";
+ }
+ ]
+ ) myconfig.env.buildbot.projects
+ )
+ ) ++ [
+ {
+ permissions = "0600";
+ user = "buildbot";
+ group = "buildbot";
+ text = myconfig.env.buildbot.ldap.password;
+ dest = "buildbot/ldap";
+ }
+ {
+ permissions = "0600";
+ user = "buildbot";
+ group = "buildbot";
+ text = builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key";
+ 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" ];
+ wantedBy = [ "multi-user.target" ];
+ path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgs);
+ preStart = let
+ master-cfg = "${buildbot_common}/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common/master.cfg";
tac_file = pkgs.writeText "buildbot.tac" ''
import os
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}"
+ ${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
ln -sf ${tac_file} ${varDir}/${project.name}/buildbot.tac
- install -Dm600 -o buildbot -g buildbot -T ${buildbot_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 0600 -o buildbot -g buildbot -d $buildbot_secrets
- echo "${myconfig.env.buildbot.ldap.password}" > $buildbot_secrets/ldap
+ install -m 0700 -o buildbot -g buildbot -d $buildbot_secrets
+ install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/ldap $buildbot_secrets/ldap
${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList
- (k: v: "echo ${lib.strings.escapeShellArg v} > $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
)}
- chown -R buildbot:buildbot $buildbot_secrets
- chmod -R u=rX,go=- $buildbot_secrets
- ${project.activationScript}
'';
- }) myconfig.env.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" ];
- wantedBy = [ "multi-user.target" ];
- path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgsNext);
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}";
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.wokkel
+ 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 = {
Type = "forking";
User = "buildbot";
Group = "buildbot";
+ SupplementaryGroups = "keys";
WorkingDirectory = "${varDir}/${project.name}";
ExecStart = "${buildbot}/bin/buildbot start";
};
projects / perso / Immae / Config / Nix.git / blobdiff