aboutsummaryrefslogtreecommitdiff
path: root/src/xyz/euandreh
diff options
context:
space:
mode:
Diffstat (limited to 'src/xyz/euandreh')
-rw-r--r--src/xyz/euandreh/queue.scm16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xyz/euandreh/queue.scm b/src/xyz/euandreh/queue.scm
index 48a3b7e..1e0b86a 100644
--- a/src/xyz/euandreh/queue.scm
+++ b/src/xyz/euandreh/queue.scm
@@ -844,15 +844,15 @@ dksign unix - - n - - smtp
"
master.cf-extra)))
-(define (cert-for config)
+(define (cert-for prefix config)
(match-record config <postfix-configuration>
(cert-file hostname)
- (or cert-file (format #f "/etc/letsencrypt/live/mta-sts.~a/fullchain.pem" hostname))))
+ (or cert-file (format #f "/etc/letsencrypt/live/~a~a/fullchain.pem" prefix hostname))))
-(define (key-for config)
+(define (key-for prefix config)
(match-record config <postfix-configuration>
(key-file hostname)
- (or key-file (format #f "/etc/letsencrypt/live/mta-sts.~a/privkey.pem" hostname))))
+ (or key-file (format #f "/etc/letsencrypt/live/~a~a/privkey.pem" prefix hostname))))
(define (generate-main.cf config)
(match-record config <postfix-configuration>
@@ -910,8 +910,8 @@ milter_default_action = accept
setgid-group
hostname
- (cert-for config)
- (key-for config)
+ (cert-for "" config)
+ (key-for "" config)
main.cf-extra)))
(define (postfix-etc-files config)
@@ -1070,8 +1070,8 @@ milter_default_action = accept
(nginx-server-configuration
(server-name (list (string-append "mta-sts." hostname)))
(listen '("[::]:443 ssl http2" "443 ssl http2"))
- (ssl-certificate (cert-for config))
- (ssl-certificate-key (key-for config))
+ (ssl-certificate (cert-for "mta-sts." config))
+ (ssl-certificate-key (key-for "mta-sts." config))
(locations
(list
(nginx-location-configuration