Change main branch to 1.4.12~alpha

Author: jaapmarcus

install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.11'
+HESTIA_INSTALL_VER='1.4.12~alpha'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.11'
+HESTIA_INSTALL_VER='1.4.12~alpha'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/upgrade/versions/1.4.11.sh

@@ -1,27 +1,8 @@
 #!/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

install/upgrade/versions/1.4.12.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# 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

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.4.11
+Version: 1.4.12~alpha
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com