Skip to content

Commit 8f718c3

Browse files
authored
Display always servername.com:port (hestiacp#3291)
* Display always servername.com:port With additional backup url * Only when hostname is not resolving * Also install Rclone * Fix text * Improve output * Fix bug in backup url use ip instead Also remove extra error
1 parent d84ecad commit 8f718c3

File tree

2 files changed

+37
-25
lines changed

2 files changed

+37
-25
lines changed

install/hst-install-debian.sh

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,23 +1899,10 @@ if [ "$sieve" = 'yes' ]; then
18991899
fi
19001900

19011901
#----------------------------------------------------------#
1902-
# Configure File Manager #
1903-
#----------------------------------------------------------#
1904-
1905-
echo "[ * ] Configuring File Manager..."
1906-
$HESTIA/bin/v-add-sys-filemanager quiet
1907-
1908-
#----------------------------------------------------------#
1909-
# Configure PHPMailer #
1910-
#----------------------------------------------------------#
1911-
1912-
echo "[ * ] Configuring PHP dependencies..."
1913-
$HESTIA/bin/v-add-sys-dependencies quiet
1914-
1915-
#----------------------------------------------------------#
1916-
# Configure API #
1902+
# Comfigure API #
19171903
#----------------------------------------------------------#
19181904

1905+
# Configuring system IPs
19191906
if [ "$api" = "yes" ]; then
19201907
# keep legacy api enabled until transition is complete
19211908
write_config_value "API" "yes"
@@ -1928,6 +1915,23 @@ else
19281915
$HESTIA/bin/v-change-sys-api disable
19291916
fi
19301917

1918+
#----------------------------------------------------------#
1919+
# Configure File Manager #
1920+
#----------------------------------------------------------#
1921+
1922+
echo "[ * ] Configuring File Manager..."
1923+
$HESTIA/bin/v-add-sys-filemanager quiet
1924+
1925+
#----------------------------------------------------------#
1926+
# Configure dependencies #
1927+
#----------------------------------------------------------#
1928+
1929+
echo "[ * ] Configuring PHP dependencies..."
1930+
$HESTIA/bin/v-add-sys-dependencies quiet
1931+
1932+
echo "[ * ] Install Rclone"
1933+
curl -s https://rclone.org/install.sh | bash > /dev/null 2>&1
1934+
19311935
#----------------------------------------------------------#
19321936
# Configure IP #
19331937
#----------------------------------------------------------#
@@ -2096,9 +2100,12 @@ You have successfully installed Hestia Control Panel on your server.
20962100
20972101
Ready to get started? Log in using the following credentials:
20982102
2099-
Admin URL: https://$ip:$port
2100-
Username: admin
2101-
Password: $displaypass
2103+
Admin URL: https://$servername:$port"
2104+
if [ "$host_ip" != "$ip" ]; then
2105+
echo " Backup URL: https://$ip:$port"
2106+
fi
2107+
echo -e " Username: admin
2108+
Password: $displaypass
21022109
21032110
Thank you for choosing Hestia Control Panel to power your full stack web server,
21042111
we hope that you enjoy using it as much as we do!

install/hst-install-ubuntu.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@ if [ "$named" = 'yes' ]; then
17031703
systemctl restart apparmor >> $LOG
17041704
fi
17051705
fi
1706-
update-rc.d bind9 defaults
1706+
update-rc.d bind9 defaults > /dev/null 2>&1
17071707
systemctl start bind9
17081708

17091709
check_result $? "bind9 start failed"
@@ -1964,16 +1964,20 @@ echo "[ * ] Configuring File Manager..."
19641964
$HESTIA/bin/v-add-sys-filemanager quiet
19651965

19661966
#----------------------------------------------------------#
1967-
# Configure PHPMailer #
1967+
# Configure dependencies #
19681968
#----------------------------------------------------------#
19691969

19701970
echo "[ * ] Configuring PHP dependencies..."
19711971
$HESTIA/bin/v-add-sys-dependencies quiet
19721972

1973+
echo "[ * ] Install Rclone"
1974+
curl -s https://rclone.org/install.sh | bash > /dev/null 2>&1
1975+
19731976
#----------------------------------------------------------#
19741977
# Configure IP #
19751978
#----------------------------------------------------------#
19761979

1980+
echo "[ * ] Configuring System IP..."
19771981
# Configuring system IPs
19781982
$HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
19791983

@@ -1987,7 +1991,6 @@ if [ "$iptables" = 'yes' ]; then
19871991
fi
19881992

19891993
# Get public IP
1990-
echo "[ * ] Configuring System IP..."
19911994
pub_ip=$(curl --ipv4 -s https://ip.hestiacp.com/)
19921995
if [ -n "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
19931996
if [ -e /etc/rc.local ]; then
@@ -2135,7 +2138,6 @@ fi' >> /root/.bashrc
21352138
# Hestia Access Info #
21362139
#----------------------------------------------------------#
21372140

2138-
# Comparing hostname and IP
21392141
host_ip=$(host $servername | head -n 1 | awk '{print $NF}')
21402142
if [ "$host_ip" = "$ip" ]; then
21412143
ip="$servername"
@@ -2152,9 +2154,12 @@ You have successfully installed Hestia Control Panel on your server.
21522154
21532155
Ready to get started? Log in using the following credentials:
21542156
2155-
Admin URL: https://$ip:$port
2156-
Username: admin
2157-
Password: $displaypass
2157+
Admin URL: https://$servername:$port"
2158+
if [ "$host_ip" != "$ip" ]; then
2159+
echo " Backup URL: https://$ip:$port"
2160+
fi
2161+
echo -e " Username: admin
2162+
Password: $displaypass
21582163
21592164
Thank you for choosing Hestia Control Panel to power your full stack web server,
21602165
we hope that you enjoy using it as much as we do!

0 commit comments

Comments
 (0)