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 = {
enable = true;
config =
# This configuration makes only sense for retiolum-enabled hosts. # This configuration makes only sense for retiolum-enabled hosts.
# TODO modular configuration # TODO modular configuration
assert config.krebs.retiolum.enable; assert config.krebs.retiolum.enable;
{ ''
enable = true;
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