diff options
| author | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
| commit | 91023a11ebae6794caaecc882892da7f90deea28 (patch) | |
| tree | 5bfd29cf49b1248cff80c4e001b0bf78b972ff26 /krebs/3modules/default.nix | |
| parent | 9104af869e8c8ce299fc2ddbf7f2631bbbf48b1e (diff) | |
| parent | 6b08d5aa46adc80d8a1ab4ed1d3e320c61a19f01 (diff) | |
Merge remote-tracking branch 'lass/18.09' into 18.09
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 6307649e3..8f2e22acf 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 = { |