Merge branch 'staging/1.4.4' into main

Author: jaapmarcus

CHANGELOG.md

@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
 ### Features
 
 - Add nginx user_agent separation to desktop/mobile (e.g. for fastcgi cache)
-- Run phpmyadmin folder under www-data user instead of "user" improving security. (Reported via Discord)
+- Run phpmyadmin folder under www-data user instead of "user" improving security. (@bet0x)
 - Added new template for mod php users to access phpmymyadmin
 
 ### Bugfixes
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file.
 - Set "default" when WEB_TEMPLATE and PROXY_TEMPLATE is missing in user.conf 
 - Add BACKEND_TEMPLATE to default package
 - Fix possible error occur for v-rebuild-cron-jobs #1943 (thanks @clarkchentw)
-- Restrict access Filemanager when SSH is enabled for the user
+- Restrict access Filemanager when SSH is enabled for the user (@bet0x)
 - Check for DNS domains when running v-change-sys-ip-nat (@clarkchentw)
 - Fix logical error in installer (@clarkchentw)
 

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.3 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.4 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

bin/v-generate-ssl-cert

@@ -74,6 +74,10 @@ args_usage='DOMAIN EMAIL COUNTRY STATE CITY ORG UNIT [ALIASES] [FORMAT]'
 check_args '7' "$#" "$args_usage"
 is_format_valid 'domain' 'aliases' 'format'
 
+release="$(lsb_release -s -r)"
+if [ "$release" = "18.04" ]; then
+    is_format_valid 'email'
+fi
 
 if [ ! -f /root/.rnd ]; then
     touch /root/.rnd
@@ -108,7 +112,7 @@ if [ -z "$aliases" ]; then
         -batch \
         -subj "$subj" \
         -key $domain.key \
-        -out $domain.csr #>/dev/null 2>&1
+        -out $domain.csr >/dev/null 2>&1
 else
     for alias in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
         if [[ "$alias" = *[![:ascii:]]* ]]; then

install/deb/filemanager/filegator/composer.json

@@ -18,7 +18,8 @@
         "php-di/php-di": "^6.0",
         "rakit/validation": "^1.1",
         "league/flysystem": "^1.1",
-        "league/flysystem-ziparchive": "^1.0"
+        "league/flysystem-ziparchive": "^1.0",
+        "league/flysystem-sftp": "^1.0"
     },
     "authors": [
         {

install/deb/filemanager/filegator/composer.lock

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.4~alpha'
+HESTIA_INSTALL_VER='1.4.4'
 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-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.4~alpha'
+HESTIA_INSTALL_VER='1.4.4'
 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

@@ -33,6 +33,6 @@ fi
 # Reset PMA SSO to fix bug with Nginx + Apache2 
 if [ "$PHPMYADMIN_KEY" != "" ]; then
     echo "[ * ] Refressh hestia-sso for PMA..."
-    $BIN/v-delete-sys-pma-sso 
-    $BIN/v-add-sys-pma-sso 
+    $BIN/v-delete-sys-pma-sso quiet
+    $BIN/v-add-sys-pma-sso quiet
 fi

install/upgrade/versions/1.4.4.sh

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