diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:29 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:29 +0100 |
| commit | 72939a2d6f45950dbfa6ec0815eae62e83d02630 (patch) | |
| tree | d35ae568feeb1d1110be316ba8d434308e0aa780 /shared | |
| parent | db3dd77f6de5964bcaa265bf8e5863d7647932f5 (diff) | |
| parent | 2e317bfe747ec968d3b933ae4c0df68ad204021c (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/1systems/wolf.nix | 3 | ||||
| -rw-r--r-- | shared/2configs/base.nix | 10 | ||||
| -rw-r--r-- | shared/2configs/shared-buildbot.nix | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 96691aed8..f0323dc2f 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -20,6 +20,9 @@ in # use your own binary cache, fallback use cache.nixos.org (which is used by # apt-cacher-ng in first place) + # local discovery in shackspace + nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; + services.grafana = { enable = true; addr = "0.0.0.0"; diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index f6ec93a97..7cabbd347 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -3,15 +3,7 @@ with config.krebs.lib; { krebs.enable = true; - krebs.retiolum = { - enable = true; - connectTo = [ - # TODO remove connectTo cd, this was only used for bootstrapping - "cd" - "gum" - "pigstarter" - ]; - }; + krebs.retiolum.enable = true; # TODO rename shared user to "krebs" krebs.build.user = mkDefault config.krebs.users.shared; diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index b474af7b3..9804580db 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -144,7 +144,6 @@ # * retiolum s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json")) s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv")) - addShell(s, name="infest-cac-centos7",env=env, sigtermTime=60, # SIGTERM 1 minute before SIGKILL timeout=10800, # 3h @@ -173,7 +172,7 @@ masterhost = "localhost"; username = "testslave"; password = "krebspass"; - packages = with pkgs;[ git nix ]; + packages = with pkgs;[ git nix gnumake jq rsync ]; # all nix commands will need a working nixpkgs installation extraEnviron = { NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; }; |