diff options
| author | EuAndreh <eu@euandre.org> | 2023-03-17 14:43:06 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2023-03-17 14:43:06 -0300 |
| commit | 3c573f5d8828583aeee2f056b929d490a2a7bfed (patch) | |
| tree | 57f31edf041b7cd3b16c83f64e2cffbf3e4bf2a9 /src/org | |
| parent | queue.scm: Add missing mapping to DKIMPorxy.out container and enable it by de... (diff) | |
| download | package-repository-3c573f5d8828583aeee2f056b929d490a2a7bfed.tar.gz package-repository-3c573f5d8828583aeee2f056b929d490a2a7bfed.tar.xz | |
queue.scm: Add flexible "config-extra" and "raw-file" options for dkimproxyout
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/euandre/queue.scm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm index a468413..412699c 100644 --- a/src/org/euandre/queue.scm +++ b/src/org/euandre/queue.scm @@ -94,6 +94,8 @@ dkimproxyout-configuration-group dkimproxyout-configuration-supplementary-groups dkimproxyout-configuration-config-name + dkimproxyout-configuration-config-extra + dkimproxyout-configuration-raw-file dkimproxyout-configuration-listen dkimproxyout-configuration-relay dkimproxyout-configuration-domains @@ -681,6 +683,8 @@ By default, the daemon runs in a container."))) (group dkimproxyout-configuration-group (default "dkimproxyout")) (supplementary-groups dkimproxyout-configuration-supplementary-groups (default '())) (config-name dkimproxyout-configuration-config-name (default "dkimproxyout.conf")) + (config-extra dkimproxyout-configuration-config-extra (default "")) + (raw-file dkimproxyout-configuration-raw-file (default #f)) (listen dkimproxyout-configuration-listen (default "127.0.0.1:10027")) (relay dkimproxyout-configuration-relay (default "127.0.0.1:10028")) (domains dkimproxyout-configuration-domains (default (list (gethostname)))) @@ -697,7 +701,7 @@ By default, the daemon runs in a container."))) ;; # ~a/public.key (define (generate-out.cf config) (match-record config <dkimproxyout-configuration> - (listen relay domains selector data-directory) + (config-extra listen relay domains selector data-directory) (format #f "listen ~a relay ~a @@ -708,18 +712,21 @@ selector ~a signature dkim(c=relaxed/relaxed) keyfile ~a/private.key -" +~a" listen relay (string-join domains ",") selector data-directory - data-directory))) + data-directory + config-extra))) (define (dkimproxyout-etc-files config) (match-record config <dkimproxyout-configuration> - (config-name) - `((,config-name ,(plain-file config-name (generate-out.cf config)))))) + (config-name raw-file) + `((,config-name ,(plain-file config-name + (or raw-file + (generate-out.cf config))))))) (define (dkimproxyout-accounts config) (match-record config <dkimproxyout-configuration> |