diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-01 15:19:04 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-01 15:19:04 +0100 |
| commit | 1f345820ffb80177db695aeea76a5d8e5f1ef6a7 (patch) | |
| tree | 600200540e2c3deb15683c5236ae9776b6590617 | |
| parent | c5441d30682e0dbe31ebc09bfff6fc0bd0056677 (diff) | |
| parent | 5b1e066cbd3106d03300276a704955df6cf7657e (diff) | |
Merge remote-tracking branch 'gum/master'
| -rw-r--r-- | shared/1systems/wolf.nix | 13 | ||||
| -rw-r--r-- | shared/2configs/base.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/buildbot-standalone.nix | 11 |
3 files changed, 17 insertions, 9 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index f05356f..8cf5be7 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -12,10 +12,21 @@ in ../2configs/shack-nix-cacher.nix ../2configs/shack-drivedroid.nix ../2configs/buildbot-standalone.nix - ../2configs/graphite.nix + # ../2configs/graphite.nix ]; # use your own binary cache, fallback use cache.nixos.org (which is used by # apt-cacher-ng in first place) + + services.grafana = { + enable = true; + addr = "0.0.0.0"; + extraOptions = { "AUTH_ANONYMOUS_ENABLED" = "true"; }; + users.allowSignUp = true; + users.allowOrgCreate = true; + users.autoAssignOrg = true; + security = import <secrets/grafana_security.nix>; + }; + nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ]; networking = { diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index 4d509d7..5e60726 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -18,7 +18,7 @@ with lib; krebs.build.source = { git.nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80"; + rev = "d0e3cca"; target-path = "/var/src/nixpkgs"; }; dir.secrets = { diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 3275189..c614bd3 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -1,11 +1,6 @@ { lib, config, pkgs, ... }: -let - pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {}; -in { - nixpkgs.config.packageOverrides = pkgs: { - buildbot = pkgs-unst.buildbot; - buildbot-slave = pkgs-unst.buildbot-slave; - }; + +{ networking.firewall.allowedTCPPorts = [ 8010 9989 ]; krebs.buildbot.master = { secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ]; @@ -89,6 +84,7 @@ in { nix-instantiate --eval -A \ users.shared.test-all-krebs-modules.system \ -I stockholm=. \ + --show-trace \ -I secrets=. '<stockholm>' \ --argstr current-date lol \ --argstr current-user-name shared \ @@ -101,6 +97,7 @@ in { users.shared.test-minimal-deploy.system \ -I stockholm=. \ -I secrets=. '<stockholm>' \ + --show-trace \ --argstr current-date lol \ --argstr current-user-name shared \ --argstr current-host-name lol \ |