Skip to content

Commit f8c8a33

Browse files
pcfreak30pcfreak30
committed
*Set VESTA global variable and use everywhere
1 parent e6d6e19 commit f8c8a33

File tree

3 files changed

+40
-38
lines changed

3 files changed

+40
-38
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
#----------------------------------------------------------#
@@ -644,10 +645,10 @@ wget $vestacp/sudo/admin -O /etc/sudoers.d/admin
644645
chmod 440 /etc/sudoers.d/admin
645646

646647
# Configuring system env
647-
echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
648+
echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh
648649
chmod 755 /etc/profile.d/vesta.sh
649650
source /etc/profile.d/vesta.sh
650-
echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
651+
echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile
651652
echo 'export PATH' >> /root/.bash_profile
652653
source /root/.bash_profile
653654

@@ -666,7 +667,7 @@ chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
666667
chmod -R 750 $VESTA/data/queue
667668
chmod 660 $VESTA/log/*
668669
rm -f /var/log/vesta
669-
ln -s /usr/local/vesta/log /var/log/vesta
670+
ln -s $VESTA/log /var/log/vesta
670671
chown admin:admin $VESTA/data/sessions
671672
chmod 770 $VESTA/data/sessions
672673

@@ -1160,19 +1161,19 @@ $VESTA/bin/v-add-domain admin $servername
11601161
check_result $? "can't create $servername domain"
11611162

11621163
# Adding cron jobs
1163-
command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
1164+
command="sudo $VESTA/bin/v-update-sys-queue disk"
11641165
$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
1165-
command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
1166+
command="sudo $VESTA/bin/v-update-sys-queue traffic"
11661167
$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
1167-
command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
1168+
command="sudo $VESTA/bin/v-update-sys-queue webstats"
11681169
$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
1169-
command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
1170+
command="sudo $VESTA/bin/v-update-sys-queue backup"
11701171
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1171-
command='sudo /usr/local/vesta/bin/v-backup-users'
1172+
command="sudo $VESTA/bin/v-backup-users"
11721173
$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
1173-
command='sudo /usr/local/vesta/bin/v-update-user-stats'
1174+
command="sudo $VESTA/bin/v-update-user-stats"
11741175
$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
1175-
command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
1176+
command="sudo $VESTA/bin/v-update-sys-rrd"
11761177
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
11771178
service cron restart
11781179

‎install/vst-install-rhel.sh‎

Lines changed: 14 additions & 14 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)
@@ -527,8 +528,8 @@ mv /var/lib/pgsql/data $vst_backups/postgresql/ >/dev/null 2>&1
527528

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

533534

534535
#----------------------------------------------------------#
@@ -677,10 +678,10 @@ wget $vestacp/sudo/admin -O /etc/sudoers.d/admin
677678
chmod 440 /etc/sudoers.d/admin
678679

679680
# Configuring system env
680-
echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
681+
echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh
681682
chmod 755 /etc/profile.d/vesta.sh
682683
source /etc/profile.d/vesta.sh
683-
echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
684+
echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile
684685
echo 'export PATH' >> /root/.bash_profile
685686
source /root/.bash_profile
686687

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

@@ -1229,22 +1230,21 @@ fi
12291230
$VESTA/bin/v-add-domain admin $servername
12301231
check_result $? "can't create $servername domain"
12311232

1232-
# Adding cron jobs
1233-
command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
1233+
command="sudo $VESTA/bin/v-update-sys-queue disk"
12341234
$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
1235-
command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
1235+
command="sudo $VESTA/bin/v-update-sys-queue traffic"
12361236
$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
1237-
command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
1237+
command="sudo $VESTA/bin/v-update-sys-queue webstats"
12381238
$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
1239-
command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
1239+
command="sudo $VESTA/bin/v-update-sys-queue backup"
12401240
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1241-
command='sudo /usr/local/vesta/bin/v-backup-users'
1241+
command="sudo $VESTA/bin/v-backup-users"
12421242
$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
1243-
command='sudo /usr/local/vesta/bin/v-update-user-stats'
1243+
command="sudo $VESTA/bin/v-update-user-stats"
12441244
$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
1245-
command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
1245+
command="sudo $VESTA/bin/v-update-sys-rrd"
12461246
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1247-
service crond restart
1247+
service cron restart
12481248

12491249
# Building inititall rrd images
12501250
$VESTA/bin/v-update-sys-rrd

‎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
#----------------------------------------------------------#
@@ -636,10 +637,10 @@ wget $vestacp/sudo/admin -O /etc/sudoers.d/admin
636637
chmod 440 /etc/sudoers.d/admin
637638

638639
# Configuring system env
639-
echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh
640+
echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh
640641
chmod 755 /etc/profile.d/vesta.sh
641642
source /etc/profile.d/vesta.sh
642-
echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile
643+
echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile
643644
echo 'export PATH' >> /root/.bash_profile
644645
source /root/.bash_profile
645646

@@ -658,7 +659,7 @@ chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
658659
chmod -R 750 $VESTA/data/queue
659660
chmod 660 $VESTA/log/*
660661
rm -f /var/log/vesta
661-
ln -s /usr/local/vesta/log /var/log/vesta
662+
ln -s $VESTA/log /var/log/vesta
662663
chown admin:admin $VESTA/data/sessions
663664
chmod 770 $VESTA/data/sessions
664665

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

11511152
# Adding cron jobs
1152-
command='sudo /usr/local/vesta/bin/v-update-sys-queue disk'
1153+
command="sudo $VESTA/bin/v-update-sys-queue disk"
11531154
$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command"
1154-
command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic'
1155+
command="sudo $VESTA/bin/v-update-sys-queue traffic"
11551156
$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command"
1156-
command='sudo /usr/local/vesta/bin/v-update-sys-queue webstats'
1157+
command="sudo $VESTA/bin/v-update-sys-queue webstats"
11571158
$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command"
1158-
command='sudo /usr/local/vesta/bin/v-update-sys-queue backup'
1159+
command="sudo $VESTA/bin/v-update-sys-queue backup"
11591160
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
1160-
command='sudo /usr/local/vesta/bin/v-backup-users'
1161+
command="sudo $VESTA/bin/v-backup-users"
11611162
$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command"
1162-
command='sudo /usr/local/vesta/bin/v-update-user-stats'
1163+
command="sudo $VESTA/bin/v-update-user-stats"
11631164
$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command"
1164-
command='sudo /usr/local/vesta/bin/v-update-sys-rrd'
1165+
command="sudo $VESTA/bin/v-update-sys-rrd"
11651166
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
11661167
service cron restart
11671168

0 commit comments

Comments
 (0)