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 | d81b068113325fb7604089c3647c365a41804978 (patch) | |
| tree | 4c43ad2142825ac7c0a7045e5c48a039b25f6786 /shared | |
| parent | 1542f9bbee823025f703e6abf3836905cee416fd (diff) | |
| parent | f12578c66f8b7b829c0dec5255f358778c0d3366 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared')
| -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 53334d6f1..180510066 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 5f3b35304..6c40d9966 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"])) ''; |