Skip to content

Commit 4659a67

Browse files
ScIT-RaphaelScIT-Raphael
authored
Updated to use ssl and modified to use hestia repo.
1 parent 3a28537 commit 4659a67

File tree

2 files changed

+28
-40
lines changed

2 files changed

+28
-40
lines changed

‎install/vst-install-debian.sh‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#!/bin/bash
22

3-
# Vesta Debian installer v.05
3+
# Hestia Debian installer v.06
44

55
#----------------------------------------------------------#
66
# Variables&Functions #
77
#----------------------------------------------------------#
88
export PATH=$PATH:/sbin
99
export DEBIAN_FRONTEND=noninteractive
10-
RHOST='apt.vestacp.com'
11-
CHOST='c.vestacp.com'
10+
RHOST='apt.hestiacp.com'
11+
CHOST='c.hestiacp.com'
1212
VERSION='debian'
1313
VESTA='/usr/local/vesta'
1414
memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
1515
arch=$(uname -i)
1616
os='debian'
1717
release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
1818
codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
19-
vestacp="http://$CHOST/$VERSION/$release"
19+
vestacp="https://$CHOST/$VERSION/$release"
2020

2121
if [ "$release" -eq 9 ]; then
2222
software="nginx apache2 apache2-utils apache2-suexec-custom
@@ -29,7 +29,7 @@ if [ "$release" -eq 9 ]; then
2929
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
3030
e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
3131
bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl
32-
unrar-free vim-common vesta-ioncube vesta-softaculous net-tools"
32+
unrar-free vim-common net-tools"
3333
elif [ "$release" -eq 8 ]; then
3434
software="nginx apache2 apache2-utils apache2.2-common
3535
apache2-suexec-custom libapache2-mod-ruid2
@@ -42,7 +42,7 @@ elif [ "$release" -eq 8 ]; then
4242
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
4343
e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
4444
bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl
45-
unrar-free vim-common vesta-ioncube vesta-softaculous net-tools"
45+
unrar-free vim-common net-tools"
4646
else
4747
software="nginx apache2 apache2-utils apache2.2-common
4848
apache2-suexec-custom libapache2-mod-ruid2
@@ -55,7 +55,7 @@ else
5555
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
5656
e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
5757
bsdmainutils cron vesta vesta-nginx vesta-php expect unrar-free
58-
vim-common vesta-ioncube vesta-softaculous net-tools"
58+
vim-common net-tools"
5959
fi
6060

6161
# Defining help function
@@ -76,7 +76,6 @@ help() {
7676
-t, --spamassassin Install SpamAssassin [yes|no] default: yes
7777
-i, --iptables Install Iptables [yes|no] default: yes
7878
-b, --fail2ban Install Fail2ban [yes|no] default: yes
79-
-o, --softaculous Install Softaculous [yes|no] default: yes
8079
-q, --quota Filesystem Quota [yes|no] default: no
8180
-l, --lang Default language default: en
8281
-y, --interactive Interactive install [yes|no] default: yes
@@ -86,7 +85,7 @@ help() {
8685
-f, --force Force installation
8786
-h, --help Print this help
8887
89-
Example: bash $0 -e demo@vestacp.com -p p4ssw0rd --apache no --phpfpm yes"
88+
Example: bash $0 -e demo@hestiacp.com -p p4ssw0rd --apache no --phpfpm yes"
9089
exit 1
9190
}
9291

@@ -164,7 +163,6 @@ for arg; do
164163
--iptables) args="${args}-i " ;;
165164
--fail2ban) args="${args}-b " ;;
166165
--remi) args="${args}-r " ;;
167-
--softaculous) args="${args}-o " ;;
168166
--quota) args="${args}-q " ;;
169167
--lang) args="${args}-l " ;;
170168
--interactive) args="${args}-y " ;;
@@ -198,7 +196,6 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do
198196
i) iptables=$OPTARG ;; # Iptables
199197
b) fail2ban=$OPTARG ;; # Fail2ban
200198
r) remi=$OPTARG ;; # Remi repo
201-
o) softaculous=$OPTARG ;; # Softaculous plugin
202199
q) quota=$OPTARG ;; # FS Quota
203200
l) lang=$OPTARG ;; # Language
204201
y) interactive=$OPTARG ;; # Interactive install
@@ -232,7 +229,6 @@ else
232229
fi
233230
set_default_value 'iptables' 'yes'
234231
set_default_value 'fail2ban' 'yes'
235-
set_default_value 'softaculous' 'yes'
236232
set_default_value 'quota' 'no'
237233
set_default_value 'interactive' 'yes'
238234
set_default_lang 'en'
@@ -309,13 +305,13 @@ fi
309305
# Printing nice ascii aslogo
310306
clear
311307
echo
312-
echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|'
313-
echo ' _| _| _| _| _| _| _|'
314-
echo ' _| _| _|_|_| _|_| _| _|_|_|_|'
315-
echo ' _| _| _| _| _| _| _|'
316-
echo ' _| _|_|_|_| _|_|_| _| _| _|'
308+
echo ' _ _ _ _ ____ ____ '
309+
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
310+
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) |'
311+
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
312+
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
317313
echo
318-
echo ' Vesta Control Panel'
314+
echo ' Hestia Control Panel'
319315
echo -e "\n\n"
320316

321317
echo 'Following software will be installed on your system:'
@@ -474,7 +470,7 @@ wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
474470
apt-key add /tmp/nginx_signing.key
475471

476472
# Installing vesta repo
477-
echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list
473+
echo "deb http://$RHOST/ $codename main" > $apt/hestia.list
478474
wget $CHOST/deb_signing.key -O deb_signing.key
479475
apt-key add deb_signing.key
480476

@@ -617,9 +613,6 @@ if [ "$postgresql" = 'no' ]; then
617613
software=$(echo "$software" | sed -e 's/php-pgsql//')
618614
software=$(echo "$software" | sed -e 's/phppgadmin//')
619615
fi
620-
if [ "$softaculous" = 'no' ]; then
621-
software=$(echo "$software" | sed -e 's/vesta-softaculous//')
622-
fi
623616
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
624617
software=$(echo "$software" | sed -e 's/fail2ban//')
625618
fi
@@ -1269,7 +1262,7 @@ if [ "$iptables" = 'yes' ]; then
12691262
fi
12701263

12711264
# Get public ip
1272-
pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
1265+
pub_ip=$(curl -s https://hestiacp.com/what-is-my-ip/)
12731266

12741267
if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
12751268
$VESTA/bin/v-change-sys-ip-nat $ip $pub_ip
@@ -1337,11 +1330,6 @@ if [ "$quota" = 'yes' ]; then
13371330
$VESTA/bin/v-add-sys-quota
13381331
fi
13391332

1340-
# Enabling softaculous plugin
1341-
if [ "$softaculous" = 'yes' ]; then
1342-
$VESTA/bin/v-add-vesta-softaculous
1343-
fi
1344-
13451333
# Starting vesta service
13461334
update-rc.d vesta defaults
13471335
service vesta start
@@ -1359,8 +1347,8 @@ $VESTA/bin/v-add-cron-vesta-autoupdate
13591347
# Vesta Access Info #
13601348
#----------------------------------------------------------#
13611349

1362-
# Sending install notification to vestacp.com
1363-
wget vestacp.com/notify/?$codename -O /dev/null -q
1350+
# Sending install notification to hestiacp.com
1351+
wget https://hestiacp.com/notify/?os=$os\&version=$release -O /dev/null -q
13641352

13651353
# Comparing hostname and ip
13661354
host_ip=$(host $servername| head -n 1 | awk '{print $NF}')
@@ -1382,20 +1370,20 @@ Thank you.
13821370
13831371
--
13841372
Sincerely yours
1385-
vestacp.com team
1373+
HestiaCP.com team
13861374
" > $tmpfile
13871375

13881376
send_mail="$VESTA/web/inc/mail-wrapper.php"
1389-
cat $tmpfile | $send_mail -s "Vesta Control Panel" $email
1377+
cat $tmpfile | $send_mail -s "Hestia Control Panel" $email
13901378

13911379
# Congrats
13921380
echo '======================================================='
13931381
echo
1394-
echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| '
1395-
echo ' _| _| _| _| _| _| _| '
1396-
echo ' _| _| _|_|_| _|_| _| _|_|_|_| '
1397-
echo ' _| _| _| _| _| _| _| '
1398-
echo ' _| _|_|_|_| _|_|_| _| _| _| '
1382+
echo ' _ _ _ _ ____ ____ '
1383+
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
1384+
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) |'
1385+
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
1386+
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
13991387
echo
14001388
echo
14011389
cat $tmpfile

‎install/vst-install-ubuntu.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ arch=$(uname -i)
1616
os='ubuntu'
1717
release="$(lsb_release -s -r)"
1818
codename="$(lsb_release -s -c)"
19-
vestacp="$VESTA/install/$VERSION/$release"
19+
vestacp="https://$VESTA/install/$VERSION/$release"
2020

2121
# Defining software pack for all distros
2222
software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
@@ -1218,7 +1218,7 @@ if [ "$iptables" = 'yes' ]; then
12181218
fi
12191219

12201220
# Get public IP
1221-
pub_ip=$(curl -s hestiaacp.com/what-is-my-ip/)
1221+
pub_ip=$(curl -s https://hestiacp.com/what-is-my-ip/)
12221222
if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
12231223
echo "$VESTA/bin/v-update-sys-ip" >> /etc/rc.local
12241224
$VESTA/bin/v-change-sys-ip-nat $ip $pub_ip
@@ -1283,7 +1283,7 @@ $VESTA/bin/v-add-cron-vesta-autoupdate
12831283
#----------------------------------------------------------#
12841284

12851285
# Sending install notification to hestiacp.com
1286-
wget hestiacp.com/notify/?os=$os\&version=$release -O /dev/null -q
1286+
wget https://hestiacp.com/notify/?os=$os\&version=$release -O /dev/null -q
12871287

12881288
# Comparing hostname and IP
12891289
host_ip=$(host $servername| head -n 1 |awk '{print $NF}')

0 commit comments

Comments
 (0)