From 222ca361e38b09ddef563abaaacd114ec86e2a5c Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 19 Oct 2015 20:36:09 +0200
Subject: nginx service: add port option and extraConfig

---
 krebs/3modules/nginx.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix
index 702e8a7f6..65f3b238e 100644
--- a/krebs/3modules/nginx.nix
+++ b/krebs/3modules/nginx.nix
@@ -24,9 +24,17 @@ let
             "${config.networking.hostName}.retiolum"
           ];
         };
+        port = mkOption {
+          type = with types; int;
+          default = 80;
+        };
         locations = mkOption {
           type = with types; listOf (attrsOf str);
         };
+        extraConfig = mkOption {
+          type = with types; str;
+          default = "";
+        };
       };
       default = {};
     };
@@ -60,10 +68,11 @@ let
     }
   '';
 
-  to-server = { server-names, locations, ... }: ''
+  to-server = { server-names, port, locations, extraConfig, ... }: ''
     server {
-      listen 80;
+      listen ${toString port};
       server_name ${toString server-names};
+      ${extraConfig}
       ${indent (concatStrings (map to-location locations))}
     }
   '';
-- 
cgit v1.2.3


From dc52c4b988ba1e64bf91567f06b89586ca92fa47 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 19 Oct 2015 20:42:18 +0200
Subject: nginx service: replace port by listen

---
 krebs/3modules/nginx.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix
index 65f3b238e..c5f38c271 100644
--- a/krebs/3modules/nginx.nix
+++ b/krebs/3modules/nginx.nix
@@ -24,9 +24,9 @@ let
             "${config.networking.hostName}.retiolum"
           ];
         };
-        port = mkOption {
-          type = with types; int;
-          default = 80;
+        listen = mkOption {
+          type = with types; str;
+          default = "80";
         };
         locations = mkOption {
           type = with types; listOf (attrsOf str);
@@ -68,9 +68,9 @@ let
     }
   '';
 
-  to-server = { server-names, port, locations, extraConfig, ... }: ''
+  to-server = { server-names, listen, locations, extraConfig, ... }: ''
     server {
-      listen ${toString port};
+      listen ${listen};
       server_name ${toString server-names};
       ${extraConfig}
       ${indent (concatStrings (map to-location locations))}
-- 
cgit v1.2.3


From 5fdae43a99af8783549e8b7d1424556d1f219bf6 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 19 Oct 2015 21:20:38 +0200
Subject: move user namespaces into "users" attribute

IOW get ${user-name} -> get users.${user-name}
---
 krebs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index b98fad558..6e2aa2f9e 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -132,7 +132,7 @@
     stockholm = import ../. current;
 
     get-config = system:
-      stockholm.${current-user-name}.${system}.config
+      stockholm.users.${current-user-name}.${system}.config
         or (abort "unknown system: ${system}");
 
     doc = s:
@@ -181,6 +181,7 @@
           --profile ${lib.shell.escape config.krebs.build.profile} \
           --set \
           -A ${lib.escapeShellArg (lib.concatStringsSep "." [
+                "users"
                 config.krebs.build.user.name
                 config.krebs.build.host.name
                 "system"
-- 
cgit v1.2.3


From cb654782fa9b8130d056579a7922062a92501b77 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 02:33:58 +0200
Subject: document top-level default.nix

---
 krebs/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index 6e2aa2f9e..daa23cba8 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -129,11 +129,15 @@
 
   lib = import ./4lib { lib = import <nixpkgs/lib>; } // rec {
 
-    stockholm = import ../. current;
+    stockholm-path = ../.;
+
+    stockholm = import stockholm-path current;
+
+    nspath = ns: p: stockholm-path + "/${ns}/${p}";
 
     get-config = system:
       stockholm.users.${current-user-name}.${system}.config
-        or (abort "unknown system: ${system}");
+        or (abort "unknown system: ${system}, user: ${current-user-name}");
 
     doc = s:
       let b = "EOF${builtins.hashString "sha256" s}"; in
@@ -160,8 +164,7 @@
           inherit current-user-name;
         };
 
-        config = stockholm.${current-user-name}.${system}.config
-          or (abort "unknown system: ${system}");
+        config = get-config system;
 
         nix-path =
           lib.concatStringsSep ":"
@@ -209,8 +212,7 @@
           inherit current-user-name;
         };
 
-        config = stockholm.${current-user-name}.${system}.config
-            or (abort "unknown system: ${system}");
+        config = get-config system;
 
         current-host = config.krebs.hosts.${current-host-name};
         current-user = config.krebs.users.${current-user-name};
-- 
cgit v1.2.3


From aaa52a7a1c68687b1d90c4fa363e4446f6af9f3d Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 02:36:13 +0200
Subject: RIP lib.maybe

---
 krebs/4lib/default.nix |  5 -----
 krebs/4lib/maybe.nix   | 10 ----------
 2 files changed, 15 deletions(-)
 delete mode 100644 krebs/4lib/maybe.nix

(limited to 'krebs')

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index f15514fe3..0a6101314 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -3,13 +3,8 @@
 with builtins;
 with lib;
 
-let
-  maybe = import ./maybe.nix { inherit lib; };
-in
-
 builtins //
 lib //
-maybe //
 rec {
 
   eq = x: y: x == y;
diff --git a/krebs/4lib/maybe.nix b/krebs/4lib/maybe.nix
deleted file mode 100644
index 5189c99a1..000000000
--- a/krebs/4lib/maybe.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }:
-
-rec {
-  Just = x: { type = "maybe"; value = x; };
-  Nothing = { type = "maybe"; };
-  isMaybe = x: builtins.typeOf x == "set" && x.type or false == "maybe";
-  isJust = x: isMaybe x && builtins.hasAttr "value" x;
-  fromJust = x: assert isJust x; x.value;
-  catMaybes = xs: map fromJust (builtins.filter isJust xs);
-}
-- 
cgit v1.2.3


From a2b455c78692ba32fdcf31652621b826a16f78c5 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 02:43:27 +0200
Subject: push: 1.0.0 -> 1.1.0

---
 krebs/5pkgs/push/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/push/default.nix
index ce496d9c3..410b43465 100644
--- a/krebs/5pkgs/push/default.nix
+++ b/krebs/5pkgs/push/default.nix
@@ -9,12 +9,12 @@
 , ... }:
 
 stdenv.mkDerivation {
-  name = "push-1.0.0";
+  name = "push-1.1.0";
 
   src = fetchgit {
     url = http://cgit.cd.retiolum/push;
-    rev = "513da89fe50b3bad3d758855f5622c4508977e4a";
-    sha256 = "6124e1d4d4ef57455e2f06891e06fb01d3786846efaf9b79e3176d89988e1b4e";
+    rev = "c5f4bda5bd00bad7778bbd5a9af8d476de0de920";
+    sha256 = "d335b644b791214263cee5c6659538c8e45326531b0588e5e7eb3bd9ef969800";
   };
 
   phases = [
-- 
cgit v1.2.3


From 433479bc517d966ff6b56fb55e0b91500cad9e45 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 03:31:38 +0200
Subject: top-level default.nix provides stockholm

Collaterally, define krebs/default.nix's output in a concise way.
---
 krebs/default.nix | 264 ++++++++++++++++++++++++++----------------------------
 1 file changed, 128 insertions(+), 136 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index daa23cba8..c23cf152a 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -1,21 +1,29 @@
 { current-date
 , current-host-name
 , current-user-name
-}@current: rec {
+, stockholm
+}:
+
+let out = {
+    inherit deploy;
+    inherit infest;
+    inherit init;
+    inherit lib;
+  };
 
   deploy =
     { system ? current-host-name
     , target ? system
     }@args: let
-      config = lib.get-config system;
+      config = get-config system;
     in ''
       #! /bin/sh
       # ${current-date} ${current-user-name}@${current-host-name}
       # krebs.deploy
       set -efu
-      (${lib.populate args})
-      ${lib.rootssh target ''
-        ${lib.install args}
+      (${populate args})
+      ${rootssh target ''
+        ${install args}
         ${config.krebs.build.profile}/bin/switch-to-configuration switch
       ''}
       echo OK
@@ -66,17 +74,17 @@
           )"
         }
 
-        # Location to insert lib.install
+        # Location to insert install
         i=$(sed -n '/^echo "building the system configuration/=' "$src")
 
         {
           cat_src | sed -n "1,$i{p}"
-          cat ${lib.doc (lib.install args)}
+          cat ${lib.doc (install args)}
           cat_src | sed -n "$i,\''${$i!p}"
         } > nixos-install
         chmod +x nixos-install
 
-        ## Wrap inserted lib.install into chroot.
+        ## Wrap inserted install into chroot.
         #nix_env=$(cat_src | sed -n '
         #  s:.*\(/nix/store/[a-z0-9]*-nix-[0-9.]\+/bin/nix-env\).*:\1:p;T;q
         #')
@@ -95,7 +103,7 @@
   init =
     { system ? current-host-name
     }@args: let
-      config = lib.get-config system;
+      config = get-config system;
     in ''
       #! /bin/sh
       # ${current-date} ${current-user-name}@${current-host-name}
@@ -128,140 +136,124 @@
     '';
 
   lib = import ./4lib { lib = import <nixpkgs/lib>; } // rec {
-
     stockholm-path = ../.;
-
-    stockholm = import stockholm-path current;
-
     nspath = ns: p: stockholm-path + "/${ns}/${p}";
+  };
 
-    get-config = system:
-      stockholm.users.${current-user-name}.${system}.config
-        or (abort "unknown system: ${system}, user: ${current-user-name}");
+  doc = s:
+    let b = "EOF${builtins.hashString "sha256" s}"; in
+    ''
+    <<\${b}
+    ${s}
+    ${b}
+    '';
 
-    doc = s:
-      let b = "EOF${builtins.hashString "sha256" s}"; in
-      ''
-      <<\${b}
-      ${s}
-      ${b}
-      '';
+  get-config = system:
+    stockholm.users.${current-user-name}.${system}.config
+      or (abort "unknown system: ${system}, user: ${current-user-name}");
 
-    rootssh = target: script:
-      "ssh root@${target} -T ${lib.doc ''
-        set -efu
-        ${script}
-      ''}";
-
-    install =
-      { system ? current-host-name
-      , target ? system
-      }:
-      let
-        stockholm = import ../. {
-          inherit current-date;
-          inherit current-host-name;
-          inherit current-user-name;
-        };
-
-        config = get-config system;
-
-        nix-path =
-          lib.concatStringsSep ":"
-            (lib.mapAttrsToList (name: _: "${name}=/root/${name}")
-              (config.krebs.build.source.dir //
-               config.krebs.build.source.git));
-      in ''
+  install =
+    { system ? current-host-name
+    , target ? system
+    }:
+    let
+      config = get-config system;
+
+      nix-path =
+        lib.concatStringsSep ":"
+          (lib.mapAttrsToList (name: _: "${name}=/root/${name}")
+            (config.krebs.build.source.dir //
+             config.krebs.build.source.git));
+    in ''
+      set -efu
+      NIX_PATH=${lib.shell.escape nix-path} \
+      nix-env \
+        --show-trace \
+        -f '<stockholm>' \
+        --argstr current-date ${lib.shell.escape current-date} \
+        --argstr current-host-name ${lib.shell.escape current-host-name} \
+        --argstr current-user-name ${lib.shell.escape current-user-name} \
+        --profile ${lib.shell.escape config.krebs.build.profile} \
+        --set \
+        -A ${lib.escapeShellArg (lib.concatStringsSep "." [
+              "users"
+              config.krebs.build.user.name
+              config.krebs.build.host.name
+              "system"
+            ])}
+    '';
+
+  populate =
+    { system ? current-host-name
+    , target ? system
+    }@args:
+    let out = ''
+        #! /bin/sh
+        # ${current-date} ${current-user-name}@${current-host-name}
         set -efu
-        NIX_PATH=${lib.shell.escape nix-path} \
-        nix-env \
-          --show-trace \
-          -f '<stockholm>' \
-          -Q \
-          --argstr current-date ${lib.shell.escape current-date} \
-          --argstr current-host-name ${lib.shell.escape current-host-name} \
-          --argstr current-user-name ${lib.shell.escape current-user-name} \
-          --profile ${lib.shell.escape config.krebs.build.profile} \
-          --set \
-          -A ${lib.escapeShellArg (lib.concatStringsSep "." [
-                "users"
-                config.krebs.build.user.name
-                config.krebs.build.host.name
-                "system"
-              ])}
+        ${lib.concatStringsSep "\n"
+          (lib.concatMap
+            (type: lib.mapAttrsToList (_: methods.${type})
+                                      config.krebs.build.source.${type})
+            ["dir" "git"])}
       '';
 
-    populate =
-      { system ? current-host-name
-      , target ? system
-      }@args:
-      let out = ''
-          #! /bin/sh
-          # ${current-date} ${current-user-name}@${current-host-name}
-          set -efu
-          ${lib.concatStringsSep "\n"
-            (lib.concatMap
-              (type: lib.mapAttrsToList (_: methods.${type})
-                                        config.krebs.build.source.${type})
-              ["dir" "git"])}
+      config = get-config system;
+
+      current-host = config.krebs.hosts.${current-host-name};
+      current-user = config.krebs.users.${current-user-name};
+
+      target-host = config.krebs.hosts.${system};
+
+      methods.dir = config:
+        let
+          can-link = config.host.name == target-host.name;
+          can-push = config.host.name == current-host.name;
+          push-method = ''
+            rsync \
+              --exclude .git \
+              --exclude .graveyard \
+              --exclude old \
+              --exclude tmp \
+              --rsync-path='mkdir -p ${config.target-path} && rsync' \
+              --delete-excluded \
+              -vrLptgoD \
+              ${config.path}/ \
+              root@${target}:${config.target-path}
+          '';
+          url = "file://${config.host.name}${config.path}";
+        in
+        #if can-link then link-method else
+        if can-push then push-method else
+        throw "cannot source ${url}";
+
+      methods.git = config:
+        rootssh target ''
+          mkdir -p ${config.target-path}
+          cd ${config.target-path}
+          if ! test -e .git; then
+            git init
+          fi
+          if ! cur_url=$(git config remote.origin.url 2>/dev/null); then
+            git remote add origin ${config.url}
+          elif test "$cur_url" != ${config.url}; then
+            git remote set-url origin ${config.url}
+          fi
+          if test "$(git rev-parse --verify HEAD 2>/dev/null)" != ${config.rev}; then
+            git fetch origin
+            git checkout ${config.rev} -- .
+            git checkout -q ${config.rev}
+            git submodule init
+            git submodule update
+          fi
+          git clean -dxf
         '';
+    in out;
 
-        stockholm = import ../. {
-          inherit current-date;
-          inherit current-host-name;
-          inherit current-user-name;
-        };
-
-        config = get-config system;
-
-        current-host = config.krebs.hosts.${current-host-name};
-        current-user = config.krebs.users.${current-user-name};
-
-        target-host = config.krebs.hosts.${system};
-
-        methods.dir = config:
-          let
-            can-link = config.host.name == target-host.name;
-            can-push = config.host.name == current-host.name;
-            push-method = ''
-              rsync \
-                --exclude .git \
-                --exclude .graveyard \
-                --exclude old \
-                --exclude tmp \
-                --rsync-path='mkdir -p ${config.target-path} && rsync' \
-                --delete-excluded \
-                -vrLptgoD \
-                ${config.path}/ \
-                root@${target}:${config.target-path}
-            '';
-            url = "file://${config.host.name}${config.path}";
-          in
-          #if can-link then link-method else
-          if can-push then push-method else
-          throw "cannot source ${url}";
-
-        methods.git = config:
-          lib.rootssh target ''
-            mkdir -p ${config.target-path}
-            cd ${config.target-path}
-            if ! test -e .git; then
-              git init
-            fi
-            if ! cur_url=$(git config remote.origin.url 2>/dev/null); then
-              git remote add origin ${config.url}
-            elif test "$cur_url" != ${config.url}; then
-              git remote set-url origin ${config.url}
-            fi
-            if test "$(git rev-parse --verify HEAD 2>/dev/null)" != ${config.rev}; then
-              git fetch origin
-              git checkout ${config.rev} -- .
-              git checkout -q ${config.rev}
-              git submodule init
-              git submodule update
-            fi
-            git clean -dxf
-          '';
-      in out;
-  };
-}
+  rootssh = target: script:
+    "ssh root@${target} -T ${doc ''
+      set -efu
+      ${script}
+    ''}";
+
+in out
-- 
cgit v1.2.3


From b2fd7be3ff755e17e9d303f03b9a2345623fd384 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 18:53:11 +0200
Subject: nginx service: allow multiple listen entries

---
 krebs/3modules/nginx.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix
index c5f38c271..0530921a0 100644
--- a/krebs/3modules/nginx.nix
+++ b/krebs/3modules/nginx.nix
@@ -25,8 +25,12 @@ let
           ];
         };
         listen = mkOption {
-          type = with types; str;
+          type = with types; either str (listOf str);
           default = "80";
+          apply = x:
+            if typeOf x != "list"
+              then [x]
+              else x;
         };
         locations = mkOption {
           type = with types; listOf (attrsOf str);
@@ -70,7 +74,7 @@ let
 
   to-server = { server-names, listen, locations, extraConfig, ... }: ''
     server {
-      listen ${listen};
+      ${concatMapStringsSep "\n" (x: "listen ${x};") listen}
       server_name ${toString server-names};
       ${extraConfig}
       ${indent (concatStrings (map to-location locations))}
-- 
cgit v1.2.3


From 2efaf0f219850cd02cc77cb41d6c1c1bdd9de6ba Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 20:06:17 +0200
Subject: populate dir: improve error message

---
 krebs/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index c23cf152a..5e6595ced 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -221,11 +221,15 @@ let out = {
               ${config.path}/ \
               root@${target}:${config.target-path}
           '';
-          url = "file://${config.host.name}${config.path}";
+          current-url = "${current-user-name}@${current-host.name}";
+          source-url = "file://${config.host.name}${config.path}";
+          target-url = "root@${target}:${config.target-path}";
         in
         #if can-link then link-method else
         if can-push then push-method else
-        throw "cannot source ${url}";
+        throw
+          # /!\ revise this message when using more than just push-method
+          "No way to push ${source-url} from ${current-url} to ${target-url}";
 
       methods.git = config:
         rootssh target ''
-- 
cgit v1.2.3


From acb53c23dcb11de02e642e7f99e83401531e48c1 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 20:19:40 +0200
Subject: populate dir: drop link-method fragments

---
 krebs/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index 5e6595ced..40b3550c8 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -203,11 +203,8 @@ let out = {
       current-host = config.krebs.hosts.${current-host-name};
       current-user = config.krebs.users.${current-user-name};
 
-      target-host = config.krebs.hosts.${system};
-
       methods.dir = config:
         let
-          can-link = config.host.name == target-host.name;
           can-push = config.host.name == current-host.name;
           push-method = ''
             rsync \
@@ -219,13 +216,12 @@ let out = {
               --delete-excluded \
               -vrLptgoD \
               ${config.path}/ \
-              root@${target}:${config.target-path}
+              ${target-url}
           '';
           current-url = "${current-user-name}@${current-host.name}";
           source-url = "file://${config.host.name}${config.path}";
           target-url = "root@${target}:${config.target-path}";
         in
-        #if can-link then link-method else
         if can-push then push-method else
         throw
           # /!\ revise this message when using more than just push-method
-- 
cgit v1.2.3


From 9cb1fdc946aecc96bd9bbadca77b6d7e3c87abd3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 20:24:25 +0200
Subject: populate dir: reduce noise in error message

---
 krebs/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index 40b3550c8..3e86c0466 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -216,16 +216,13 @@ let out = {
               --delete-excluded \
               -vrLptgoD \
               ${config.path}/ \
-              ${target-url}
+              root@${target}:${config.target-path}
           '';
-          current-url = "${current-user-name}@${current-host.name}";
-          source-url = "file://${config.host.name}${config.path}";
-          target-url = "root@${target}:${config.target-path}";
         in
         if can-push then push-method else
-        throw
-          # /!\ revise this message when using more than just push-method
-          "No way to push ${source-url} from ${current-url} to ${target-url}";
+        let dir = "file://${config.host.name}${config.path}"; in
+        # /!\ revise this message when using more than just push-method
+        throw "No way to push ${dir} from ${current-host.name} to ${target}";
 
       methods.git = config:
         rootssh target ''
-- 
cgit v1.2.3


From 914c4c4a2fb6be95f7f4dbc9134fd272ec210c26 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 20:28:26 +0200
Subject: krebs default: drop redundant "lib."

---
 krebs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index 3e86c0466..9258c236b 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -48,14 +48,14 @@ let out = {
       #  eval "$RSYNC_RSH \"\$@\""
       #}
 
-      ${lib.rootssh target ''
+      ${rootssh target ''
         ${builtins.readFile ./4lib/infest/prepare.sh}
         ${builtins.readFile ./4lib/infest/install-nix.sh}
       ''}
 
-      (${lib.populate args})
+      (${populate args})
 
-      ${lib.rootssh target ''
+      ${rootssh target ''
         export PATH; PATH=/root/.nix-profile/bin:$PATH
 
         src=$(type -p nixos-install)
@@ -79,7 +79,7 @@ let out = {
 
         {
           cat_src | sed -n "1,$i{p}"
-          cat ${lib.doc (install args)}
+          cat ${doc (install args)}
           cat_src | sed -n "$i,\''${$i!p}"
         } > nixos-install
         chmod +x nixos-install
-- 
cgit v1.2.3


From 9bbdfb85cf333fde4050bbef738c54ca988db228 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 22:13:42 +0200
Subject: export krebs.populate

---
 krebs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index 9258c236b..4d09075cb 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -8,6 +8,7 @@ let out = {
     inherit deploy;
     inherit infest;
     inherit init;
+    inherit populate;
     inherit lib;
   };
 
-- 
cgit v1.2.3


From fc45cc29265e9b3e51033fddd5d8ea1042c1aa41 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 23:17:32 +0200
Subject: export krebs.nixos-install

Collaterally, unexport krebs.populate again.
---
 krebs/default.nix | 101 ++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

(limited to 'krebs')

diff --git a/krebs/default.nix b/krebs/default.nix
index 4d09075cb..de805a89c 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -8,8 +8,8 @@ let out = {
     inherit deploy;
     inherit infest;
     inherit init;
-    inherit populate;
     inherit lib;
+    inherit nixos-install;
   };
 
   deploy =
@@ -24,7 +24,7 @@ let out = {
       set -efu
       (${populate args})
       ${rootssh target ''
-        ${install args}
+        ${nix-install args}
         ${config.krebs.build.profile}/bin/switch-to-configuration switch
       ''}
       echo OK
@@ -40,63 +40,14 @@ let out = {
       # krebs.infest
       set -efu
 
-      # XXX type -p is non-standard
-      #export RSYNC_RSH; RSYNC_RSH="$(type -p ssh) \
-      #  -o 'HostName $ {target.host.infest.addr}' \
-      #  -o 'Port $ {toString target.host.infest.port}' \
-      #"
-      #ssh() {
-      #  eval "$RSYNC_RSH \"\$@\""
-      #}
-
       ${rootssh target ''
         ${builtins.readFile ./4lib/infest/prepare.sh}
         ${builtins.readFile ./4lib/infest/install-nix.sh}
       ''}
 
-      (${populate args})
+      (${nixos-install args})
 
       ${rootssh target ''
-        export PATH; PATH=/root/.nix-profile/bin:$PATH
-
-        src=$(type -p nixos-install)
-        cat_src() {
-          sed < "$src" "$(
-            { sed < "$src" -n '
-                  /^if ! test -e "\$mountPoint\/\$NIXOS_CONFIG/,/^fi$/=
-                  /^nixpkgs=/=
-                  /^NIX_PATH=/,/^$/{/./=}
-
-                  # Disable: Copy the NixOS/Nixpkgs sources to the target as
-                  # the initial contents of the NixOS channel.
-                  /^srcs=/,/^ln -sfn /=
-                '
-            } | sed 's:$:s/^/#krebs#/:'
-          )"
-        }
-
-        # Location to insert install
-        i=$(sed -n '/^echo "building the system configuration/=' "$src")
-
-        {
-          cat_src | sed -n "1,$i{p}"
-          cat ${doc (install args)}
-          cat_src | sed -n "$i,\''${$i!p}"
-        } > nixos-install
-        chmod +x nixos-install
-
-        ## Wrap inserted install into chroot.
-        #nix_env=$(cat_src | sed -n '
-        #  s:.*\(/nix/store/[a-z0-9]*-nix-[0-9.]\+/bin/nix-env\).*:\1:p;T;q
-        #')
-        #echo nix-env is $nix_env
-        #sed -i '
-        #  s:^nix-env:chroot $mountPoint '"$nix_env"':
-        #' nixos-install
-
-        unset SSL_CERT_FILE
-        ./nixos-install
-
         ${builtins.readFile ./4lib/infest/finalize.sh}
       ''}
     '';
@@ -136,6 +87,50 @@ let out = {
       EOF
     '';
 
+  nixos-install =
+    { system ? current-host-name
+    , target ? system
+    }@args: let
+    in ''
+      #! /bin/sh
+      # ${current-date} ${current-user-name}@${current-host-name}
+      # krebs.nixos-install
+      (${populate args})
+
+      ${rootssh target ''
+        export PATH; PATH=/root/.nix-profile/bin:$PATH
+
+        src=$(type -p nixos-install)
+        cat_src() {
+          sed < "$src" "$(
+            { sed < "$src" -n '
+                  /^if ! test -e "\$mountPoint\/\$NIXOS_CONFIG/,/^fi$/=
+                  /^nixpkgs=/=
+                  /^NIX_PATH=/,/^$/{/./=}
+
+                  # Disable: Copy the NixOS/Nixpkgs sources to the target as
+                  # the initial contents of the NixOS channel.
+                  /^srcs=/,/^ln -sfn /=
+                '
+            } | sed 's:$:s/^/#krebs#/:'
+          )"
+        }
+
+        # Location to insert `nix-install`
+        i=$(sed -n '/^echo "building the system configuration/=' "$src")
+
+        {
+          cat_src | sed -n "1,$i{p}"
+          cat ${doc (nix-install args)}
+          cat_src | sed -n "$i,\''${$i!p}"
+        } > nixos-install
+        chmod +x nixos-install
+
+        unset SSL_CERT_FILE
+        ./nixos-install
+      ''}
+    '';
+
   lib = import ./4lib { lib = import <nixpkgs/lib>; } // rec {
     stockholm-path = ../.;
     nspath = ns: p: stockholm-path + "/${ns}/${p}";
@@ -153,7 +148,7 @@ let out = {
     stockholm.users.${current-user-name}.${system}.config
       or (abort "unknown system: ${system}, user: ${current-user-name}");
 
-  install =
+  nix-install =
     { system ? current-host-name
     , target ? system
     }:
-- 
cgit v1.2.3