From bd56dcf5f5908e21a3dfb6b7dc1b2659d3d51539 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 14 Oct 2025 23:08:27 +0300 Subject: [PATCH] Added fixes for last apache update --- install/hst-install.sh | 6 +++-- install/rpm/templates/mail/nginx/default.stpl | 4 ++++ .../mail/nginx/default_disabled.stpl | 2 ++ .../mail/nginx/default_snappymail.stpl | 5 ++++ install/rpm/templates/web/nginx/caching.stpl | 4 ++++ install/rpm/templates/web/nginx/default.stpl | 4 ++++ install/rpm/templates/web/nginx/hosting.stpl | 4 ++++ install/upgrade/versions/1.9.6.sh | 23 +++++++++++++++++++ package.json | 2 +- src/rpm/hestia/hestia.spec | 7 ++++-- 10 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 install/upgrade/versions/1.9.6.sh diff --git a/install/hst-install.sh b/install/hst-install.sh index 997517a..4f23a31 100755 --- a/install/hst-install.sh +++ b/install/hst-install.sh @@ -38,7 +38,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common" VERBOSE='no' # Define software versions -HESTIA_INSTALL_VER='1.9.5.rpm-alpha' +HESTIA_INSTALL_VER='1.9.6.rpm-alpha' # Dependencies mariadb_v="10.11" @@ -164,7 +164,9 @@ set_default_port() { write_config_value() { local key="$1" local value="$2" - echo "$key='$value'" >> $HESTIA/conf/hestia.conf + if [ -e $HESTIA/conf/hestia.conf ]; then + echo "$key='$value'" >> $HESTIA/conf/hestia.conf + fi } # Sort configuration file values diff --git a/install/rpm/templates/mail/nginx/default.stpl b/install/rpm/templates/mail/nginx/default.stpl index c86fb59..3e76d2f 100644 --- a/install/rpm/templates/mail/nginx/default.stpl +++ b/install/rpm/templates/mail/nginx/default.stpl @@ -30,6 +30,8 @@ server { try_files $uri $uri/ =404; + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { @@ -39,6 +41,8 @@ server { } location @fallback { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; } diff --git a/install/rpm/templates/mail/nginx/default_disabled.stpl b/install/rpm/templates/mail/nginx/default_disabled.stpl index 3ff2253..6a323f4 100644 --- a/install/rpm/templates/mail/nginx/default_disabled.stpl +++ b/install/rpm/templates/mail/nginx/default_disabled.stpl @@ -20,6 +20,8 @@ server { } location / { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass http://%ip%:%web_port%; } diff --git a/install/rpm/templates/mail/nginx/default_snappymail.stpl b/install/rpm/templates/mail/nginx/default_snappymail.stpl index 5e1062c..6cb982e 100644 --- a/install/rpm/templates/mail/nginx/default_snappymail.stpl +++ b/install/rpm/templates/mail/nginx/default_snappymail.stpl @@ -30,6 +30,9 @@ server { try_files $uri $uri/ =404; + proxy_ssl_server_name on; + proxy_ssl_name $host; + proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { @@ -39,6 +42,8 @@ server { } location @fallback { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; } diff --git a/install/rpm/templates/web/nginx/caching.stpl b/install/rpm/templates/web/nginx/caching.stpl index f8232d9..2ae472a 100755 --- a/install/rpm/templates/web/nginx/caching.stpl +++ b/install/rpm/templates/web/nginx/caching.stpl @@ -27,6 +27,8 @@ server { } location / { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; proxy_cache %domain%; @@ -64,6 +66,8 @@ server { } location @fallback { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; } diff --git a/install/rpm/templates/web/nginx/default.stpl b/install/rpm/templates/web/nginx/default.stpl index 13f652c..39fa79a 100755 --- a/install/rpm/templates/web/nginx/default.stpl +++ b/install/rpm/templates/web/nginx/default.stpl @@ -26,6 +26,8 @@ server { } location / { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extensions%)$ { @@ -40,6 +42,8 @@ server { } location @fallback { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; } diff --git a/install/rpm/templates/web/nginx/hosting.stpl b/install/rpm/templates/web/nginx/hosting.stpl index 6591c47..10727be 100755 --- a/install/rpm/templates/web/nginx/hosting.stpl +++ b/install/rpm/templates/web/nginx/hosting.stpl @@ -26,6 +26,8 @@ server { } location / { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extensions%)$ { @@ -40,6 +42,8 @@ server { } location @fallback { + proxy_ssl_server_name on; + proxy_ssl_name $host; proxy_pass https://%ip%:%web_ssl_port%; } diff --git a/install/upgrade/versions/1.9.6.sh b/install/upgrade/versions/1.9.6.sh new file mode 100644 index 0000000..6672342 --- /dev/null +++ b/install/upgrade/versions/1.9.6.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Hestia Control Panel upgrade script for target version 1.9.3 + +####################################################################################### +####### Place additional commands below. ####### +####################################################################################### +####### upgrade_config_set_value only accepts true or false. ####### +####### ####### +####### Pass through information to the end user in case of a issue or problem ####### +####### ####### +####### Use add_upgrade_message "My message here" to include a message ####### +####### in the upgrade notification email. Example: ####### +####### ####### +####### add_upgrade_message "My message here" ####### +####### ####### +####### You can use \n within the string to create new lines. ####### +####################################################################################### + +upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'true' +upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false' +upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'true' +upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no' \ No newline at end of file diff --git a/package.json b/package.json index 5921f0f..c17ca01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hestia", "private": true, - "version": "1.9.5.rpm", + "version": "1.9.6.rpm", "description": "An open-source Linux web server control panel.", "repository": "https://github.com/hestiacp/hestiacp", "license": "GPL-3.0-or-later", diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec index 639c9c3..5f0e721 100644 --- a/src/rpm/hestia/hestia.spec +++ b/src/rpm/hestia/hestia.spec @@ -2,8 +2,8 @@ %global _hardened_build 1 Name: hestia -Version: 1.9.5 -Release: 4%{dist} +Version: 1.9.6 +Release: 1%{dist} Summary: Hestia Control Panel Group: System Environment/Base License: GPLv3 @@ -184,6 +184,9 @@ fi %{_tmpfilesdir}/%{name}.conf %changelog +* Thu Oct 09 2025 Alexey Berezhok - 1.9.6-1 +- Fix error on all web and mail domains after Apache 2.4.64 update + * Thu Jun 05 2025 Alexey Berezhok - 1.9.5-4 - Fixed memory calculation in service list