From 85862577b29ad77ff9a6078bf700fd8fcd87ed43 Mon Sep 17 00:00:00 2001 From: philc Date: Tue, 16 May 2023 10:31:27 +0200 Subject: [PATCH] cleanup --- .gitignore | 15 +-- .../www/adminapx/conf/electedtowns.json | 0 .../www/adminapx/conf}/initconf.json | 4 + .../www/adminapx/conf}/nginx.conf.mustache | 0 .../conf}/nginxmodelwebsite.conf.mustache | 14 +- .../adminapx/conf}/nginxproxyparams.mustache | 0 .../www/adminapx/index_en.html | 4 +- .../www/adminapx}/schema/accessright.json | 0 .../www/adminapx}/schema/conf.json | 0 .../www/adminapx}/schema/lg/nations_en.json | 0 .../www/adminapx}/schema/lg/nations_fr.json | 0 .../www/adminapx}/schema/lg/pagans_en.json | 0 .../www/adminapx}/schema/lg/pagans_fr.json | 0 .../www/adminapx}/schema/lg/towns_en.json | 0 .../www/adminapx}/schema/lg/towns_fr.json | 0 .../www/adminapx}/schema/nations.json | 0 .../www/adminapx}/schema/pagans.json | 0 .../www/adminapx}/schema/person.json | 0 .../www/adminapx}/schema/towns.json | 0 .../www/adminapx}/schema/tribes.json | 0 .../www/adminapx}/schema/www.json | 0 .../www/adminapx/static/img/logo/favicon.png | Bin .../adminapx/static/img/logo/logobgdark.png | Bin .../adminapx/static/img/logo/logobgdark.svg | 0 .../adminapx/static/img/logo/logobglight.png | Bin .../adminapx/static/img/logo/logobglight.svg | 0 .../static/img/logo/logocarredark.png | Bin .../static/img/logo/logocarrelight.png | Bin .../www/adminapx/static/js/apxapp.js | 0 .../www/adminapx/static/js/apxpagans.js | 1 + adminapi/www/adminapx/static/js/apxtowns.js | 9 ++ .../www/adminapx/static/js/apxtribcli.js | 0 .../www/adminapx/static/js/apxtribes.js | 0 .../adminapx/static/style/fonts/logo/OFL.txt | 0 .../logo/Quicksand-VariableFont_wght.ttf | Bin .../static/style/fonts/logo/Quicksand.zip | Bin .../static/style/fonts/logo/README.txt | 0 .../fonts/logo/static/Quicksand-Bold.ttf | Bin .../fonts/logo/static/Quicksand-Light.ttf | Bin .../fonts/logo/static/Quicksand-Medium.ttf | Bin .../fonts/logo/static/Quicksand-Regular.ttf | Bin .../fonts/logo/static/Quicksand-SemiBold.ttf | Bin .../adminapx/static/style/fonts/texte/OFL.txt | 0 .../style/fonts/texte/Questrial-Regular.ttf | Bin .../static/style/fonts/texte/Questrial.zip | Bin .../style/fonts/texte/generator_config.txt | 0 .../fonts/texte/questrial-regular-demo.html | 0 .../texte/questrial-regular-webfont.woff | Bin .../texte/questrial-regular-webfont.woff2 | Bin .../specimen_files/grid_12-825-55-15.css | 0 .../specimen_files/specimen_stylesheet.css | 0 .../static/style/fonts/texte/stylesheet.css | 0 .../texte/webfontkit-20230503-055110.zip | Bin .../adminapx/static/tpl/apxmodal_en.mustache | 0 .../static/tpl/articleeditor_en.mustache | 0 .../static/tpl/articleslist_en.mustache | 0 .../static/tpl/emailregisterhtml_en.mustache | 0 .../static/tpl/emailregistertxt_en.mustache | 0 .../static/tpl/pagancreate_en.mustache | 67 +++++++--- .../static/tpl/paganloginout_en.mustache | 0 .../adminapx/static/tpl/townsetup_en.mustache | 0 .../adminapx/static/tpldata/ASUPtownconf.json | 0 .../static/tpldata/paganloginout_en.json | 0 .../adminapx/static/tpldata/tribeconf.json | 0 .../apidoc/assets/android-chrome-192x192.png | Bin .../apidoc/assets/android-chrome-512x512.png | Bin .../cdn/apidoc/assets/apple-touch-icon.png | Bin .../www/cdn/apidoc/assets/bootstrap.min.css | 0 .../cdn/apidoc/assets/bootstrap.min.css.map | 0 .../www/cdn/apidoc/assets/favicon-16x16.png | Bin .../www/cdn/apidoc/assets/favicon-32x32.png | Bin .../www/cdn/apidoc/assets/favicon.ico | Bin .../assets/glyphicons-halflings-regular.eot | Bin .../assets/glyphicons-halflings-regular.svg | 0 .../assets/glyphicons-halflings-regular.ttf | Bin .../assets/glyphicons-halflings-regular.woff | Bin .../assets/glyphicons-halflings-regular.woff2 | Bin .../www/cdn/apidoc/assets/main.bundle.js | 0 .../www/cdn/apidoc/assets/main.css | 0 .../www/cdn/apidoc/assets/prism.css | 0 .../www/cdn/apidoc/index.html | 0 .../www/cdn/share/js/axios.min.js | 0 .../www/cdn/share/js/axios.min.map | 0 .../www/cdn/share/js/dayjs.min.js | 0 .../www/cdn/share/js/editor.js | 0 .../www/cdn/share/js/mustache.min.js | 0 .../www/cdn/share/js/openpgp.js | 0 .../www/cdn/share/js/openpgp.min.js | 0 .../www/cdn/share/js/openpgp.min.js.map | 0 .../www/cdn/share/logo/favicon.png | Bin .../www/cdn/share/logo/logobgdark.png | Bin .../www/cdn/share/logo/logobgdark.svg | 0 .../www/cdn/share/logo/logobglight.png | Bin .../www/cdn/share/logo/logobglight.svg | 0 .../www/cdn/share/logo/logocarredark.png | Bin .../www/cdn/share/logo/logocarrelight.png | Bin .../www/socialworld/apxtrib.html | 0 .../www/socialworld/enmaintenance.html | 0 .../www/socialworld/nation_ants.html | 0 .../www/socialworld/setup.html | 0 .../www/socialworld/static/error/404.html | 0 .../socialworld/static/error/50x.html.html | 0 .../static/fonts/Cantarell-Bold.ttf | Bin .../static/fonts/Cantarell-BoldItalic.ttf | Bin .../static/fonts/Cantarell-Italic.ttf | Bin .../static/fonts/Cantarell-Regular.ttf | Bin .../www/socialworld/static/fonts/OFL.txt | 0 .../static/fonts/cantarell-bold-demo.html | 0 .../static/fonts/cantarell-bold-webfont.woff | Bin .../static/fonts/cantarell-bold-webfont.woff2 | Bin .../fonts/cantarell-bolditalic-demo.html | 0 .../fonts/cantarell-bolditalic-webfont.woff | Bin .../fonts/cantarell-bolditalic-webfont.woff2 | Bin .../static/fonts/cantarell-italic-demo.html | 0 .../fonts/cantarell-italic-webfont.woff | Bin .../fonts/cantarell-italic-webfont.woff2 | Bin .../static/fonts/cantarell-regular-demo.html | 0 .../fonts/cantarell-regular-webfont.woff | Bin .../fonts/cantarell-regular-webfont.woff2 | Bin .../static/fonts/generator_config.txt | 0 .../specimen_files/grid_12-825-55-15.css | 0 .../specimen_files/specimen_stylesheet.css | 0 .../socialworld/static/fonts/stylesheet.css | 0 .../static/img/avataranonymous.png | Bin .../static/img/avataranonymous1.png | Bin .../static/img/avataranonymous2.png | Bin .../img/chartegraphique/codecouleur.png | Bin .../static/img/chartegraphique/favicon.png | Bin .../img/chartegraphique/logo_bgplein.png | Bin .../chartegraphique/logo_bgtransparent.png | Bin .../img/chartegraphique/logocarre_bgplein.png | Bin .../logocarre_vertical_bgplein.png | Bin .../img/chartegraphique/planchelogo.svg | 0 .../www/socialworld/static/img/imgtg.png | Bin .../static/img/nations/ants/antsNation.svg | 0 .../static/img/site-en-maintenance.png | Bin .../www/socialworld/testnetwork.html | 0 .../www/socialworld/town_base.html | 0 api/middlewares/checkHeaders.js | 2 +- api/middlewares/hasAccessrighton.js | 4 +- api/middlewares/isAuthenticated.js | 20 +-- api/models/Contracts.js | 2 +- api/models/Nations.js | 8 +- api/models/Odmdb.js | 2 +- api/models/Pagans.js | 23 ++-- api/models/Setup.js | 123 ++++++++++++++---- api/models/Towns.js | 2 +- api/models/Tribes.js | 60 ++++----- api/routes/nations.js | 4 +- api/routes/odmdb.js | 4 +- api/routes/tribes.js | 2 +- apxtrib.js | 34 +++-- .../ASUPnginx/proxy_params copy.mustache | 11 -- .../adminapx/ASUPnginx/proxy_params.mustache | 11 -- .../www/adminapx/static/js/apxtowns.js | 0 .../adminapx/static/tpl/nginx.conf.mustache | 34 ----- .../www/adminapx/static/tpldata/setup_en.json | 1 - package.json | 4 +- tribes/devenv/person/itm/testerC.json | 1 - unittest.js | 4 +- 160 files changed, 268 insertions(+), 202 deletions(-) rename electedtown.json => adminapi/www/adminapx/conf/electedtowns.json (100%) rename {nationchains/www/adminapx/static/tpldata => adminapi/www/adminapx/conf}/initconf.json (81%) rename {nationchains/www/adminapx/ASUPnginx => adminapi/www/adminapx/conf}/nginx.conf.mustache (100%) rename {nationchains/www/adminapx/static/tpl => adminapi/www/adminapx/conf}/nginxmodelwebsite.conf.mustache (71%) rename {nationchains/www/adminapx/static/tpl => adminapi/www/adminapx/conf}/nginxproxyparams.mustache (100%) rename {nationchains => adminapi}/www/adminapx/index_en.html (98%) rename {nationchains => adminapi/www/adminapx}/schema/accessright.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/conf.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/lg/nations_en.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/lg/nations_fr.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/lg/pagans_en.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/lg/pagans_fr.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/lg/towns_en.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/lg/towns_fr.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/nations.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/pagans.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/person.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/towns.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/tribes.json (100%) rename {nationchains => adminapi/www/adminapx}/schema/www.json (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/favicon.png (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/logobgdark.png (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/logobgdark.svg (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/logobglight.png (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/logobglight.svg (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/logocarredark.png (100%) rename {nationchains => adminapi}/www/adminapx/static/img/logo/logocarrelight.png (100%) rename {nationchains => adminapi}/www/adminapx/static/js/apxapp.js (100%) rename {nationchains => adminapi}/www/adminapx/static/js/apxpagans.js (99%) create mode 100644 adminapi/www/adminapx/static/js/apxtowns.js rename {nationchains => adminapi}/www/adminapx/static/js/apxtribcli.js (100%) rename {nationchains => adminapi}/www/adminapx/static/js/apxtribes.js (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/OFL.txt (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/Quicksand-VariableFont_wght.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/Quicksand.zip (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/README.txt (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/static/Quicksand-Bold.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/static/Quicksand-Light.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/static/Quicksand-Medium.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/static/Quicksand-Regular.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/logo/static/Quicksand-SemiBold.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/OFL.txt (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/Questrial-Regular.ttf (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/Questrial.zip (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/generator_config.txt (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/questrial-regular-demo.html (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/questrial-regular-webfont.woff (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/questrial-regular-webfont.woff2 (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/specimen_files/grid_12-825-55-15.css (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/specimen_files/specimen_stylesheet.css (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/stylesheet.css (100%) rename {nationchains => adminapi}/www/adminapx/static/style/fonts/texte/webfontkit-20230503-055110.zip (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/apxmodal_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/articleeditor_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/articleslist_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/emailregisterhtml_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/emailregistertxt_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/pagancreate_en.mustache (68%) rename {nationchains => adminapi}/www/adminapx/static/tpl/paganloginout_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpl/townsetup_en.mustache (100%) rename {nationchains => adminapi}/www/adminapx/static/tpldata/ASUPtownconf.json (100%) rename {nationchains => adminapi}/www/adminapx/static/tpldata/paganloginout_en.json (100%) rename {nationchains => adminapi}/www/adminapx/static/tpldata/tribeconf.json (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/android-chrome-192x192.png (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/android-chrome-512x512.png (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/apple-touch-icon.png (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/bootstrap.min.css (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/bootstrap.min.css.map (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/favicon-16x16.png (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/favicon-32x32.png (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/favicon.ico (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/glyphicons-halflings-regular.eot (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/glyphicons-halflings-regular.svg (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/glyphicons-halflings-regular.ttf (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/glyphicons-halflings-regular.woff (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/glyphicons-halflings-regular.woff2 (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/main.bundle.js (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/main.css (100%) rename {nationchains => adminapi}/www/cdn/apidoc/assets/prism.css (100%) rename {nationchains => adminapi}/www/cdn/apidoc/index.html (100%) rename {nationchains => adminapi}/www/cdn/share/js/axios.min.js (100%) rename {nationchains => adminapi}/www/cdn/share/js/axios.min.map (100%) rename {nationchains => adminapi}/www/cdn/share/js/dayjs.min.js (100%) rename {nationchains => adminapi}/www/cdn/share/js/editor.js (100%) rename {nationchains => adminapi}/www/cdn/share/js/mustache.min.js (100%) rename {nationchains => adminapi}/www/cdn/share/js/openpgp.js (100%) rename {nationchains => adminapi}/www/cdn/share/js/openpgp.min.js (100%) rename {nationchains => adminapi}/www/cdn/share/js/openpgp.min.js.map (100%) rename {nationchains => adminapi}/www/cdn/share/logo/favicon.png (100%) rename {nationchains => adminapi}/www/cdn/share/logo/logobgdark.png (100%) rename {nationchains => adminapi}/www/cdn/share/logo/logobgdark.svg (100%) rename {nationchains => adminapi}/www/cdn/share/logo/logobglight.png (100%) rename {nationchains => adminapi}/www/cdn/share/logo/logobglight.svg (100%) rename {nationchains => adminapi}/www/cdn/share/logo/logocarredark.png (100%) rename {nationchains => adminapi}/www/cdn/share/logo/logocarrelight.png (100%) rename {nationchains => adminapi}/www/socialworld/apxtrib.html (100%) rename {nationchains => adminapi}/www/socialworld/enmaintenance.html (100%) rename {nationchains => adminapi}/www/socialworld/nation_ants.html (100%) rename {nationchains => adminapi}/www/socialworld/setup.html (100%) rename {nationchains => adminapi}/www/socialworld/static/error/404.html (100%) rename {nationchains => adminapi}/www/socialworld/static/error/50x.html.html (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/Cantarell-Bold.ttf (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/Cantarell-BoldItalic.ttf (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/Cantarell-Italic.ttf (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/Cantarell-Regular.ttf (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/OFL.txt (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-bold-demo.html (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-bold-webfont.woff (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-bold-webfont.woff2 (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-bolditalic-demo.html (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-bolditalic-webfont.woff (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-bolditalic-webfont.woff2 (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-italic-demo.html (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-italic-webfont.woff (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-italic-webfont.woff2 (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-regular-demo.html (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-regular-webfont.woff (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/cantarell-regular-webfont.woff2 (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/generator_config.txt (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/specimen_files/grid_12-825-55-15.css (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/specimen_files/specimen_stylesheet.css (100%) rename {nationchains => adminapi}/www/socialworld/static/fonts/stylesheet.css (100%) rename {nationchains => adminapi}/www/socialworld/static/img/avataranonymous.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/avataranonymous1.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/avataranonymous2.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/codecouleur.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/favicon.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/logo_bgplein.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/logo_bgtransparent.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/logocarre_bgplein.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/logocarre_vertical_bgplein.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/chartegraphique/planchelogo.svg (100%) rename {nationchains => adminapi}/www/socialworld/static/img/imgtg.png (100%) rename {nationchains => adminapi}/www/socialworld/static/img/nations/ants/antsNation.svg (100%) rename {nationchains => adminapi}/www/socialworld/static/img/site-en-maintenance.png (100%) rename {nationchains => adminapi}/www/socialworld/testnetwork.html (100%) rename {nationchains => adminapi}/www/socialworld/town_base.html (100%) delete mode 100644 nationchains/www/adminapx/ASUPnginx/proxy_params copy.mustache delete mode 100644 nationchains/www/adminapx/ASUPnginx/proxy_params.mustache delete mode 100644 nationchains/www/adminapx/static/js/apxtowns.js delete mode 100755 nationchains/www/adminapx/static/tpl/nginx.conf.mustache delete mode 100644 nationchains/www/adminapx/static/tpldata/setup_en.json delete mode 100644 tribes/devenv/person/itm/testerC.json diff --git a/.gitignore b/.gitignore index d728e23..2230359 100755 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,5 @@ /node_modules -/tmp -/nginx -/cleaning -/nationchains/blocks -/nationchains/deals -/nationchains/logs -/nationchains/nations -/nationchains/pagans -/nationchains/towns -/nationchains/tribes -/nationchains/www/nginx_adminapx.conf -/nationchainssave +/nationchains +/adminapi/www/nginx_adminapx.conf +/adminapi/www/adminapx/conf/setup_xx.json /yarn* diff --git a/electedtown.json b/adminapi/www/adminapx/conf/electedtowns.json similarity index 100% rename from electedtown.json rename to adminapi/www/adminapx/conf/electedtowns.json diff --git a/nationchains/www/adminapx/static/tpldata/initconf.json b/adminapi/www/adminapx/conf/initconf.json similarity index 81% rename from nationchains/www/adminapx/static/tpldata/initconf.json rename to adminapi/www/adminapx/conf/initconf.json index 055258d..24553b3 100644 --- a/nationchains/www/adminapx/static/tpldata/initconf.json +++ b/adminapi/www/adminapx/conf/initconf.json @@ -1,5 +1,9 @@ { "dns": ["adminapx"], + "towns": [ + { "townId": "wall", "nationId": "ants", "url": "wall-ants.ndda.fr" }, + { "townId": "hill", "nationId": "ants", "url": "hill-ants.ndda.fr" } + ], "api": { "port": 3020, "languages": ["en", "fr"], diff --git a/nationchains/www/adminapx/ASUPnginx/nginx.conf.mustache b/adminapi/www/adminapx/conf/nginx.conf.mustache similarity index 100% rename from nationchains/www/adminapx/ASUPnginx/nginx.conf.mustache rename to adminapi/www/adminapx/conf/nginx.conf.mustache diff --git a/nationchains/www/adminapx/static/tpl/nginxmodelwebsite.conf.mustache b/adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache similarity index 71% rename from nationchains/www/adminapx/static/tpl/nginxmodelwebsite.conf.mustache rename to adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache index a3e6d01..58698b7 100755 --- a/nationchains/www/adminapx/static/tpl/nginxmodelwebsite.conf.mustache +++ b/adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache @@ -1,18 +1,18 @@ server { server_name {{#dns}} {{.}} {{/dns}}; - access_log {{{dirname}}}/{{{nginx.fswww}}}logs/nginx/{{{nginx.website}}}.{{{nginx.tribeid}}}.access.log main; + access_log {{{nginx.logs}}}.access.log main; location ~* /nationchains/(schema|blocks|pagans|towns|nations)/ { # Warning: never add tribes for keeping it private - root {{{dirname}}}/; + root {{{dirapi}}}/; } # /plugins/pluginame/components/xxx?plugin=pluginname&pluginkey=key # acess if exist pluginkey location /plugins/ { add_header X-debug "plugins local $arg_plugin/keys/$arg_pluginkey sent"; - root {{{dirname}}}/{{{nginx.fswww}}}/plugins/; - if (-f {{{dirname}}}/{{{nginx.fswww}}}/plugins/$arg_plugin/keys/$arg_pluginkey) { + root {{{nginx.fswww}}}/plugins/; + if (-f {{{nginx.fswww}}}/plugins/$arg_plugin/keys/$arg_pluginkey) { rewrite /plugins/([^/]+)/components/([^\?]+) /$1/components/$2 break; } return 403 "No valid token access for plugin:$arg_plugin with token:$arg_pluginkey please ask your admin"; @@ -20,12 +20,12 @@ server { location /cdn/ { rewrite /cdn/(.*$) /$1 break; - root {{{dirname}}}/{{{nginx.fswww}}}www/cdn/; + root {{{nginx.fswww}}}www/cdn/; } location /spacedev/ { rewrite /spacedev/(.*$) /$1 break; - root {{{dirname}}}/{{{nginx.fswww}}}spacedev/{{{nginx.website}}}/dist/; + root {{{nginx.fswww}}}spacedev/{{{nginx.website}}}/dist/; } location /api/ { @@ -36,7 +36,7 @@ server { } location / { - root {{{dirname}}}/{{{nginx.fswww}}}www/{{{nginx.website}}}; + root {{{nginx.fswww}}}/{{{nginx.website}}}; index index.html {{{nginx.pageindex}}}; } error_page 404 /404.html; diff --git a/nationchains/www/adminapx/static/tpl/nginxproxyparams.mustache b/adminapi/www/adminapx/conf/nginxproxyparams.mustache similarity index 100% rename from nationchains/www/adminapx/static/tpl/nginxproxyparams.mustache rename to adminapi/www/adminapx/conf/nginxproxyparams.mustache diff --git a/nationchains/www/adminapx/index_en.html b/adminapi/www/adminapx/index_en.html similarity index 98% rename from nationchains/www/adminapx/index_en.html rename to adminapi/www/adminapx/index_en.html index 26b3456..9967182 100644 --- a/nationchains/www/adminapx/index_en.html +++ b/adminapi/www/adminapx/index_en.html @@ -47,7 +47,7 @@
+ add2data tpldata="static/tpldata/setup_xx.json">

apXtrib

Manage and understand apXtrib back-end

@@ -90,8 +90,8 @@