michael.heier/mynode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove tor v2 services

Browse Source
This commit is contained in:
Taylor Helsper 2021-11-03 22:24:48 -05:00
parent 3d70ecdd4f
commit 1b6e77a4d5
4 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootfs/standard/etc/tor/torrc
View File

@ -246,12 +246,6 @@ HiddenServiceDir /var/lib/tor/mynode_btc/
HiddenServiceVersion 3
HiddenServicePort 8332 127.0.0.1:8332
# Hidden Service for myNode (BTC) v2
HiddenServiceDir /var/lib/tor/mynode_btc_v2/
HiddenServiceVersion 2
HiddenServiceAuthorizeClient stealth mynode
HiddenServicePort 8332 127.0.0.1:8332
# Hidden Service for myNode (LND)
HiddenServiceDir /var/lib/tor/mynode_lnd/
HiddenServiceVersion 3

2
rootfs/standard/var/www/mynode/device_info.py
View File

@ -1056,7 +1056,7 @@ def get_tor_version():
if "tor_version" in cached_data:
return cached_data["tor_version"]
cached_data["tor_version"] = subprocess.check_output("tor --version | egrep -o '[0-9\\.]+'", shell=True).strip().strip(".")
cached_data["tor_version"] = subprocess.check_output("tor --version | head -n 1 | egrep -o '[0-9\\.]+[0-9]'", shell=True).strip().strip(".")
return cached_data["tor_version"]

34
rootfs/standard/var/www/mynode/templates/tor.html
View File

@ -87,7 +87,7 @@
</div>
<br/>
<div class="sub_header">v3 Addresses</div>
<div class="sub_header">Tor Services</div>
<table class="bitcoin_table">
<thead class="bitcoin_table_header">
<td>Service</td>
@ -127,38 +127,6 @@
</table>
<br/>
<div class="sub_header">v2 Addresses</div>
<table class="bitcoin_table">
<thead class="bitcoin_table_header">
<td>Service</td>
<td>Address</td>
<td>Password</td>
<td>Port</td>
<td>Guide</td>
</thead>
<tbody>
{% for service in v2_services %}
<tr>
<td><b>{{ service.service }}</b></td>
<td>
<span class="onion_url">{{ service.url }}</span>
<span class="onion_url_placeholder">..........................................</span>
</td>
<td>
<span class="onion_password">{{ service.password }}</span>
<span class="onion_password_placeholder">..........................................</span>
</td>
<td>{{ service.port }}</td>
<td>
{% if service.guide|length %}
<a href="{{ service.guide }}" target="_blank">Guide</a>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
<br/>
<div class="main_header">Tor Connected Apps</div>
<div class="app_tile_row">

9
rootfs/standard/var/www/mynode/tor.py
View File

@ -53,10 +53,7 @@ def page_tor():
btcpay_onion_url = get_onion_url_btcpay()
sphinxrelay_onion_url = get_onion_url_sphinxrelay()
btc_info_v2 = get_onion_info_btc_v2()
# Services
# v3 Services
v3_services = []
v3_services.append(create_v3_service("myNode Web", general_onion_url, "80", True, ""))
v3_services.append(create_v3_service("WebSSH", general_onion_url, "2222 / 2223", True, ""))
@ -81,9 +78,6 @@ def page_tor():
v3_services.append(create_v3_service("Electrum Server", electrs_onion_url, "50002", False, "https://mynodebtc.github.io/tor/electrum.html"))
v3_services.append(create_v3_service("Sphinx Relay", sphinxrelay_onion_url, "53001", True, ""))
v2_services = []
v2_services.append({"service": "Bitcoin API (REST)", "url": btc_info_v2["url"], "password": btc_info_v2["pass"], "port": "8332","guide":""})
# App links
rpc_password = get_bitcoin_rpc_password()
fully_noded_link = "btcstandup://mynode:{}@{}:8332?label=myNode%20Tor".format(rpc_password, btc_onion_url)
@ -93,7 +87,6 @@ def page_tor():
"title": "myNode Tor Services",
"version": get_tor_version(),
"v3_services": v3_services,
"v2_services": v2_services,
"fully_noded_link": fully_noded_link,
"ui_settings": read_ui_settings()
}