diff options
| author | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
| commit | cc9c6c81c48275ce82a8aca4d1b52db6d62e0d17 (patch) | |
| tree | 9d175e82142291a28a15242ab9dfd30cffc99f66 | |
| parent | 9236b1eca8b781524e8fe4da6989f29f0a1891c0 (diff) | |
| parent | 54bbd21d021d7eb26980d4fa18ad1008de91a490 (diff) | |
Merge remote-tracking branch 'prism/master'
| -rw-r--r-- | shared/1systems/wolf.nix | 4 | ||||
| -rw-r--r-- | shared/2configs/shared-buildbot.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 53334d6..1805100 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -22,7 +22,7 @@ in # local discovery in shackspace nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - + krebs.retiolum.extraConfig = "TCPOnly = yes"; services.grafana = { enable = true; addr = "0.0.0.0"; @@ -37,7 +37,7 @@ in networking = { firewall.enable = false; - interfaces.eth0.ip4 = [{ + interfaces.enp0s3.ip4 = [{ address = shack-ip; prefixLength = 20; }]; diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 5f3b353..6c40d99 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -26,7 +26,7 @@ stockholm_repo, workdir='stockholm-poller', branches=True, project='stockholm', - pollinterval=120)) + pollinterval=60)) ''; scheduler = { force-scheduler = '' @@ -43,7 +43,7 @@ sched.append(schedulers.SingleBranchScheduler( ## all branches change_filter=util.ChangeFilter(branch_re=".*"), - # treeStableTimer=10, + treeStableTimer=10, name="fast-all-branches", builderNames=["fast-tests"])) ''; |