Skip to content

Commit afd5715

Browse files
committed
The one time update of configuration.php was planed, future updates should follow under using of sed.
1 parent 87d621d commit afd5715

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

func/upgrade.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ upgrade_start_routine() {
159159
upgrade_refresh_config
160160
fi
161161

162-
# Upgrade to Version 1.2.0
162+
# Upgrade to Version 1.1.2
163163
if [ $VERSION = "1.1.1" ]; then
164164
source $HESTIA/install/upgrade/versions/latest.sh
165165
VERSION="$new_version"
@@ -214,13 +214,6 @@ upgrade_phpmyadmin() {
214214
fi
215215
}
216216

217-
upgrade_fm_configuration() {
218-
if [ -e "$HESTIA/web/fm/configuration.php" ]; then
219-
echo "(*) Updating File Manager Configuration..."
220-
cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
221-
fi
222-
}
223-
224217
upgrade_get_version() {
225218
# Retrieve new version number for Hestia Control Panel from .deb package
226219
new_version=$(dpkg -l | awk '$2=="hestia" { print $3 }')

install/upgrade/versions/latest.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,14 @@ fi
134134

135135
# Install Filegator FileManager during upgrade
136136
if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
137-
echo "(*) Installing File Manager..."
137+
echo "(*) Configuring Filegator FileManager..."
138+
138139
# Install the FileManager
139140
source $HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
141+
else
142+
echo "(*) Update Filegator Configuration..."
143+
# Update configuration.php
144+
cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
140145
fi
141146

142147
# Enable nginx module loading

src/deb/hestia/postinst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ upgrade_start_routine
3737
# Upgrade phpMyAdmin if applicable
3838
upgrade_phpmyadmin
3939

40-
# Ensure that File Manager configuration is up-to-date
41-
upgrade_fm_configuration
42-
4340
# Set new version number in hestia.conf
4441
upgrade_set_version
4542

0 commit comments

Comments
 (0)