From 7a0480e5fe2b0b0762e56caa1878f7ada8cb76e1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 14 Jan 2016 17:30:02 +0100
Subject: ma 1 minimal: cosmetics

---
 shared/1systems/test-minimal-deploy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared')

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";
-- 
cgit v1.2.3


From 64a69bd1537a2000208bd3bbb5f1be6be08220f6 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Mon, 18 Jan 2016 16:59:44 +0100
Subject: s 2 base: use current unstable

---
 shared/2configs/base.nix                | 2 +-
 shared/2configs/buildbot-standalone.nix | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 4d509d7a6..5e6072661 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 3275189a5..2ea19e8aa 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" ];
-- 
cgit v1.2.3


From 462921984914029b87a2c3dc7b7a9f6a658eb8fe Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 19 Jan 2016 22:39:43 +0100
Subject: s 2 buildbot: add show-trace

---
 shared/2configs/buildbot-standalone.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'shared')

diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 2ea19e8aa..c614bd3c1 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -84,6 +84,7 @@
                         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 \
@@ -96,6 +97,7 @@
                             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 \
-- 
cgit v1.2.3


From 43751d79e81ac6b6e75da3f449ed7e71254286ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
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(-)

(limited to 'shared')

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 = {
-- 
cgit v1.2.3