queue.scm: Add support for raw config file of cyrus-service-configuration

1 files changed, 10 insertions, 10 deletions

diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm
index ab2a482..0426d41 100644
--- a/src/org/euandre/queue.scm
+++ b/src/org/euandre/queue.scm
@@ -53,6 +53,7 @@
              cyrus-service-configuration-name
              cyrus-service-configuration-authmech
              cyrus-service-configuration-log-level
+             cyrus-service-configuration-raw-file
 
             <cyrus-sasl-configuration>
              cyrus-sasl-configuration
@@ -485,7 +486,8 @@ to the list of supplementary groups of the user of such running process.")))
   cyrus-service-configuration?
   (name      cyrus-service-configuration-name)
   (authmech  cyrus-service-configuration-authmech  (default "saslauthd"))
-  (log-level cyrus-service-configuration-log-level (default 7)))
+  (log-level cyrus-service-configuration-log-level (default 7))
+  (raw-file  cyrus-service-configuration-raw-file  (default #f)))
 
 (define-record-type* <cyrus-sasl-configuration>
   cyrus-sasl-configuration
@@ -504,10 +506,7 @@ to the list of supplementary groups of the user of such running process.")))
   (container-namespaces cyrus-sasl-configuration-container-namespaces (default container:%namespaces))
   (extra-mappings       cyrus-sasl-configuration-extra-mappings       (default '())))
 
-
 (define (cyrus-sasl-etc-files config)
-  ;; FIXME: support opaque files
-  ;; FIXME: extend this with postfix instead of making postfix add here
   (match-record config <cyrus-sasl-configuration>
       (services config-dirname run-directory)
     `((,config-dirname
@@ -515,14 +514,15 @@ to the list of supplementary groups of the user of such running process.")))
          config-dirname
          (map (lambda (service-config)
                 (match-record service-config <cyrus-service-configuration>
-                    (name authmech log-level)
+                    (name authmech log-level raw-file)
                   `(,name ,(plain-file
                             name
-                            (format #f
-                             "pwcheck_method: ~a~%saslauthd_path: ~a/mux~%log_level: ~a~%"
-                             authmech
-                             run-directory
-                             log-level)))))
+                            (or raw-file
+                               (format #f
+                                "pwcheck_method: ~a~%saslauthd_path: ~a/mux~%log_level: ~a~%"
+                                authmech
+                                run-directory
+                                log-level))))))
               services))))))
 
 (define (cyrus-sasl-activation config)