merge shared into krebs

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,$@)
 

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;

krebs/1systems/test-all-krebs-modules/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-all-krebs-modules";
+}

krebs/1systems/test-arch/config.nix

@@ -2,7 +2,8 @@
 
 {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
+    <stockholm/krebs/2configs>
     {
       boot.loader.grub = {
         device = "/dev/sda";

krebs/1systems/test-arch/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-arch";
+}

krebs/1systems/test-centos6/config.nix

@@ -7,8 +7,9 @@ let
   gw = "168.235.148.1";
 in {
   imports = [
-    <stockholm/shared>
+    <stockholm/krebs>
-    <stockholm/shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix>
+    <stockholm/krebs/2configs>
+    <stockholm/krebs/2configs/os-templates/CAC-CentOS-6.5-64bit.nix>
     {
       networking.interfaces.enp11s0.ip4 = [
         {

krebs/1systems/test-centos6/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-centos6";
+}

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;
+}

krebs/1systems/test-centos7/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-centos7";
+}

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;

krebs/1systems/test-failing/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-failing";
+}

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

krebs/1systems/test-minimal-deploy/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "test-minimal-deploy";
+}

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/krebs/2configs/collectd-base.nix>
-    <stockholm/shared/2configs/central-stats-client.nix>
+    <stockholm/krebs/2configs/central-stats-client.nix>
-    <stockholm/shared/2configs/save-diskspace.nix>
+    <stockholm/krebs/2configs/save-diskspace.nix>
 
-    <stockholm/shared/2configs/cgit-mirror.nix>
+    <stockholm/krebs/2configs/cgit-mirror.nix>
-    <stockholm/shared/2configs/graphite.nix>
+    <stockholm/krebs/2configs/graphite.nix>
-    <stockholm/shared/2configs/repo-sync.nix>
+    <stockholm/krebs/2configs/repo-sync.nix>
-    <stockholm/shared/2configs/shared-buildbot.nix>
+    <stockholm/krebs/2configs/shared-buildbot.nix>
 
-    <stockholm/shared/2configs/shack/worlddomination.nix>
+    <stockholm/krebs/2configs/shack/worlddomination.nix>
-    <stockholm/shared/2configs/shack/drivedroid.nix>
+    <stockholm/krebs/2configs/shack/drivedroid.nix>
-    # <stockholm/shared/2configs/shack/nix-cacher.nix>
+    # <stockholm/krebs/2configs/shack/nix-cacher.nix>
-    <stockholm/shared/2configs/shack/mqtt_sub.nix>
+    <stockholm/krebs/2configs/shack/mqtt_sub.nix>
-    <stockholm/shared/2configs/shack/muell_caller.nix>
+    <stockholm/krebs/2configs/shack/muell_caller.nix>
-    <stockholm/shared/2configs/shack/radioactive.nix>
+    <stockholm/krebs/2configs/shack/radioactive.nix>
-    <stockholm/shared/2configs/shack/share.nix>
+    <stockholm/krebs/2configs/shack/share.nix>
 
   ];
   # use your own binary cache, fallback use cache.nixos.org (which is used by

krebs/1systems/wolf/source.nix

@@ -0,0 +1,3 @@
+import <stockholm/krebs/source.nix> {
+  name = "wolf";
+}

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.krebs;
-  krebs.build.user = mkDefault config.krebs.users.shared;
 
   networking.hostName = config.krebs.build.host.name;
 

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"; };
   };
 }

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 = {

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
     };
   };
 }

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 "$retiolum_key" $krebs_secrets/retiolum.rsa_key.priv
@@ -135,7 +135,7 @@ cp "$retiolum_key" $krebs_secrets/retiolum.rsa_key.priv
 # additionally we set the ssh key we generated
 ip=$(cac-api getserver $id | jq -r .ip)
 
-cat > shared/2configs/temp/dirs.nix <<EOF
+cat > krebs/2configs/temp/dirs.nix <<EOF
 _: {
   krebs.build.source = {
     secrets.file = "$krebs_secrets";

krebs/source.nix

@@ -2,14 +2,14 @@ with import <stockholm/lib>;
 host@{ name, secure ? false }: let
   builder = if getEnv "dummy_secrets" == "true"
               then "buildbot"
-              else "shared";
+              else "krebs";
-  _file = <stockholm> + "/shared/1systems/${name}/source.nix";
+  _file = <stockholm> + "/krebs/1systems/${name}/source.nix";
 in
   evalSource (toString _file) {
-    nixos-config.symlink = "stockholm/shared/1systems/${name}/config.nix";
+    nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix";
     secrets.file = getAttr builder {
-      buildbot = toString <stockholm/shared/6tests/data/secrets>;
+      buildbot = toString <stockholm/krebs/6tests/data/secrets>;
-      shared = "${getEnv "HOME"}/secrets/krebs/${host.name}";
+      krebs = "${getEnv "HOME"}/secrets/krebs/${host.name}";
     };
     stockholm.file = toString <stockholm>;
     nixpkgs.git = {

shared/1systems/test-all-krebs-modules/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "test-all-krebs-modules";
-}

shared/1systems/test-arch/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "test-arch";
-}

shared/1systems/test-centos6/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "test-centos6";
-}

shared/1systems/test-centos7/config.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) head;
-
-in {
-  imports = [
-    <stockholm/shared>
-    <stockholm/shared/2configs/os-templates/CAC-CentOS-7-64bit.nix>
-    <stockholm/shared/2configs/temp/networking.nix>
-    <stockholm/shared/2configs/temp/dirs.nix>
-  ];
-
-  sound.enable = false;
-  krebs.build.host = config.krebs.hosts.test-centos7;
-}

shared/1systems/test-centos7/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "test-centos7";
-}

shared/1systems/test-failing/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "test-failing";
-}

shared/1systems/test-minimal-deploy/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "test-minimal-deploy";
-}

shared/1systems/wolf/source.nix

@@ -1,3 +0,0 @@
-import <stockholm/shared/source.nix> {
-  name = "wolf";
-}

shared/3modules/default.nix

@@ -1,5 +0,0 @@
-# TODO don't require 3modules
-_:
-
-{
-}

shared/default.nix

@@ -1,8 +0,0 @@
-_:
-{
-  imports = [
-    ../krebs
-    ./2configs
-    ./3modules
-  ];
-}