Skip to content

Commit 31788d1

Browse files
author
Kristan Kenney
committed
Merge branch 'installer-update-0706'
2 parents 2b9f529 + 1e2d57c commit 31788d1

File tree

2 files changed

+90
-44
lines changed

2 files changed

+90
-44
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -436,22 +436,28 @@ fi
436436
# Brief Info #
437437
#----------------------------------------------------------#
438438

439+
install_welcome_message() {
440+
echo
441+
echo ' _ _ _ _ ____ ____ '
442+
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
443+
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) | '
444+
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
445+
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
446+
echo " "
447+
echo " Hestia Control Panel "
448+
echo " ${HESTIA_INSTALL_VER} "
449+
echo " www.hestiacp.com "
450+
echo
451+
echo "========================================================================"
452+
echo
453+
echo "Thank you for downloading Hestia Control Panel! In a few moments,"
454+
echo "we will begin installing the following components on your server:"
455+
echo
456+
}
457+
439458
# Printing nice ASCII logo
440459
clear
441-
echo
442-
echo ' _ _ _ _ ____ ____ '
443-
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
444-
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) |'
445-
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
446-
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
447-
echo
448-
echo ' Hestia Control Panel'
449-
echo " v${HESTIA_INSTALL_VER}"
450-
echo -e "\n"
451-
echo "===================================================================="
452-
echo -e "\n"
453-
echo 'The following components will be installed on your server:'
454-
echo
460+
install_welcome_message
455461

456462
# Web stack
457463
if [ "$nginx" = 'yes' ]; then
@@ -521,7 +527,7 @@ if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then
521527
echo -n ' + Fail2Ban Access Monitor'
522528
fi
523529
echo -e "\n"
524-
echo "===================================================================="
530+
echo "========================================================================"
525531
echo -e "\n"
526532

527533
# Asking for confirmation to proceed
@@ -856,7 +862,7 @@ echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
856862
chmod a+x /usr/sbin/policy-rc.d
857863

858864
# Installing apt packages
859-
echo "Now installing Hestia Control Panel and all required dependencies."
865+
echo "The installer is now downloading and installing all required packages."
860866
echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
861867
echo
862868
apt-get -y install $software > /dev/null 2>&1 &
@@ -876,31 +882,41 @@ echo
876882
wait $BACK_PID
877883
check_result $? "apt-get install failed"
878884

885+
echo
886+
echo "========================================================================"
887+
echo
888+
879889
# Install Hestia packages from local folder
880890
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
881-
dpkg -i $withdebs/hestia_*.deb
891+
echo "(*) Installing local package files..."
892+
echo " - hestia core package"
893+
dpkg -i $withdebs/hestia_*.deb > /dev/null 2>&1
882894

883895
if [ -z $(ls $withdebs/hestia-php_*.deb 2>/dev/null) ]; then
896+
echo " - hestia-php backend package (from apt)"
884897
apt-get -y install hestia-php > /dev/null 2>&1
885898
else
886-
dpkg -i $withdebs/hestia-php_*.deb
899+
echo " - hestia-php backend package"
900+
dpkg -i $withdebs/hestia-php_*.deb > /dev/null 2>&1
887901
fi
888902

889903
if [ -z $(ls $withdebs/hestia-nginx_*.deb 2>/dev/null) ]; then
904+
echo " - hestia-nginx backend package (from apt)"
890905
apt-get -y install hestia-nginx > /dev/null 2>&1
891906
else
892-
dpkg -i $withdebs/hestia-nginx_*.deb
907+
echo " - hestia-nginx backend package"
908+
dpkg -i $withdebs/hestia-nginx_*.deb > /dev/null 2>&1
893909
fi
894910
fi
895911

896912
# Restoring autostart policy
897913
rm -f /usr/sbin/policy-rc.d
898914

899-
900915
#----------------------------------------------------------#
901916
# Configure system #
902917
#----------------------------------------------------------#
903918

919+
904920
echo "(*) Configuring system settings..."
905921
# Enable SSH password authentication
906922
sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config
@@ -1212,7 +1228,7 @@ if [ "$apache" = 'yes' ]; then
12121228
a2enmod ssl > /dev/null 2>&1
12131229
a2enmod actions > /dev/null 2>&1
12141230
a2dismod --quiet status > /dev/null 2>&1
1215-
a2enmod --quiet hestia-status
1231+
a2enmod --quiet hestia-status > /dev/null 2>&1
12161232

12171233
if [ "$phpfpm" = 'yes' ]; then
12181234
# Disable prefork and php, enable event
@@ -1842,6 +1858,13 @@ $HESTIA/bin/v-change-sys-port $port > /dev/null 2>&1
18421858
# Set default theme
18431859
$HESTIA/bin/v-change-sys-theme 'default'
18441860

1861+
# Update remaining packages since repositories have changed
1862+
echo -ne "(*) Installing remaining software updates..."
1863+
apt-get -qq update
1864+
apt-get -y upgrade >> $LOG &
1865+
BACK_PID=$!
1866+
echo
1867+
18451868
# Starting Hestia service
18461869
update-rc.d hestia defaults
18471870
systemctl start hestia
@@ -1914,7 +1937,7 @@ cat $tmpfile
19141937
rm -f $tmpfile
19151938

19161939
# Add welcome message to notification panel
1917-
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' 'Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a> or e-mail <a href="mailto:info@hestiacp.com?Subject="['$new_version'] Bug Report: ">info@hestiacp.com</a><br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
1940+
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a> or e-mail <a href="mailto:info@hestiacp.com?Subject="['$new_version'] Bug Report: ">info@hestiacp.com</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
19181941

19191942
echo "(!) IMPORTANT: You must logout or restart the server before continuing."
19201943
echo ""

‎install/hst-install-ubuntu.sh‎

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -411,22 +411,28 @@ fi
411411
# Brief Info #
412412
#----------------------------------------------------------#
413413

414+
install_welcome_message() {
415+
echo
416+
echo ' _ _ _ _ ____ ____ '
417+
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
418+
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) | '
419+
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
420+
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
421+
echo " "
422+
echo " Hestia Control Panel "
423+
echo " ${HESTIA_INSTALL_VER} "
424+
echo " www.hestiacp.com "
425+
echo
426+
echo "========================================================================"
427+
echo
428+
echo "Thank you for downloading Hestia Control Panel! In a few moments,"
429+
echo "we will begin installing the following components on your server:"
430+
echo
431+
}
432+
414433
# Printing nice ASCII logo
415434
clear
416-
echo
417-
echo ' _ _ _ _ ____ ____ '
418-
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
419-
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) |'
420-
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
421-
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
422-
echo
423-
echo ' Hestia Control Panel'
424-
echo " v${HESTIA_INSTALL_VER}"
425-
echo -e "\n"
426-
echo "===================================================================="
427-
echo -e "\n"
428-
echo 'The following components will be installed on your server:'
429-
echo
435+
install_welcome_message
430436

431437
# Web stack
432438
if [ "$nginx" = 'yes' ]; then
@@ -496,7 +502,7 @@ if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then
496502
echo -n ' + Fail2Ban Access Monitor'
497503
fi
498504
echo -e "\n"
499-
echo "===================================================================="
505+
echo "========================================================================"
500506
echo -e "\n"
501507

502508
# Asking for confirmation to proceed
@@ -854,7 +860,7 @@ echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
854860
chmod a+x /usr/sbin/policy-rc.d
855861

856862
# Installing apt packages
857-
echo "Now installing Hestia Control Panel and all required dependencies."
863+
echo "The installer is now downloading and installing all required packages."
858864
echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
859865
echo
860866
apt-get -y install $software > /dev/null 2>&1 &
@@ -874,20 +880,30 @@ echo
874880
wait $BACK_PID
875881
check_result $? "apt-get install failed"
876882

883+
echo
884+
echo "========================================================================"
885+
echo
886+
877887
# Install Hestia packages from local folder
878888
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
879-
dpkg -i $withdebs/hestia_*.deb
889+
echo "(*) Installing local package files..."
890+
echo " - hestia core package"
891+
dpkg -i $withdebs/hestia_*.deb > /dev/null 2>&1
880892

881893
if [ -z $(ls $withdebs/hestia-php_*.deb 2>/dev/null) ]; then
894+
echo " - hestia-php backend package (from apt)"
882895
apt-get -y install hestia-php > /dev/null 2>&1
883896
else
884-
dpkg -i $withdebs/hestia-php_*.deb
897+
echo " - hestia-php backend package"
898+
dpkg -i $withdebs/hestia-php_*.deb > /dev/null 2>&1
885899
fi
886900

887901
if [ -z $(ls $withdebs/hestia-nginx_*.deb 2>/dev/null) ]; then
902+
echo " - hestia-nginx backend package (from apt)"
888903
apt-get -y install hestia-nginx > /dev/null 2>&1
889904
else
890-
dpkg -i $withdebs/hestia-nginx_*.deb
905+
echo " - hestia-nginx backend package"
906+
dpkg -i $withdebs/hestia-nginx_*.deb > /dev/null 2>&1
891907
fi
892908
fi
893909

@@ -1246,7 +1262,7 @@ if [ "$apache" = 'yes' ]; then
12461262
a2enmod ssl > /dev/null 2>&1
12471263
a2enmod actions > /dev/null 2>&1
12481264
a2dismod --quiet status > /dev/null 2>&1
1249-
a2enmod --quiet hestia-status
1265+
a2enmod --quiet hestia-status > /dev/null 2>&1
12501266

12511267
# Enable mod_ruid/mpm_itk or mpm_event
12521268
if [ "$phpfpm" = 'yes' ]; then
@@ -1767,7 +1783,7 @@ if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
17671783
echo "$HESTIA/bin/v-update-sys-ip" >> /etc/rc.local
17681784
echo "exit 0" >> /etc/rc.local
17691785
chmod +x /etc/rc.local
1770-
systemctl enable rc-local
1786+
systemctl enable rc-local > /dev/null 2>&1
17711787
$HESTIA/bin/v-change-sys-ip-nat $ip $pub_ip > /dev/null 2>&1
17721788
ip=$pub_ip
17731789
fi
@@ -1846,6 +1862,13 @@ $HESTIA/bin/v-change-sys-port $port > /dev/null 2>&1
18461862
# Set default theme
18471863
$HESTIA/bin/v-change-sys-theme 'default'
18481864

1865+
# Update remaining packages since repositories have changed
1866+
echo -ne "(*) Installing remaining software updates..."
1867+
apt-get -qq update
1868+
apt-get -y upgrade >> $LOG &
1869+
BACK_PID=$!
1870+
echo
1871+
18491872
# Starting Hestia service
18501873
update-rc.d hestia defaults
18511874
systemctl start hestia
@@ -1918,7 +1941,7 @@ cat $tmpfile
19181941
rm -f $tmpfile
19191942

19201943
# Add welcome message to notification panel
1921-
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' 'Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a> or e-mail <a href="mailto:info@hestiacp.com?Subject="['$new_version'] Bug Report: ">info@hestiacp.com</a><br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
1944+
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a> or e-mail <a href="mailto:info@hestiacp.com?Subject="['$new_version'] Bug Report: ">info@hestiacp.com</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
19221945

19231946
echo "(!) IMPORTANT: You must logout or restart the server before continuing."
19241947
echo ""

0 commit comments

Comments
 (0)