Merge remote-tracking branch 'origin/main' into staging/release/1.4

Author: jaapmarcus

install/deb/firewall/ipset/blacklist.sh

@@ -8,6 +8,7 @@ BLACKLISTS=(
     "https://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs
     "https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1"  # TOR Exit Nodes
     "https://www.maxmind.com/en/high-risk-ip-sample-list" # MaxMind GeoIP Anonymous Proxies
+    "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
     "https://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP)
     "https://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List
     "https://lists.blocklist.de/lists/all.txt" # blocklist.de attackers

install/upgrade/manual/migrate_phpmyadmin.sh

@@ -38,7 +38,7 @@ then
    cp -r /var/lib/phpmyadmin/* /root/hst_backup_man/var_phmyadmin
 
    echo '[ * ] Remove PHPmyAdmin via ATP'
-   apt-get autoremove phpmyadmin
+   apt-mark hold phpmyadmin
 
    echo '[ * ] Delete possible trail'
    # make sure everything is deleted 

install/upgrade/manual/migrate_roundcube.sh

@@ -30,6 +30,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]
 then
     version=$(cat /usr/share/roundcube/index.php | grep -o -E '[0-9].[0-9].[0-9]+' | head -1);
     # Backup database 
+    echo "#version $version" >> ~/roundcube.sql
     echo "SET FOREIGN_KEY_CHECKS = 0;" >> ~/roundcube.sql
     mysqldump  --add-drop-table roundcube >> ~/roundcube.sql
     echo "SET FOREIGN_KEY_CHECKS = 1;" >> ~/roundcube.sql
@@ -44,6 +45,11 @@ then
     # Install roundcube
     $HESTIA/bin/v-add-sys-roundcube
     # restore backup
+    echo "SET FOREIGN_KEY_CHECKS = 0;" > ~/drop_all_tables.sql
+    ( mysqldump --add-drop-table --no-data -u root roundcube | grep 'DROP TABLE' ) >> ./drop_all_tables.sql 
+    echo "SET FOREIGN_KEY_CHECKS = 1;" >> ~/drop_all_tables.sql
+    mysql -u root roundcube < ./drop_all_tables.sql
+     
     mysql roundcube < ~/roundcube.sql
     /var/lib/roundcube/bin/update.sh --version "$version"
 fi

install/upgrade/versions/1.4.0.sh

@@ -117,7 +117,7 @@ fi
 if [ ! -z "$WEBMAIL_SYSTEM" ]; then
     for user in $($BIN/v-list-users plain | cut -f1); do
         for domain in $($BIN/v-list-mail-domains $user plain | cut -f1); do
-            $BIN/v-add-mail-domain-webmail $user $domain
+            $BIN/v-add-mail-domain-webmail $user $domain '' no
         done 
     done
 fi
@@ -187,10 +187,6 @@ if [ -f "/etc/clamav/clamd.conf" ]; then
     $HESTIA/bin/v-add-user-notification admin 'ClamAV config has been overwritten' 'Warning: If you have manualy changed /etc/clamav/clamd.conf and any changes you made will be lost an backup has been created in the /root/hst_backups folder with the original config. If you have not changed the config file you can ignore this message'
 fi
 
-if [ -f "$HESTIA/data/firewall/ipset/blacklist.sh" ]; then
-    sed -i  '/BruteForceBlocker/d' $HESTIA/data/firewall/ipset/blacklist.sh
-fi
-
 ##### COMMANDS FOR V1.5.X
 
 # Back up default package and install latest version