diff options
| author | tv <tv@krebsco.de> | 2018-11-10 19:52:37 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-11-10 19:52:37 +0100 |
| commit | 5ea1c2fcbb5756ef99d5fade8a7cd9e33b04a0c6 (patch) | |
| tree | f6edbd9d1ff68773f413065a1f1c5dd71150be1a /krebs/3modules/default.nix | |
| parent | 9a801fa642a60a2c46240670b4e3ad66ea77d995 (diff) | |
| parent | 05b288604e7e653efb6035b9953aa849e6e6bc19 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6307649e..8f2e22ac 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -14,6 +14,7 @@ let ./buildbot/master.nix ./buildbot/slave.nix ./build.nix + ./charybdis.nix ./ci.nix ./current.nix ./exim.nix @@ -111,7 +112,6 @@ let { krebs = import ./krebs { inherit config; }; } { krebs = import ./lass { inherit config; }; } { krebs = import ./makefu { inherit config; }; } - { krebs = import ./nin { inherit config; }; } { krebs = import ./tv { inherit config; }; } { krebs.dns.providers = { |