Merge remote-tracking branch 'cd/master' into before-merge

This commit is contained in:
makefu 2015-08-13 16:46:54 +02:00
commit 659a289277

View File

@ -8,11 +8,7 @@ let
out = { out = {
options.krebs.exim-retiolum = api; options.krebs.exim-retiolum = api;
config = config =
# This configuration makes only sense for retiolum-enabled hosts. mkIf cfg.enable imp;
# TODO modular configuration
mkIf cfg.enable (
#assert config.krebs.retiolum.enable;
imp);
}; };
api = { api = {
@ -20,7 +16,11 @@ let
}; };
imp = { imp = {
services.exim = { services.exim =
# This configuration makes only sense for retiolum-enabled hosts.
# TODO modular configuration
assert config.krebs.retiolum.enable;
{
enable = true; enable = true;
config = '' config = ''
primary_hostname = ${retiolumHostname} primary_hostname = ${retiolumHostname}