Merge remote-tracking branch 'gum/master'

5 files changed, 2 insertions, 43 deletions

diff --git a/makefu/2configs/audio/realtime-audio.nix b/makefu/2configs/audio/realtime-audio.nix
index 6cb18c45c..8c392dbb6 100644
--- a/makefu/2configs/audio/realtime-audio.nix
+++ b/makefu/2configs/audio/realtime-audio.nix
@@ -4,7 +4,6 @@ let
 in
 {
   imports = [
-    ../sources/musnix.nix # populate musnix
     <musnix>
   ];
   musnix.enable = true;
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 0b4ef8909..e47dfac99 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -18,34 +18,7 @@ with import <stockholm/lib>;
 
     dns.providers.lan  = "hosts";
     search-domain = "r";
-    build = {
-      user = config.krebs.users.makefu;
-      source = let
-          inherit (config.krebs.build) host user;
-          ref = "06734d1"; # unstable @ 2017-07-03 + graceful requests2 (a772c3aa)
-      in {
-        nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
-          {
-            git = { url = https://github.com/makefu/nixpkgs; inherit ref; };
-          }
-            else
-            # TODO use http, once it is implemented
-            # right now it is simply extracted revision folder
-
-            ## prepare so we do not have to wait for rsync:
-            ## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff  -L | tar zx  && mv NixOS-nixpkgs-125ffff nixpkgs
-            { file = "/home/makefu/store/${ref}";};
-        secrets.file =
-          if getEnv "dummy_secrets" == "true"
-            then toString <stockholm/makefu/6tests/data/secrets>
-            else "/home/makefu/secrets/${host.name}";
-        stockholm.file = getEnv "PWD";
-
-        # Defaults for all stockholm users?
-        nixos-config.symlink =
-          "stockholm/${user.name}/1systems/${host.name}.nix";
-      };
-    };
+    build.user = config.krebs.users.makefu;
   };
 
   users.extraUsers = {
diff --git a/makefu/2configs/iodined.nix b/makefu/2configs/iodined.nix
index b1446eab4..a2d43e567 100644
--- a/makefu/2configs/iodined.nix
+++ b/makefu/2configs/iodined.nix
@@ -12,7 +12,7 @@ in {
       enable = true;
       domain = domain;
       ip = "172.16.10.1/24";
-      extraConfig = "-P ${pw} -l ${config.krebs.build.host.nets.internet.ip4.addr}";
+      extraConfig = "-c -P ${pw} -l ${config.krebs.build.host.nets.internet.ip4.addr}";
     };
   };
 
diff --git a/makefu/2configs/sources/default.nix b/makefu/2configs/sources/default.nix
deleted file mode 100644
index 232117aec..000000000
--- a/makefu/2configs/sources/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-# the builder pc (my laptop) will also require the sources i use to deploy
-# other boxes
-{
-  imports = [
-    ./musnix.nix
-  ];
-}
diff --git a/makefu/2configs/sources/musnix.nix b/makefu/2configs/sources/musnix.nix
deleted file mode 100644
index a5be303e9..000000000
--- a/makefu/2configs/sources/musnix.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  krebs.build.source.musnix.git = {
-    url = https://github.com/musnix/musnix.git;
-    ref = "f0ec1f3";
-  };
-}