From 4dadf12bb8613a610bfd1b6b044cd6b5b4ec8ed3 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Fri, 17 Mar 2023 15:06:19 -0300
Subject: Makefile: Streamline verification of generated config files

---
 .gitignore                              |  4 ++-
 Makefile                                | 32 +++++++++++++++----
 src/org/euandre/queue.scm               | 14 +++------
 tests/internet/etc/dkimproxyout.conf.in |  9 ++++++
 tests/internet/etc/dovecot.conf.in      | 54 +++++++++++++++++++++++++++++++++
 tests/internet/etc/postfix/main.cf.in   | 36 ++++++++++++++++++++++
 tests/internet/etc/postfix/master.cf    | 51 +++++++++++++++++++++++++++++++
 tests/internet/etc/sasl2/smtpd.conf     |  3 ++
 tests/internet/main.cf.in               | 36 ----------------------
 tests/internet/master.cf                | 51 -------------------------------
 tests/local/etc/postfix/main.cf         | 21 +++++++++++++
 tests/local/etc/postfix/master.cf       | 30 ++++++++++++++++++
 tests/local/main.cf                     | 21 -------------
 tests/local/master.cf                   | 30 ------------------
 14 files changed, 238 insertions(+), 154 deletions(-)
 create mode 100644 tests/internet/etc/dkimproxyout.conf.in
 create mode 100644 tests/internet/etc/dovecot.conf.in
 create mode 100644 tests/internet/etc/postfix/main.cf.in
 create mode 100644 tests/internet/etc/postfix/master.cf
 create mode 100644 tests/internet/etc/sasl2/smtpd.conf
 delete mode 100644 tests/internet/main.cf.in
 delete mode 100644 tests/internet/master.cf
 create mode 100644 tests/local/etc/postfix/main.cf
 create mode 100644 tests/local/etc/postfix/master.cf
 delete mode 100644 tests/local/main.cf
 delete mode 100644 tests/local/master.cf

diff --git a/.gitignore b/.gitignore
index 6b54c16..0275198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /result*
-/tests/internet/main.cf
+/tests/internet/etc/postfix/main.cf
+/tests/internet/etc/dkimproxyout.conf
+/tests/internet/etc/dovecot.conf
diff --git a/Makefile b/Makefile
index 26893ea..6ec9c2e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,14 @@
 all: EuAndreh.key guix nix
 
 
+test-config-files = \
+	tests/internet/etc/postfix/main.cf   \
+	tests/internet/etc/dkimproxyout.conf \
+	tests/internet/etc/dovecot.conf      \
+
+derived-assets = \
+	$(test-config-files) \
+
 guix: guix-packages guix-services
 
 guix-packages:
@@ -22,17 +30,29 @@ guix-packages:
 		-f src/org/euandre/packages.scm \
 		-f src/org/euandre/queue.scm    \
 
+local-files = \
+	/etc/postfix/master.cf \
+	/etc/postfix/main.cf   \
+
+internet-files = \
+	$(local-files)         \
+	/etc/sasl2/smtpd.conf  \
+	/etc/dkimproxyout.conf \
+	/etc/dovecot.conf      \
+
 guix-services-local:
 	rm -f result-local
 	guix system -v3 -Lsrc/ -K -r result-local build tests/local/system.scm
-	cmp -s result-local/etc/postfix/master.cf tests/local/master.cf
-	cmp -s result-local/etc/postfix/main.cf   tests/local/main.cf
+	for f in $(local-files); do \
+		diff -U5 --color=always result-local$$f tests/local$$f; \
+	done
 
-guix-services-internet: tests/internet/main.cf
+guix-services-internet: $(test-config-files)
 	rm -f result-internet
 	guix system -v3 -Lsrc/ -K -r result-internet build tests/internet/system.scm
-	cmp -s result-internet/etc/postfix/master.cf tests/internet/master.cf
-	cmp -s result-internet/etc/postfix/main.cf   tests/internet/main.cf
+	for f in $(internet-files); do \
+		diff -U5 --color=always result-internet$$f tests/internet$$f; \
+	done
 
 guix-services: guix-services-local guix-services-internet
 
@@ -47,7 +67,7 @@ check:
 
 clean:
 	rm -rf \
-		result* .paku/ deb/ tests/internet/main.cf
+		$(derived-assets) result* .paku/ deb/
 
 public:
 
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm
index 340bc1e..c331cdd 100644
--- a/src/org/euandre/queue.scm
+++ b/src/org/euandre/queue.scm
@@ -1366,13 +1366,15 @@ max_age: 604800
   (state-dir         dovecot-configuration-state-dir         (default "/var/lib/dovecot"))
   (hostname          dovecot-configuration-hostname          (default (gethostname))))
 
+
+;; FIXME:
+;; mail_plugins
 (define (generate-dovecot-config config)
   (match-record config <dovecot-configuration>
       (mail-in-home? user group auth-worker-group untrusted-user
        hostname base-dir state-dir extra-content)
     (format #f
-      "
-protocols = imap
+      "protocols = imap
 
 default_internal_user = ~a
 default_internal_group = ~a
@@ -1390,7 +1392,6 @@ service auth-worker {
   group = ~a
 }
 
-
 ssl = required
 ssl_cert = </etc/letsencrypt/live/~a/fullchain.pem
 ssl_key  = </etc/letsencrypt/live/~a/privkey.pem
@@ -1403,10 +1404,6 @@ verbose_proctitle = yes
 
 mail_location = maildir:~a:INBOX=~a:LAYOUT=fs
 
-# FIXME:
-# mail_plugins
-
-
 namespace inbox {
   inbox = yes
   mailbox Drafts {
@@ -1431,8 +1428,7 @@ namespace inbox {
     auto = subscribe
   }
 }
-~a
-"
+~a"
      user
      group
      untrusted-user
diff --git a/tests/internet/etc/dkimproxyout.conf.in b/tests/internet/etc/dkimproxyout.conf.in
new file mode 100644
index 0000000..0059804
--- /dev/null
+++ b/tests/internet/etc/dkimproxyout.conf.in
@@ -0,0 +1,9 @@
+listen 127.0.0.1:10027
+relay 127.0.0.1:10028
+
+domain @HOSTNAME@
+selector dkimproxyout
+
+signature dkim(c=relaxed/relaxed)
+
+keyfile /var/lib/dkimproxyout/private.key
diff --git a/tests/internet/etc/dovecot.conf.in b/tests/internet/etc/dovecot.conf.in
new file mode 100644
index 0000000..6ac013d
--- /dev/null
+++ b/tests/internet/etc/dovecot.conf.in
@@ -0,0 +1,54 @@
+protocols = imap
+
+default_internal_user = dovecot
+default_internal_group = dovecot
+default_login_user = dovenull
+auth_mechanisms = plain login
+auth_username_format = %n
+
+passdb {
+  driver = shadow
+}
+userdb {
+  driver = passwd
+}
+service auth-worker {
+  group = etc-shadow
+}
+
+ssl = required
+ssl_cert = </etc/letsencrypt/live/@HOSTNAME@/fullchain.pem
+ssl_key  = </etc/letsencrypt/live/@HOSTNAME@/privkey.pem
+ssl_dh = </var/lib/dovecot/dhparam.pem
+
+base_dir = /var/run/dovecot
+state_dir = /var/lib/dovecot
+
+verbose_proctitle = yes
+
+mail_location = maildir:/var/mail/%u:INBOX=/var/mail/%u:LAYOUT=fs
+
+namespace inbox {
+  inbox = yes
+  mailbox Drafts {
+    special_use = \Drafts
+    auto = subscribe
+  }
+  mailbox Sent {
+    special_use = \Sent
+    auto = subscribe
+  }
+  mailbox Archive {
+    special_use = \Archive
+    auto = subscribe
+  }
+  mailbox Junk {
+    special_use = \Junk
+    auto = subscribe
+    autoexpunge = 30d
+  }
+  mailbox Trash {
+    special_use = \Trash
+    auto = subscribe
+  }
+}
diff --git a/tests/internet/etc/postfix/main.cf.in b/tests/internet/etc/postfix/main.cf.in
new file mode 100644
index 0000000..566dbcd
--- /dev/null
+++ b/tests/internet/etc/postfix/main.cf.in
@@ -0,0 +1,36 @@
+compatibility_level = 3.6
+
+queue_directory = /var/spool/postfix
+data_directory = /var/lib/postfix
+mail_owner = postfix
+setgid_group = postdrop
+
+header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } }
+
+mail_spool_directory = /var/mail/
+
+myhostname = @HOSTNAME@
+
+smtpd_use_tls = yes
+smtpd_tls_cert_file = /etc/letsencrypt/live/@HOSTNAME@/fullchain.pem
+smtpd_tls_key_file  = /etc/letsencrypt/live/@HOSTNAME@/privkey.pem
+smtp_use_tls       = $smtpd_use_tls
+smtp_tls_cert_file = $smtpd_tls_cert_file
+smtp_tls_key_file  = $smtpd_tls_key_file
+
+smtp_tls_security_level  = may
+
+recipient_delimiter = +
+
+smtpd_sasl_tls_security_options = noanonymous
+smtpd_tls_security_level = may
+smtpd_tls_auth_only = yes
+
+smtpd_relay_restrictions = $smtpd_recipient_restrictions
+smtpd_recipient_restrictions = permit_mynetworks,
+  permit_sasl_authenticated, reject_unauth_destination
+smtpd_sasl_auth_enable = yes
+cyrus_sasl_config_path = /etc/sasl2
+debug_peer_list = 127.0.0.1
+
+milter_default_action = accept
diff --git a/tests/internet/etc/postfix/master.cf b/tests/internet/etc/postfix/master.cf
new file mode 100644
index 0000000..5c25fd9
--- /dev/null
+++ b/tests/internet/etc/postfix/master.cf
@@ -0,0 +1,51 @@
+# ============================================================================================================
+# service   type       private  unpriv  chroot  wakeup   maxproc  command + args
+#                      (yes)    (yes)   (no)    (never)  (100)
+# =============================================================================================================
+
+anvil       unix       -        -       n       -        1        anvil
+bounce      unix       -        -       n       -        0        bounce
+cleanup     unix       n        -       n       -        0        cleanup
+defer       unix       -        -       n       -        0        bounce
+discard     unix       -        -       n       -        -        discard
+error       unix       -        -       n       -        -        error
+flush       unix       n        -       n       1000?    0        flush
+lmtp        unix       -        -       n       -        -        lmtp
+local       unix       -        n       n       -        -        local
+pickup      unix       n        -       n       60       1        pickup
+  -o content_filter=dksign:[127.0.0.1]:10027
+proxymap    unix       -        -       n       -        -        proxymap
+proxywrite  unix       -        -       n       -        1        proxymap
+qmgr        unix       n        -       n       300      1        qmgr
+relay       unix       -        -       n       -        -        smtp
+retry       unix       -        -       n       -        -        error
+rewrite     unix       -        -       n       -        -        trivial-rewrite
+scache      unix       -        -       n       -        1        scache
+showq       unix       n        -       n       -        -        showq
+smtp        inet       n        -       n       -        -        smtpd -o syslog_name=postfix/smtp
+smtp        unix       -        -       n       -        -        smtp
+tlsmgr      unix       -        -       n       1000?    1        tlsmgr
+trace       unix       -        -       n       -        0        bounce
+verify      unix       -        -       n       -        1        verify
+virtual     unix       -        n       n       -        -        virtual
+postlog     unix-dgram n        -       n       -        1        postlogd
+
+submission  inet       n        -       n       -        -        smtpd -o syslog_name=postfix/submission
+  -o smtpd_tls_security_level=encrypt
+  -o content_filter=dksign:[127.0.0.1]:10027
+
+dksign      unix       -        -       n       -        -        smtp
+  -o syslog_name=postfix/dkimproxyout-listen
+  -o smtp_send_xforward_command=yes
+  -o smtp_discard_ehlo_keywords=8bitmime,starttls
+
+127.0.0.1:10028 inet   n        -       n       -        -        smtpd
+  -o syslog_name=postfix/dkimproxyout-relay
+  -o content_filter=
+  -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
+  -o smtpd_helo_restrictions=
+  -o smtpd_client_restrictions=
+  -o smtpd_sender_restrictions=
+  -o smtpd_recipient_restrictions=permit_mynetworks,reject
+  -o mynetworks=127.0.0.0/8
+  -o smtpd_authorized_xforward_hosts=127.0.0.0/8
diff --git a/tests/internet/etc/sasl2/smtpd.conf b/tests/internet/etc/sasl2/smtpd.conf
new file mode 100644
index 0000000..af2ac43
--- /dev/null
+++ b/tests/internet/etc/sasl2/smtpd.conf
@@ -0,0 +1,3 @@
+pwcheck_method: saslauthd
+saslauthd_path: /var/run/saslauthd/mux
+log_level: 7
diff --git a/tests/internet/main.cf.in b/tests/internet/main.cf.in
deleted file mode 100644
index 566dbcd..0000000
--- a/tests/internet/main.cf.in
+++ /dev/null
@@ -1,36 +0,0 @@
-compatibility_level = 3.6
-
-queue_directory = /var/spool/postfix
-data_directory = /var/lib/postfix
-mail_owner = postfix
-setgid_group = postdrop
-
-header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } }
-
-mail_spool_directory = /var/mail/
-
-myhostname = @HOSTNAME@
-
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/letsencrypt/live/@HOSTNAME@/fullchain.pem
-smtpd_tls_key_file  = /etc/letsencrypt/live/@HOSTNAME@/privkey.pem
-smtp_use_tls       = $smtpd_use_tls
-smtp_tls_cert_file = $smtpd_tls_cert_file
-smtp_tls_key_file  = $smtpd_tls_key_file
-
-smtp_tls_security_level  = may
-
-recipient_delimiter = +
-
-smtpd_sasl_tls_security_options = noanonymous
-smtpd_tls_security_level = may
-smtpd_tls_auth_only = yes
-
-smtpd_relay_restrictions = $smtpd_recipient_restrictions
-smtpd_recipient_restrictions = permit_mynetworks,
-  permit_sasl_authenticated, reject_unauth_destination
-smtpd_sasl_auth_enable = yes
-cyrus_sasl_config_path = /etc/sasl2
-debug_peer_list = 127.0.0.1
-
-milter_default_action = accept
diff --git a/tests/internet/master.cf b/tests/internet/master.cf
deleted file mode 100644
index 5c25fd9..0000000
--- a/tests/internet/master.cf
+++ /dev/null
@@ -1,51 +0,0 @@
-# ============================================================================================================
-# service   type       private  unpriv  chroot  wakeup   maxproc  command + args
-#                      (yes)    (yes)   (no)    (never)  (100)
-# =============================================================================================================
-
-anvil       unix       -        -       n       -        1        anvil
-bounce      unix       -        -       n       -        0        bounce
-cleanup     unix       n        -       n       -        0        cleanup
-defer       unix       -        -       n       -        0        bounce
-discard     unix       -        -       n       -        -        discard
-error       unix       -        -       n       -        -        error
-flush       unix       n        -       n       1000?    0        flush
-lmtp        unix       -        -       n       -        -        lmtp
-local       unix       -        n       n       -        -        local
-pickup      unix       n        -       n       60       1        pickup
-  -o content_filter=dksign:[127.0.0.1]:10027
-proxymap    unix       -        -       n       -        -        proxymap
-proxywrite  unix       -        -       n       -        1        proxymap
-qmgr        unix       n        -       n       300      1        qmgr
-relay       unix       -        -       n       -        -        smtp
-retry       unix       -        -       n       -        -        error
-rewrite     unix       -        -       n       -        -        trivial-rewrite
-scache      unix       -        -       n       -        1        scache
-showq       unix       n        -       n       -        -        showq
-smtp        inet       n        -       n       -        -        smtpd -o syslog_name=postfix/smtp
-smtp        unix       -        -       n       -        -        smtp
-tlsmgr      unix       -        -       n       1000?    1        tlsmgr
-trace       unix       -        -       n       -        0        bounce
-verify      unix       -        -       n       -        1        verify
-virtual     unix       -        n       n       -        -        virtual
-postlog     unix-dgram n        -       n       -        1        postlogd
-
-submission  inet       n        -       n       -        -        smtpd -o syslog_name=postfix/submission
-  -o smtpd_tls_security_level=encrypt
-  -o content_filter=dksign:[127.0.0.1]:10027
-
-dksign      unix       -        -       n       -        -        smtp
-  -o syslog_name=postfix/dkimproxyout-listen
-  -o smtp_send_xforward_command=yes
-  -o smtp_discard_ehlo_keywords=8bitmime,starttls
-
-127.0.0.1:10028 inet   n        -       n       -        -        smtpd
-  -o syslog_name=postfix/dkimproxyout-relay
-  -o content_filter=
-  -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-  -o smtpd_helo_restrictions=
-  -o smtpd_client_restrictions=
-  -o smtpd_sender_restrictions=
-  -o smtpd_recipient_restrictions=permit_mynetworks,reject
-  -o mynetworks=127.0.0.0/8
-  -o smtpd_authorized_xforward_hosts=127.0.0.0/8
diff --git a/tests/local/etc/postfix/main.cf b/tests/local/etc/postfix/main.cf
new file mode 100644
index 0000000..f9eee9e
--- /dev/null
+++ b/tests/local/etc/postfix/main.cf
@@ -0,0 +1,21 @@
+compatibility_level = 3.6
+
+queue_directory = /var/spool/postfix
+data_directory = /var/lib/postfix
+mail_owner = postfix
+setgid_group = postdrop
+
+header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } }
+
+mail_spool_directory = /var/mail/
+smtp_sender_dependent_authentication = yes
+sender_dependent_relayhost_maps = hash:/var/lib/private/postfix/relayhosts-maps
+smtp_sasl_password_maps = hash:/var/lib/private/postfix/sasl-password
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous
+smtp_sasl_mechanism_filter = login, plain
+smtp_use_tls = yes
+smtp_tls_security_level = encrypt
+smtp_tls_note_starttls_offer = yes
+
+mynetworks = 127.0.0.0/8
diff --git a/tests/local/etc/postfix/master.cf b/tests/local/etc/postfix/master.cf
new file mode 100644
index 0000000..2cc4b02
--- /dev/null
+++ b/tests/local/etc/postfix/master.cf
@@ -0,0 +1,30 @@
+# ============================================================================================================
+# service   type       private  unpriv  chroot  wakeup   maxproc  command + args
+#                      (yes)    (yes)   (no)    (never)  (100)
+# =============================================================================================================
+
+anvil       unix       -        -       n       -        1        anvil
+bounce      unix       -        -       n       -        0        bounce
+cleanup     unix       n        -       n       -        0        cleanup
+defer       unix       -        -       n       -        0        bounce
+discard     unix       -        -       n       -        -        discard
+error       unix       -        -       n       -        -        error
+flush       unix       n        -       n       1000?    0        flush
+lmtp        unix       -        -       n       -        -        lmtp
+local       unix       -        n       n       -        -        local
+pickup      unix       n        -       n       60       1        pickup
+proxymap    unix       -        -       n       -        -        proxymap
+proxywrite  unix       -        -       n       -        1        proxymap
+qmgr        unix       n        -       n       300      1        qmgr
+relay       unix       -        -       n       -        -        smtp
+retry       unix       -        -       n       -        -        error
+rewrite     unix       -        -       n       -        -        trivial-rewrite
+scache      unix       -        -       n       -        1        scache
+showq       unix       n        -       n       -        -        showq
+smtp        inet       n        -       n       -        -        smtpd -o syslog_name=postfix/smtp
+smtp        unix       -        -       n       -        -        smtp
+tlsmgr      unix       -        -       n       1000?    1        tlsmgr
+trace       unix       -        -       n       -        0        bounce
+verify      unix       -        -       n       -        1        verify
+virtual     unix       -        n       n       -        -        virtual
+postlog     unix-dgram n        -       n       -        1        postlogd
diff --git a/tests/local/main.cf b/tests/local/main.cf
deleted file mode 100644
index f9eee9e..0000000
--- a/tests/local/main.cf
+++ /dev/null
@@ -1,21 +0,0 @@
-compatibility_level = 3.6
-
-queue_directory = /var/spool/postfix
-data_directory = /var/lib/postfix
-mail_owner = postfix
-setgid_group = postdrop
-
-header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } }
-
-mail_spool_directory = /var/mail/
-smtp_sender_dependent_authentication = yes
-sender_dependent_relayhost_maps = hash:/var/lib/private/postfix/relayhosts-maps
-smtp_sasl_password_maps = hash:/var/lib/private/postfix/sasl-password
-smtp_sasl_auth_enable = yes
-smtp_sasl_security_options = noanonymous
-smtp_sasl_mechanism_filter = login, plain
-smtp_use_tls = yes
-smtp_tls_security_level = encrypt
-smtp_tls_note_starttls_offer = yes
-
-mynetworks = 127.0.0.0/8
diff --git a/tests/local/master.cf b/tests/local/master.cf
deleted file mode 100644
index 2cc4b02..0000000
--- a/tests/local/master.cf
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============================================================================================================
-# service   type       private  unpriv  chroot  wakeup   maxproc  command + args
-#                      (yes)    (yes)   (no)    (never)  (100)
-# =============================================================================================================
-
-anvil       unix       -        -       n       -        1        anvil
-bounce      unix       -        -       n       -        0        bounce
-cleanup     unix       n        -       n       -        0        cleanup
-defer       unix       -        -       n       -        0        bounce
-discard     unix       -        -       n       -        -        discard
-error       unix       -        -       n       -        -        error
-flush       unix       n        -       n       1000?    0        flush
-lmtp        unix       -        -       n       -        -        lmtp
-local       unix       -        n       n       -        -        local
-pickup      unix       n        -       n       60       1        pickup
-proxymap    unix       -        -       n       -        -        proxymap
-proxywrite  unix       -        -       n       -        1        proxymap
-qmgr        unix       n        -       n       300      1        qmgr
-relay       unix       -        -       n       -        -        smtp
-retry       unix       -        -       n       -        -        error
-rewrite     unix       -        -       n       -        -        trivial-rewrite
-scache      unix       -        -       n       -        1        scache
-showq       unix       n        -       n       -        -        showq
-smtp        inet       n        -       n       -        -        smtpd -o syslog_name=postfix/smtp
-smtp        unix       -        -       n       -        -        smtp
-tlsmgr      unix       -        -       n       1000?    1        tlsmgr
-trace       unix       -        -       n       -        0        bounce
-verify      unix       -        -       n       -        1        verify
-virtual     unix       -        n       n       -        -        virtual
-postlog     unix-dgram n        -       n       -        1        postlogd
-- 
cgit v1.2.3