Fix hestiacp#2078 news@domain.com goes to /var/spool/news (hestiacp#2079)

* Fix hestiacp#2078 news@domain.com goes to /var/spool/news

Added 
require_files = ${local_part}:+${home}/.forward
  domains = +local_domains

To userforward: block

* Un comment rm part older upgrade script

Author: jaapmarcus

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - Fix an issue with sorting the update scripts when version goes higher then 1.x.10 
 - Allow the use of multiple CAA records for domain. #2073
 - Add missing group (www-data) to migrate_phpmyadmin script #2077 @bet0x
+- Fix an issue where news@domain.com get forwarded to /var/spool/news
 
 ## [1.4.10] - Service release 
 

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

@@ -269,6 +269,8 @@ userforward:
   driver = redirect
   check_local_user
   file = $home/.forward
+  require_files = ${local_part}:+${home}/.forward
+  domains = +local_domains
   allow_filter
   no_verify
   no_expn

install/deb/exim/exim4.conf.template

@@ -269,6 +269,8 @@ userforward:
   driver = redirect
   check_local_user
   file = $home/.forward
+  require_files = ${local_part}:+${home}/.forward
+  domains = +local_domains
   allow_filter
   no_verify
   no_expn

install/upgrade/versions/1.4.11.sh

@@ -15,3 +15,13 @@ if [ "$FIREWALL_SYSTEM" = "iptables" ]; then
     rm -f /usr/lib/networkd-dispatcher/routable.d/10-hestia-iptables /etc/network/if-pre-up.d/hestia-iptables
     $BIN/v-update-firewall
 fi
+
+if [ -f "/etc/exim4/exim4.conf.template" ]; then
+    test=$(grep 'require_files = ${local_part}:+${home}/.forward' /etc/exim4/exim4.conf.template)
+    if [ -z "$test" ]; then
+    echo "[ * ] Fix bug where email send to news@domain.com is handled by /var/spool/news"
+    insert="\  require_files = \${local_part}:+\${home}/.forward\n\  domains = +local_domains"
+    line=$(expr $(sed -n '/userforward/=' /etc/exim4/exim4.conf.template) + 1)
+    sed -i "${line}i $insert" /etc/exim4/exim4.conf.template
+    fi
+fi