From e7aacb1fe972b465242e051a8ab0faf6ead2c19f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 16:30:01 +0100
Subject: s 1 test-centos7: prepare for ci

---
 shared/2configs/base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared/2configs/base.nix')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index df41eae..fceea67 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -20,11 +20,11 @@ with lib;
     };
     dir.secrets = {
       host = config.krebs.current.host;
-      path = "${getEnv "HOME"}/secrets/krebs/wolf";
+      path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf";
     };
     dir.stockholm = {
       host = config.krebs.current.host;
-      path = "${getEnv "HOME"}/stockholm";
+      path = mkDefault "${getEnv "HOME"}/stockholm";
     };
   };
 
-- 
cgit v1.2.3


From f6605c1222399a31f90c9f429cdf788fb32fcba0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 16:42:28 +0100
Subject: s 2 base: fix user,pubkey,secrets path

---
 shared/2configs/base.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'shared/2configs/base.nix')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index fceea67..c36061e 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -13,6 +13,8 @@ with lib;
     ];
   };
 
+  # TODO rename shared user to "krebs"
+  krebs.build.user = config.krebs.users.shared;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
@@ -20,7 +22,7 @@ with lib;
     };
     dir.secrets = {
       host = config.krebs.current.host;
-      path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf";
+      path = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
     };
     dir.stockholm = {
       host = config.krebs.current.host;
@@ -65,7 +67,7 @@ with lib;
     config.krebs.users.lass.pubkey
     config.krebs.users.makefu.pubkey
     # TODO HARDER:
-    (readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub)
+    config.krebs.users.makefu-omo.pubkey
     config.krebs.users.tv.pubkey
   ];
 
-- 
cgit v1.2.3


From e93e886777776f30d2ad3ea114ce06525ebf20ef Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 18:53:53 +0100
Subject: m 2 base: build user defaults to shared

---
 shared/2configs/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared/2configs/base.nix')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index c36061e..0ce3365 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -14,7 +14,7 @@ with lib;
   };
 
   # TODO rename shared user to "krebs"
-  krebs.build.user = config.krebs.users.shared;
+  krebs.build.user = mkDefault config.krebs.users.shared;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-- 
cgit v1.2.3


From 8a4f301afb38ed9a2a51efec1a51dba8be69db7b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 24 Dec 2015 20:50:23 +0100
Subject: s 2 buildbot: add treestabletimer

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

(limited to 'shared/2configs/base.nix')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 0ce3365..4d509d7 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -19,6 +19,7 @@ with lib;
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
       rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
+      target-path = "/var/src/nixpkgs";
     };
     dir.secrets = {
       host = config.krebs.current.host;
@@ -27,6 +28,7 @@ with lib;
     dir.stockholm = {
       host = config.krebs.current.host;
       path = mkDefault "${getEnv "HOME"}/stockholm";
+      target-path = "/var/src/stockholm";
     };
   };
 
-- 
cgit v1.2.3