experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable nginx systemd check

Browse source
This commit is contained in:
Olof hagsand 2020-11-06 20:11:01 +01:00
parent 6ecb0d5232
commit 5088f23e6a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/lib.sh
View file

@ -50,6 +50,7 @@ if [ -f ./site.sh ]; then
fi fi
# Auto-start nginx # Auto-start nginx
if false; then # Does not work on some platforms
nginxactive=$(systemctl show nginx |grep ActiveState=active) nginxactive=$(systemctl show nginx |grep ActiveState=active)
if [ "${WITH_RESTCONF}" = "fcgi" ]; then if [ "${WITH_RESTCONF}" = "fcgi" ]; then
if [ -z "$nginxactive" ]; then if [ -z "$nginxactive" ]; then
@ -64,7 +65,7 @@ else
exit -1 exit -1
fi fi
fi fi
fi
# Test number from start # Test number from start
: ${testnr:=0} : ${testnr:=0}

9
yang/clixon/clixon-config@2020-11-03.yang
View file

@ -416,11 +416,10 @@ module clixon-config {
type boolean; type boolean;
default false; default false;
description description
"If set, load clixon-restconf module automatically. This also means "If set, get restconf-specific configuration from the backend running datastore,
that the clixon restconf daemon gets its restconf-specific configuration using clixon-restconf.yang.
from that yang loaded in the backend running datastore instead of from If not set, load all config from local clixon XML config file.
the clixon XML config file. This only applies to with-restconf=evhtp, NOT with restconf=fcgi (nginx)
This only works with-restconf=evhtp, NOT with restconf=fcgi (nginx)
A consequence is that if set, the following option in this YANG are obsolete: A consequence is that if set, the following option in this YANG are obsolete:
CLICON_RESTCONF_IPV4_ADDR CLICON_RESTCONF_IPV4_ADDR
CLICON_RESTCONF_IPV6_ADDR CLICON_RESTCONF_IPV6_ADDR