X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fbuildbot%2Fdefault.nix;h=5cf833b8e2a41bf8ae948accd89c55d4e54362c7;hb=1a7188052f235fb632700478fad0108e4306107d;hp=c670b7d4e66b521acec2d395c8bcda46ee7b8f81;hpb=256d607c2db3e56a2f481a2097ffa3ccd109d141;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index c670b7d..5cf833b 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix @@ -2,10 +2,15 @@ let varDir = "/var/lib/buildbot"; buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json; - buildslist_yarn = pkgs.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 = pkgs.buildBowerComponents { name = "buildslist"; @@ -57,33 +62,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; @@ -94,6 +72,7 @@ in group = "buildbot"; description = "Buildbot user"; home = varDir; + extraGroups = [ "keys" ]; }; services.myWebsites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: '' @@ -113,18 +92,69 @@ in Require local Require ldap-group cn=users,ou=${project.name},cn=buildbot,ou=services,dc=immae,dc=eu - ${if lib.attrsets.hasAttr "webhookTokens" project then '' - Require expr "req('Access-Key') in { ${builtins.concatStringsSep ", " (map (x: "'${x}'") project.webhookTokens)} }" - '' else ""} + Include /var/secrets/buildbot/${project.name}/webhook-httpd-include '') myconfig.env.buildbot.projects; system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" { deps = [ "users" "wrappers" ]; - text = let + 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"; - buildbot_key = pkgs.writeText "buildbot_key" (builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key"); tac_file = pkgs.writeText "buildbot.tac" '' import os @@ -159,32 +189,21 @@ in 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 pkgs); environment = let project_env = lib.attrsets.mapAttrs' (k: v: lib.attrsets.nameValuePair "BUILDBOT_${k}" v) project.environment; buildbot_config = pkgs.python3Packages.buildPythonPackage (rec { @@ -209,6 +228,7 @@ in Type = "forking"; User = "buildbot"; Group = "buildbot"; + SupplementaryGroups = "keys"; WorkingDirectory = "${varDir}/${project.name}"; ExecStart = "${buildbot}/bin/buildbot start"; };