From ca3e5741e2fdfd0ccc609d51d0e36ef0fc36e884 Mon Sep 17 00:00:00 2001
From: Dmitry Molchanov <dmolchanov@gmail.com>
Date: Mon, 4 Nov 2019 13:14:00 +0300
Subject: [PATCH 1/2] Added key selector change support since 'mail' might be
 already allocated

---
 README.md         | 11 +++++++++++
 assets/install.sh | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 955a64c..b9315ab 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,17 @@ TLS and OpenDKIM support are optional.
 			-v /path/to/domainkeys:/etc/opendkim/domainkeys \
 			--name postfix -d catatnight/postfix
 	```
+	You may specify key selector if selector *mail* is already allocated by passing keyselector environment variable.
+	In this case $keyselector.private will be searched in /etc/opendkim/domainkeys inside container.
+
+	```bash
+	$ sudo docker run -p 25:25 \
+			-e maildomain=mail.example.com -e keyselector=app \
+      -e smtp_user=user:pwd \
+      -v /path/to/domainkeys:/etc/opendkim/domainkeys \
+			--name postfix -d catatnight/postfix
+	```
+
 3. Enable TLS(587): save your SSL certificates ```.key``` and ```.crt``` to  ```/path/to/certs```
 
 	```bash
diff --git a/assets/install.sh b/assets/install.sh
index 0b2aaff..11ad44b 100755
--- a/assets/install.sh
+++ b/assets/install.sh
@@ -120,11 +120,15 @@ localhost
 
 *.$maildomain
 EOF
+
+keyselector=${keyselector:=mail}
+keyfile=/etc/opendkim/domainkeys/${keyselector}.private
+[[ -f $keyfile ]] || keyfile=$(find /etc/opendkim/domainkeys -name "*.private" | head -n 1)
 cat >> /etc/opendkim/KeyTable <<EOF
-mail._domainkey.$maildomain $maildomain:mail:$(find /etc/opendkim/domainkeys -iname *.private)
+${keyselector}._domainkey.${maildomain} ${maildomain}:${keyselector}:${keyfile}
 EOF
 cat >> /etc/opendkim/SigningTable <<EOF
-*@$maildomain mail._domainkey.$maildomain
+*@$maildomain $keyselector._domainkey.$maildomain
 EOF
-chown opendkim:opendkim $(find /etc/opendkim/domainkeys -iname *.private)
-chmod 400 $(find /etc/opendkim/domainkeys -iname *.private)
\ No newline at end of file
+chown opendkim:opendkim ${keyfile}
+chmod 400 ${keyfile}

From 83d0c15b443fbc8088d4a079f76c87bdb4e24dd1 Mon Sep 17 00:00:00 2001
From: Dmitry Molchanov <dmolchanov@gmail.com>
Date: Fri, 22 Jan 2021 16:33:19 +0300
Subject: [PATCH 2/2] install update

---
 assets/install.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/assets/install.sh b/assets/install.sh
index 11ad44b..bfd5e41 100755
--- a/assets/install.sh
+++ b/assets/install.sh
@@ -120,15 +120,11 @@ localhost
 
 *.$maildomain
 EOF
-
-keyselector=${keyselector:=mail}
-keyfile=/etc/opendkim/domainkeys/${keyselector}.private
-[[ -f $keyfile ]] || keyfile=$(find /etc/opendkim/domainkeys -name "*.private" | head -n 1)
 cat >> /etc/opendkim/KeyTable <<EOF
-${keyselector}._domainkey.${maildomain} ${maildomain}:${keyselector}:${keyfile}
+$keyselector._domainkey.$maildomain $maildomain:mail:$(find /etc/opendkim/domainkeys -iname $keyselector.private)
 EOF
 cat >> /etc/opendkim/SigningTable <<EOF
 *@$maildomain $keyselector._domainkey.$maildomain
 EOF
-chown opendkim:opendkim ${keyfile}
-chmod 400 ${keyfile}
+chown opendkim:opendkim $(find /etc/opendkim/domainkeys -iname $keyselector.private)
+chmod 400 $(find /etc/opendkim/domainkeys -iname $keyselector.private)