From b0e3991e68bb9e30563d3eec8edc7f01082246d5 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sat, 2 Nov 2024 20:01:23 +0000 Subject: [PATCH] Add over the moon coordinator (#1591) * Add over the moon coordinator * Add Over the Moon to self-hosted backend * Add over the moon avatar --------- Co-authored-by: Reckless_Satoshi --- frontend/static/federation.json | 46 ++++++++++++ .../static/federation/avatars/moon.small.webp | Bin 0 -> 2082 bytes frontend/static/federation/avatars/moon.webp | Bin 0 -> 5820 bytes ...D833CB2258715B4E627291942B7D51A8533742.asc | 54 ++++++++++++++ nodeapp/coordinators/exp/upstreams.conf | 9 --- .../coordinators/{exp => moon}/locations.conf | 32 ++++----- nodeapp/coordinators/moon/upstreams.conf | 9 +++ .../coordinators/satstralia/locations.conf | 67 ------------------ .../coordinators/satstralia/upstreams.conf | 9 --- nodeapp/nginx.conf | 12 ++-- nodeapp/robosats-client.sh | 38 ++++------ 11 files changed, 142 insertions(+), 134 deletions(-) create mode 100644 frontend/static/federation/avatars/moon.small.webp create mode 100644 frontend/static/federation/avatars/moon.webp create mode 100644 frontend/static/federation/pgp/19D833CB2258715B4E627291942B7D51A8533742.asc delete mode 100644 nodeapp/coordinators/exp/upstreams.conf rename nodeapp/coordinators/{exp => moon}/locations.conf (74%) create mode 100644 nodeapp/coordinators/moon/upstreams.conf delete mode 100644 nodeapp/coordinators/satstralia/locations.conf delete mode 100644 nodeapp/coordinators/satstralia/upstreams.conf diff --git a/frontend/static/federation.json b/frontend/static/federation.json index 590614d35..6e32862d5 100644 --- a/frontend/static/federation.json +++ b/frontend/static/federation.json @@ -142,6 +142,52 @@ "mainnetNodesPubkeys": ["02c5b5972b05fba2cd2c2d9269a47bc478f73fae0f248a85cb1e5af60a07c1919d"], "testnetNodesPubkeys": ["032b698c8143f293d138c0926594f11d119194ddedb513f63a944d14c094d0e54a"] }, + "moon": { + "longAlias": "Over the moon", + "shortAlias": "moon", + "identifier": "moon", + "description": "Forget \"to the moon\", at Over the Moon we are here to take no-KYC, p2p exchange to the next level! Our goal is to further decentralise the RoboSats federation whilst providing the maximum level of privacy and security for our users. *Trade amounts increase by 30% every 2016 blocks (~2 weeks).", + "motto": "Bene videtur hinc", + "color": "#eeeee4", + "established": "2024-11-01", + "nostrHexPubkey": "7af6f7cfc3bfdf8aa65df2465aa7841096fa8ee6b2d4d14fc43d974e5db9ab96", + "contact": { + "email": "otmoon@proton.me", + "telegram": "", + "simplex": "https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2FUkMFNAXLXeAAe0beCa4w6X_zp18PwxSaSjY17BKUGXQ%3D%40smp12.simplex.im%2FtrEIGy97lLpA9IeAc6axGF6J6vWK6U6r%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAj8vhZDsAf8au1XSFG43DWZzzFYUnGNi9RAXMVvG2znk%253D%26srv%3Die42b5weq7zdkghocs3mgxdjeuycheeqqmksntj57rmejagmg4eor5yd.onion", + "pgp": "/static/federation/pgp/19D833CB2258715B4E627291942B7D51A8533742.asc", + "nostr": "npub10tm00n7rhl0c4fja7fr94fuyzzt04rhxkt2dzn7y8kt5uhde4wtq899xam", + "website": "", + "fingerprint": "19D833CB2258715B4E627291942B7D51A8533742" + }, + "badges": { + "isFounder": false, + "donatesToDevFund": 25, + "hasGoodOpSec": true, + "robotsLove": false, + "hasLargeLimits": false + }, + "policies": { + "Privacy Policy 1": "Evidence in Disputes: In the event of a dispute, users will be asked to provide transaction-related evidence. This could include transaction IDs, screenshots of payment confirmations, or other pertinent transaction records. Personal information or unrelated transaction details should be redacted to maintain privacy.", + "Privacy Policy 2": "Short-term Storage: Sensitive information related to disputes will be stored only for the duration necessary to resolve the issue. Once resolved, the data will be permanently deleted.", + "Data Policy 1": "No Third-Party Sharing: Under no circumstances will user information be shared with third parties. Also because it is impossible to do so by design of Robosats architecture. Due to the decentralized and privacy-centric structure of RoboSats built on the Tor network, we are unable to collect or store user information, including but not limited to, the location of users. This design ensures maximum privacy and anonymity for our users.", + "Data Policy 2": "Short-term Storage: Any log needed to operate the coordinator will be cleared after 7 days, unless strictly needed to process disputes. To ensure utmost privacy, the coordinator will be accessible only through TOR.", + "Rule 1:": " Do not share personal information through the chat, unless strictly needed for completing the trade.", + "Rule 2:": "Users are solely responsible for understanding and complying with their local laws and regulations regarding cryptocurrency transactions. By using this coordinator, you agree to ensure that your activities on the platform are lawful in your jurisdiction." + }, + "mainnet": { + "onion": "http://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion", + "clearnet": "", + "i2p": "" + }, + "testnet": { + "onion": "http://otmtestgbj3kqo3nre6oksusuqfb4ids5zg2y5z2qza2jogeu67stwid.onion", + "clearnet": "", + "i2p": "" + }, + "mainnetNodesPubkeys": ["023924542082a5d16bce188ec4c29a45f00dd439a3f5992034d82e3353232a0345"], + "testnetNodesPubkeys": ["02f0ddc838b35fe54daa13baa4abab84475c7b9f2670ff4b53c1724792843ef62a"] + }, "local": { "longAlias": "Local Dev", "shortAlias": "local", diff --git a/frontend/static/federation/avatars/moon.small.webp b/frontend/static/federation/avatars/moon.small.webp new file mode 100644 index 0000000000000000000000000000000000000000..3e3b51a70b7698e224d89fe5392a0eb3e100c685 GIT binary patch literal 2082 zcmV+-2;KKmNk&E*2mky}&aETDksC>h6fv;8r@|+Y zqs=3sIy}>+#%zr~KTzRFGx@W9Y4bAULbJ=wrFJj01#!luHF3};O=tBcXD9QUYNsUq z>I)0_MfFS36eX5rOrjL!mYi)oK0>)g*u%A%$f*Q0xz#og|9V(7xkV=smrSkUZ6 zJztus7xv`KRN2SBPH)FTxo>Fps4nw`?hE$nMe+aC?O68fPF-R6uy-p3$3*I%&xwDh zo+AeEsOeus76BXmE6?6Dgh~J3D9aeCzl+Kj2H{KRpR6;C>wi|z8ys%heiP(44Ps;O0=gIT>z_hubs2?Lpx7G;n()xIGu#9u9v`SQJpHENP{VT&HsBom2+#~>2P&gn41^@tX9sr#IDo_AW06u9fkVT{-p_Xl*bU+4# zv;b%7A%cJAIaE1#$j-9y-TDFU18fJF57#cBAM5=A?jTS#*TxHY=pOP8QJ+`f zOFNWP?+gb zRr|4eju9U^{)!EtmP3e!)6@U}@SqcEcnnmsa8L5C>=XU_-}`?9x$_L4e1D3u@5GdW zB=%TkzsOZ%^7}YU>uTTrY;O@BilL!Xsa*+P#>*omOe=&T$ z5s3HMc>+uWg3n0D9LXjr4LF~&-V?WiuxjUf4LHRdl?HwVuJn2_%+FUrf=Y6A?Z97l zv?U1!gq@>Il{g~={#%ZYV6h<~&TXs2F{FV9sBTLaY$Qz@2>+XAIz8p%?N8VH$}MCp z;F2NvDiQfD^9MMim;F|#F)X9QoeH_#6M0s|w}T`ft>Ud%a|@~eZgi_UP5wIg@1%4~ z5VzsL5rUHharL&2`_tafwp~OjlbdE6d18f=x!D^vxr0^62 zYnzw(R%)tCdlIoJj-1R#@Ma@obPw}62t3|<=l^M$@G|IhMLrf_@% zxu!AN;olFw^e%!Tl>189J91jMez&@P8HBh;0m^jJkvl%wV*BHvmT%)14yy52BslBX zWC<0fb5pE8(T}5*$J(S9p2%Dr> zbG{kk9d#+7bY|Sp{8J2AKPl}>93WHzhFER7rbMVm8LZ|*A_D{t=aO%c~YL6UP!PnL{@D2ciLDJge zN)L!{nY{d8{(e7vt^iT8OtLC7`Qg)WN+a8X_@Dk$D48c_e38EIQ}b7JUf5!{SuP%F z^LPbwk>3GZjFkB=U15C^#+{zad`Wm!ZUXmIBI-uiJc2g-<2R8{D579ePB5eU%>&~u z`d8AxUAj3~V>&i>T+MaYxf$Vq#?dWB;+IU`F*_i=Dp&vFE=GrCbx>A}mLSg9{s8RT zEoaRnWH@U9WF~yIt3`;atjN-tiC^1}_C3$}r5}`{Wl6iRmt|(2$C+)br|p?t4>G6o z-yK~%E4F<#hhAm0z4Rn|K-sJ}Cj+g~p<&z%YE^LeHLtKdaf|5L7fE;Ybhvc~^Wr!0 z8BwbgKwG&P1IEY={fq; z80KHDxvHjcrh^aOAGDn~?AK@A=5(-CELq{R!5Q_`{gVR(P31#I3*~G&TId>?7g71< z8DZIhFPstSEz|9sb?0FFn;Y{LU)0PpW6|Wv#7`o#|(2|kmG=_spAEvdH8791=o4C zpcvgoyqZ`GeQE1agN|SYbe8Vv!3#j)W&A+Uv7d)J$?U}}T0hPSrlLzw#?2;tn-k1N zK+6)sO6hTEj&~yrVIk-T^Ie+-{y&iG)WIG0wwL;7_gk+dqMTgo0zm5+t>V#l%k>KF zBD2uO)B5)ff;R$giWzQxiL!io5+}4xMCR%8)CTaVLD;E}KU_9>@YQKw__|MDn5=5A M=mtM;$U}et05H80@c;k- literal 0 HcmV?d00001 diff --git a/frontend/static/federation/avatars/moon.webp b/frontend/static/federation/avatars/moon.webp new file mode 100644 index 0000000000000000000000000000000000000000..3d7fad7b937de10e389a751f0a63055c35d9d990 GIT binary patch literal 5820 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

OW-LQ475bWhVR6E ziR31~InfPAY?=^M;%6jUiQ;QOHB@>8ll;8u_IvREVM%$Mh4=6|Tgs29*yb~h`Pbee zlXqf%gR&=Q+-rfSTSWb_>|$N5HF-(&y1m`3qN2ERJ-Nwvmc93aA&)CLk&A8ed!^Y+ z^{;AVm}BT=t6#UBI$nDhp77k4fU--tr&zsb>>Wr8l4gf%fX`Qp6iT1nei%0 z*dDKa@Wya+wr$>;(AZ6!#URulYlSpp9Cyaq>7sYKTEs(>nG|(a;yv&AW^Iq*H6_^_ zZ|H1`)f4768*%hkyFAIceKR^bBPwLo)KMA`-I{d>cMf0w{!)*sU#4bcWNrt@{E?qS zA{-y*O#EWpQ$+`H~qwbFh+Ol`IpKVe(yE&Xd-)gHeJgQUxhP4?#L(Vsq#RcAM8-s zVfK*G;rx_&2k15DH*V1R zMjWS}%3k}K`!QzVta>B0KV9Oiocih2-a$cH@$tdz-`p2aaIXDD5rxd7)a~2Zv5%-7 z*U35Up7|e8|GyFOGOZD@&aBZ#ppnCpojVm2CsA8=Rn3rYN|4=vcq^wDuhN0J2oIXZ zCNO@h0p<&`gTp}pQ8alqcM6s{>BGyu)nu6*8HrV4bXjiz*MO%Idu;Mc+2lq^ZHul} zUReoEyoClF8u#%Pl-Kq42^nXzi5dpo?X}6d6f1^#otBxN!R{89!iZSsctiF;kLMA4 zuyu1xqN4GiqIqmpX0C72O>+K;Z*fa;tLAL!&^e>LX1H$Ea3s^Sqvo`t+4&xfdMQUj z6v-Y|sqNi5ITEeT_jue>5dGdvt{1sb@I4?V?iylD5K}Hmq6mG@j&0Ew2Fy((?6T>6 z>%Fon{7D6x#Jk%}-G})h1}S>4n-$L;@R1<&KmEtyf=Y%2Ylvp3L}2no186(=|B7}& zk=)NR>xgDO`c{LH?cpt3?t71qTuEOK>$|UX2!vB z4V_raUH%>Rwe?@GB$(dW@@I9SXY>jdac+y8w)m^5{=Xa!ttzE1>e(O+eXN}EE2O0; z&oBqhP_O1ID=Y*{NkUJ@q~+Us#L=W<%70i#}wOPr@O zi2@aS=}lh;f{+Lt zcud!6w{Dhy2{v4glT-tCjH~1?e=fZ35sCoS3v@=<7(=VNP=R90tb6-&Gf>N;PBo~J8e1f#KmQC81a%EhO7Gw5BQmz z-F%om3iWY(UzlqQBV$RMN23g;*#7|!X8gTf!<_36J|?y!qlN1{CN{02_3E*ge!cAZ z8KVx6D>wt=<4>j-iW8NvYETWiE>IprJtV=6_+P|h2)TUS$5YFr+wJi%GS6A_Zxn<# zn2=7@+T(bTQ=s*^dRGR6u6fB|7l4%JNALpTC}=V8I{8D&3K1{~(mBL14qN@cp=63N zp@1YuJ|m;fZlY&IrNotqP-brZ#e&M?!?&k`h4)MeT8bm@qdKszj~wyBLT+waUh@%a z3c`RlbVB-QGb#o|o>)`8+Mx7ryu@f419%YoYD@{NtsZcNV^6Bv;!4%EW-fIS97Lg|rra}&tlS&4_6x9Xhmt~-eU>%FLgjZY2dl~0&mFAHvj(e6C8#z-)ZQU7$t#iovTNzZYVr1ma=;Nm<`=(o0Pp#(q>c|uDcd2gY zfbwfA`Cd@Uo;CxNz_-dx(biKRk7P_LzyL5Ie0fji*f8{S<= G0001Nom}kz literal 0 HcmV?d00001 diff --git a/frontend/static/federation/pgp/19D833CB2258715B4E627291942B7D51A8533742.asc b/frontend/static/federation/pgp/19D833CB2258715B4E627291942B7D51A8533742.asc new file mode 100644 index 000000000..db985782e --- /dev/null +++ b/frontend/static/federation/pgp/19D833CB2258715B4E627291942B7D51A8533742.asc @@ -0,0 +1,54 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: 19D8 33CB 2258 715B 4E62 7291 942B 7D51 A853 3742 +Comment: Over the Moon + +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 +wfIn16AyVN4= +=sjet +-----END PGP PUBLIC KEY BLOCK----- diff --git a/nodeapp/coordinators/exp/upstreams.conf b/nodeapp/coordinators/exp/upstreams.conf deleted file mode 100644 index 8628e8b43..000000000 --- a/nodeapp/coordinators/exp/upstreams.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Experimental Coordinator Mainnet -upstream mainnet_exp { - server localhost:101; -} - -# Experimental Coordinator Testnet -upstream testnet_exp { - server localhost:1001; -} \ No newline at end of file diff --git a/nodeapp/coordinators/exp/locations.conf b/nodeapp/coordinators/moon/locations.conf similarity index 74% rename from nodeapp/coordinators/exp/locations.conf rename to nodeapp/coordinators/moon/locations.conf index 6a31d01cc..7156cdbd1 100644 --- a/nodeapp/coordinators/exp/locations.conf +++ b/nodeapp/coordinators/moon/locations.conf @@ -1,9 +1,9 @@ -# Experimental Coordinator Mainnet Locations -location /mainnet/exp/static/assets/avatars/ { - proxy_pass http://mainnet_exp/static/assets/avatars/; +# Over the Moon Mainnet Locations +location /mainnet/moon/static/assets/avatars/ { + proxy_pass http://mainnet_moon/static/assets/avatars/; } -location /mainnet/exp/api/ { +location /mainnet/moon/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'; @@ -22,44 +22,44 @@ location /mainnet/exp/api/ { # 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_exp/api/; + proxy_pass http://mainnet_moon/api/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $host; } -location /mainnet/exp/ws/ { - proxy_pass http://mainnet_exp/ws/; +location /mainnet/moon/ws/ { + proxy_pass http://mainnet_moon/ws/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $host; } -location /mainnet/exp/nostr/ { - proxy_pass http://mainnet_exp/nostr/; +location /mainnet/moon/nostr/ { + proxy_pass http://mainnet_moon/nostr/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $host; } -# Experimental Coordinator Testnet Locations -location /test/exp/static/assets/avatars/ { - proxy_pass http://testnet_exp/static/assets/avatars/; +# Over the Moon Coordinator Testnet Locations +location /test/moon/static/assets/avatars/ { + proxy_pass http://testnet_moon/static/assets/avatars/; } -location /testnet/exp/api/ { - proxy_pass http://testnet_exp/api/; +location /testnet/moon/api/ { + proxy_pass http://testnet_moon/api/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $host; } -location /testnet/exp/ws/ { - proxy_pass http://testnet_exp/ws/; +location /testnet/moon/ws/ { + proxy_pass http://testnet_moon/ws/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; diff --git a/nodeapp/coordinators/moon/upstreams.conf b/nodeapp/coordinators/moon/upstreams.conf new file mode 100644 index 000000000..a56a057ed --- /dev/null +++ b/nodeapp/coordinators/moon/upstreams.conf @@ -0,0 +1,9 @@ +# Over the Moon Coordinator Mainnet +upstream mainnet_moon { + server localhost:106; +} + +# Over the Moon Coordinator Testnet +upstream testnet_moon { + server localhost:1006; +} \ No newline at end of file diff --git a/nodeapp/coordinators/satstralia/locations.conf b/nodeapp/coordinators/satstralia/locations.conf deleted file mode 100644 index 4d17e5da4..000000000 --- a/nodeapp/coordinators/satstralia/locations.conf +++ /dev/null @@ -1,67 +0,0 @@ -# Satstralia Mainnet Locations -location /mainnet/satstralia/static/assets/avatars/ { - proxy_pass http://mainnet_satstralia/static/assets/avatars/; -} - -location /mainnet/satstralia/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_satstralia/api/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -location /mainnet/satstralia/ws/ { - proxy_pass http://mainnet_satstralia/ws/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -location /mainnet/satstralia/nostr/ { - proxy_pass http://mainnet_satstralia/nostr/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -# Satstralia Coordinator Testnet Locations -location /test/satstralia/static/assets/avatars/ { - proxy_pass http://testnet_satstralia/static/assets/avatars/; -} - -location /testnet/satstralia/api/ { - proxy_pass http://testnet_satstralia/api/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; -} - -location /testnet/satstralia/ws/ { - proxy_pass http://testnet_satstralia/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/satstralia/upstreams.conf b/nodeapp/coordinators/satstralia/upstreams.conf deleted file mode 100644 index fb116b78e..000000000 --- a/nodeapp/coordinators/satstralia/upstreams.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Satstralia Coordinator Mainnet -upstream mainnet_satstralia { - server localhost:103; -} - -# Satstralia Coordinator Testnet -upstream testnet_satstralia { - server localhost:1003; -} \ No newline at end of file diff --git a/nodeapp/nginx.conf b/nodeapp/nginx.conf index 6b0eedd52..612ebe217 100644 --- a/nodeapp/nginx.conf +++ b/nodeapp/nginx.conf @@ -28,16 +28,14 @@ http { # Every robosat coordinators socat tor bridge is an upstream. # Coordinators in the federation: - # Experimental - include /etc/nginx/conf.d/exp/upstreams.conf; # Temple of Sats include /etc/nginx/conf.d/temple/upstreams.conf; - # Satstralia - include /etc/nginx/conf.d/satstralia/upstreams.conf; # TheBigLake include /etc/nginx/conf.d/lake/upstreams.conf; # BitcoinVeneto include /etc/nginx/conf.d/veneto/upstreams.conf; + # Over the Moon + include /etc/nginx/conf.d/moon/upstreams.conf; server { @@ -70,16 +68,14 @@ http { # Proxy API, WS and Avatarts to the coordinator(s) socat bridges - # Experimental - include /etc/nginx/conf.d/exp/locations.conf; # Temple of Sats include /etc/nginx/conf.d/temple/locations.conf; - # Satstralia - include /etc/nginx/conf.d/satstralia/locations.conf; # TheBigLake include /etc/nginx/conf.d/lake/locations.conf; # BitcoinVeneto include /etc/nginx/conf.d/veneto/locations.conf; + # Over the Moon + include /etc/nginx/conf.d/moon/locations.conf; # do not log healtchecks made against "/selfhosted" location /selfhosted { diff --git a/nodeapp/robosats-client.sh b/nodeapp/robosats-client.sh index f3d7376b4..98fa7fed0 100644 --- a/nodeapp/robosats-client.sh +++ b/nodeapp/robosats-client.sh @@ -8,18 +8,6 @@ # Every robosat coordinators needs a tor socat bridge. -############################### -# Experimental -# 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 # Mainnet @@ -32,18 +20,6 @@ testnet_temple_port=1002 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}" -################################ -# Satstralia -# Mainnet -mainnet_satstralia_onion=satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion -mainnet_satstralia_port=103 -# Testnet -testnet_satstralia_onion=testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion -testnet_satstralia_port=1003 -# socat cmd -mainnet_satstralia_socat="socat tcp4-LISTEN:${mainnet_satstralia_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_satstralia_onion}:80,socksport=${TOR_PROXY_PORT:-9050}" -testnet_satstralia_socat="socat tcp4-LISTEN:${testnet_satstralia_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_satstralia_onion}:80,socksport=${TOR_PROXY_PORT:-9050}" - ################################ # TheBigLake # Mainnet @@ -68,6 +44,18 @@ testnet_veneto_port=1005 mainnet_veneto_socat="socat tcp4-LISTEN:${mainnet_veneto_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_veneto_onion}:80,socksport=${TOR_PROXY_PORT:-9050}" testnet_veneto_socat="socat tcp4-LISTEN:${testnet_veneto_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_veneto_onion}:80,socksport=${TOR_PROXY_PORT:-9050}" +################################ +# Over the Moon +# Mainnet +mainnet_moon_onion=otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion +mainnet_moon_port=106 +# Testnet +testnet_moon_onion=otmtestgbj3kqo3nre6oksusuqfb4ids5zg2y5z2qza2jogeu67stwid.onion +testnet_moon_port=1006 +# socat cmd +mainnet_moon_socat="socat tcp4-LISTEN:${mainnet_moon_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_moon_onion}:80,socksport=${TOR_PROXY_PORT:-9050}" +testnet_moon_socat="socat tcp4-LISTEN:${testnet_moon_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_moon_onion}:80,socksport=${TOR_PROXY_PORT:-9050}" + # RUN! -$mainnet_exp_socat & $testnet_exp_socat & $mainnet_temple_socat & $testnet_temple_socat & $mainnet_satstralia_socat & $testnet_satstralia_socat & $mainnet_lake_socat & $testnet_lake_socat & $mainnet_veneto_socat & $testnet_veneto_socat & nginx \ No newline at end of file +$mainnet_temple_socat & $testnet_temple_socat & $mainnet_lake_socat & $testnet_lake_socat & $mainnet_veneto_socat & $testnet_veneto_socat & $mainnet_moon_socat & $testnet_moon_socat & nginx \ No newline at end of file