diff options
| author | tv <tv@krebsco.de> | 2017-08-31 20:05:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-08-31 20:05:05 +0200 |
| commit | 30864205c4e07823f93a85fb813196b5096f8692 (patch) | |
| tree | 6fc13127899a62be53d4e728713939bcbf400448 /krebs/2configs | |
| parent | eb2d780e5c4c5aee09153c56ea6150414c1c6db1 (diff) | |
| parent | af0696b9987d3ff0783cdd69d26a903c1ea92004 (diff) | |
Merge derp
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/buildbot-all.nix | 7 | ||||
| -rw-r--r-- | krebs/2configs/buildbot-krebs.nix | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index acd806d6e..8a647012f 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -1,3 +1,4 @@ +with import <stockholm/lib>; { lib, config, pkgs, ... }: { imports = [ @@ -7,10 +8,6 @@ networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; krebs.ci.enable = true; krebs.ci.treeStableTimer = 1; - krebs.ci.users.krebs.all = true; - krebs.ci.users.lass.all = true; - krebs.ci.users.makefu.all = true; - krebs.ci.users.nin.all = true; - krebs.ci.users.tv.all = true; + krebs.ci.hosts = filter (getAttr "ci") (attrValues config.krebs.hosts); } diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix index 40ca3c66d..a09b3b98b 100644 --- a/krebs/2configs/buildbot-krebs.nix +++ b/krebs/2configs/buildbot-krebs.nix @@ -1,3 +1,4 @@ +with import <stockholm/lib>; { lib, config, pkgs, ... }: { imports = [ @@ -7,7 +8,5 @@ networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; krebs.ci.enable = true; krebs.ci.treeStableTimer = 120; - krebs.ci.users.krebs.hosts = [ - config.networking.hostName - ]; + krebs.ci.hosts = [ config.krebs.build.host ]; } |