From 3bb965c3f071f30a2ac381fb18cb2da5603193a3 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 16 Jan 2016 01:36:58 +0100 Subject: k 5 lentil: haskellng -> haskell --- krebs/5pkgs/lentil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 // { -- cgit v1.2.3 From 43751d79e81ac6b6e75da3f449ed7e71254286ad Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 23 Jan 2016 00:27:33 +0100 Subject: s 1 wolf: add grafana service --- shared/1systems/wolf.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 ; + }; + nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ]; networking = { -- cgit v1.2.3