diff --git a/frontend/static/federation.json b/frontend/static/federation.json index a1c6cc57..33e0a444 100644 --- 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": "contact@contact.com", - "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 deleted file mode 100644 index b4d9766c..00000000 Binary files a/frontend/static/federation/temp.small.webp and /dev/null differ diff --git a/frontend/static/federation/temp.webp b/frontend/static/federation/temp.webp deleted file mode 100644 index 7eece612..00000000 Binary files a/frontend/static/federation/temp.webp and /dev/null differ diff --git a/nodeapp/coordinators/temp/locations.conf b/nodeapp/coordinators/temp/locations.conf deleted file mode 100644 index 7b4187a7..00000000 --- a/nodeapp/coordinators/temp/locations.conf +++ /dev/null @@ -1,59 +0,0 @@ -# Template Coordinator Mainnet Locations -location /mainnet/temp/static/assets/avatars/ { - proxy_pass http://mainnet_temp/static/assets/avatars/; -} - -location /mainnet/temp/api/ { - # if ($request_method = 'OPTIONS') { - # add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - # add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; - # add_header 'Access-Control-Max-Age' 1728000; - # add_header 'Content-Type' 'text/plain; charset=utf-8'; - # add_header 'Content-Length' 0; - # return 204; - # } - # if ($request_method = 'POST') { - # add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - # add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; - # add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; - # } - # if ($request_method = 'GET') { - # add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - # add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; - # add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; - # } - proxy_pass http://mainnet_temp/api/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -location /mainnet/temp/ws/ { - proxy_pass http://mainnet_temp/ws/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -# Template Coordinator Testnet Locations -location /test/temp/static/assets/avatars/ { - proxy_pass http://testnet_temp/static/assets/avatars/; -} - -location /testnet/temp/api/ { - proxy_pass http://testnet_temp/api/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -location /testnet/temp/ws/ { - proxy_pass http://testnet_temp/ws/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} \ No newline at end of file diff --git a/nodeapp/coordinators/temp/upstreams.conf b/nodeapp/coordinators/temp/upstreams.conf deleted file mode 100644 index 804838fa..00000000 --- a/nodeapp/coordinators/temp/upstreams.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Template Coordinator Mainnet -upstream mainnet_temp { - server localhost:100; -} - -# Template Coordinator Testnet -upstream testnet_temp { - server localhost:1000; -} \ No newline at end of file diff --git a/nodeapp/nginx.conf b/nodeapp/nginx.conf index 5d6345ba..8b00566c 100644 --- 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 index 4f9e2266..be645ac0 100644 --- a/nodeapp/robosats-client.sh +++ b/nodeapp/robosats-client.sh @@ -8,6 +8,7 @@ # Every robosat coordinators needs a tor socat bridge. +############################### # Experimental Coordinator # Mainnet mainnet_exp_onion=robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion @@ -15,7 +16,11 @@ 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 @@ -23,24 +28,10 @@ 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 \ No newline at end of file +# RUN! +$mainnet_exp_socat & $testnet_exp_socat & $mainnet_temple_socat & $testnet_temple_socat & nginx \ No newline at end of file