Added fixes for last apache update
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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%;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,8 @@ server {
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_ssl_server_name on;
|
||||
proxy_ssl_name $host;
|
||||
proxy_pass http://%ip%:%web_port%;
|
||||
}
|
||||
|
||||
|
||||
@@ -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%;
|
||||
}
|
||||
|
||||
|
||||
@@ -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%;
|
||||
}
|
||||
|
||||
|
||||
@@ -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%;
|
||||
}
|
||||
|
||||
|
||||
@@ -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%;
|
||||
}
|
||||
|
||||
|
||||
23
install/upgrade/versions/1.9.6.sh
Normal file
23
install/upgrade/versions/1.9.6.sh
Normal file
@@ -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'
|
||||
Reference in New Issue
Block a user