testing

Final testing and PHP 8.5 support added.

Author: QROkes

lib/general

@@ -7,7 +7,7 @@
 readonly app_version="1.19.7"
 readonly svr_version="1.11"
 readonly os_ubuntu_supported=(focal jammy noble) # https://ubuntu.com/about/release-cycle
-readonly php_supported=(7.4 8.0 8.1 8.2 8.3 8.4) # https://www.php.net/supported-versions.php
+readonly php_supported=(7.4 8.0 8.1 8.2 8.3 8.4 8.5) # https://www.php.net/supported-versions.php
 readonly php_default="8.4"
 readonly mariadb_supported=(10.11 11.4 11.8) # https://mariadb.com/docs/release-notes/community-server
 readonly mariadb_default="11.8"

lib/install

@@ -211,8 +211,11 @@ php_install() {
 	fi
 	local ver=$(conf_read php-ver)
 
-	sudo apt -y install php${ver}-common php${ver}-cli php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-readline php${ver}-mysql php${ver}-mbstring php${ver}-bcmath php${ver}-opcache php${ver}-zip php${ver}-xml php${ver}-soap php${ver}-imagick php${ver}-msgpack php${ver}-igbinary php${ver}-intl php-pear graphviz ghostscript
+	sudo apt -y install php${ver}-common php${ver}-cli php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-readline php${ver}-mysql php${ver}-mbstring php${ver}-bcmath php${ver}-zip php${ver}-xml php${ver}-soap php${ver}-imagick php${ver}-msgpack php${ver}-igbinary php${ver}-intl php-pear graphviz ghostscript
 
+	# Starting with 8.5: Opcache extension is now always bundled in core, cannot be installed separately.
+	[[ $ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1|8.2|8.3|8.4)$ ]] && sudo apt -y install php${ver}-opcache
+
 	conf_write php true
 
 	if [[ -d /etc/php/${ver}/fpm ]] && systemctl is-active --quiet php${ver}-fpm; then
@@ -430,13 +433,13 @@ fastcgi_param  HTTP_ACCEPT_ENCODING "";
 	[[ -n $(conf_read default-response) ]] && sudo webinoly -default-site=$(conf_read default-response)
 	[[ -n $(conf_read tools-port-set) ]] && sudo webinoly -tools-port=$(conf_read tools-port-set)
 	[[ -n $(conf_read tools-site) ]] && sudo webinoly -tools-site=$(conf_read tools-site)
-	[[ $(conf_read global-access-log-off) =~ ^(false|purged)$ ]] && sudo log -only-error=off || sudo log -only-error=on
+	[[ $(conf_read global-access-log-off) =~ ^(false|purged)$ ]] && sudo log -access-log=on || sudo log -access-log=off
 	[[ -n $(conf_read fastcgi-conf) ]] && sudo webinoly -cache-valid=[$(conf_read fastcgi-conf)]
 	[[ -n $(conf_read auth-whitelist-ip) ]] && sudo httpauth -whitelist=$(conf_read auth-whitelist-ip)
 	[[ -n $(conf_read blockip) ]] && sudo webinoly -blockip=$(conf_read blockip)
 
-	[[ $(conf_read sftp-www-data) == "true" ]] && sudo webinoly -login-www-data=on
-	[[ $(conf_read sftp-www-data) == "false" ]] && sudo webinoly -login-www-data=off
+	[[ $(conf_read sftp-www-data) == "true" ]] && sudo webinoly -sftp=on
+	[[ $(conf_read sftp-www-data) == "false" ]] && sudo webinoly -sftp=off
 
 	http_header_referrer
 	http_header_hsts
@@ -797,7 +800,10 @@ php_tool_memcached() {
 	local ver=$(conf_read php-ver)
 
 	# Memcached (Object Cache)
-	sudo apt -y install php${ver}-memcached php${ver}-memcache memcached
+	sudo apt -y install php${ver}-memcached memcached
+	
+	# Starting with 8.5: Memcache module still not available, we should consider remove it permanently.
+	[[ $ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1|8.2|8.3|8.4)$ ]] && sudo apt -y install php${ver}-memcache
 
 	conf_write php-tool-memcached true
 

lib/sites

@@ -852,9 +852,9 @@ createsite() {
 
 	# Check if only-error log is enabled
 	if [[ $(conf_read global-access-log-off) == "true" && $domain != $ADMIN_TOOLS_SITE ]]; then
-		sudo log $domain -only-error=on > /dev/null 2>&1
+		sudo log $domain -access-log=off > /dev/null 2>&1
 	else
-		sudo log $domain -only-error=off > /dev/null 2>&1
+		sudo log $domain -access-log=on > /dev/null 2>&1
 	fi
 
 	# Force redirection "root" is now enabled by default!

lib/verify

@@ -688,14 +688,14 @@ if [[ -z $critical_mode ]]; then
 			local ver_three_war="1"
 		fi
 
-		if ! [[ $ver_php_ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1|8.2|8.3|8.4)$ ]]; then
+		if ! [[ $ver_php_ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1|8.2|8.3|8.4|8.5)$ ]]; then
 			echo "${dim}- [WARNING] Unknown PHP version! (${ver_php_ver}) ${end}${red}"
 			local ver_three_war="1"
-		elif [[ $ver_php_ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0)$ ]]; then
+		elif [[ $ver_php_ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1)$ ]]; then
 			echo "${dim}- [WARNING] You have an obsolete PHP version installed (${ver_php_ver}) that not even receive security updates!${end}${red}"
 			local ver_three_war="1"
-		elif [[ $ver_php_ver == "8.1" ]]; then
-			echo "${blu}${dim}- [INFO] PHP v8.2 or later is recommended to get an optimal perfomance! (Current: ${ver_php_ver}) ${end}${red}"
+		elif [[ $ver_php_ver == "8.2" ]]; then
+			echo "${blu}${dim}- [INFO] PHP v8.3 or later is recommended to get an optimal perfomance! (Current: ${ver_php_ver}) ${end}${red}"
 		fi
 
 		# PHP Workers!
@@ -1169,6 +1169,13 @@ if [[ -z $critical_mode ]]; then
 		fi
 	fi
 
+	if [[ $(conf_read smtp) == "true" && $(conf_read php-tool-postfix) != "true" ]]; then
+		echo "- [ERROR] Seems like SMTP is configuraded, but Postfix is not found!"
+		local ver_seven_err="1"
+	elif [[ $(conf_read smtp) == "true" ]]; then
+		echo "${blu}${dim}- [INFO] SMTP is Enabled! Be sure SPF, DKIM and DMARC are also configured!${end}${red}"
+	fi
+
 	if [[ $ver_seven_err == "1" ]]; then
 		echo "(7) Additional Tools Verification Test has failed!"
 	elif [[ $ver_seven_war == "1" ]]; then

templates/general/conf

@@ -100,7 +100,7 @@
 # SFTP Access for www-data user
 # Values: boolean (true/false)
 # Default: false
-# Same as: sudo webinoly -login-www-data=on
+# Same as: sudo webinoly -sftp=on
 ###########################
 #sftp-www-data:false
 
@@ -109,7 +109,7 @@
 # Values: boolean (true/false)
 # Default: true
 # Note: This setting will be applied to new sites, or for existing sites 'access log' needs to be reenabled (same for global).
-# Same as: sudo log -only-error=on
+# Same as: sudo log -access-log=off
 ###########################
 #global-access-log-off:true
 

usr/stack

@@ -55,7 +55,7 @@ purge_mysql_client() {
 
 purge_nginx_tools() {
 	# Remove additional tools
-	[[ $(conf_read login-www-data) == "true" ]] && webinoly -login-www-data=off
+	[[ $(conf_read login-www-data) == "true" ]] && webinoly -sftp=off
 	[[ $(conf_read nginx-tool-ssl) == "true" ]] && stack -letsencrypt -purge=force
 	[[ $(conf_read nginx-tool-bkp) == "true" ]] && stack -backups -purge=force
 	[[ $(conf_read mysql-tool-pma) == "true" ]] && stack -pma -purge=force
@@ -231,7 +231,10 @@ elif [[ -n $purge && -n $php ]]; then
 			ver=$(conf_read php-ver)
 			sudo systemctl stop php${ver}-fpm
 
-			sudo apt -y purge php${ver}-common php${ver}-cli php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-readline php${ver}-mysql php${ver}-mbstring php${ver}-bcmath php${ver}-mysql php${ver}-opcache php${ver}-zip php${ver}-xml php${ver}-soap php${ver}-imagick php${ver}-msgpack php${ver}-igbinary php${ver}-intl php-pear graphviz ghostscript
+			sudo apt -y purge php${ver}-common php${ver}-cli php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-readline php${ver}-mysql php${ver}-mbstring php${ver}-bcmath php${ver}-mysql php${ver}-zip php${ver}-xml php${ver}-soap php${ver}-imagick php${ver}-msgpack php${ver}-igbinary php${ver}-intl php-pear graphviz ghostscript
+			
+			# Starting with 8.5: Opcache extension is now always bundled in core, cannot be installed separately.
+			[[ $ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1|8.2|8.3|8.4)$ ]] && sudo apt -y purge php${ver}-opcache
 
 			# For old packages - before ondrej split modules
 			sudo apt -y purge php-imagick php-msgpack
@@ -547,7 +550,8 @@ elif [[ -n $purge && -n $memcached ]]; then
 
 		if [[ $answer == [Yy] || $(conf_read force-flag) == "true" ]]; then
 			ver=$(conf_read php-ver)
-			sudo apt -y purge php${ver}-memcached php${ver}-memcache memcached
+			sudo apt -y purge php${ver}-memcached memcached
+			[[ $ver =~ ^(5.6|7.0|7.1|7.2|7.3|7.4|8.0|8.1|8.2|8.3|8.4)$ ]] && sudo apt -y purge php${ver}-memcache
 			purge_autoremove="true"
 
 			# For old packages - before ondrej split modules