Răsfoiți Sursa

revert back 1.4.11.sh to 1.4.11 version

Jaap Marcus 4 ani în urmă
părinte
comite
26934cb5b6
2 a modificat fișierele cu 21 adăugiri și 22 ștergeri
  1. 20 1
      install/upgrade/versions/1.4.11.sh
  2. 1 21
      install/upgrade/versions/1.4.12.sh

+ 20 - 1
install/upgrade/versions/1.4.11.sh

@@ -1,8 +1,27 @@
 #!/bin/bash
 
-# Hestia Control Panel upgrade script for target version 1.4.12
+# Hestia Control Panel upgrade script for target version 1.4.11
 
 #######################################################################################
 #######                      Place additional commands below.                   #######
 #######################################################################################
 
+# Fix the potential issue of loading firewall rules
+if [ "$FIREWALL_SYSTEM" = "iptables" ]; then
+    echo "[ * ] Fix the potential issue of loading firewall rules..."
+    # Just in case, delete the legacy version loading script again to prevent any residue
+    rm -f /usr/lib/networkd-dispatcher/routable.d/50-ifup-hooks /etc/network/if-pre-up.d/iptables
+    # The firewall rules are loading by Systemd, the old loading script is no longer needed
+    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

+ 1 - 21
install/upgrade/versions/1.4.12.sh

@@ -1,27 +1,7 @@
 #!/bin/bash
 
-# Hestia Control Panel upgrade script for target version 1.4.11
+# Hestia Control Panel upgrade script for target version 1.4.12
 
 #######################################################################################
 #######                      Place additional commands below.                   #######
 #######################################################################################
-
-# Fix the potential issue of loading firewall rules
-if [ "$FIREWALL_SYSTEM" = "iptables" ]; then
-    echo "[ * ] Fix the potential issue of loading firewall rules..."
-    # Just in case, delete the legacy version loading script again to prevent any residue
-    rm -f /usr/lib/networkd-dispatcher/routable.d/50-ifup-hooks /etc/network/if-pre-up.d/iptables
-    # The firewall rules are loading by Systemd, the old loading script is no longer needed
-    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