Merge branch 'main' into feature/user-roles

Author: Kristan Kenney

bin/v-add-fastcgi-cache

@@ -1,22 +1,24 @@
 #!/bin/bash
-# info: Add FastCGI nginx support
-# options: USER DOMAIN [DEBUG]
+# info: Enable FastCGI cache for nginx
+# options: USER DOMAIN [DURATION] [DEBUG] [RESTART]
 # labels: hestia web
 #
-# example: v-add-fastcgi-cache user domain.tld
+# example: v-add-fastcgi-cache user domain.tld 30m
 #
 # The function enables FastCGI cache for nginx
+# Acceptable values for duration is time in seconds (10s) minutes (10m) or days (10d)
 # Add "yes" as last parameter to append debug information to response headers
 
-
 #----------------------------------------------------------#
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
 # Argument definition
 user=$1
 domain=$2
-debug=$3
+duration=${3-2m}
+debug=${4-no}
+restart=${5-no}
 
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -36,6 +38,16 @@ is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
 is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
+if ! [[ "$duration" =~ ^[0-9].*[s|m|d]$ ]]; then
+   echo "Invalid duration";
+   exit 2;
+fi
+
+if [[ "$duration" =~ ^[0].*[s|m|d]$ ]]; then
+   echo "Invalid duration";
+   exit 2;
+fi
+
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 
@@ -47,7 +59,7 @@ check_hestia_demo_mode
 # Load domain data
 parse_object_kv_list $(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
 
-# Check if nginx is not in proxy mode
+# Check that nginx is not in proxy mode
 if [ "$WEB_SYSTEM" != 'nginx' ]; then
     echo "Error: nginx is in proxy mode"
     exit $E_NOTEXIST
@@ -65,7 +77,7 @@ status='$upstream_cache_status'
 
 cat << EOF > $fastcgi
     fastcgi_cache $domain;
-    fastcgi_cache_valid 200 2m;
+    fastcgi_cache_valid 200 $duration;
     fastcgi_cache_valid 301 302 10m;
     fastcgi_cache_valid 404 10m;
     fastcgi_cache_bypass $no_cache;
@@ -96,16 +108,22 @@ mkdir -p /var/cache/nginx/micro/$domain
 #                       Hestia                             #
 #----------------------------------------------------------#
 
-if [ -z "$FASTCGI" ]; then
+if [ -z "$FASTCGI_CACHE" ]; then
     add_object_key "web" 'DOMAIN' "$domain" 'FASTCGI_CACHE' 'ALIAS'
 fi
+if [ -z "$FASTCGI_DURATION" ]; then
+    add_object_key "web" 'DOMAIN' "$domain" 'FASTCGI_DURATION' 'ALIAS'
+fi
 
 # Set FastCGI cache flag to enabled
 update_object_value 'web' 'DOMAIN' "$domain" '$FASTCGI_CACHE' 'yes'
+update_object_value 'web' 'DOMAIN' "$domain" '$FASTCGI_DURATION' "$duration"
 
-# Restart web server
-$BIN/v-restart-web
-check_result $? "Web server restart failed" > /dev/null
+if [ "$restart" = "yes" ]; then
+    # Restart web server
+    $BIN/v-restart-web
+    check_result $? "Web server restart failed" > /dev/null
+fi
 
 # Logging
 $BIN/v-log-action "$user" "Info" "Web" "FastCGI cache enabled (Domain: $domain)."

bin/v-change-sys-port

@@ -58,16 +58,8 @@ check_hestia_demo_mode
 # Get original port
 ORIGINAL_PORT=$(cat $HESTIA/nginx/conf/nginx.conf | grep "listen" | sed 's/[^0-9]*//g')
 
-# Check if system variable is set
-if [ ! -n "$BACKEND_PORT" ]; then
-    echo "BACKEND_PORT='$port'" >> $HESTIA/conf/hestia.conf
-    source $HESTIA/conf/hestia.conf
-fi
-
-# Check if port is different to hestia.conf
-if [ ! "$BACKEND_PORT" = "$PORT" ]; then
-    sed -i s/BACKEND_PORT=\'$BACKEND_PORT\'/BACKEND_PORT=\'$PORT\'/g $HESTIA/conf/hestia.conf
-fi
+# Set new port in config via v-change-sys-config-value
+$HESTIA/bin/v-change-sys-config-value "BACKEND_PORT" $PORT
 
 # Check if port is different to nginx.conf
 if [ "$ORIGINAL_PORT" = "$PORT" ]; then

bin/v-delete-fastcgi-cache

@@ -1,11 +1,11 @@
 #!/bin/bash
-# info: Remove FastCGI nginx support
+# info: Disable FastCGI cache for nginx
 # options: USER DOMAIN [RESTART]
 # labels: hestia web
 #
 # example: v-delete-fastcgi-cache user domain.tld
 #
-# The function enables FastCGI cache for nginx
+# The function disables FastCGI cache for nginx
 
 
 #----------------------------------------------------------#
@@ -51,7 +51,7 @@ fi
 
 conf='/etc/nginx/conf.d/fastcgi_cache_pool.conf'
 if [ -f "$conf" ]; then
-    sed -i "/fastcgi_cache $domain;/d" $conf
+    sed -i "/ keys_zone=$domain/d" $conf
     if [ ! -s "$conf" ]; then
         rm -rf $conf
     fi
@@ -68,11 +68,15 @@ fi
 #----------------------------------------------------------#
 
 if [ -z "$FASTCGI_CACHE" ]; then
-    add_object_key "web" 'DOMAIN' "$domain" 'FASTCGI_CACHE' 'ALIAS'
+add_object_key "web" 'DOMAIN' "$domain" 'FASTCGI_CACHE' 'ALIAS'
+fi
+if [ -z "$FASTCGI_DURATION" ]; then
+add_object_key "web" 'DOMAIN' "$domain" 'FASTCGI_DURATION' 'ALIAS'
 fi
 
-# Set FASTCGI flag to disabled
-update_object_value 'web' 'DOMAIN' "$domain" '$FASTCGI_CACHE' ''
+# Set FastCGI cache flag to disabled
+update_object_value 'web' 'DOMAIN' "$domain" '$FASTCGI_CACHE' 'no'
+update_object_value 'web' 'DOMAIN' "$domain" '$FASTCGI_DURATION' '0s'
 
 # Restart web server
 if [ ! -z "$restart" ]; then

bin/v-delete-web-domain

@@ -81,6 +81,11 @@ if [ "$SSL" = 'yes' ]; then
     rm -f $USER_DATA/ssl/$domain.*
 fi
 
+if [ "$FASTCGI_CACHE" = "yes" ]; then
+    # make sure no trails left behind 
+    $BIN/v-delete-fastcgi-cache $user $domain
+fi
+
 # Deleting domain from web.conf
 sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf
 
@@ -111,7 +116,6 @@ rm -f /var/log/$WEB_SYSTEM/domains/$domain.error*
 rm -rf $HOMEDIR/$user/web/$domain
 rm -rf $HOMEDIR/$user/conf/web/$domain
 
-
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#

bin/v-list-web-domain

@@ -46,6 +46,7 @@ json_list() {
         "PROXY": "'$PROXY'",
         "PROXY_EXT": "'$PROXY_EXT'",
         "FASTCGI_CACHE": "'$FASTCGI_CACHE'",
+        "FASTCGI_DURATION": "'$FASTCGI_DURATION'",
         "REDIRECT": "'$REDIRECT'",
         "REDIRECT_CODE": "'$REDIRECT_CODE'",
         "CUSTOM_DOCROOT": "'$CUSTOM_DOCROOT'",

bin/v-restore-user

@@ -314,7 +314,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
             str="DOMAIN='$domain' IP='$IP' IP6='$IP6' ALIAS='$ALIAS'"
             str="$str CUSTOM_DOCROOT='$CUSTOM_DOCROOT' CUSTOM_PHPROOT='$CUSTOM_PHPROOT'"
             str="$str REDIRECT='$REDIRECT' REDIRECT_CODE='$REDIRECT_CODE'"
-            str="$str FASTCGI_CACHE='$FASTCGI_CACHE' FASTCGI_CACHE_LENGTH='$FASTCGI_CACHE_LENGTH'"
+            str="$str FASTCGI_CACHE='$FASTCGI_CACHE' FASTCGI_DURATION='$FASTCGI_DURATION'"
             str="$str TPL='$TPL' SSL='$SSL' SSL_HOME='$SSL_HOME'"
             str="$str LETSENCRYPT='$LETSENCRYPT' FTP_USER='$FTP_USER'"
             str="$str FTP_MD5='$FTP_MD5' BACKEND='$BACKEND' PROXY='$PROXY'"

bin/v-update-sys-hestia-git

@@ -72,6 +72,12 @@ BUILD_DIR='/tmp/hestiacp-src'
 DEB_DIR="$BUILD_DIR/debs"
 INSTALL_DIR='/usr/local/hestia'
 ARCHIVE_DIR="${BUILD_DIR}/archive"
+architecture="$(uname -m)"
+if [ $architecture == 'aarch64' ]; then
+    BUILD_ARCH='arm64'
+else
+    BUILD_ARCH='amd64'
+fi
 
 # Set command variables
 fork=$1
@@ -81,7 +87,6 @@ flags=$4
 
 # Set Version for compiling
 BUILD_VER=$(curl -s https://raw.githubusercontent.com/$fork/hestiacp/$branch/src/deb/hestia/control | grep "Version:" | cut -d' ' -f2)
-BUILD_ARCH='amd64'
 HESTIA_V="${BUILD_VER}_${BUILD_ARCH}"
 NGINX_V=$(curl -s https://raw.githubusercontent.com/$fork/hestiacp/$branch/src/deb/nginx/control |grep "Version:" |cut -d' ' -f2)
 OPENSSL_V='1.1.1g'
@@ -234,6 +239,9 @@ if [ "$NGINX_B" = true ] ; then
     # Download control, postinst and postrm files
     cd DEBIAN
     download_file $GIT_REP/nginx/control
+    if [ "$BUILD_ARCH" != "amd64" ]; then
+        sed -i "s/amd64/${BUILD_ARCH}/g" "control"
+    fi
     download_file $GIT_REP/nginx/copyright
     download_file $GIT_REP/nginx/postinst
     download_file $GIT_REP/nginx/postrm
@@ -296,14 +304,31 @@ if [ "$PHP_B" = true ] ; then
     cd php-$PHP_V
 
     # Configure PHP
-    ./configure     --prefix=/usr/local/hestia/php \
+    if [ $BUILD_ARCH = 'amd64' ]; then
+        ./configure   --prefix=/usr/local/hestia/php \
                     --enable-fpm \
                     --with-fpm-user=admin \
                     --with-fpm-group=admin \
                     --with-libdir=lib/x86_64-linux-gnu \
                     --with-mysqli \
+                    --with-gettext \
                     --with-curl \
+                    --with-zip \
+                    --with-gmp \
                     --enable-mbstring
+    else
+        ./configure   --prefix=/usr/local/hestia/php \
+                    --enable-fpm \
+                    --with-fpm-user=admin \
+                    --with-fpm-group=admin \
+                    --with-libdir=lib/aarch64-linux-gnu \
+                    --with-mysqli \
+                    --with-gettext \
+                    --with-curl \
+                    --with-zip \
+                    --with-gmp \
+                    --enable-mbstring
+    fi
 
     # Create the files and install them
     make -j $NUM_CPUS && make INSTALL_ROOT=$BUILD_DIR install
@@ -319,6 +344,9 @@ if [ "$PHP_B" = true ] ; then
     # Download control, postinst and postrm files
     cd DEBIAN
     download_file $GIT_REP/php/control
+    if [ "$BUILD_ARCH" != "amd64" ]; then
+        sed -i "s/amd64/${BUILD_ARCH}/g" "control"
+    fi
     download_file $GIT_REP/php/copyright
 
     # Move php directory
@@ -375,6 +403,9 @@ if [ "$HESTIA_B" = true ] ; then
     # Download control, postinst and postrm files
     cd DEBIAN
     download_file $GIT_REP/hestia/control
+    if [ "$BUILD_ARCH" != "amd64" ]; then
+        sed -i "s/amd64/${BUILD_ARCH}/g" "control"
+    fi
     download_file $GIT_REP/hestia/copyright
     download_file $GIT_REP/hestia/postinst
 

func/main.sh

@@ -937,7 +937,7 @@ is_service_format_valid() {
 }
 
 is_hash_format_valid() {
-  if ! [[ "$1" =~ ^[_A-Za-z0-9]{1,32}$ ]]; then
+  if ! [[ "$1" =~ ^[-_A-Za-z0-9]{1,32}$ ]]; then
         check_result $E_INVALID "invalid $2 format :: $1"
     fi    
 }

func/rebuild.sh

@@ -297,6 +297,10 @@ rebuild_web_domain_conf() {
         $BIN/v-delete-web-domain-ssl-hsts $user $domain no yes
         $BIN/v-add-web-domain-ssl-hsts $user $domain yes yes
     fi
+    if [ "$FASTCGI_CACHE" = 'yes' ]; then
+        $BIN/v-delete-fastcgi-cache $user $domain
+        $BIN/v-add-fastcgi-cache $user $domain "$FASTCGI_DURATION"
+    fi
 
     # Adding proxy configuration
     if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then

func/syshealth.sh

@@ -45,7 +45,7 @@ function syshealth_update_web_config_format() {
     # WEB DOMAINS
     # Create array of known keys in configuration file
     system="web"
-    known_keys=(DOMAIN IP IP6 CUSTOM_DOCROOT CUSTOM_PHPROOT FASTCGI_CACHE FASTCGI_LENGTH ALIAS TPL SSL SSL_FORCE SSL_HOME LETSENCRYPT FTP_USER FTP_MD5 FTP_PATH BACKEND PROXY PROXY_EXT STATS STATS_USER STATS_CRYPT SUSPENDED TIME DATE)
+    known_keys=(DOMAIN IP IP6 CUSTOM_DOCROOT CUSTOM_PHPROOT FASTCGI_CACHE FASTCGI_DURATION ALIAS TPL SSL SSL_FORCE SSL_HOME LETSENCRYPT FTP_USER FTP_MD5 FTP_PATH BACKEND PROXY PROXY_EXT STATS STATS_USER STATS_CRYPT SUSPENDED TIME DATE)
     write_kv_config_file
     unset system
     unset known_keys
@@ -236,8 +236,9 @@ function syshealth_repair_system_config() {
 
     # Backend port
     if [ -z "$BACKEND_PORT" ]; then 
-        echo "[ ! ] Adding missing variable to hestia.conf: BACKEND_PORT ('8083')"
-        $BIN/v-change-sys-port '8083' >/dev/null 2>&1
+        ORIGINAL_PORT=$(cat $HESTIA/nginx/conf/nginx.conf | grep "listen" | sed 's/[^0-9]*//g')
+        echo "[ ! ] Adding missing variable to hestia.conf: BACKEND_PORT ('$ORIGINAL_PORT')"
+        $HESTIA/bin/v-change-sys-config-value 'BACKEND_PORT' $PORT
     fi
 
     # Upgrade: Send email notification