hestiacp#2776 [Bug] emails sent to aliases are sent to catch-all email as well (hestiacp#3177)

* Update Exim.conf

* Exim upgrade conf

Author: jaapmarcus

install/deb/exim/exim4.conf.4.94.template

@@ -350,6 +350,7 @@ catchall:
   data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}}
   file_transport = local_delivery
   redirect_router = dnslookup
+  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
 
 terminate_alias:
   driver = accept
@@ -469,4 +470,4 @@ begin rewrite
 
 
 
-######################################################################
+######################################################################

install/deb/exim/exim4.conf.template

@@ -352,6 +352,7 @@ catchall:
   data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}}
   file_transport = local_delivery
   redirect_router = dnslookup
+  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
 
 terminate_alias:
   driver = accept

install/rpm/exim/exim.conf

@@ -310,6 +310,7 @@ catchall:
   data = ${extract{1}{:}{${lookup{*@${lookup{$domain}dsearch{/etc/exim/domains/}}}lsearch{/etc/exim/domains/${lookup{${lookup{$domain}dsearch{/etc/exim/domains/}}}dsearch{/etc/exim/domains/}}/aliases}}}}
   file_transport = local_delivery
   redirect_router = dnslookup
+  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
 
 terminate_alias:
   driver = accept

install/upgrade/versions/1.7.0.sh

@@ -37,3 +37,14 @@ for package in $packages; do
 		echo "RATE_LIMIT='200'" >> $HESTIA/data/packages/$package
 	fi
 done
+
+if [ -z "$(grep -e 'condition =  ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}' /etc/exim4/exim4.conf.template)" ]; then
+	for line in $(sed -n '/redirect_router = dnslookup/=' /etc/exim4/exim4.conf.template); do
+		testline=$((line - 1))
+		newline=$((line + 1))
+		if [ "$(awk NR==$testline /etc/exim4/exim4.conf.template)" = "  file_transport = local_delivery" ]; then
+			# Add new line
+			sed -i "$newline i \ \ condition = \${lookup{$local_part@\$domain}lsearch{/etc/exim4/domains/\${lookup{\$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}" /etc/exim4/exim4.conf.template
+		fi
+	done
+fi