Skip to content

Commit 3e7d636

Browse files
serghey-rodinserghey-rodin
authored
Merge pull request hestiacp#799 from pcfreak30/hotfix/798
Use $VESTA variable everywhere in installer
2 parents ce1be73 + 9ada699 commit 3e7d636

File tree

3 files changed

+39
-37
lines changed

3 files changed

+39
-37
lines changed

‎install/vst-install-debian.sh‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export DEBIAN_FRONTEND=noninteractive
1010
RHOST='apt.vestacp.com'
1111
CHOST='c.vestacp.com'
1212
VERSION='debian'
13+
VESTA='/usr/local/vesta'
1314
memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
1415
arch=$(uname -i)
1516
os='debian'
@@ -506,10 +507,10 @@ mv -f /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1
506507

507508
# Backup vesta
508509
service vesta stop > /dev/null 2>&1
509-
cp -r /usr/local/vesta/* $vst_backups/vesta > /dev/null 2>&1
510+
cp -r $VESTA/* $vst_backups/vesta > /dev/null 2>&1
510511
apt-get -y remove vesta vesta-nginx vesta-php > /dev/null 2>&1
511512
apt-get -y purge vesta vesta-nginx vesta-php > /dev/null 2>&1
512-
rm -rf /usr/local/vesta > /dev/null 2>&1
513+
rm -rf $VESTA > /dev/null 2>&1
513514

514515

515516
#----------------------------------------------------------#
@@ -641,10 +642,10 @@ wget $vestacp/sudo/admin -O /etc/sudoers.d/admin
641642
chmod 440 /etc/sudoers.d/admin
642643

643644
# Configuring system env
644-
echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
645+
echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh
645646
chmod 755 /etc/profile.d/vesta.sh
646647
source /etc/profile.d/vesta.sh
647-
echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
648+
echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile
648649
echo 'export PATH' >> /root/.bash_profile
649650
source /root/.bash_profile
650651

@@ -663,7 +664,7 @@ chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
663664
chmod -R 750 $VESTA/data/queue
664665
chmod 660 $VESTA/log/*
665666
rm -f /var/log/vesta
666-
ln -s /usr/local/vesta/log /var/log/vesta
667+
ln -s $VESTA/log /var/log/vesta
667668
chown admin:admin $VESTA/data/sessions
668669
chmod 770 $VESTA/data/sessions
669670

@@ -1163,19 +1164,19 @@ $VESTA/bin/v-add-domain admin $servername
11631164
check_result $? "can't create $servername domain"
11641165

11651166
# Adding cron jobs
1166-
command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
1167+
command="sudo $VESTA/bin/v-update-sys-queue disk"
11671168
$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
1168-
command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
1169+
command="sudo $VESTA/bin/v-update-sys-queue traffic"
11691170
$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
1170-
command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
1171+
command="sudo $VESTA/bin/v-update-sys-queue webstats"
11711172
$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
1172-
command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
1173+
command="sudo $VESTA/bin/v-update-sys-queue backup"
11731174
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1174-
command='sudo /usr/local/vesta/bin/v-backup-users'
1175+
command="sudo $VESTA/bin/v-backup-users"
11751176
$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
1176-
command='sudo /usr/local/vesta/bin/v-update-user-stats'
1177+
command="sudo $VESTA/bin/v-update-user-stats"
11771178
$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
1178-
command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
1179+
command="sudo $VESTA/bin/v-update-sys-rrd"
11791180
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
11801181
service cron restart
11811182

‎install/vst-install-rhel.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RHOST='r.vestacp.com'
1010
CHOST='c.vestacp.com'
1111
REPO='cmmnt'
1212
VERSION='rhel'
13+
VESTA='/usr/local/vesta'
1314
memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
1415
arch=$(uname -i)
1516
os=$(cut -f 1 -d ' ' /etc/redhat-release)
@@ -528,8 +529,8 @@ mv /var/lib/pgsql/data $vst_backups/postgresql/ >/dev/null 2>&1
528529

529530
# Backing up Vesta configuration and data
530531
service vesta stop > /dev/null 2>&1
531-
mv /usr/local/vesta/data/* $vst_backups/vesta > /dev/null 2>&1
532-
mv /usr/local/vesta/conf/* $vst_backups/vesta > /dev/null 2>&1
532+
mv $VESTA/data/* $vst_backups/vesta > /dev/null 2>&1
533+
mv $VESTA/conf/* $vst_backups/vesta > /dev/null 2>&1
533534

534535

535536
#----------------------------------------------------------#
@@ -678,10 +679,10 @@ wget $vestacp/sudo/admin -O /etc/sudoers.d/admin
678679
chmod 440 /etc/sudoers.d/admin
679680

680681
# Configuring system env
681-
echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
682+
echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh
682683
chmod 755 /etc/profile.d/vesta.sh
683684
source /etc/profile.d/vesta.sh
684-
echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
685+
echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile
685686
echo 'export PATH' >> /root/.bash_profile
686687
source /root/.bash_profile
687688

@@ -700,7 +701,7 @@ chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
700701
chmod -R 750 $VESTA/data/queue
701702
chmod 660 $VESTA/log/*
702703
rm -f /var/log/vesta
703-
ln -s /usr/local/vesta/log /var/log/vesta
704+
ln -s $VESTA/log /var/log/vesta
704705
chown admin:admin $VESTA/data/sessions
705706
chmod 770 $VESTA/data/sessions
706707

@@ -1234,20 +1235,19 @@ fi
12341235
$VESTA/bin/v-add-domain admin $servername
12351236
check_result $? "can't create $servername domain"
12361237

1237-
# Adding cron jobs
1238-
command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
1238+
command="sudo $VESTA/bin/v-update-sys-queue disk"
12391239
$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
1240-
command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
1240+
command="sudo $VESTA/bin/v-update-sys-queue traffic"
12411241
$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
1242-
command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
1242+
command="sudo $VESTA/bin/v-update-sys-queue webstats"
12431243
$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
1244-
command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
1244+
command="sudo $VESTA/bin/v-update-sys-queue backup"
12451245
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1246-
command='sudo /usr/local/vesta/bin/v-backup-users'
1246+
command="sudo $VESTA/bin/v-backup-users"
12471247
$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
1248-
command='sudo /usr/local/vesta/bin/v-update-user-stats'
1248+
command="sudo $VESTA/bin/v-update-user-stats"
12491249
$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
1250-
command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
1250+
command="sudo $VESTA/bin/v-update-sys-rrd"
12511251
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
12521252
service crond restart
12531253

‎install/vst-install-ubuntu.sh‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export DEBIAN_FRONTEND=noninteractive
1010
RHOST='apt.vestacp.com'
1111
CHOST='c.vestacp.com'
1212
VERSION='ubuntu'
13+
VESTA='/usr/local/vesta'
1314
memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
1415
arch=$(uname -i)
1516
os='ubuntu'
@@ -491,10 +492,10 @@ mv -f /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1
491492

492493
# Backup vesta
493494
service vesta stop > /dev/null 2>&1
494-
cp -r /usr/local/vesta/* $vst_backups/vesta > /dev/null 2>&1
495+
cp -r $VESTA/* $vst_backups/vesta > /dev/null 2>&1
495496
apt-get -y remove vesta vesta-nginx vesta-php > /dev/null 2>&1
496497
apt-get -y purge vesta vesta-nginx vesta-php > /dev/null 2>&1
497-
rm -rf /usr/local/vesta > /dev/null 2>&1
498+
rm -rf $VESTA > /dev/null 2>&1
498499

499500

500501
#----------------------------------------------------------#
@@ -631,10 +632,10 @@ wget $vestacp/sudo/admin -O /etc/sudoers.d/admin
631632
chmod 440 /etc/sudoers.d/admin
632633

633634
# Configuring system env
634-
echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
635+
echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh
635636
chmod 755 /etc/profile.d/vesta.sh
636637
source /etc/profile.d/vesta.sh
637-
echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
638+
echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile
638639
echo 'export PATH' >> /root/.bash_profile
639640
source /root/.bash_profile
640641

@@ -653,7 +654,7 @@ chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
653654
chmod -R 750 $VESTA/data/queue
654655
chmod 660 $VESTA/log/*
655656
rm -f /var/log/vesta
656-
ln -s /usr/local/vesta/log /var/log/vesta
657+
ln -s $VESTA/log /var/log/vesta
657658
chown admin:admin $VESTA/data/sessions
658659
chmod 770 $VESTA/data/sessions
659660

@@ -1150,19 +1151,19 @@ $VESTA/bin/v-add-domain admin $servername
11501151
check_result $? "can't create $servername domain"
11511152

11521153
# Adding cron jobs
1153-
command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
1154+
command="sudo $VESTA/bin/v-update-sys-queue disk"
11541155
$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
1155-
command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
1156+
command="sudo $VESTA/bin/v-update-sys-queue traffic"
11561157
$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
1157-
command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
1158+
command="sudo $VESTA/bin/v-update-sys-queue webstats"
11581159
$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
1159-
command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
1160+
command="sudo $VESTA/bin/v-update-sys-queue backup"
11601161
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1161-
command='sudo /usr/local/vesta/bin/v-backup-users'
1162+
command="sudo $VESTA/bin/v-backup-users"
11621163
$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
1163-
command='sudo /usr/local/vesta/bin/v-update-user-stats'
1164+
command="sudo $VESTA/bin/v-update-user-stats"
11641165
$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
1165-
command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
1166+
command="sudo $VESTA/bin/v-update-sys-rrd"
11661167
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
11671168
service cron restart
11681169

0 commit comments

Comments
 (0)