Просмотр исходного кода

Fix issue in /etc/apache2/conf.d/phpmyadmin.conf

+ Prepare new version release
Jaap Marcus 4 лет назад
Родитель
Сommit
51dd07565d

+ 6 - 0
CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 
 
 ## Features
 ## Features
 
 
+## [1.4.16] - Service release 
+
+### Bugfixes
+
+- Fix bug with .json not loading on Apache2 due to rule in /etc/apache2/conf.d/hpmyadmin.conf
+
 ### Bugfixes
 ### Bugfixes
 
 
 ## [1.4.15] - Service release 
 ## [1.4.15] - Service release 

+ 1 - 9
install/deb/pma/apache.conf

@@ -49,12 +49,4 @@ Alias /%pma_alias% /usr/share/phpmyadmin
 <Directory /usr/share/phpmyadmin/locale>
 <Directory /usr/share/phpmyadmin/locale>
     Order Deny,Allow
     Order Deny,Allow
     Deny from All
     Deny from All
-</Directory>
-<Files ~ "\.json$">
-    Order Deny,Allow
-    Deny from all
-</Files>
-<Files ~ "\.lock$">
-    Order Deny,Allow
-    Deny from all
-</Files>
+</Directory>

+ 1 - 1
install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 VERBOSE='no'
 
 
 # Define software versions
 # Define software versions
-HESTIA_INSTALL_VER='1.4.15'
+HESTIA_INSTALL_VER='1.4.16'
 pma_v='5.1.1'
 pma_v='5.1.1'
 rc_v="1.4.11"
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 VERBOSE='no'
 
 
 # Define software versions
 # Define software versions
-HESTIA_INSTALL_VER='1.4.15'
+HESTIA_INSTALL_VER='1.4.16'
 pma_v='5.1.1'
 pma_v='5.1.1'
 rc_v="1.4.11"
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

+ 1 - 1
install/upgrade/upgrade.conf

@@ -60,7 +60,7 @@ rc_v="1.4.11"
 rl_v="1.16.0"
 rl_v="1.16.0"
 
 
 # Set version of File manager to update during upgrade if not already installed
 # Set version of File manager to update during upgrade if not already installed
-fm_v="7.6.0"
+fm_v="7.7.0"
 
 
 # Set version of PHPMailer to update during upgrade if not already installed
 # Set version of PHPMailer to update during upgrade if not already installed
 pm_v="6.5.0"
 pm_v="6.5.0"

+ 1 - 1
install/upgrade/versions/1.4.15.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-# Hestia Control Panel upgrade script for target version 1.4.14
+# Hestia Control Panel upgrade script for target version 1.4.15
 
 
 #######################################################################################
 #######################################################################################
 #######                      Place additional commands below.                   #######
 #######                      Place additional commands below.                   #######

+ 21 - 0
install/upgrade/versions/1.4.16.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.4.16
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### Pass trough information to the end user incase of a issue or problem    #######
+#######                                                                         #######
+####### Use add_upgrade_message "My message here" to include a message          #######
+####### to the upgrade email. Please add it using:                              #######
+#######                                                                         #######
+####### add_upgrade_message "My message here"                                   #######
+#######                                                                         #######
+####### You can use \n within the string to create new lines.                   #######
+#######################################################################################
+
+if [ ! -z "$DB_PMA_ALIAS" ]; then
+    $HESTIA/bin/v-change-sys-db-alias 'pma' $DB_PMA_ALIAS
+fi
+

+ 1 - 1
src/deb/hestia/control

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