diff --git a/README.md b/README.md index d3cda0db..4a9293b6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Clixon is a YANG-based configuration manager, with interactive CLI, NETCONF and RESTCONF interfaces, an embedded database and transaction mechanism. -See [documentation](https://clixon-docs.readthedocs.io), [project page](https://www.clicon.org) and [examples](https://github.com/clicon/clixon-examples). +See [documentation](https://clixon-docs.readthedocs.io), [project page](https://www.clicon.org) and [examples](https://github.com/clicon/clixon-examples), [Travis-CI](https://travis-ci.org/clicon/clixon) Clixon is open-source and dual licensed. Either Apache License, Version 2.0 or GNU General Public License Version 2; you choose. diff --git a/docker/main/startsystem_evhtp.sh b/docker/main/startsystem_evhtp.sh index f3c4cb0f..873a3815 100755 --- a/docker/main/startsystem_evhtp.sh +++ b/docker/main/startsystem_evhtp.sh @@ -43,9 +43,14 @@ set -ux # e but clixon_backend may fail if test is run in parallell >&2 echo "$0" -DBG=${DBG:-0} +# If set, enable debugging (of backend and restconf daemons) +: ${DBG:=0} -WWWUSER=${WWWUSER:-www-data} +# Web user default (ie what RESTCONF daemon runs as) +: ${WWWUSER:=www-data} + +# Home dir for web user +: ${WWWDIR:=/www-data} # Initiate clixon configuration (env variable) echo "$CONFIG" > /usr/local/etc/clixon.xml @@ -110,7 +115,7 @@ openssl req -x509 -config ./ca.cnf -nodes -newkey rsa:4096 -keyout /etc/ssl/priv # Start clixon_restconf # -s https # But dont use -s exposing local ports since there is problem with self-signed certs? -/www-data/clixon_restconf -l f/www-data/restconf.log -D $DBG & +${WWWDIR}/clixon_restconf -l f${WWWDIR}/restconf.log -D $DBG & >&2 echo "clixon_restconf started" # Start clixon backend (tests will kill this)