mirror of
https://github.com/unraid/webgui.git
synced 2026-03-01 05:41:08 -06:00
rc.ntpd: Fix 'update' subcommand
rc.nginx: Fix 'update' subcommand rc.libvirt: Fix 'vmlist()' function to ignore 'virsh list' headers rc.library_source: changes to support above
This commit is contained in:
@@ -30,7 +30,7 @@ this(){
|
||||
grep -Pom1 "^RPCBIND_OPTS=\"\K[^\"]+" $RPC ;;
|
||||
'nginx')
|
||||
MAP=();
|
||||
for ADDR in $(awk '$1=="listen" && $2~/^[0-9]|\[/ && $0~/http2; #.*$/{print $2}' $SERVERS 2>/dev/null); do
|
||||
for ADDR in $(awk '$1=="listen" && $2~/^[0-9]|\[/ && !/# lo/{print $2}' $SERVERS 2>/dev/null); do
|
||||
# extract ipv4 / ipv6 address
|
||||
[[ $(ipv $ADDR) == 4 ]] && ADDR=${ADDR%:*} || ADDR=${ADDR#*[} ADDR=${ADDR%]*}
|
||||
MAP+=($ADDR)
|
||||
@@ -151,7 +151,7 @@ check(){
|
||||
fi
|
||||
for ADDR in ${NET[@]/$NET}; do
|
||||
ADDR=$(unmask $ADDR)
|
||||
if [[ "avahi show" =~ "$CALLER" ]]; then
|
||||
if [[ "ntp avahi show" =~ "$CALLER" ]]; then
|
||||
[[ -z $(good $NET) ]] && BIND+=($NET)
|
||||
else
|
||||
[[ -z $(good $ADDR) ]] && BIND+=($ADDR) || continue
|
||||
|
||||
@@ -54,7 +54,7 @@ vmlist(){
|
||||
for ARG in ${@: 1}; do
|
||||
[[ $ARG == all ]] && STATE="$STATE --all" || STATE="$STATE --state-$ARG"
|
||||
done
|
||||
virsh list --uuid $STATE | grep -v '^$'
|
||||
virsh list --uuid $STATE | tail -n +3 | grep -v '^$'
|
||||
}
|
||||
|
||||
waitfor(){
|
||||
|
||||
@@ -35,7 +35,7 @@ ntpd_build(){
|
||||
[[ $IPV6 == no ]] && echo "interface ignore ipv6" >>$CONF
|
||||
# add listen interfaces
|
||||
for NET in $BIND; do
|
||||
echo "interface listen $(show $NET) # $NET" >>$CONF
|
||||
echo "interface listen $NET" >>$CONF
|
||||
done
|
||||
fi
|
||||
# add configured NTP servers
|
||||
|
||||
Reference in New Issue
Block a user