From a94174e94accd7c519d3a0092cf396cfe0459454 Mon Sep 17 00:00:00 2001
From: philc <phc@ndda.fr>
Date: Tue, 26 Nov 2024 16:14:06 +0100
Subject: [PATCH] update setup

---
 apxtri/setup/initadminapi.json | 3 +++
 apxtri/setup/nginx.wwwscf      | 4 ++--
 apxtri/setup/setup.sh          | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apxtri/setup/initadminapi.json b/apxtri/setup/initadminapi.json
index e225b09..38c53d7 100644
--- a/apxtri/setup/initadminapi.json
+++ b/apxtri/setup/initadminapi.json
@@ -6,6 +6,9 @@
     "nationId": "",
     "townId": "",
     "sudoUser": "",
+    "socket":{
+        "port":3031
+    },
     "api": {
         "port": 3021,
         "activelog": [],
diff --git a/apxtri/setup/nginx.wwwscf b/apxtri/setup/nginx.wwwscf
index 70d287b..4772dd6 100644
--- a/apxtri/setup/nginx.wwwscf
+++ b/apxtri/setup/nginx.wwwscf
@@ -50,12 +50,12 @@ location /cdn/ {
 }
 location /api/ {
     rewrite /api/(.*$) /$1 break; 
-    proxy_pass http://localhost:{{{apiport}}};
+    proxy_pass http://localhost:{{{api.port}}};
     proxy_redirect off;
     include proxy_params;
 }
 location /socket/ {
-    proxy_pass http://127.0.0.1:{{socketport}};
+    proxy_pass http://127.0.0.1:{{socket.port}};
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';
diff --git a/apxtri/setup/setup.sh b/apxtri/setup/setup.sh
index 2d6ff6d..8eae998 100755
--- a/apxtri/setup/setup.sh
+++ b/apxtri/setup/setup.sh
@@ -30,10 +30,10 @@ codekey=$4 # code to access backend of the tribe in case it is not newtribe or a
 
 function help {
    echo "Need more params, cmd must be $ . setup.sh <tribename> <url to get data> <gitrepourl> <codekey to getdata>"
-   echo "Example1: . setup.sh adminapi https://app1.smatchit.io?code= https://gitea.ndda.fr/apxtri/adminapi"
-   echo "          install adminapi from the repo (with git accessright) and get data for adminapi from testwall-ants.nnda.fr"
-   echo "Example2: setup.sh smatchit https://admin.smatchit.io?code=1234"
-   echo "          install smatchit as a copy of testwall-ants.ndda.fr but not from the git (you don't need to have git acess but need to know a specific code)"
+   echo "Example1: . setup.sh adminapi https://app1.smatchit.io https://gitea.ndda.fr/apxtri/adminapi"
+   echo "          install adminapi from the repo (with git accessright) and get data for adminapi from app1.smatchit.io"
+   echo "Example2: setup.sh smatchit https://admin.smatchit.io 1234"
+   echo "          install smatchit as a copy of admin.smatchit.io but not from the git (you don't need to have git acess but need to know a specific code like 1234)"
    echo "Example3: setup.sh smatchit newtribe"
    echo "          create a new empty tribe"
 }