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 @@