aboutsummaryrefslogtreecommitdiff
path: root/src/org/euandre/queue.scm
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2023-03-17 06:36:11 -0300
committerEuAndreh <eu@euandre.org>2023-03-17 06:36:11 -0300
commit5ae3fdfc8e7825074497bebf01c5aa441d700a67 (patch)
tree0d4bc38e3d8bb3a87a717c9609757a42bc39d39e /src/org/euandre/queue.scm
parentqueue.scm: Conditionally create /var/mail on activation (diff)
downloadpackage-repository-5ae3fdfc8e7825074497bebf01c5aa441d700a67.tar.gz
package-repository-5ae3fdfc8e7825074497bebf01c5aa441d700a67.tar.xz
queue.scm: Remove non-literal format string
Diffstat (limited to 'src/org/euandre/queue.scm')
-rw-r--r--src/org/euandre/queue.scm12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm
index 8d18f3b..0a318c1 100644
--- a/src/org/euandre/queue.scm
+++ b/src/org/euandre/queue.scm
@@ -961,7 +961,8 @@ postlog unix-dgram n - n - 1 postlogd
(key-file hostname)
(or key-file (format #f "/etc/letsencrypt/live/~a~a/privkey.pem" prefix hostname))))
-(define main.cf-internet-extra
+(define (main.cf-internet-extra hostname cert key)
+ (format #f
"
myhostname = ~a
@@ -991,7 +992,10 @@ debug_peer_list = 127.0.0.1
milter_default_action = accept
# smtpd_milters = FIXME
-")
+"
+ hostname
+ cert
+ key))
(define main.cf-local-extra
"
mynetworks = 127.0.0.0/8
@@ -1037,11 +1041,11 @@ header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGN
"mail_spool_directory = /var/mail/")
main.cf-extra
(if enable-submission?
- (format #f main.cf-internet-extra
+ (main.cf-internet-extra
hostname
(cert-for "" config)
(key-for "" config))
- (format #f main.cf-local-extra)))))
+ main.cf-local-extra))))
(define (postfix-etc-files config)
(match-record config <postfix-configuration>