From 2c9845db4bc00221bc3c2343a020208f7f532166 Mon Sep 17 00:00:00 2001
From: Cullum Smith <cullum@sacredheartsc.com>
Date: Thu, 31 Oct 2024 21:36:39 -0400
Subject: many fixes

---
 scripts/hostclass/smtp_server/20-postfix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'scripts/hostclass/smtp_server')

diff --git a/scripts/hostclass/smtp_server/20-postfix b/scripts/hostclass/smtp_server/20-postfix
index 68ac474..795e574 100644
--- a/scripts/hostclass/smtp_server/20-postfix
+++ b/scripts/hostclass/smtp_server/20-postfix
@@ -38,10 +38,10 @@ ln -snfv "$postfix_keytab" "/var/krb5/user/${postfix_uid}/client.keytab"
 # Generate postfix configuration.
 install_template -m 0644 \
   "${postfix_conf_dir}/main.cf" \
+  "${postfix_conf_dir}/master.cf" \
   "${postfix_conf_dir}/virtual_mailboxes.cf" \
   "${postfix_conf_dir}/virtual_aliases.cf" \
   /usr/local/lib/sasl2/smtpd.conf
-install_file -m 0644 "${postfix_conf_dir}/master.cf"
 
 # Allow postfix to read the saslauthd socket.
 install_directory -m 0750 -o "$saslauthd_user" -g "$postfix_user" "$saslauthd_runtime_dir"
@@ -54,10 +54,9 @@ if [ "$postfix_public_fqdn" != "$fqdn" ]; then
   # Acquire public TLS certificate.
   install_template -m 0600 /usr/local/etc/sudoers.d/acme
   acme_install_certificate \
-    -c "$postfix_public_tls_cert" \
-    -k "$postfix_public_tls_key" \
     -g "$postfix_user" \
     -r 'sudo service postfix reload' \
+    postfix \
     "$postfix_public_fqdn"
 fi
 
-- 
cgit v1.2.3