From 35a70789778e86e0431c2dfc4bb1075d9049bf38 Mon Sep 17 00:00:00 2001 From: makefu 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(-) diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix index ddd96f6..309e289 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 0e5cc0bf34c3959a5a3e87a71ea26ddf6055a5ed Mon Sep 17 00:00:00 2001 From: makefu 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(-) 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..2ea19e8 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 8bf0e7a7f51014280a8bb60aa0fa00ab19060ef5 Mon Sep 17 00:00:00 2001 From: makefu 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(-) 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..2ea19e8 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 631c8b6fdeed5c4a45015cdeec6347aeb5a7ad42 Mon Sep 17 00:00:00 2001 From: makefu 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(+) diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 2ea19e8..c614bd3 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=. '' \ --argstr current-date lol \ --argstr current-user-name shared \ @@ -96,6 +97,7 @@ users.shared.test-minimal-deploy.system \ -I stockholm=. \ -I secrets=. '' \ + --show-trace \ --argstr current-date lol \ --argstr current-user-name shared \ --argstr current-host-name lol \ -- cgit v1.2.3 From 3f9fcaf7f9adbd7f2aabd295d25dbd0b380b532f 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 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 ; + }; + nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ]; networking = { -- cgit v1.2.3 From 7b402a6601b87783c0bef203b2ac192de1a26f79 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 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 ; + }; + nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ]; networking = { -- cgit v1.2.3