diff options
Diffstat (limited to 'src/org/euandre/queue.scm')
| -rw-r--r-- | src/org/euandre/queue.scm | 102 |
1 files changed, 43 insertions, 59 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm index fab13a9..fb3a025 100644 --- a/src/org/euandre/queue.scm +++ b/src/org/euandre/queue.scm @@ -50,7 +50,6 @@ cyrus-sasl-configuration-run-in-container? cyrus-sasl-configuration-container-name cyrus-sasl-configuration-container-namespaces - cyrus-sasl-configuration-extra-mappings cyrus-sasl-etc-files cyrus-sasl-activation @@ -79,7 +78,6 @@ dkimproxyout-configuration-run-in-container? dkimproxyout-configuration-container-name dkimproxyout-configuration-container-namespaces - dkimproxyout-configuration-extra-mappings dkimproxyout-etc-files dkimproxyout-accounts @@ -114,7 +112,6 @@ postfix-configuration-run-in-container? postfix-configuration-container-name postfix-configuration-container-namespaces - postfix-configuration-extra-mappings postfix-aliases postfix-accounts @@ -150,7 +147,6 @@ dovecot-configuration-run-in-container? dovecot-configuration-container-name dovecot-configuration-container-namespaces - dovecot-configuration-extra-mappings dovecot-etc-files dovecot-accounts @@ -688,8 +684,7 @@ to the list of supplementary groups of the user of such running process."))) (run-directory cyrus-sasl-configuration-run-directory (default "/var/run/saslauthd")) (run-in-container? cyrus-sasl-configuration-run-in-container? (default #t)) (container-name cyrus-sasl-configuration-container-name (default "saslauthd")) - (container-namespaces cyrus-sasl-configuration-container-namespaces (default container:%namespaces)) - (extra-mappings cyrus-sasl-configuration-extra-mappings (default '()))) + (container-namespaces cyrus-sasl-configuration-container-namespaces (default container:%namespaces))) (define (cyrus-sasl-etc-files config) (match-record config <cyrus-sasl-configuration> @@ -740,7 +735,7 @@ to the list of supplementary groups of the user of such running process."))) (define (cyrus-sasl-shepherd-service config) (match-record config <cyrus-sasl-configuration> (package user group supplementary-groups authmech config-dirname run-directory - services run-in-container? container-name container-namespaces extra-mappings) + services run-in-container? container-name container-namespaces) (let* ((bin (file-append package "/sbin/saslauthd")) (cmd (if (not run-in-container?) bin @@ -748,19 +743,17 @@ to the list of supplementary groups of the user of such running process."))) bin #:name container-name #:namespaces container-namespaces - #:mappings (append - (list - (file-system-mapping - (source run-directory) - (target source) - (writable? #t)) - (file-system-mapping - (source "/etc/passwd") - (target source)) - (file-system-mapping - (source "/etc/shadow") - (target source))) - extra-mappings))))) + #:mappings (list + (file-system-mapping + (source run-directory) + (target source) + (writable? #t)) + (file-system-mapping + (source "/etc/passwd") + (target source)) + (file-system-mapping + (source "/etc/shadow") + (target source))))))) (list (shepherd-service (provision '(cyrus-sasl)) @@ -840,8 +833,7 @@ By default, the daemon runs in a container."))) (data-directory dkimproxyout-configuration-data-directory (default "/var/lib/dkimproxyout")) (run-in-container? dkimproxyout-configuration-run-in-container? (default #t)) (container-name dkimproxyout-configuration-container-name (default "dkimproxyout")) - (container-namespaces dkimproxyout-configuration-container-namespaces (default (s1:fold delq container:%namespaces '(net)))) - (extra-mappings dkimproxyout-configuration-extra-mappings (default '()))) + (container-namespaces dkimproxyout-configuration-container-namespaces (default (s1:fold delq container:%namespaces '(net))))) (define (generate-out.cf config) (match-record config <dkimproxyout-configuration> @@ -933,7 +925,7 @@ keyfile ~a/private.key (define (dkimproxyout-shepherd-service config) (match-record config <dkimproxyout-configuration> (package user group supplementary-groups config-name data-directory - run-in-container? container-name container-namespaces extra-mappings) + run-in-container? container-name container-namespaces) (let* ((config-file (string-append "/etc/" config-name)) (bin (file-append package "/bin/dkimproxy.out")) (cmd (if (not run-in-container?) @@ -942,19 +934,17 @@ keyfile ~a/private.key bin #:name container-name #:namespaces container-namespaces - #:mappings (append - (list - (file-system-mapping - (source "/etc/protocols") - (target source)) - (file-system-mapping - (source config-file) - (target source)) - (file-system-mapping - (source - (string-append data-directory "/private.key")) - (target source))) - extra-mappings))))) + #:mappings (list + (file-system-mapping + (source "/etc/protocols") + (target source)) + (file-system-mapping + (source config-file) + (target source)) + (file-system-mapping + (source + (string-append data-directory "/private.key")) + (target source))))))) (list (shepherd-service (provision '(dkimproxyout)) @@ -1032,8 +1022,7 @@ By default, the daemon runs in a container."))) (sasl-dirname postfix-configuration-sasl-dirname (default "/etc/sasl2")) (run-in-container? postfix-configuration-run-in-container? (default #f)) (container-name postfix-configuration-container-name (default "postfix")) - (container-namespaces postfix-configuration-container-namespaces (default (s1:fold delq container:%namespaces '(net)))) - (extra-mappings postfix-configuration-extra-mappings (default '()))) + (container-namespaces postfix-configuration-container-namespaces (default (s1:fold delq container:%namespaces '(net))))) (define (dksign-filter dkim-filter-listen) (format #f @@ -1269,7 +1258,7 @@ mailbox_size_limit = 5120000000 (define (postfix-shepherd-service config) (match-record config <postfix-configuration> (package config-dirname data-directory queue-directory - run-in-container? container-name container-namespaces extra-mappings) + run-in-container? container-name container-namespaces) (let* ((config-dir (string-append "/etc/" config-dirname)) (bin (file-append package "/sbin/postfix")) (cmd (if (not run-in-container?) @@ -1278,17 +1267,15 @@ mailbox_size_limit = 5120000000 bin #:name container-name #:namespaces container-namespaces - #:mappings (append - (list - (file-system-mapping - (source data-directory) - (target source) - (writable? #t)) - (file-system-mapping - (source queue-directory) - (target source) - (writable? #t))) - extra-mappings))))) + #:mappings (list + (file-system-mapping + (source data-directory) + (target source) + (writable? #t)) + (file-system-mapping + (source queue-directory) + (target source) + (writable? #t))))))) (list (shepherd-service (provision '(postfix)) @@ -1484,8 +1471,7 @@ correctly."))) (hostname dovecot-configuration-hostname (default (gethostname))) (run-in-container? dovecot-configuration-run-in-container? (default #f)) (container-name dovecot-configuration-container-name (default "dovecot")) - (container-namespaces dovecot-configuration-container-namespaces (default (s1:fold delq container:%namespaces '(net)))) - (extra-mappings dovecot-configuration-extra-mappings (default '()))) + (container-namespaces dovecot-configuration-container-namespaces (default (s1:fold delq container:%namespaces '(net))))) (define (generate-dovecot-config config) (match-record config <dovecot-configuration> @@ -1628,7 +1614,7 @@ namespace inbox { (define (dovecot-shepherd-service config) (match-record config <dovecot-configuration> (package config-dirname config-filename - run-in-container? container-name container-namespaces extra-mappings) + run-in-container? container-name container-namespaces) (let* ((config-file (string-append "/etc/" config-dirname "/" config-filename)) (bin (file-append package "/sbin/dovecot")) (cmd (if (not run-in-container?) @@ -1637,12 +1623,10 @@ namespace inbox { bin #:name container-name #:namespaces container-namespaces - #:mappings (append - (list - (file-system-mapping - (source "/etc/shadow") - (target source))) - extra-mappings))))) + #:mappings (list + (file-system-mapping + (source "/etc/shadow") + (target source))))))) (list (shepherd-service (provision '(dovecot)) |