diff options
| author | jeschli <jeschli@gmail.com> | 2018-12-04 19:27:27 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-12-04 19:27:27 +0100 |
| commit | 5030b74cc5c578bb82619a24592504a6008f1a10 (patch) | |
| tree | 0551e3ddb94353b7438bec02174bf3379bc89b87 /krebs/3modules/default.nix | |
| parent | 78b289201987675844aa37abeb4279eb4051ebe0 (diff) | |
| parent | 82988de84c177c247ebbe80940c4d50b9f073b4e (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6307649e..24cbd9cc 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -14,6 +14,8 @@ let ./buildbot/master.nix ./buildbot/slave.nix ./build.nix + ./cachecache.nix + ./charybdis.nix ./ci.nix ./current.nix ./exim.nix @@ -111,7 +113,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 = { @@ -201,6 +202,7 @@ let "cfp@eloop.org" = eloop-ml; "kontakt@eloop.org" = eloop-ml; "root@eloop.org" = eloop-ml; + "youtube@eloop.org" = eloop-ml; "eloop2016@krebsco.de" = eloop-ml; "eloop2017@krebsco.de" = eloop-ml; "postmaster@krebsco.de" = spam-ml; # RFC 822 |