From 14d1655deb456d6be95463af2ca1524f7a1b7a98 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/1systems/test-centos7.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared/1systems')

diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix
index 077a5d61b..48cecc877 100644
--- a/shared/1systems/test-centos7.nix
+++ b/shared/1systems/test-centos7.nix
@@ -7,7 +7,8 @@ in {
   imports = [
     ../2configs/base.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
-    ../2configs/os-templates/temp-networking.nix
+    ../2configs/temp/networking.nix
+    ../2configs/temp/dirs.nix
   ];
 
   sound.enable = false;
-- 
cgit v1.2.3


From c26ba8d7e674a02995ae613327208f4d9771546b 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/1systems/wolf.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'shared/1systems')

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 2c51ac8fe..fba4bd9b9 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -33,8 +33,6 @@ in
   # uninteresting stuff
   #####################
   krebs.build.host = config.krebs.hosts.wolf;
-  # TODO rename shared user to "krebs"
-  krebs.build.user = config.krebs.users.shared;
   krebs.build.target = "wolf";
 
   boot.kernel.sysctl = {
-- 
cgit v1.2.3


From bf1b6482ce3535ef7e7b3f77879def12ff454c0c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 19:36:19 +0100
Subject: mv makefu->krebs 3 buildbot

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

(limited to 'shared/1systems')

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index fba4bd9b9..f05356f0f 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -11,7 +11,7 @@ in
     ../2configs/collectd-base.nix
     ../2configs/shack-nix-cacher.nix
     ../2configs/shack-drivedroid.nix
-    ../2configs/cac-ci.nix
+    ../2configs/buildbot-standalone.nix
     ../2configs/graphite.nix
   ];
   # use your own binary cache, fallback use cache.nixos.org (which is used by
-- 
cgit v1.2.3


From 9de08634c0718363a9ff7ee5c3a6825a4a4a7d9c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 22:00:30 +0100
Subject: s 1 test-failing: add for CI

---
 shared/1systems/test-failing.nix | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 shared/1systems/test-failing.nix

(limited to 'shared/1systems')

diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix
new file mode 100644
index 000000000..81a9e48d6
--- /dev/null
+++ b/shared/1systems/test-failing.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  programs.ssh.startAgent = true;
+  programs.ssh.startAgent = false;
+}
-- 
cgit v1.2.3