Skip to content

Commit 8fe64c0

Browse files
committed
manually merged PR hestiacp#653
2 parents 9e21076 + 8b18ca3 commit 8fe64c0

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

bin/v-list-sys-services

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,13 @@ if [ ! -z "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" != 'remote' ]; then
165165
data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
166166
fi
167167

168-
# Checking DNS system
169-
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'remote' ]; then
170-
if [ "$DNS_SYSTEM" == 'bind' ] || [ "$DNS_SYSTEM" == 'bind9' ]; then
171-
proc_name='named'
172-
fi
173-
get_srv_state $DNS_SYSTEM $proc_name
174-
data="$data\nNAME='$DNS_SYSTEM' SYSTEM='dns server' STATE='$state'"
175-
data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
168+
# DNS
169+
service=$DNS_SYSTEM
170+
if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then
171+
proc_name='named'
172+
get_srv_state $service $proc_name
173+
str="$str\nNAME='$service' SYSTEM='dns server' STATE='$state' CPU='$cpu'"
174+
str="$str MEM='$mem' RTIME='$rtime'"
176175
fi
177176

178177
# Checking MAIL system

0 commit comments

Comments
 (0)