diff options
| author | makefu <github@syntax-fehler.de> | 2016-01-23 00:31:11 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-01-23 00:31:11 +0100 |
| commit | 9505c8c686814db2d61dd5b169c82b1f447e7cbf (patch) | |
| tree | 3ecdfa30fdf77e51d1a2347d362f6630799d56ab | |
| parent | 69daaa8f3477cdfbe8d0b508c12ee5d976586e11 (diff) | |
| parent | 43751d79e81ac6b6e75da3f449ed7e71254286ad (diff) | |
Merge branch 'master' of gum.krebsco.de:stockholm
| -rw-r--r-- | krebs/5pkgs/lentil/default.nix | 2 | ||||
| -rw-r--r-- | shared/1systems/wolf.nix | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/krebs/5pkgs/lentil/default.nix b/krebs/5pkgs/lentil/default.nix index fc9b4fd31..8a57a77fe 100644 --- a/krebs/5pkgs/lentil/default.nix +++ b/krebs/5pkgs/lentil/default.nix @@ -1,6 +1,6 @@ { pkgs, ... }: -(pkgs.haskellngPackages.override { +(pkgs.haskellPackages.override { overrides = self: super: { lentil = super.lentil.override { mkDerivation = (attrs: self.mkDerivation (attrs // { diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index f05356f0f..8cf5be71c 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 = { |