src/infrastructure/guix/system.scm: Cleanup doc strings; shuffle things around

1 files changed, 12 insertions, 58 deletions

diff --git a/src/infrastructure/guix/system.scm b/src/infrastructure/guix/system.scm
index 630cb7d..bdba899 100644
--- a/src/infrastructure/guix/system.scm
+++ b/src/infrastructure/guix/system.scm
@@ -44,8 +44,6 @@
 (define ssh-pubkey
   "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnUv7iWOejQNa3fZ6v4lkHT6qFRp2+NuzIpFJ2Vy7eP58XZoiz6HJPcCU8Hf95JXwaXEwS4S7mXdw1x60hd8JIe058Ek6MZSSVQmlLfocGsAYj1wTrLmnQ8+PV0IeQlNj1aytBI1fL+v3IPt+JdLt6b+g3vwcEUU9efzxx2E0KZ5GIpb2meiCQ6ha+tcd7XqegB53eQj/h/coE2zLJodpaJ3xbj894pE/OJCNC0+4d0Sv7oHhY7QoLYldTQbSgPyhyfl4iZpJf6OEPZxK2cJaB+cbeoBB6aGNyU+CIJToM+uAJJ7H7EpvxfcnfJQ1PuY5szTdvFbW820euiUEKEW69mW4uaFNPSc6D4Z8tZ5hXQIqBD40irULhF0CYNkIILmyNV/KJIZ5HkbQ1q+UrCFHJyvuH/3aCTjj9OSfE7xHPQ3xd3Xw8vvj0Mjie09xFbbcklBTw5WRzH7cw8c+Q0O69kZZ8b+ykcdzWTeZeWNdnzptNqnMjfheig90rUIJ7DN0c+53jCUcGpWJxJhcYF9Uk1RNHmSE5+VzK1y+20t0grVFX90nApm4Tl35QPrX7Qxp9C81cWiUB8xCAE6jYrmd4x+P/3wSQfc1Xg0Eg3QjJB+6JD7cbyDJpzDR3ja+CLZCAr9I0B4rDKD2d6et/z67iXPnZUWMyZ8RVVZPFbBMOTw== openpgp:0xF727046D")
 
-(define git-dir "/srv/git/git")
-
 (define rc.sh (plain-file "rc.sh" #"-
   #!/bin/sh
 
@@ -1013,12 +1011,9 @@
 (define (dovecot2-etc-files config)
   (match-record config <dovecot2-configuration>
       (raw-file config-name)
-    `(("dovecot2"
-       ,(file-union
-         "dovecot2"
-         `((,config-name ,(plain-file config-name
-                                      (or raw-file
-                                          (generate-dovecot-config config))))))))))
+    `((,config-name ,(plain-file config-name
+                                 (or raw-file
+                                     (generate-dovecot-config config)))))))
 
 (define (dovecot2-accounts config)
   (match-record config <dovecot2-configuration>
@@ -1068,17 +1063,11 @@
 (define (dovecot2-shepherd-service config)
   (match-record config <dovecot2-configuration>
       (dovecot2 config-name)
-    (let ((config-file (string-append "/etc/dovecot2/" config-name)))
+    (let ((config-file (string-append "/etc/" config-name)))
       (list
        (shepherd-service
          (provision '(dovecot2))
-         (documentation
-           #"-
-             FIXME: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."#)
+         (documentation "FIXME:DOCUMENTATION: heredoc syntax")
          (start #~(make-forkexec-constructor
                    (list
                     #$(file-append dovecot2 "/sbin/dovecot")
@@ -1090,24 +1079,13 @@
            (list
             (shepherd-action
               (name 'configuration)
-              (documentation
-                #"-
-                  FIXME:DOCUMENTATION
-                  "#)
+              (documentation "FIXME:DOCUMENTATION: heredoc syntax")
               (procedure
                 #~(lambda _
                     (format #t "~a~%" #$config-file))))
             (shepherd-action
               (name 'reload)
-              (documentation
-                #"-
-                  FIXME:DOCUMENTATION 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."#)
+              (documentation "FIXME:DOCUMENTATION: heredoc syntax")
               (procedure
                 #~(lambda _
                     (invoke #$(file-append dovecot "/bin/doveadm")
@@ -1131,31 +1109,7 @@
        (service-extension shepherd-root-service-type
                           dovecot2-shepherd-service)))
     (default-value (dovecot2-configuration))
-    (description
-      #"-
-        FIXME:DOCUMENTATION Run the Postfix MTA.
-
-        This is the top-level system service for Postfix.
-
-        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 Shepherd service for starting, stopping and *reloading* the
-          service without restarting it;
-        - the activation script for creating the required directories and
-          configuring them with the correct permissions;
-        - the binaries in the system profile so that one doesn't need to explicilty
-          include the package when the service is already enabled.
-
-        An extension to the log-rotation service isn't included: the default
-        rottlog configuration already includes /var/log/maillog in its routine,
-        so it is kept out.
-
-        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"."#)))
+    (description "FIXME:DOCUMENTATION: heredoc syntax")))
 
 
 
@@ -1170,6 +1124,8 @@
 (define me "eu")
 (define public-me (format #f "~a@~a" me tld))
 
+(define git-dir "/srv/git/git")
+
 (define gitconfig (plain-file "gitconfig" (format #f #"-
   [init]
     defaultBranch = main
@@ -1243,9 +1199,7 @@
             trash-cli
             tree
 
-            dkimproxy
-            prosody
-            cgit))
+            prosody))
      (list ;; lua-cyrussasl
            (script "rc"          rc.sh)
            (script "backup"      backup.sh)
@@ -1339,7 +1293,7 @@
                           rewrite /r/velhinho(.*) $1 break;
                           proxy_pass http://velhinho:4219;
                           "#))))))))))
-      (simple-service 'create-/srv/www activation-service-type
+      (simple-service 'create-/srv/* activation-service-type
         #~(begin
             (use-modules (guix build utils))
             (let ((user (getpwnam #$whoami))