From e10d36bec7e4fb8cb82162c2e9bc86e58f2d5a0e Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 31 Aug 2015 19:56:47 +0200 Subject: add sample of how to extend the Reaktor config --- makefu/2configs/Reaktor/simpleExtend.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 makefu/2configs/Reaktor/simpleExtend.nix (limited to 'makefu/2configs/Reaktor') diff --git a/makefu/2configs/Reaktor/simpleExtend.nix b/makefu/2configs/Reaktor/simpleExtend.nix new file mode 100644 index 000000000..3b55ca412 --- /dev/null +++ b/makefu/2configs/Reaktor/simpleExtend.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +let + nixos-version-script = pkgs.writeScript "nix-version" '' + #! /bin/sh + . /etc/os-release + echo "$PRETTY_NAME" + ''; +in { + krebs.Reaktor.enable = true; + krebs.Reaktor.nickname = "test-reaktor"; + krebs.Reaktor.extraConfig = '' + public_commands.insert(0,{ + 'capname' : "nixos-version", + 'pattern' : indirect_pattern.format("nixos-version"), + 'argv' : ["${nixos-version-script}"], + 'env' : { 'state_dir': workdir } }) + ''; +} + -- cgit v1.2.3 From 6bcda8fa7b87ae84e6484d497382abb766c7bae8 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 4 Sep 2015 22:57:16 +0200 Subject: makefu:Reakor add random-issue --- makefu/2configs/Reaktor/random-issue.sh | 20 ++++++++++++++++++++ makefu/2configs/Reaktor/stockholmLentil.nix | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 makefu/2configs/Reaktor/random-issue.sh create mode 100644 makefu/2configs/Reaktor/stockholmLentil.nix (limited to 'makefu/2configs/Reaktor') diff --git a/makefu/2configs/Reaktor/random-issue.sh b/makefu/2configs/Reaktor/random-issue.sh new file mode 100644 index 000000000..5c47c6156 --- /dev/null +++ b/makefu/2configs/Reaktor/random-issue.sh @@ -0,0 +1,20 @@ +#! /bin/sh +set -eu +# requires env: +# $state_dir +# $origin + +# in PATH: git,lentil,coreutils +subdir=`echo "$1" | tr -dc "[:alnum:]"` +name=`echo "$origin" | tr -dc "[:alnum:]"` +track="$state_dir/$name-checkout" +(if test -e "$track" ;then + cd "$track" + git fetch origin master + git reset --hard origin/master +else + git clone "$origin" "$track" +fi) >&2 + +cd "$track" +lentil "${subdir:-.}" -f csv | sed 1d | shuf | head -1 diff --git a/makefu/2configs/Reaktor/stockholmLentil.nix b/makefu/2configs/Reaktor/stockholmLentil.nix new file mode 100644 index 000000000..80f1f7765 --- /dev/null +++ b/makefu/2configs/Reaktor/stockholmLentil.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +let + random-issue = pkgs.writeScript "random-issue" (builtins.readFile ./random-issue.sh); + random-issue-path = lib.makeSearchPath "bin" (with pkgs; [ + coreutils + git + gnused + lentil]); +in { + krebs.Reaktor.enable = true; + krebs.Reaktor.debug = true; + # krebs.Reaktor.nickname = "test-reaktor"; + # TODO: make origin variable + krebs.Reaktor.extraConfig = '' + public_commands.insert(0,{ + 'capname' : "stockholm-issue", + 'pattern' : indirect_pattern.format("stockholm-issue"), + 'argv' : ["${random-issue}"], + 'env' : { 'state_dir': workdir, + 'PATH':'${random-issue-path}', + 'origin':'http://cgit.pnp/stockholm' } }) + ''; +} -- cgit v1.2.3 From 6099a42734f4fe242c7d244944cb2b3b23b2524f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 4 Sep 2015 23:01:41 +0200 Subject: Reaktor extraconfig is extensible --- makefu/2configs/Reaktor/simpleExtend.nix | 2 -- makefu/2configs/Reaktor/stockholmLentil.nix | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'makefu/2configs/Reaktor') diff --git a/makefu/2configs/Reaktor/simpleExtend.nix b/makefu/2configs/Reaktor/simpleExtend.nix index 3b55ca412..95175a4e0 100644 --- a/makefu/2configs/Reaktor/simpleExtend.nix +++ b/makefu/2configs/Reaktor/simpleExtend.nix @@ -8,8 +8,6 @@ let echo "$PRETTY_NAME" ''; in { - krebs.Reaktor.enable = true; - krebs.Reaktor.nickname = "test-reaktor"; krebs.Reaktor.extraConfig = '' public_commands.insert(0,{ 'capname' : "nixos-version", diff --git a/makefu/2configs/Reaktor/stockholmLentil.nix b/makefu/2configs/Reaktor/stockholmLentil.nix index 80f1f7765..147fb5a7a 100644 --- a/makefu/2configs/Reaktor/stockholmLentil.nix +++ b/makefu/2configs/Reaktor/stockholmLentil.nix @@ -9,10 +9,7 @@ let gnused lentil]); in { - krebs.Reaktor.enable = true; - krebs.Reaktor.debug = true; - # krebs.Reaktor.nickname = "test-reaktor"; - # TODO: make origin variable + # TODO: make origin a variable, <- module is generic enough to handle different origins, not only stockholm krebs.Reaktor.extraConfig = '' public_commands.insert(0,{ 'capname' : "stockholm-issue", -- cgit v1.2.3