Merge remote-tracking branch 'ni/master'

53 files changed, 100 insertions, 103 deletions

diff --git a/Makefile b/Makefile
index 962eae00d..0a9b4f29f 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ populate:
 pkgs:;@$(error no package selected)
 pkgs.%:;@$(call build,$@)
 
-# usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name
+# usage: make LOGNAME=krebs system=wolf eval.config.krebs.build.host.name
 eval eval.:;@$(call evaluate,$${expr-eval})
 eval.%:;@$(call evaluate,$@)
 
diff --git a/shared/1systems/test-all-krebs-modules/config.nix b/krebs/1systems/test-all-krebs-modules/config.nix
index 7ebcf3b50..c0c14b71f 100644
--- a/shared/1systems/test-all-krebs-modules/config.nix
+++ b/krebs/1systems/test-all-krebs-modules/config.nix
@@ -3,11 +3,12 @@ let
   en = { enable = true;};
 in {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
   ];
   krebs = {
     enable = true;
-    build.user = config.krebs.users.shared;
+    build.user = config.krebs.users.krebs;
     build.host = config.krebs.hosts.test-all-krebs-modules;
     Reaktor.test = {};
     apt-cacher-ng.enable = true;
diff --git a/krebs/1systems/test-all-krebs-modules/source.nix b/krebs/1systems/test-all-krebs-modules/source.nix
new file mode 100644
index 000000000..66fdaa773
--- /dev/null
+++ b/krebs/1systems/test-all-krebs-modules/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-all-krebs-modules";
+}
diff --git a/shared/1systems/test-arch/config.nix b/krebs/1systems/test-arch/config.nix
index 453483d48..b5a4234e7 100644
--- a/shared/1systems/test-arch/config.nix
+++ b/krebs/1systems/test-arch/config.nix
@@ -2,7 +2,8 @@
 
 {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
     {
       boot.loader.grub = {
         device = "/dev/sda";
diff --git a/krebs/1systems/test-arch/source.nix b/krebs/1systems/test-arch/source.nix
new file mode 100644
index 000000000..bff9d4325
--- /dev/null
+++ b/krebs/1systems/test-arch/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-arch";
+}
diff --git a/shared/1systems/test-centos6/config.nix b/krebs/1systems/test-centos6/config.nix
index a81ff7c51..968f8b8f0 100644
--- a/shared/1systems/test-centos6/config.nix
+++ b/krebs/1systems/test-centos6/config.nix
@@ -7,8 +7,9 @@ let
   gw = "168.235.148.1";
 in {
   imports = [
-    <stockholm/shared>
-    <stockholm/shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
+    <stockholm/krebs/2configs/os-templates/CAC-CentOS-6.5-64bit.nix>
     {
       networking.interfaces.enp11s0.ip4 = [
         {
diff --git a/krebs/1systems/test-centos6/source.nix b/krebs/1systems/test-centos6/source.nix
new file mode 100644
index 000000000..3693bbb29
--- /dev/null
+++ b/krebs/1systems/test-centos6/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-centos6";
+}
diff --git a/krebs/1systems/test-centos7/config.nix b/krebs/1systems/test-centos7/config.nix
new file mode 100644
index 000000000..732bc4f17
--- /dev/null
+++ b/krebs/1systems/test-centos7/config.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) head;
+
+in {
+  imports = [
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
+    <stockholm/krebs/2configs/os-templates/CAC-CentOS-7-64bit.nix>
+    <stockholm/krebs/2configs/temp/networking.nix>
+    <stockholm/krebs/2configs/temp/dirs.nix>
+  ];
+
+  sound.enable = false;
+  krebs.build.host = config.krebs.hosts.test-centos7;
+}
diff --git a/krebs/1systems/test-centos7/source.nix b/krebs/1systems/test-centos7/source.nix
new file mode 100644
index 000000000..44230f08d
--- /dev/null
+++ b/krebs/1systems/test-centos7/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-centos7";
+}
diff --git a/shared/1systems/test-failing/config.nix b/krebs/1systems/test-failing/config.nix
index fb6a58397..0dc8e6bf8 100644
--- a/shared/1systems/test-failing/config.nix
+++ b/krebs/1systems/test-failing/config.nix
@@ -2,7 +2,8 @@
 
 {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
   ];
   programs.ssh.startAgent = true;
   programs.ssh.startAgent = false;
diff --git a/krebs/1systems/test-failing/source.nix b/krebs/1systems/test-failing/source.nix
new file mode 100644
index 000000000..60b77a0a0
--- /dev/null
+++ b/krebs/1systems/test-failing/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-failing";
+}
diff --git a/shared/1systems/test-minimal-deploy/config.nix b/krebs/1systems/test-minimal-deploy/config.nix
index eab703671..9974b4f7c 100644
--- a/shared/1systems/test-minimal-deploy/config.nix
+++ b/krebs/1systems/test-minimal-deploy/config.nix
@@ -1,11 +1,12 @@
 { config, pkgs, lib, ... }:
 {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
   ];
   krebs = {
     enable = true;
-    build.user = config.krebs.users.shared;
+    build.user = config.krebs.users.krebs;
     build.host = config.krebs.hosts.test-all-krebs-modules;
   };
   # just get the system to eval in nixos without errors
diff --git a/krebs/1systems/test-minimal-deploy/source.nix b/krebs/1systems/test-minimal-deploy/source.nix
new file mode 100644
index 000000000..032ab12bb
--- /dev/null
+++ b/krebs/1systems/test-minimal-deploy/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-minimal-deploy";
+}
diff --git a/shared/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 636f8e822..b8cc1b4a1 100644
--- a/shared/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -4,24 +4,25 @@ let
 in
 {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-    <stockholm/shared/2configs/collectd-base.nix>
-    <stockholm/shared/2configs/central-stats-client.nix>
-    <stockholm/shared/2configs/save-diskspace.nix>
-
-    <stockholm/shared/2configs/cgit-mirror.nix>
-    <stockholm/shared/2configs/graphite.nix>
-    <stockholm/shared/2configs/repo-sync.nix>
-    <stockholm/shared/2configs/shared-buildbot.nix>
-
-    <stockholm/shared/2configs/shack/worlddomination.nix>
-    <stockholm/shared/2configs/shack/drivedroid.nix>
-    # <stockholm/shared/2configs/shack/nix-cacher.nix>
-    <stockholm/shared/2configs/shack/mqtt_sub.nix>
-    <stockholm/shared/2configs/shack/muell_caller.nix>
-    <stockholm/shared/2configs/shack/radioactive.nix>
-    <stockholm/shared/2configs/shack/share.nix>
+    <stockholm/krebs/2configs/collectd-base.nix>
+    <stockholm/krebs/2configs/central-stats-client.nix>
+    <stockholm/krebs/2configs/save-diskspace.nix>
+
+    <stockholm/krebs/2configs/cgit-mirror.nix>
+    <stockholm/krebs/2configs/graphite.nix>
+    <stockholm/krebs/2configs/repo-sync.nix>
+    <stockholm/krebs/2configs/shared-buildbot.nix>
+
+    <stockholm/krebs/2configs/shack/worlddomination.nix>
+    <stockholm/krebs/2configs/shack/drivedroid.nix>
+    # <stockholm/krebs/2configs/shack/nix-cacher.nix>
+    <stockholm/krebs/2configs/shack/mqtt_sub.nix>
+    <stockholm/krebs/2configs/shack/muell_caller.nix>
+    <stockholm/krebs/2configs/shack/radioactive.nix>
+    <stockholm/krebs/2configs/shack/share.nix>
 
   ];
   # use your own binary cache, fallback use cache.nixos.org (which is used by
diff --git a/krebs/1systems/wolf/source.nix b/krebs/1systems/wolf/source.nix
new file mode 100644
index 000000000..c292bfa62
--- /dev/null
+++ b/krebs/1systems/wolf/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "wolf";
+}
diff --git a/shared/2configs/central-stats-client.nix b/krebs/2configs/central-stats-client.nix
index 0412eba9a..0412eba9a 100644
--- a/shared/2configs/central-stats-client.nix
+++ b/krebs/2configs/central-stats-client.nix
diff --git a/shared/2configs/cgit-mirror.nix b/krebs/2configs/cgit-mirror.nix
index c2326a5cc..c2326a5cc 100644
--- a/shared/2configs/cgit-mirror.nix
+++ b/krebs/2configs/cgit-mirror.nix
diff --git a/shared/2configs/collectd-base.nix b/krebs/2configs/collectd-base.nix
index 440f83fce..440f83fce 100644
--- a/shared/2configs/collectd-base.nix
+++ b/krebs/2configs/collectd-base.nix
diff --git a/shared/2configs/default.nix b/krebs/2configs/default.nix
index 2146f42e8..53ad56d65 100644
--- a/shared/2configs/default.nix
+++ b/krebs/2configs/default.nix
@@ -5,8 +5,7 @@ with import <stockholm/lib>;
   krebs.enable = true;
   krebs.tinc.retiolum.enable = true;
 
-  # TODO rename shared user to "krebs"
-  krebs.build.user = mkDefault config.krebs.users.shared;
+  krebs.build.user = mkDefault config.krebs.users.krebs;
 
   networking.hostName = config.krebs.build.host.name;
 
diff --git a/shared/2configs/graphite.nix b/krebs/2configs/graphite.nix
index 64222e43a..64222e43a 100644
--- a/shared/2configs/graphite.nix
+++ b/krebs/2configs/graphite.nix
diff --git a/shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix b/krebs/2configs/os-templates/CAC-CentOS-6.5-64bit.nix
index b5ec722a0..b5ec722a0 100644
--- a/shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix
+++ b/krebs/2configs/os-templates/CAC-CentOS-6.5-64bit.nix
diff --git a/shared/2configs/os-templates/CAC-CentOS-7-64bit.nix b/krebs/2configs/os-templates/CAC-CentOS-7-64bit.nix
index 168d1d97b..168d1d97b 100644
--- a/shared/2configs/os-templates/CAC-CentOS-7-64bit.nix
+++ b/krebs/2configs/os-templates/CAC-CentOS-7-64bit.nix
diff --git a/shared/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 637a26e3c..637a26e3c 100644
--- a/shared/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
diff --git a/shared/2configs/save-diskspace.nix b/krebs/2configs/save-diskspace.nix
index ab074c750..ab074c750 100644
--- a/shared/2configs/save-diskspace.nix
+++ b/krebs/2configs/save-diskspace.nix
diff --git a/shared/2configs/shack/bincache.nix b/krebs/2configs/shack/bincache.nix
index 9cd7fae23..9cd7fae23 100644
--- a/shared/2configs/shack/bincache.nix
+++ b/krebs/2configs/shack/bincache.nix
diff --git a/shared/2configs/shack/drivedroid.nix b/krebs/2configs/shack/drivedroid.nix
index 12e4a39c3..12e4a39c3 100644
--- a/shared/2configs/shack/drivedroid.nix
+++ b/krebs/2configs/shack/drivedroid.nix
diff --git a/shared/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix
index a8427dde4..a8427dde4 100644
--- a/shared/2configs/shack/mqtt_sub.nix
+++ b/krebs/2configs/shack/mqtt_sub.nix
diff --git a/shared/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix
index 2d8d78e33..2d8d78e33 100644
--- a/shared/2configs/shack/muell_caller.nix
+++ b/krebs/2configs/shack/muell_caller.nix
diff --git a/shared/2configs/shack/nix-cacher.nix b/krebs/2configs/shack/nix-cacher.nix
index 8feeca9af..8feeca9af 100644
--- a/shared/2configs/shack/nix-cacher.nix
+++ b/krebs/2configs/shack/nix-cacher.nix
diff --git a/shared/2configs/shack/radioactive.nix b/krebs/2configs/shack/radioactive.nix
index 378b54056..378b54056 100644
--- a/shared/2configs/shack/radioactive.nix
+++ b/krebs/2configs/shack/radioactive.nix
diff --git a/shared/2configs/shack/share.nix b/krebs/2configs/shack/share.nix
index 247b9ee7d..247b9ee7d 100644
--- a/shared/2configs/shack/share.nix
+++ b/krebs/2configs/shack/share.nix
diff --git a/shared/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix
index d0f9f5fa6..d0f9f5fa6 100644
--- a/shared/2configs/shack/worlddomination.nix
+++ b/krebs/2configs/shack/worlddomination.nix
diff --git a/shared/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix
index 1d6883afe..efb41cc3e 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/krebs/2configs/shared-buildbot.nix
@@ -1,9 +1,9 @@
 { lib, config, pkgs, ... }:
 # The buildbot config is self-contained and currently provides a way 
-# to test "shared" configuration (infrastructure to be used by every krebsminister).
+# to test "krebs" configuration (infrastructure to be used by every krebsminister).
 
 # You can add your own test, test steps as required. Deploy the config on a
-# shared host like wolf and everything should be fine.
+# krebs host like wolf and everything should be fine.
 
 # TODO for all users schedule a build for fast tests
 {
@@ -56,7 +56,7 @@
         test-cac-infest-master = ''
   # files everyone depends on or are part of the share branch
   def shared_files(change):
-    r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)")
+    r =re.compile("^(krebs/.*|Makefile|default.nix|shell.nix)")
     for file in change.files:
       if r.match(file):
         return True
@@ -78,7 +78,7 @@
   grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
 
   env = {
-    "LOGNAME": "shared",
+    "LOGNAME": "krebs",
     "NIX_REMOTE": "daemon",
     "dummy_secrets": "true",
   }
@@ -173,6 +173,6 @@
     packages = with pkgs; [ gnumake jq nix populate ];
     # all nix commands will need a working nixpkgs installation
     extraEnviron = {
-      NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; };
+      NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./krebs/1systems/wolf.nix"; };
   };
 }
diff --git a/shared/2configs/temp/dirs.nix b/krebs/2configs/temp/dirs.nix
index 958608a54..958608a54 100644
--- a/shared/2configs/temp/dirs.nix
+++ b/krebs/2configs/temp/dirs.nix
diff --git a/shared/2configs/temp/networking.nix b/krebs/2configs/temp/networking.nix
index 958608a54..958608a54 100644
--- a/shared/2configs/temp/networking.nix
+++ b/krebs/2configs/temp/networking.nix
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 081724cfe..6123b6dd9 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -94,10 +94,10 @@ let
 
   imp = lib.mkMerge [
     { krebs = import ./lass   { inherit config; }; }
+    { krebs = import ./krebs  { inherit config; }; }
     { krebs = import ./makefu { inherit config; }; }
     { krebs = import ./mv     { inherit config; }; }
     { krebs = import ./nin    { inherit config; }; }
-    { krebs = import ./shared { inherit config; }; }
     { krebs = import ./tv     { inherit config; }; }
     {
       krebs.dns.providers = {
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/krebs/default.nix
index 17179a39f..780aeb1cf 100644
--- a/krebs/3modules/shared/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -8,7 +8,7 @@ let
     "test-centos7"
     "test-all-krebs-modules"
   ] (name: {
-    owner = config.krebs.users.shared;
+    owner = config.krebs.users.krebs;
     inherit name;
     cores = 1;
     nets = {
@@ -31,7 +31,7 @@ let
 in {
   hosts = {
     wolf = {
-      owner = config.krebs.users.shared;
+      owner = config.krebs.users.krebs;
       nets = {
         shack = {
           ip4.addr =  "10.42.2.150" ;
@@ -67,9 +67,9 @@ in {
     };
   } // testHosts;
   users = {
-    shared = {
+    krebs = {
       mail = "spam@krebsco.de";
-      pubkey = "lol"; # TODO krebs.users.shared.pubkey should be unnecessary
+      pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary
     };
   };
 }
diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
index 2a3ebd6fc..e89edffcb 100755
--- a/krebs/5pkgs/test/infest-cac-centos7/notes
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -15,7 +15,7 @@ krebs_cred=${krebs_cred-./cac.json}
 #   tinc retiolum key for host
 retiolum_key=${retiolum_key-./retiolum.rsa_key.priv}
 # build this host
-user=${user:-shared}
+user=${user:-krebs}
 system=${target_system:-test-centos7}
 
 log(){
@@ -125,9 +125,9 @@ done
 clear_defer >/dev/null
 defer "cac-api delete $id;$old_trapstr"
 
-mkdir -p shared/2configs/temp
+mkdir -p krebs/2configs/temp
 cac-api generatenetworking $id > \
-  shared/2configs/temp/networking.nix
+  krebs/2configs/temp/networking.nix
 # new temporary ssh key we will use to log in after install
 ssh-keygen -f $krebs_ssh -N ""
 cp "$r