From 125e569f1df0000b54f907b7b0a8af47c4e64912 Mon Sep 17 00:00:00 2001
From: Mario Alegre <mario@git.alemor.org>
Date: Tue, 16 Feb 2021 18:07:04 -0500
Subject: [PATCH] made mailsrv host-agnostic

---
 mailsrv/assets/bin/mkvirt                        | 4 ++++
 mailsrv/assets/postfix/{main.cf => main.cf.part} | 4 ----
 mailsrv/docs/Deploy.md                           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename mailsrv/assets/postfix/{main.cf => main.cf.part} (91%)

diff --git a/mailsrv/assets/bin/mkvirt b/mailsrv/assets/bin/mkvirt
index 36fdd86..f88a9ad 100755
--- a/mailsrv/assets/bin/mkvirt
+++ b/mailsrv/assets/bin/mkvirt
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+### Domains ###
+# /vol/data/domains should contain the configuration parameters for myhostname and virtual_alias_domains
+cat /vol/data/domains /etc/postfix/main.cf.part > /etc/postfix/main.cf
+
 ### Users ###
 
 # copy users db to dovecot config
diff --git a/mailsrv/assets/postfix/main.cf b/mailsrv/assets/postfix/main.cf.part
similarity index 91%
rename from mailsrv/assets/postfix/main.cf
rename to mailsrv/assets/postfix/main.cf.part
index 33cd6c6..f695171 100644
--- a/mailsrv/assets/postfix/main.cf
+++ b/mailsrv/assets/postfix/main.cf.part
@@ -2,8 +2,6 @@
 # interfaces & protocols to listen on
 inet_interfaces = all
 inet_protocols = all
-# primary name of server
-myhostname = mail.alemor.org
 myorigin = $mydomain
 # what host to use as a relay
 relayhost =
@@ -13,8 +11,6 @@ relayhost =
 mynetworks_style = host
 # domains to consider primary (local) endpoints
 mydestination = $myhostname, $mydomain, localhost.localdomain, localhost
-# domains to consider secondary (virtual) endpoints
-virtual_alias_domains = epic.alemor.org, home.alemor.org, alegre.alemor.org, daniel.alemor.org, fernando.alemor.org, juana.alemor.org, mario.alemor.org, moreno.alemor.org, mar.alemor.org
 
 ### Users ###
 # get list of valid users from here instead of /etc/passwd
diff --git a/mailsrv/docs/Deploy.md b/mailsrv/docs/Deploy.md
index 6a0b8da..9071e20 100644
--- a/mailsrv/docs/Deploy.md
+++ b/mailsrv/docs/Deploy.md
@@ -57,15 +57,15 @@ git clone https://github.com/acmesh-official/acme.sh.git
 cd acme.sh
 ./acme.sh --install --home /usr/local/lib/acme-sh \
           --config-home /etc/acme-sh \
-          --accountemail letsencrypt@mail.alemor.org
+          --accountemail ${email:?}
 ```
 
 Then exit and relogin to refresh the bash hash
 
 ```
 acme.sh --issue --alpn --pre-hook 'systemctl stop haproxy' \
-        --post-hook 'systemctl start haproxy' -d mail.alemor.org
-acme.sh --install-cert -d mail.alemor.org \
+        --post-hook 'systemctl start haproxy' -d ${domain:?}
+acme.sh --install-cert -d ${domain:?} \
         --fullchain-file /srv/vol/mailsrv/ssl/fullchain.pem \
         --key-file /srv/vol/mailsrv/ssl/privkey.pem
 ```