diff options
| author | lassulus <lass@blue.r> | 2018-11-10 19:42:46 +0100 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-11-10 19:42:46 +0100 |
| commit | eff97662c02f385b1740929639817fc5b8318f07 (patch) | |
| tree | f11710101eed0dcc8d75304939f06e819339d9f0 /krebs/3modules/default.nix | |
| parent | 0028e3dde3dcb8e5e9394f7d230c7224b6177b79 (diff) | |
| parent | 254e9e62b95951cecadd2b4800c03ef96f95b3c0 (diff) | |
Merge remote-tracking branch 'nextgum/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 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 = { |