better logic

docker-mailserver · Feb 7, 2022 · 0ae2da2 · 0ae2da2
1 parent dbb9467
commit 0ae2da2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/target/scripts/helpers/aliases.sh b/target/scripts/helpers/aliases.sh
@@ -9,6 +9,7 @@
 function _handle_postfix_virtual_config
 {
   : >/etc/postfix/virtual
+  : >/etc/postfix/regexp
 
   if [[ -f /tmp/docker-mailserver/postfix-virtual.cf ]]
   then
@@ -41,8 +42,6 @@ function _handle_postfix_regexp_config
   then
     _notify 'inf' "Adding regexp alias file postfix-regexp.cf"
     cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp
-  else
-    rm -rf /etc/postfix/regexp
   fi
 }
 

diff --git a/target/scripts/startup/setup-stack.sh b/target/scripts/startup/setup-stack.sh
@@ -512,7 +512,7 @@ function _setup_spoof_protection
       postconf -e "smtpd_sender_login_maps = ldap:/etc/postfix/ldap-senders.cf"
     fi
   else
-    if [[ -f /etc/postfix/regexp ]]
+    if [[ -f /tmp/docker-mailserver/postfix-regexp.cf ]]
     then
       postconf -e "smtpd_sender_login_maps = unionmap:{ texthash:/etc/postfix/virtual, hash:/etc/aliases, pcre:/etc/postfix/maps/sender_login_maps.pcre, pcre:/etc/postfix/regexp }"
     else