diff options
| author | tv <tv@krebsco.de> | 2016-02-04 01:31:21 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-04 01:31:21 +0100 |
| commit | e2a922dd7d2ab1f3e24a5d54c641c9ce6f51865d (patch) | |
| tree | 361d2db5f8226a5b9d6aea80e9b7e55a7a845bed /shared/1systems | |
| parent | 48381bd8dd9607d54a936c644964ab5bac90e4a9 (diff) | |
| parent | b38a821c31de84af6567073bd65ac76c5fc02b5d (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/1systems')
| -rw-r--r-- | shared/1systems/test-minimal-deploy.nix | 2 | ||||
| -rw-r--r-- | shared/1systems/wolf.nix | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix index ddd96f6b5..309e28950 100644 --- a/shared/1systems/test-minimal-deploy.nix +++ b/shared/1systems/test-minimal-deploy.nix @@ -5,7 +5,7 @@ build.user = config.krebs.users.shared; build.host = config.krebs.hosts.test-all-krebs-modules; }; - # just get the system running + # just get the system to eval in nixos without errors boot.loader.grub.devices = ["/dev/sda"]; fileSystems."/" = { device = "/dev/lol"; 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 = { |