Merge remote-tracking branch 'cd/master'

This commit is contained in:
makefu 2015-12-30 14:58:20 +01:00
commit c625c7d422

View File

@ -1,14 +1,12 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with builtins;
with lib; with lib;
let let
cfg = config.krebs.exim-retiolum; cfg = config.krebs.exim-retiolum;
out = { out = {
options.krebs.exim-retiolum = api; options.krebs.exim-retiolum = api;
config = config = mkIf cfg.enable imp;
mkIf cfg.enable imp;
}; };
api = { api = {
@ -16,13 +14,13 @@ let
}; };
imp = { imp = {
services.exim = services.exim = {
# This configuration makes only sense for retiolum-enabled hosts. enable = true;
# TODO modular configuration config =
assert config.krebs.retiolum.enable; # This configuration makes only sense for retiolum-enabled hosts.
{ # TODO modular configuration
enable = true; assert config.krebs.retiolum.enable;
config = '' ''
primary_hostname = ${retiolumHostname} primary_hostname = ${retiolumHostname}
domainlist local_domains = @ : localhost domainlist local_domains = @ : localhost
domainlist relay_to_domains = *.retiolum domainlist relay_to_domains = *.retiolum
@ -134,7 +132,7 @@ let
begin authenticators begin authenticators
''; '';
}; };
}; };
# TODO get the hostname from somewhere else. # TODO get the hostname from somewhere else.