diff options
author | makefu <github@syntax-fehler.de> | 2015-10-25 18:17:14 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-25 18:17:14 +0100 |
commit | bb16a38df6ad33c7339d4875e948853927015045 (patch) | |
tree | 3cd41d5d52c8facf55e48e05c65b6bad887ae4c3 /krebs/3modules/default.nix | |
parent | cca25c7b66c44e0ec826d466bd48f2463df03fe9 (diff) | |
parent | 4b22988392f940c705e7f3fddc39481635777895 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/default.nix')
-rw-r--r-- | krebs/3modules/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index e0c3b00f8..fd9d56ed2 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -8,6 +8,7 @@ let imports = [ ./bepasty-server.nix ./build.nix + ./current.nix ./exim-retiolum.nix ./exim-smarthost.nix ./github-hosts-sync.nix @@ -76,6 +77,7 @@ let imp = mkMerge [ { krebs = import ./lass { inherit lib; }; } { krebs = import ./makefu { inherit lib; }; } + { krebs = import ./shared { inherit lib; }; } { krebs = import ./tv { inherit lib; }; } { krebs.dns.providers = { |