maj setup

adminapi/www/adminapx/conf/electedtowns.json

@@ -1 +0,0 @@
-["https://wallants.ndda.fr/nations/synchro"]

adminapi/www/adminapx/conf/initconf.json

@@ -1,8 +1,7 @@
 {
-  "dns": ["adminapx"],
+  "dns": ["devfarm-ants"],
   "towns": [
-    { "townId": "wall", "nationId": "ants", "url": "wall-ants.ndda.fr" },
-    { "townId": "hill", "nationId": "ants", "url": "hill-ants.ndda.fr" }
+    { "townId": "wall", "nationId": "ants", "dns": "wall-ants.ndda.fr" }
   ],
   "api": {
     "port": 3020,

adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache

@@ -1,49 +1,49 @@
 server {
-   server_name {{#dns}} {{.}} {{/dns}};
-   access_log  {{{nginx.logs}}}.access.log main;
+server_name {{#dns}} {{.}} {{/dns}};
+access_log {{{nginx.logs}}}.access.log main;
 
-   location ~* /nationchains/(schema|blocks|pagans|towns|nations)/ {
-      # Warning: never add tribes for keeping it private
-      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 {{{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";
-   }
-
-   location /cdn/ {
-     rewrite /cdn/(.*$) /$1 break;
-     root {{{nginx.fswww}}}www/cdn/;
-    }
-
-  location /spacedev/ {
-     rewrite /spacedev/(.*$) /$1 break;
-     root {{{nginx.fswww}}}spacedev/{{{nginx.website}}}/dist/;
-    }
-  
-   location /api/ {
-     rewrite /api/(.*$) /$1 break;
-     proxy_pass http://localhost:{{{api.port}}};
-     proxy_redirect off;
-     include proxy_params;
-    }
-   
-   location / {
-     root {{{nginx.fswww}}}/{{{nginx.website}}};
-     index index.html {{{nginx.pageindex}}};
-   }
-    error_page  404              /404.html;
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/local/nginx/html;
-    }
+location ~* /nationchains/(schema|blocks|pagans|towns|nations)/ {
+# Warning: never add tribes for keeping it private
+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 {{{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";
+}
+
+location /cdn/ {
+rewrite /cdn/(.*$) /$1 break;
+root {{{nginx.fswww}}}/cdn/;
+}
+
+location /spacedev/ {
+rewrite /spacedev/(.*$) /$1 break;
+root {{{nginx.fswww}}}spacedev/{{{nginx.website}}}/dist/;
+}
+
+location /api/ {
+rewrite /api/(.*$) /$1 break;
+proxy_pass http://localhost:{{{api.port}}};
+proxy_redirect off;
+include proxy_params;
+}
+
+location / {
+root {{{nginx.fswww}}}/{{{nginx.website}}};
+index index.html {{{nginx.pageindex}}};
+}
+error_page 404 /404.html;
+# redirect server error pages to the static page /50x.html
+#
+error_page 500 502 503 504 /50x.html;
+location = /50x.html {
+root /usr/local/nginx/html;
+}
+}

adminapi/www/adminapx/conf/setup_xx.json

@@ -0,0 +1 @@
+{"nationId":"ants","townId":"devfarm","dns":["devfarm-ants"],"comment":"Auto generate setup from apxtrib after node apxtrib nationId:value townId:value dns:domaine_to_access"}