Skip to content

Commit 6bbc5bc

Browse files
authored
Merge pull request hestiacp#333 from hestiacp/apps-update
Applications Version Bump
2 parents 55440ef + ebf52a5 commit 6bbc5bc

File tree

3 files changed

+37
-4
lines changed

3 files changed

+37
-4
lines changed

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ codename="$(lsb_release -s -c)"
2222
hestiacp="$HESTIA/install/deb"
2323

2424
# Define software versions
25-
pma_v='4.8.5'
25+
pma_v='4.9.0.1'
2626
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3")
2727
fpm_v="7.3"
2828

install/upgrade/0.10.0-190430.sh

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
HESTIA="/usr/local/hestia"
55
HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)"
66
hestiacp="$HESTIA/install/deb"
7+
pma_v='4.9.0.1'
78

89
# Add webmail alias variable to system configuration if non-existent
910
WEBMAIL_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep WEBMAIL_ALIAS)
@@ -181,7 +182,7 @@ if [ ! -e '/usr/bin/setfacl' ]; then
181182
mv /var/lib/dpkg/updates/ /var/lib/dpkg/updates.bak/
182183
mkdir -p /var/lib/dpkg/updates/
183184

184-
# Install missing acl package
185+
# Install missing acl package
185186
apt-get -qq update > /dev/null 2>&1
186187
apt-get -qq -y install acl > /dev/null 2>&1
187188

@@ -374,6 +375,38 @@ for user in `ls /usr/local/hestia/data/users/`; do
374375
fi
375376
done
376377

378+
# Upgrade phpMyAdmin
379+
if [ "$DB_SYSTEM" = 'mysql' ]; then
380+
# Display upgrade information
381+
echo "(*) Upgrade phpMyAdmin to v$pma_v..."
382+
383+
# Download latest phpMyAdmin release
384+
wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
385+
386+
# Unpack files
387+
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
388+
389+
# Delete file to prevent error
390+
rm -fr /usr/share/phpmyadmin/doc/html
391+
392+
# Overwrite old files
393+
cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
394+
395+
# Set config and log directory
396+
sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
397+
sed -i "s|define('TEMP_DIR', './tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
398+
399+
# Create temporary folder and change permissions
400+
if [ ! -d /usr/share/phpmyadmin/tmp ]; then
401+
mkdir /usr/share/phpmyadmin/tmp
402+
chmod 777 /usr/share/phpmyadmin/tmp
403+
fi
404+
405+
# Clear up
406+
rm -fr phpMyAdmin-$pma_v-all-languages
407+
rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
408+
fi
409+
377410
# Add upgrade notification to admin user's panel
378411
$BIN/v-add-user-notification admin 'Upgrade complete' 'Your server has been updated to v0.10.0.<br>Please report any bugs on GitHub at<br>https://github.com/hestiacp/hestiacp/Issues<br><br>Have a great day!'
379412

src/hst_autocompile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ ARCHIVE_DIR="$SRC_DIR/src/archive/"
6666

6767
# Set Version for compiling
6868
HESTIA_V='0.10.0-190430_amd64'
69-
NGINX_V='1.16.0'
69+
NGINX_V='1.17.0'
7070
OPENSSL_V='1.1.1b'
7171
PCRE_V='8.43'
7272
ZLIB_V='1.2.11'
73-
PHP_V='7.3.5'
73+
PHP_V='7.3.6'
7474

7575
# Create build directories
7676
rm -rf $BUILD_DIR

0 commit comments

Comments
 (0)