Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exim modules: mark nested syntax

Browse Source
This commit is contained in:
tv 2019-06-22 12:55:16 +02:00
parent aca9d77a73
commit 3d4d39eecc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/exim-retiolum.nix
View File

@ -29,7 +29,7 @@ in {
# 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.tinc.retiolum.enable; assert config.krebs.tinc.retiolum.enable;
'' /* exim */ ''
keep_environment = keep_environment =
primary_hostname = ${cfg.primary_hostname} primary_hostname = ${cfg.primary_hostname}

6
krebs/3modules/exim-smarthost.nix
View File

@ -121,7 +121,7 @@ let
}; };
krebs.exim = { krebs.exim = {
enable = true; enable = true;
config = '' config = /* exim */ ''
keep_environment = keep_environment =
primary_hostname = ${cfg.primary_hostname} primary_hostname = ${cfg.primary_hostname}
@ -233,7 +233,7 @@ let
remote_smtp: remote_smtp:
driver = smtp driver = smtp
${optionalString (cfg.dkim != []) (indent '' ${optionalString (cfg.dkim != []) (indent /* exim */ ''
dkim_canon = relaxed dkim_canon = relaxed
dkim_domain = $sender_address_domain dkim_domain = $sender_address_domain
dkim_private_key = ''${lookup{$sender_address_domain}lsearch{${lsearch.dkim_private_key}}} dkim_private_key = ''${lookup{$sender_address_domain}lsearch{${lsearch.dkim_private_key}}}
@ -262,7 +262,7 @@ let
begin rewrite begin rewrite
begin authenticators begin authenticators
${concatStringsSep "\n" (mapAttrsToList (name: text: '' ${concatStringsSep "\n" (mapAttrsToList (name: text: /* exim */ ''
${name}: ${name}:
${indent text} ${indent text}
'') cfg.authenticators)} '') cfg.authenticators)}

2
krebs/3modules/exim.nix
View File

@ -37,7 +37,7 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment = { environment = {
etc."exim.conf".source = pkgs.writeEximConfig "exim.conf" '' etc."exim.conf".source = pkgs.writeEximConfig "exim.conf" /* exim */ ''
exim_user = ${cfg.user.name} exim_user = ${cfg.user.name}
exim_group = ${cfg.group.name} exim_group = ${cfg.group.name}
exim_path = /run/wrappers/bin/exim exim_path = /run/wrappers/bin/exim