Remove template coordinator

RoboSats · Nov 3, 2023 · 5363bfb · 5363bfb
1 parent 005349d
commit 5363bfb
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 125 deletions.
diff --git a/frontend/static/federation.json b/frontend/static/federation.json
@@ -82,43 +82,6 @@
     "mainnetNodesPubkeys": ["030a425f5c69a29db30f6740d4e7df8f5612ef9955078ef4497490015464733dc8"],
     "testnetNodesPubkeys": ["028e7a019180a664b84edf77ba656e96f2eb84f67f56d93020341caf4109e0dbc7"]
   },
-  "temp": {
-    "longAlias": "Template",
-    "shortAlias": "temp",
-    "description": "Mirror of 'Experimental'. Just to start testing the client with multiple coordinators",
-    "motto": "Don't trust, verify",
-    "color": "#000000",
-    "contact": {
-      "email": "[email protected]",
-      "telegram": "examplecoordinator",
-      "twitter": "examplecoordinator",
-      "matrix": "#example:matrix.org",
-      "website": "https://example.coordinator.com"
-    },
-    "badges": {
-      "isFounder": true,
-      "donatesToDevFund": 20,
-      "hasGoodOpSec": true,
-      "robotsLove": true,
-      "hasLargeLimits": true
-    },
-    "policies": {
-      "Rule #1": "You do not talk about RoboSats Club",
-      "Rule #2": "You DO NOT talk about RoboSats Club",
-      "Privacy Policy": "...",
-      "Data Policy": "..."
-    },
-    "mainnet": {
-      "onion": "http://robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion",
-      "clearnet": "http://127.0.0.1:12596/mainnet/exp"
-    },
-    "testnet": {
-      "onion": "http://robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion",
-      "clearnet": "http://127.0.0.1:12596/testnet/exp"
-    },
-    "mainnetNodesPubkeys": ["0282eb467bc073833a039940392592bf10cf338a830ba4e392c1667d7697654c7e"],
-    "testnetNodesPubkeys": ["03ecb271b3e2e36f2b91c92c65bab665e5165f8cdfdada1b5f46cfdd3248c87fd6"]
-  },
   "local": {
     "longAlias": "Local Dev",
     "shortAlias": "local",

diff --git a/frontend/static/federation/temp.small.webp b/frontend/static/federation/temp.small.webp
diff --git a/frontend/static/federation/temp.webp b/frontend/static/federation/temp.webp
diff --git a/nodeapp/coordinators/temp/locations.conf b/nodeapp/coordinators/temp/locations.conf
diff --git a/nodeapp/coordinators/temp/upstreams.conf b/nodeapp/coordinators/temp/upstreams.conf
diff --git a/nodeapp/nginx.conf b/nodeapp/nginx.conf
@@ -27,9 +27,11 @@ http {
     keepalive_timeout  65;
 
     # Every robosat coordinators socat tor bridge is an upstream.
-    # Experimental Coordinator
+    # Coordinators in the federation:
+    # Experimental
     include /etc/nginx/conf.d/exp/upstreams.conf;
-    include /etc/nginx/conf.d/temp/upstreams.conf;
+    # Temple of Sats Coordinator
+    include /etc/nginx/conf.d/temple/upstreams.conf;
 
     server {
 
@@ -62,8 +64,10 @@ http {
 
 
         # Proxy API, WS and Avatarts to the coordinator(s) socat bridges
+        # Experimental
         include /etc/nginx/conf.d/exp/locations.conf;
-        include /etc/nginx/conf.d/temp/locations.conf;
+        # Temple of Sats
+        include /etc/nginx/conf.d/temple/locations.conf;
 
         # do not log healtchecks made against "/selfhosted"
         location /selfhosted {

diff --git a/nodeapp/robosats-client.sh b/nodeapp/robosats-client.sh
@@ -8,39 +8,30 @@
 
 # Every robosat coordinators needs a tor socat bridge.
 
+###############################
 # Experimental Coordinator
 # Mainnet
 mainnet_exp_onion=robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion
 mainnet_exp_port=101
 # Testnet
 testnet_exp_onion=robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion
 testnet_exp_port=1001
+# socat cmd
+mainnet_exp_socat="socat tcp4-LISTEN:${mainnet_exp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_exp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
+testnet_exp_socat="socat tcp4-LISTEN:${testnet_exp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_exp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
 
+################################
 # Temple of Sats Coordinator
 # Mainnet
 mainnet_temple_onion=zixoneehmz7z2ctsnpuubcni4kxw5gp6fkyzjd2spo5atie5awiuwmyd.onion
 mainnet_temple_port=102
 # Testnet
 testnet_temple_onion=ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion
 testnet_temple_port=1002
-
-# Template Coordinator
-# Mainnet
-mainnet_temp_onion=robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion
-mainnet_temp_port=100
-# Testnet
-testnet_temp_onion=robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion
-testnet_temp_port=1000
-
-# ... add more
-
-mainnet_exp_socat="socat tcp4-LISTEN:${mainnet_exp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_exp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
-testnet_exp_socat="socat tcp4-LISTEN:${testnet_exp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_exp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
-
+# socat cmd
 mainnet_temple_socat="socat tcp4-LISTEN:${mainnet_temple_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_temple_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
 testnet_temple_socat="socat tcp4-LISTEN:${testnet_temple_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_temple_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
 
-mainnet_temp_socat="socat tcp4-LISTEN:${mainnet_temp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_temp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
-testnet_temp_socat="socat tcp4-LISTEN:${testnet_temp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_temp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
 
-$mainnet_exp_socat & $testnet_exp_socat & $mainnet_temple_socat & $testnet_temple_socat &$mainnet_temp_socat & $testnet_temp_socat & nginx
+# RUN!
+$mainnet_exp_socat & $testnet_exp_socat & $mainnet_temple_socat & $testnet_temple_socat & nginx