summaryrefslogtreecommitdiffstats
path: root/server/bin/comparemac
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/bin/comparemac
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/bin/comparemac')
-rwxr-xr-xserver/bin/comparemac4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/bin/comparemac b/server/bin/comparemac
index 6b1c6eff..7d893ec7 100755
--- a/server/bin/comparemac
+++ b/server/bin/comparemac
@@ -12,7 +12,7 @@
# Variables.
OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"}
-SERVERCONF=$OPENGNSYS/etc/ogserver.cfg
+SERVERCONF=$OPENGNSYS/etc/ogserver.json
# Funciones globales.
source $OPENGNSYS/lib/ogfunctions.sh || exit 1
@@ -26,7 +26,7 @@ source $OPENGNSYS/lib/ogfunctions.sh || exit 1
which arp-scan &>/dev/null || raiseError notfound "Need to install \"arp-scan\""
# Obtener datos de acceso a la base de datos.
-source $SERVERCONF
+source_json_config $SERVERCONF
# Borrar ficheros temporales si termina el proceso.
trap "rm -f $TMPSQL $TMPSCAN" 0 1 2 3 6 9 15