summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-09-04 23:01:41 +0200
committermakefu <github@syntax-fehler.de>2015-09-04 23:01:41 +0200
commit6099a42734f4fe242c7d244944cb2b3b23b2524f (patch)
tree8eadd89ccb089a853177fe5a78365e02f6edd09c
parent6bcda8fa7b87ae84e6484d497382abb766c7bae8 (diff)
Reaktor extraconfig is extensible
-rw-r--r--krebs/3modules/Reaktor.nix2
-rw-r--r--makefu/2configs/Reaktor/simpleExtend.nix2
-rw-r--r--makefu/2configs/Reaktor/stockholmLentil.nix5
3 files changed, 2 insertions, 7 deletions
diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix
index 23a1c0888..fce24fa63 100644
--- a/krebs/3modules/Reaktor.nix
+++ b/krebs/3modules/Reaktor.nix
@@ -58,7 +58,7 @@ let
};
extraConfig = mkOption {
default = "";
- type = types.str;
+ type = types.string;
description = ''
configuration appended to the default or overridden configuration
'';
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",