Merge branch 'master' of github.com:serghey-rodin/vesta

This commit is contained in:
Malishev Dmitry 2015-02-09 17:18:05 -05:00
commit 01963489ab
2 changed files with 2 additions and 7 deletions

View file

@ -160,12 +160,7 @@ if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then
for db in ${DB_SYSTEM//,/ }; do for db in ${DB_SYSTEM//,/ }; do
service="$db" service="$db"
if [ "$service" == 'mysql' ]; then if [ "$service" == 'mysql' ]; then
if [ ! -e "/etc/init.d/$service" ]; then db_proc_name='mysqld'
service='mysqld'
fi
if [ ! -e "/etc/redhat-release" ]; then
db_proc_name='mysqld'
fi
fi fi
if [ "$service" == 'pgsql' ]; then if [ "$service" == 'pgsql' ]; then
service='postgresql' service='postgresql'

View file

@ -36,7 +36,7 @@ is_object_valid 'user' 'USER' "$user" "$user"
#----------------------------------------------------------# #----------------------------------------------------------#
# Get list of ip addresses # Get list of ip addresses
ip_list=$(/sbin/ip addr |grep "inet "|grep -v "host lo" |awk '{print $2}') ip_list=$(/sbin/ip addr|grep 'inet '|grep global|awk '{print $2}')
ip_list=$(echo "$ip_list"|cut -f 1 -d /) ip_list=$(echo "$ip_list"|cut -f 1 -d /)
ip_num=$(echo "$ip_list" | wc -l) ip_num=$(echo "$ip_list" | wc -l)