summaryrefslogtreecommitdiffstats
path: root/server/lib/checkrest
diff options
context:
space:
mode:
authorRoberto Hueso Gómez <rhueso@soleta.eu>2020-10-19 13:38:11 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-10-22 12:50:37 +0200
commit4972d15ecd21a6f8dfe6f8451d19ac678fa2865b (patch)
tree9cf270d2e9c9522a0f4590864082c14f96999a63 /server/lib/checkrest
parenta0dd47a79ca4d5a06979fe22827bf7d4ea178fb7 (diff)
#988 Read json config file in scripts
This patch implements the function source_json_config() that is used to read the new ogserver.json config file in the scripts. This replaces the old 'source .../ogserver.cfg'. Co-authored-by: Javier Sánchez Parra <jsanchez@soleta.eu>
Diffstat (limited to 'server/lib/checkrest')
-rwxr-xr-xserver/lib/checkrest4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/checkrest b/server/lib/checkrest
index 3fcd8bd1..c88ff53d 100755
--- a/server/lib/checkrest
+++ b/server/lib/checkrest
@@ -12,7 +12,7 @@
PROG=$(basename "$0")
OPENGNSYS=/opt/opengnsys
-CONFIGFILE=$OPENGNSYS/etc/ogserver.cfg
+CONFIGFILE=$OPENGNSYS/etc/ogserver.json
RESTURL="https://localhost/opengnsys/rest"
source $OPENGNSYS/lib/ogfunctions.sh || exit 1
@@ -128,7 +128,7 @@ function runtests () {
# Check dependencies.
which jq &>/dev/null || raiseError notfound "Need to install \"jq\"."
-source $CONFIGFILE
+source_json_config $CONFIGFILE
deletedata
loaddata
runtests