Merge pull request #948 from ioannidesalex/patch-25

Spelling corrections Ubuntu installer
This commit is contained in:
Serghey Rodin 2016-11-24 12:59:38 +03:00 committed by GitHub
commit 6fe10a3cbc

View file

@ -517,7 +517,7 @@ rm -rf $VESTA > /dev/null 2>&1
#----------------------------------------------------------# #----------------------------------------------------------#
# Package Exludes # # Package Excludes #
#----------------------------------------------------------# #----------------------------------------------------------#
# Excluding packages # Excluding packages
@ -645,7 +645,7 @@ chmod 755 /usr/bin/rssh
#----------------------------------------------------------# #----------------------------------------------------------#
# Configure VESTA # # Configure Vesta #
#----------------------------------------------------------# #----------------------------------------------------------#
@ -665,7 +665,7 @@ source /root/.bash_profile
# Configuring logrotate for Vesta logs # Configuring logrotate for Vesta logs
wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta
# Buidling directory tree and creating some blank files for Vesta # Building directory tree and creating some blank files for Vesta
mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \
$VESTA/data/queue $VESTA/data/users $VESTA/data/firewall \ $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall \
$VESTA/data/sessions $VESTA/data/sessions
@ -744,7 +744,7 @@ if [ "$exim" = 'yes' ]; then
fi fi
fi fi
# CRON daemon # Cron daemon
echo "CRON_SYSTEM='cron'" >> $VESTA/conf/vesta.conf echo "CRON_SYSTEM='cron'" >> $VESTA/conf/vesta.conf
# Firewall stack # Firewall stack
@ -1158,7 +1158,7 @@ $VESTA/bin/v-update-sys-ip
# Get main IP # Get main IP
ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
# Firewall configuration # Configuring firewall
if [ "$iptables" = 'yes' ]; then if [ "$iptables" = 'yes' ]; then
$VESTA/bin/v-update-firewall $VESTA/bin/v-update-firewall
fi fi
@ -1170,7 +1170,7 @@ if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
ip=$pub_ip ip=$pub_ip
fi fi
# Configuring MySQL host # Configuring MySQL/MariaDB host
if [ "$mysql" = 'yes' ]; then if [ "$mysql" = 'yes' ]; then
$VESTA/bin/v-add-database-host mysql localhost root $vpass $VESTA/bin/v-add-database-host mysql localhost root $vpass
$VESTA/bin/v-add-database admin default default $(gen_pass) mysql $VESTA/bin/v-add-database admin default default $(gen_pass) mysql