From 5fdae43a99af8783549e8b7d1424556d1f219bf6 Mon Sep 17 00:00:00 2001 From: tv 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 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 ; } // 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 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 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 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 ; } // 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 '' \ + --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 '' \ - -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 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