From 41dbd92e4ac2f77912052b3da728ba952326ccde Mon Sep 17 00:00:00 2001 From: philc Date: Sat, 3 Jun 2023 17:55:40 +0200 Subject: [PATCH] suppression de adminapi/www/adminapx/conf/setup_xx.json --- .gitignore | 1 + adminapi/www/adminapx/conf/setup_xx.json | 1 - apxtrib.js | 7 ++++++- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 adminapi/www/adminapx/conf/setup_xx.json diff --git a/.gitignore b/.gitignore index ca6ff3d..2230359 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /node_modules /nationchains /adminapi/www/nginx_adminapx.conf +/adminapi/www/adminapx/conf/setup_xx.json /yarn* diff --git a/adminapi/www/adminapx/conf/setup_xx.json b/adminapi/www/adminapx/conf/setup_xx.json deleted file mode 100644 index 7464dc3..0000000 --- a/adminapi/www/adminapx/conf/setup_xx.json +++ /dev/null @@ -1 +0,0 @@ -{"nationId":"ants","townId":"devfarm","dns":["devfarm-ants"],"comment":"Auto generate setup from apxtrib after node apxtrib nationId:value townId:value dns:domaine_to_access"} diff --git a/apxtrib.js b/apxtrib.js index 2d789b6..5e2a1fe 100755 --- a/apxtrib.js +++ b/apxtrib.js @@ -181,9 +181,14 @@ if ( setconf(param); } // From git setup-xx is set to nationId:ant townId:farmdev (keyword for dev) -const infotown = fs.readJsonSync( +let infotown = {nationId:"ants",townId:"devfarm",dns:["devfarm-ants"],comment:"Auto generate setup from apxtrib after node apxtrib nationId:value townId:value dns:domaine_to_access"} +if (fs.existsSync(`${__dirname}/adminapi/www/adminapx/conf/setup_xx.json`)){ + infotown = fs.readJsonSync( `${__dirname}/adminapi/www/adminapx/conf/setup_xx.json` ); + }else{ + fs.outputJsonSync(`${__dirname}/adminapi/www/adminapx/conf/setup_xx.json`,infotown); + } if ( !fs.existsSync(