summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/default.nix2
-rw-r--r--krebs/3modules/krebs/default.nix (renamed from krebs/3modules/shared/default.nix)8
2 files changed, 5 insertions, 5 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 081724cfe..6123b6dd9 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -94,10 +94,10 @@ let
imp = lib.mkMerge [
{ krebs = import ./lass { inherit config; }; }
+ { krebs = import ./krebs { inherit config; }; }
{ krebs = import ./makefu { inherit config; }; }
{ krebs = import ./mv { inherit config; }; }
{ krebs = import ./nin { inherit config; }; }
- { krebs = import ./shared { inherit config; }; }
{ krebs = import ./tv { inherit config; }; }
{
krebs.dns.providers = {
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/krebs/default.nix
index 17179a39f..780aeb1cf 100644
--- a/krebs/3modules/shared/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -8,7 +8,7 @@ let
"test-centos7"
"test-all-krebs-modules"
] (name: {
- owner = config.krebs.users.shared;
+ owner = config.krebs.users.krebs;
inherit name;
cores = 1;
nets = {
@@ -31,7 +31,7 @@ let
in {
hosts = {
wolf = {
- owner = config.krebs.users.shared;
+ owner = config.krebs.users.krebs;
nets = {
shack = {
ip4.addr = "10.42.2.150" ;
@@ -67,9 +67,9 @@ in {
};
} // testHosts;
users = {
- shared = {
+ krebs = {
mail = "spam@krebsco.de";
- pubkey = "lol"; # TODO krebs.users.shared.pubkey should be unnecessary
+ pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary
};
};
}