Skip to content

Commit 590d8e7

Browse files
jaapmarcusjaapmarcus
authored
Revert "Feature/beta repo support (hestiacp#2402)" (hestiacp#2407)
This reverts commit 26e1108.
1 parent 424bfe6 commit 590d8e7

File tree

4 files changed

+10
-141
lines changed

4 files changed

+10
-141
lines changed

‎bin/v-change-sys-release‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
2-
# info: Update release branch variable
2+
# info: update web templates
33
# options: [RESTART]
44
#
55
# This function for changing the release branch for the
66
# Hestia Control Panel. This allows the user to switch between
7-
# stable and pre-release builds which will automatically update
7+
# stable and pre-release builds which will automaticlly update
88
# based on the appropriate release schedule if auto-update is
99
# turned on.
1010

‎bin/v-change-sys-repo‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎install/hst-install-debian.sh‎

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
export PATH=$PATH:/sbin
1717
export DEBIAN_FRONTEND=noninteractive
1818
RHOST='apt.hestiacp.com'
19-
RHOSTBETA='beta.hestiacp.com'
2019
GPG='gpg.hestiacp.com'
2120
VERSION='debian'
2221
HESTIA='/usr/local/hestia'
@@ -104,7 +103,6 @@ help() {
104103
-e, --email Set admin email
105104
-p, --password Set admin password
106105
-D, --with-debs Path to Hestia debs
107-
-B, --beta Development version [yes|no] default: yes
108106
-f, --force Force installation
109107
-h, --help Print this help
110108
@@ -238,7 +236,6 @@ for arg; do
238236
--password) args="${args}-p " ;;
239237
--force) args="${args}-f " ;;
240238
--with-debs) args="${args}-D " ;;
241-
--beta) args="${args}-B " ;;
242239
--help) args="${args}-h " ;;
243240
*) [[ "${arg:0:1}" == "-" ]] || delim="\""
244241
args="${args}${delim}${arg}${delim} ";;
@@ -247,7 +244,7 @@ done
247244
eval set -- "$args"
248245

249246
# Parsing arguments
250-
while getopts "a:w:v:j:k:m:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:B:fh" Option; do
247+
while getopts "a:w:v:j:k:m:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:fh" Option; do
251248
case $Option in
252249
a) apache=$OPTARG ;; # Apache
253250
w) phpfpm=$OPTARG ;; # PHP-FPM
@@ -273,7 +270,6 @@ while getopts "a:w:v:j:k:m:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:B:fh" Option; do
273270
e) email=$OPTARG ;; # Admin email
274271
p) vpass=$OPTARG ;; # Admin password
275272
D) withdebs=$OPTARG ;; # Hestia debs path
276-
B) beta=$OPTARG ;; # Hestia preview program
277273
f) force='yes' ;; # Force install
278274
h) help ;; # Help
279275
*) help ;; # Print help (default)
@@ -308,7 +304,6 @@ set_default_value 'fail2ban' 'yes'
308304
set_default_value 'quota' 'no'
309305
set_default_value 'interactive' 'yes'
310306
set_default_value 'api' 'yes'
311-
set_default_value 'beta' 'no'
312307
set_default_port '8083'
313308
set_default_lang 'en'
314309

@@ -447,10 +442,10 @@ if [ -d /etc/netplan ] && [ -z "$force" ]; then
447442
fi
448443
fi
449444

445+
# Validate whether installation script matches release version before continuing with install
450446
if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then
451-
# Validate whether installation script matches release version before continuing with install
452447
release_branch_ver=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/release/src/deb/hestia/control |grep "Version:" |awk '{print $2}')
453-
if [ "$HESTIA_INSTALL_VER" != "$release_branch_ver" ] && [ $beta != 'yes' ]; then
448+
if [ "$HESTIA_INSTALL_VER" != "$release_branch_ver" ]; then
454449
echo
455450
echo -e "\e[91mInstallation aborted\e[0m"
456451
echo "===================================================================="
@@ -465,20 +460,6 @@ if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then
465460
echo ""
466461
check_result 1 "Installation aborted"
467462
fi
468-
469-
# Validate if a development version is installed when --beta is enabled
470-
DISPLAY_VER=$(echo $HESTIA_INSTALL_VER | sed "s|~alpha||g" | sed "s|~beta||g")
471-
if [ "$HESTIA_INSTALL_VER" = "$DISPLAY_VER" ] && [ $beta = 'yes' ]; then
472-
echo
473-
echo -e "\e[91mInstallation aborted\e[0m"
474-
echo "===================================================================="
475-
echo -e "\e[33mERROR: Unable to use beta atp server for stable release\e[0m"
476-
echo -e "\e[33mPlease remove the -B or --beta flag from the installer string\e[0m"
477-
478-
echo ""
479-
check_result 1 "Installation aborted"
480-
fi
481-
482463
fi
483464

484465
case $architecture in
@@ -741,16 +722,10 @@ if [ "$mysql" = 'yes' ]; then
741722
curl -s https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor | tee /usr/share/keyrings/mariadb-keyring.gpg >/dev/null 2>&1
742723
fi
743724

725+
# Installing HestiaCP repo
744726
echo "[ * ] Hestia Control Panel"
745727
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/hestia-keyring.gpg] https://$RHOST/ $codename main" > $apt/hestia.list
746728
gpg --no-default-keyring --keyring /usr/share/keyrings/hestia-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A189E93654F0B0E5 >/dev/null 2>&1
747-
if [ "$beta" = 'yes' ]; then
748-
# Enable preview mode
749-
sed -i 's/deb/#deb/' $apt/hestia.list
750-
echo "[ ! ] Hestia Control Panel (Preview version)"
751-
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/hestia-beta-keyring.gpg] https://$RHOSTBETA/ $codename main" > $apt/hestia-beta.list
752-
curl -s "https://$RHOSTBETA/pubkey.gpg" | gpg --dearmor | tee /usr/share/keyrings/hestia-beta-keyring.gpg >/dev/null 2>&1
753-
fi
754729

755730
# Installing PostgreSQL repo
756731
if [ "$postgresql" = 'yes' ]; then

‎install/hst-install-ubuntu.sh‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
export PATH=$PATH:/sbin
1717
export DEBIAN_FRONTEND=noninteractive
1818
RHOST='apt.hestiacp.com'
19-
RHOSTBETA='beta.hestiacp.com'
20-
2119
GPG='gpg.hestiacp.com'
2220
VERSION='ubuntu'
2321
HESTIA='/usr/local/hestia'
@@ -86,7 +84,6 @@ help() {
8684
-e, --email Set admin email
8785
-p, --password Set admin password
8886
-D, --with-debs Path to Hestia debs
89-
-B, --beta Development version [yes|no] default: yes
9087
-f, --force Force installation
9188
-h, --help Print this help
9289
@@ -218,7 +215,6 @@ for arg; do
218215
--email) args="${args}-e " ;;
219216
--password) args="${args}-p " ;;
220217
--force) args="${args}-f " ;;
221-
--beta) args="${args}-B " ;;
222218
--with-debs) args="${args}-D " ;;
223219
--help) args="${args}-h " ;;
224220
*) [[ "${arg:0:1}" == "-" ]] || delim="\""
@@ -228,7 +224,7 @@ done
228224
eval set -- "$args"
229225

230226
# Parsing arguments
231-
while getopts "a:w:v:j:k:m:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:B:fh" Option; do
227+
while getopts "a:w:v:j:k:m:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:fh" Option; do
232228
case $Option in
233229
a) apache=$OPTARG ;; # Apache
234230
w) phpfpm=$OPTARG ;; # PHP-FPM
@@ -253,7 +249,6 @@ while getopts "a:w:v:j:k:m:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:B:fh" Option; do
253249
s) servername=$OPTARG ;; # Hostname
254250
e) email=$OPTARG ;; # Admin email
255251
p) vpass=$OPTARG ;; # Admin password
256-
B) beta=$OPTARG ;; # Beta / Development version
257252
D) withdebs=$OPTARG ;; # Hestia debs path
258253
f) force='yes' ;; # Force install
259254
h) help ;; # Help
@@ -289,7 +284,6 @@ set_default_value 'fail2ban' 'yes'
289284
set_default_value 'quota' 'no'
290285
set_default_value 'interactive' 'yes'
291286
set_default_value 'api' 'yes'
292-
set_default_value 'beta' 'no'
293287
set_default_port '8083'
294288
set_default_lang 'en'
295289

@@ -422,11 +416,10 @@ if [ -d /etc/netplan ] && [ -z "$force" ]; then
422416
fi
423417
fi
424418

425-
419+
# Validate whether installation script matches release version before continuing with install
426420
if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then
427-
# Validate whether installation script matches release version before continuing with install
428421
release_branch_ver=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/release/src/deb/hestia/control |grep "Version:" |awk '{print $2}')
429-
if [ "$HESTIA_INSTALL_VER" != "$release_branch_ver" ] && [ $beta != 'yes' ]; then
422+
if [ "$HESTIA_INSTALL_VER" != "$release_branch_ver" ]; then
430423
echo
431424
echo -e "\e[91mInstallation aborted\e[0m"
432425
echo "===================================================================="
@@ -441,20 +434,6 @@ if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then
441434
echo ""
442435
check_result 1 "Installation aborted"
443436
fi
444-
445-
# Validate if a development version is installed when --beta is enabled
446-
DISPLAY_VER=$(echo $HESTIA_INSTALL_VER | sed "s|~alpha||g" | sed "s|~beta||g")
447-
if [ "$HESTIA_INSTALL_VER" = "$DISPLAY_VER" ] && [ $beta = 'yes' ]; then
448-
echo
449-
echo -e "\e[91mInstallation aborted\e[0m"
450-
echo "===================================================================="
451-
echo -e "\e[33mERROR: Unable to use beta atp server for stable release\e[0m"
452-
echo -e "\e[33mPlease remove the -B or --beta flag from the installer string\e[0m"
453-
454-
455-
echo ""
456-
check_result 1 "Installation aborted"
457-
fi
458437
fi
459438

460439
case $architecture in
@@ -501,7 +480,7 @@ install_welcome_message() {
501480
echo " www.hestiacp.com "
502481
echo
503482
echo "========================================================================"
504-
echo
483+
echo
505484
echo "Thank you for downloading Hestia Control Panel! In a few moments,"
506485
echo "we will begin installing the following components on your server:"
507486
echo
@@ -719,14 +698,6 @@ echo "[ * ] Hestia Control Panel"
719698
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/hestia-keyring.gpg] https://$RHOST/ $codename main" > $apt/hestia.list
720699
gpg --no-default-keyring --keyring /usr/share/keyrings/hestia-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A189E93654F0B0E5 >/dev/null 2>&1
721700

722-
if [ "$beta" = 'yes' ]; then
723-
# Enable preview mode
724-
sed -i 's/deb/#deb/' $apt/hestia.list
725-
echo "[ ! ] Hestia Control Panel (Preview version)"
726-
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/hestia-beta-keyring.gpg] https://$RHOSTBETA/ $codename main" > $apt/hestia-beta.list
727-
curl -s "https://$RHOSTBETA/pubkey.gpg" | gpg --dearmor | tee /usr/share/keyrings/hestia-beta-keyring.gpg >/dev/null 2>&1
728-
fi
729-
730701
# Installing PostgreSQL repo
731702
if [ "$postgresql" = 'yes' ]; then
732703
echo "[ * ] PostgreSQL"

0 commit comments

Comments
 (0)