Merge pull request #1207 from fliker09/master

Small code and spell check fixes for rhel installer
This commit is contained in:
Serghey Rodin 2017-12-28 15:08:20 +02:00 committed by GitHub
commit 4b226fa49b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -84,7 +84,7 @@ gen_pass() {
echo "$PASS" echo "$PASS"
} }
# Defning return code check function # Defining return code check function
check_result() { check_result() {
if [ $1 -ne 0 ]; then if [ $1 -ne 0 ]; then
echo "Error: $2" echo "Error: $2"
@ -222,7 +222,7 @@ fi
# Checking root permissions # Checking root permissions
if [ "x$(id -u)" != 'x0' ]; then if [ "x$(id -u)" != 'x0' ]; then
check_error 1 "Script can be run executed only by root" check_result 1 "Script can be run executed only by root"
fi fi
# Checking admin user account # Checking admin user account
@ -705,7 +705,6 @@ chmod -R 750 $VESTA/data/queue
chmod 660 $VESTA/log/* chmod 660 $VESTA/log/*
rm -f /var/log/vesta rm -f /var/log/vesta
ln -s $VESTA/log /var/log/vesta ln -s $VESTA/log /var/log/vesta
chown admin:admin $VESTA/data/sessions
chmod 770 $VESTA/data/sessions chmod 770 $VESTA/data/sessions
# Generating vesta configuration # Generating vesta configuration
@ -974,6 +973,7 @@ if [ "$mysql" = 'yes' ]; then
mkdir -p /var/lib/mysql mkdir -p /var/lib/mysql
chown mysql:mysql /var/lib/mysql chown mysql:mysql /var/lib/mysql
mkdir -p /etc/my.cnf.d
if [ $release -ne 7 ]; then if [ $release -ne 7 ]; then
service='mysqld' service='mysqld'
@ -1283,7 +1283,7 @@ command="sudo $VESTA/bin/v-update-sys-rrd"
$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command"
service crond restart service crond restart
# Building inititall rrd images # Building initial rrd images
$VESTA/bin/v-update-sys-rrd $VESTA/bin/v-update-sys-rrd
# Enabling file system quota # Enabling file system quota