Skip to content

Commit ac34529

Browse files
author
Kristan Kenney
committed
Merge branch 'staging/fixes' into staging/v1.2.0-release
2 parents 22a486d + 21099ef commit ac34529

File tree

4 files changed

+37
-39
lines changed

4 files changed

+37
-39
lines changed

‎func/upgrade.sh‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,6 @@ upgrade_start_routine() {
8080
echo "[ * ] Adding global release branch variable to system configuration..."
8181
$BIN/v-change-sys-config-value 'RELEASE_BRANCH' 'release'
8282
fi
83-
84-
#####################################################################
85-
####### Start upgrade for pre-release builds #######
86-
####### Ensures clean upgrade path from v1.0.1 onwards #######
87-
####### DO NOT MODIFY THIS SECTION #######
88-
#####################################################################
89-
90-
if [ $VERSION = "0.9.8-25" ] || [ $VERSION = "0.9.8-26" ] || [ $VERSION = "0.9.8-27" ] || [ $VERSION = "0.9.8-28" ] || [ $VERSION = "0.9.8-29" ] || [ $VERSION = "0.10.0" ] || [ $VERSION = "1.00.0-190618" ] || [ $VERSION = "1.00.0-190621" ] || [ $VERSION = "1.0.0" ]; then
91-
source $HESTIA/install/upgrade/versions/previous/0.9.8-29.sh
92-
source $HESTIA/install/upgrade/versions/previous/1.00.0-190618.sh
93-
source $HESTIA/install/upgrade/versions/previous/1.0.1.sh
94-
VERSION="1.0.1"
95-
upgrade_refresh_config
96-
fi
9783

9884
#####################################################################
9985
####### Start standard upgrade process #######
@@ -107,55 +93,72 @@ upgrade_start_routine() {
10793
echo ""
10894
source $HESTIA/install/upgrade/versions/latest.sh
10995
VERSION="$new_version"
96+
upgrade_set_version $VERSION
97+
upgrade_refresh_config
98+
fi
99+
100+
if [ $VERSION = "0.9.8-25" ] || [ $VERSION = "0.9.8-26" ] || [ $VERSION = "0.9.8-27" ] || [ $VERSION = "0.9.8-28" ] || [ $VERSION = "0.9.8-29" ] || [ $VERSION = "0.10.0" ] || [ $VERSION = "1.00.0-190618" ] || [ $VERSION = "1.00.0-190621" ] || [ $VERSION = "1.0.0" ]; then
101+
source $HESTIA/install/upgrade/versions/previous/0.9.8-29.sh
102+
source $HESTIA/install/upgrade/versions/previous/1.00.0-190618.sh
103+
source $HESTIA/install/upgrade/versions/previous/1.0.1.sh
104+
VERSION="1.0.1"
105+
upgrade_set_version $VERSION
110106
upgrade_refresh_config
111107
fi
112108

113109
# Upgrade to Version 1.0.2
114110
if [ $VERSION = "1.0.1" ]; then
115111
source $HESTIA/install/upgrade/versions/previous/1.0.2.sh
116112
VERSION="1.0.2"
113+
upgrade_set_version $VERSION
117114
upgrade_refresh_config
118115
fi
119116

120117
# Upgrade to Version 1.0.3
121118
if [ $VERSION = "1.0.2" ]; then
122119
source $HESTIA/install/upgrade/versions/previous/1.0.3.sh
123120
VERSION="1.0.3"
121+
upgrade_set_version $VERSION
124122
upgrade_refresh_config
125123
fi
126124

127125
# Upgrade to Version 1.0.4
128126
if [ $VERSION = "1.0.3" ]; then
129127
source $HESTIA/install/upgrade/versions/previous/1.0.4.sh
130128
VERSION="1.0.4"
129+
upgrade_set_version $VERSION
131130
upgrade_refresh_config
132131
fi
133132

134133
# Upgrade to Version 1.0.5
135134
if [ $VERSION = "1.0.4" ]; then
136135
source $HESTIA/install/upgrade/versions/previous/1.0.5.sh
137136
VERSION="1.0.5"
137+
upgrade_set_version $VERSION
138138
upgrade_refresh_config
139139
fi
140140

141141
# Upgrade to Version 1.0.6
142142
if [ $VERSION = "1.0.5" ]; then
143143
source $HESTIA/install/upgrade/versions/previous/1.0.6.sh
144144
VERSION="1.0.6"
145+
upgrade_set_version $VERSION
145146
upgrade_refresh_config
146147
fi
147148

148149
# Upgrade to Version 1.1.0
149150
if [ $VERSION = "1.0.6" ]; then
150151
source $HESTIA/install/upgrade/versions/previous/1.1.0.sh
151152
VERSION="1.1.0"
153+
upgrade_set_version $VERSION
152154
upgrade_refresh_config
153155
fi
154156

155157
# Upgrade to Version 1.1.1
156158
if [ $VERSION = "1.1.0" ]; then
157159
source $HESTIA/install/upgrade/versions/previous/1.1.1.sh
158160
VERSION="1.1.1"
161+
upgrade_set_version $VERSION
159162
upgrade_refresh_config
160163
fi
161164

@@ -243,7 +246,7 @@ upgrade_get_version() {
243246
upgrade_set_version() {
244247
# Set new version number in hestia.conf
245248
sed -i "/VERSION/d" $HESTIA/conf/hestia.conf
246-
echo "VERSION='$new_version'" >> $HESTIA/conf/hestia.conf
249+
echo "VERSION='$@'" >> $HESTIA/conf/hestia.conf
247250
}
248251

249252
upgrade_rebuild_users() {

‎install/upgrade/versions/previous/1.0.2.sh‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@ fi
4343
# Remove Webalizer and set AWStats as default
4444
WEBALIZER_CHECK=$(cat $HESTIA/conf/hestia.conf | grep webalizer)
4545
if [ ! -z "$WEBALIZER_CHECK" ]; then
46-
echo "[ * ] Removing Webalizer and setting AWStats as default web statistics backend..."
47-
apt purge webalizer -y > /dev/null 2>&1
48-
if [ -d "$HESTIA/data/templates/web/webalizer" ]; then
49-
rm -rf $HESTIA/data/templates/web/webalizer
50-
fi
51-
if [ -d "/var/www/webalizer" ]; then
52-
rm -rf /var/www/webalizer
53-
fi
46+
echo "[ * ] Set awstats as default web statistics backend..."
5447
$HESTIA/bin/v-change-sys-config-value 'STATS_SYSTEM' 'awstats'
5548
fi
5649

@@ -71,5 +64,7 @@ if [ ! -z "$IMAP_SYSTEM" ]; then
7164
fi
7265

7366
# Enhance webmail security
74-
cp -f /etc/nginx/conf.d/webmail.inc $HESTIA_BACKUP/conf/
75-
sed -i "s/config|temp|logs/README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING/g" /etc/nginx/conf.d/webmail.inc
67+
if [ -e "/etc/nginx/conf.d/webmail.inc" ]; then
68+
cp -f /etc/nginx/conf.d/webmail.inc $HESTIA_BACKUP/conf/
69+
sed -i "s/config|temp|logs/README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING/g" /etc/nginx/conf.d/webmail.inc
70+
fi

‎install/upgrade/versions/previous/1.0.4.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
#######################################################################################
88

99
# Add php-imagick package to existing version...
10-
php_versions=$(ls /etc/php/*/fpm -d 2>/dev/null |wc -l)
11-
if [ "$php_versions" -gt 1 ]; then
12-
echo "[ * ] Install PHP Imageqick..."
13-
software="php-imagick"
14-
for v in $(ls /etc/php/); do
15-
if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
16-
continue
17-
fi
18-
software="$software php$v-imagick"
19-
done
20-
fi
21-
apt -qq update
22-
apt -qq install $software -y
10+
#php_versions=$(ls /etc/php/*/fpm -d 2>/dev/null |wc -l)
11+
#if [ "$php_versions" -gt 1 ]; then
12+
# echo "[ * ] Install PHP Imageqick..."
13+
# software="php-imagick"
14+
# for v in $(ls /etc/php/); do
15+
# if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
16+
# continue
17+
# fi
18+
# software="$software php$v-imagick"
19+
# done
20+
#fi
21+
#apt -qq update
22+
#apt -qq install $software -y

‎src/deb/hestia/postinst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ update_php_templates
4141
upgrade_phpmyadmin
4242

4343
# Set new version number in hestia.conf
44-
upgrade_set_version
44+
upgrade_set_version $new_version
4545

4646
# Perform account and domain rebuild to ensure configuration files are correct
4747
upgrade_rebuild_users

0 commit comments

Comments
 (0)