diff options
| -rw-r--r-- | src/xyz/euandreh/queue.scm | 86 |
1 files changed, 64 insertions, 22 deletions
diff --git a/src/xyz/euandreh/queue.scm b/src/xyz/euandreh/queue.scm index 8475734..649dea8 100644 --- a/src/xyz/euandreh/queue.scm +++ b/src/xyz/euandreh/queue.scm @@ -2,7 +2,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module ((nonguix licenses) #:prefix ng-license:) #:use-module ((srfi srfi-1) #:prefix srfi-1:) - #:use-module ((xyz euandreh heredoc) #:prefix heredoc:) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) @@ -33,8 +32,53 @@ #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages xml) - #:use-module (gnu services shepherd)) -(heredoc:enable-syntax) + #:use-module (gnu services shepherd) + #:export (<shadow-group-configuration> + shadow-group-configuration + shadow-group-configuration-group + + shadow-group-activation + shadow-group-accounts + shadow-group-service-type + + + <cyrus-service-configuration> + cyrus-service-configuration + cyrus-service-configuration-name + cyrus-service-configuration-authmech + cyrus-service-configuration-log-level + + <cyrus-sasl-configuration> + cyrus-sasl-configuration + cyrus-sasl-configuration-cyrus-sasl + cyrus-sasl-configuration-authmech + cyrus-sasl-configuration-services + cyrus-sasl-configuration-state-dir + + cyrus-sasl-etc-files + cyrus-sasl-activation + cyrus-sasl-shepherd-service + cyrus-sasl-service-type + + + <dkimproxyout-configuration> + dkimproxyout-configuration + dkimproxyout-configuration-dkimproxy + dkimproxyout-configuration-user + dkimproxyout-configuration-group + dkimproxyout-configuration-listen + dkimproxyout-configuration-relay + dkimproxyout-configuration-domains + dkimproxyout-configuration-selector + dkimproxyout-configuration-key-size + dkimproxyout-configuration-data-directory + + dkimproxyout-etc-files + dkimproxyout-accounts + dkimproxyout-activation + dkimproxyout-shepherd-service + dkimproxyout-service-type)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -610,6 +654,7 @@ This package provides a daemon to display notifications of iCalendar events") cyrus-sasl-configuration? (cyrus-sasl cyrus-sasl-configuration-cyrus-sasl (default cyrus-sasl)) (authmech cyrus-sasl-configuration-authmech (default "shadow")) + (log-level cyrus-sasl-configuration-log-level (default 7)) (services cyrus-sasl-configuration-services (default '())) (state-dir cyrus-sasl-configuration-state-dir (default "/var/lib/saslauthd"))) @@ -621,17 +666,14 @@ This package provides a daemon to display notifications of iCalendar events") "cyrus-sasl" (map (lambda (service-config) (match-record service-config <cyrus-service-configuration> - (name authmech) + (name authmech log-level) `(,name ,(plain-file name (format #f - #"- - pwcheck_method: ~a - saslauthd_path: ~a/mux - log_level: 7 - "# + "pwcheck_method: ~a~%saslauthd_path: ~a/mux~%log_level: ~a~%" authmech - state-dir))))) + state-dir + log-level))))) services)))))) (define (cyrus-sasl-activation config) @@ -705,20 +747,20 @@ This package provides a daemon to display notifications of iCalendar events") (match-record config <dkimproxyout-configuration> (listen relay domains selector data-directory) (format #f - #"- - listen ~a - relay ~a +" +listen ~a +relay ~a - domain ~a - selector ~a +domain ~a +selector ~a - signature dkim(c=relaxed/relaxed) +signature dkim(c=relaxed/relaxed) - # FIXME:DOCUMENTATION add this to the service documentation - # the corresponding public key is available at: - # ~a/public.key - keyfile ~a/private.key - "# +# FIXME:DOCUMENTATION add this to the service documentation +# the corresponding public key is available at: +# ~a/public.key +keyfile ~a/private.key +" listen relay (string-join domains ",") @@ -809,7 +851,7 @@ This package provides a daemon to display notifications of iCalendar events") #~(lambda _ (format #t "/etc/dkimproxy_out.conf~%")))))))))) -(define dkimproxyout-service-type +(define-public dkimproxyout-service-type (service-type (name 'dkimproxy) (extensions |