queue.scm: Remove heredoc strings

1 files changed, 24 insertions, 27 deletions

diff --git a/src/xyz/euandreh/queue.scm b/src/xyz/euandreh/queue.scm
index 79f17ab..f17a263 100644
--- a/src/xyz/euandreh/queue.scm
+++ b/src/xyz/euandreh/queue.scm
@@ -780,7 +780,7 @@ keyfile ~a/private.key
   (match-record config <postfix-configuration>
       (master.cf-extra)
     (format #f
-     #"-
+      "-
        # ============================================================================================================
        # service   type       private  unpriv  chroot  wakeup   maxproc  command + args
        #                      (yes)    (yes)   (no)    (never)  (100)
@@ -834,7 +834,7 @@ keyfile ~a/private.key
          -o mynetworks=127.0.0.0/8
          -o smtpd_authorized_xforward_hosts=127.0.0.0/8
        ~a
-       "#
+       "
      master.cf-extra)))
 
 (define (cert-for config)
@@ -851,7 +851,7 @@ keyfile ~a/private.key
   (match-record config <postfix-configuration>
       (postfix queue-directory data-directory user setgid-group hostname main.cf-extra)
     (format #f
-     #"-
+      "-
        compatibility_level = 3.6
 
        queue_directory = ~a
@@ -882,7 +882,7 @@ keyfile ~a/private.key
 
        # smtpd_sasl_security_options = FIXME: deny all
        smtpd_sasl_tls_security_options = noanonymous
-       # FIXME: shouldn't this be "encrypt"?
+       # FIXME: shouldn't this be \"encrypt\"?
        smtpd_tls_security_level = may
        smtpd_tls_auth_only = yes
 
@@ -896,7 +896,7 @@ keyfile ~a/private.key
        milter_default_action = accept
        # smtpd_milters = FIXME
        ~a
-       "#
+       "
      queue-directory
      data-directory
      user
@@ -1007,12 +1007,12 @@ keyfile ~a/private.key
        (shepherd-service
          (provision '(postfix))
          (documentation
-           #"-
+            "-
              Run the Postfix MTA.
 
-             This is the entrypoint for starting the "master" process.  Then the
-             "master" process itself takes responsability of starting all the
-             required daemons and commands."#)
+             This is the entrypoint for starting the \"master\" process.  Then the
+             \"master\" process itself takes responsability of starting all the
+             required daemons and commands.")
          (start #~(make-forkexec-constructor
                    (list
                     #$(file-append postfix "/sbin/postfix")
@@ -1025,10 +1025,7 @@ keyfile ~a/private.key
            (list
             (shepherd-action
               (name 'configuration)
-              (documentation
-                #"-
-                  FIXME:DOCUMENTATION
-                  "#)
+              (documentation "FIXME:DOCUMENTATION")
               (procedure
                 #~(lambda _
                     (format #t "~a/master.cf~%" #$config-dir)
@@ -1036,14 +1033,14 @@ keyfile ~a/private.key
             (shepherd-action
               (name 'reload)
               (documentation
-                #"-
-                  Re-read the "master.cf" and "main.cf" configuration files.
+                 "
+                  Re-read the \"master.cf\" and \"main.cf\" configuration files.
 
                   Daemon processes terminate when possible, and when restarted
                   use the values of the new configuration files.
 
                   This live-reload option is usually preferable over a stop/start
-                  cycle, as it incurs in no interruption of the running service."#)
+                  cycle, as it incurs in no interruption of the running service.")
               (procedure
                 #~(lambda _
                     (invoke #$(file-append postfix "/sbin/postfix")
@@ -1076,12 +1073,12 @@ keyfile ~a/private.key
               (list "alias "
                     (plain-file
                      "mta-sts.txt"
-                     (format #f #"-
-                        version: STSv1
-                        mode: enforce
-                        mx: ~a
-                        max_age: 604800
-                        "#
+                     (format #f "-
+version: STSv1
+mode: enforce
+mx: ~a
+max_age: 604800
+"
                       hostname))
                     ";"))))))))
 
@@ -1125,7 +1122,7 @@ keyfile ~a/private.key
                           postfix-sasl-services)))
     (default-value (postfix-configuration))
     (description
-      #"-
+       "
         Run the Postfix MTA.
 
         This is the top-level system service for Postfix.
@@ -1133,7 +1130,7 @@ keyfile ~a/private.key
         It includes:
         - populating /etc/postfix/ with read-only configuration files;
         - the user and groups used by Postfix when handling email delivery;
-        - the special setgid binaries for daily usage, such as "sendmail";
+        - the special setgid binaries for daily usage, such as \"sendmail\";
         - the Shepherd service for starting, stopping and *reloading* the
           service without restarting it;
         - the activation script for creating the required directories and
@@ -1148,7 +1145,7 @@ keyfile ~a/private.key
         The defaults of <postfix-configuration> provide sane default values for
         most things, such as group names, data and queue directories, etc.  When
         used as-is, it creates a Postfix server that sends email from local users
-        of the domain provided by "/etc/hostname"."#)))
+        of the domain provided by \"/etc/hostname\".")))
 
 
 
@@ -1180,7 +1177,7 @@ keyfile ~a/private.key
       (user group auth-worker-group untrusted-user
        hostname base-dir state-dir extra-content)
     (format #f
-     #"-
+      "
        protocols = imap
 
        default_internal_user = ~a
@@ -1243,7 +1240,7 @@ keyfile ~a/private.key
          }
        }
        ~a
-       "#
+       "
      user
      group
      untrusted-user