Kaynağa Gözat

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

Malishev Dmitry 11 yıl önce
ebeveyn
işleme
01963489ab
2 değiştirilmiş dosya ile 2 ekleme ve 7 silme
  1. 1 6
      bin/v-list-sys-services
  2. 1 1
      bin/v-update-sys-ip

+ 1 - 6
bin/v-list-sys-services

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

+ 1 - 1
bin/v-update-sys-ip

@@ -36,7 +36,7 @@ is_object_valid 'user' 'USER' "$user" "$user"
 #----------------------------------------------------------#
 
 # 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_num=$(echo "$ip_list" | wc -l)