diff options
author | Linux User <jordan@winter.local> | 2023-06-24 00:13:26 +0000 |
---|---|---|
committer | Linux User <jordan@winter.local> | 2023-06-24 00:13:26 +0000 |
commit | 8cb2c53d2d01c13761627231e3d182002e3742d5 (patch) | |
tree | 3395c50eb6aabdeea20bcd07264c91b551af3de0 | |
parent | 38c02e531cefaf218655fc3b51bf4a409416a96a (diff) | |
download | www-master.tar.gz www-master.zip |
-rw-r--r-- | 0x7c0.com/Makefile (renamed from tracker.jordan.im/Makefile) | 2 | ||||
-rw-r--r-- | 0x7c0.com/index.7 | 42 | ||||
-rw-r--r-- | 0x7c0.com/index.html | 75 | ||||
-rw-r--r-- | 0x7c0.com/old.txt | 1 | ||||
-rw-r--r-- | 0x7c0.com/style.css (renamed from tracker.jordan.im/style.css) | 3 | ||||
-rwxr-xr-x | 0x7c0.com/update-stats.py (renamed from tracker.jordan.im/update-stats.py) | 0 | ||||
-rw-r--r-- | jordan.im/index.7 | 28 | ||||
-rw-r--r-- | jordan.im/index.html | 29 | ||||
-rw-r--r-- | jordan.im/style.css | 2 | ||||
-rw-r--r-- | tracker.0x7c0.com/Makefile | 14 | ||||
-rw-r--r-- | tracker.0x7c0.com/index.7 | 28 | ||||
-rw-r--r-- | tracker.0x7c0.com/index.html (renamed from tracker.jordan.im/index.html) | 32 | ||||
-rw-r--r-- | tracker.0x7c0.com/style.css | 22 | ||||
-rwxr-xr-x | tracker.0x7c0.com/update-stats.py | 41 | ||||
-rw-r--r-- | tracker.jordan.im/index.7 | 27 | ||||
-rw-r--r-- | whois.jordan.im/index.7 | 8 | ||||
-rw-r--r-- | whois.jordan.im/index.html | 8 | ||||
-rw-r--r-- | whois.jordan.im/style.css | 3 |
18 files changed, 271 insertions, 94 deletions
diff --git a/tracker.jordan.im/Makefile b/0x7c0.com/Makefile index 8ebf663..e5f0645 100644 --- a/tracker.jordan.im/Makefile +++ b/0x7c0.com/Makefile @@ -1,4 +1,4 @@ -WEBROOT = /var/www/html/tracker.jordan.im +WEBROOT = /var/www/0x7c0.com FILES = index.html style.css diff --git a/0x7c0.com/index.7 b/0x7c0.com/index.7 new file mode 100644 index 0000000..e5bf59f --- /dev/null +++ b/0x7c0.com/index.7 @@ -0,0 +1,42 @@ +.Dd May 1, 2023 +.Dt "0x7c0 Labs" 7 +.Os "Alpine Linux" +. +.Sh NAME +.Nm 0x7c0 Labs +.Nd encrypted dual-stack communications infrastructure. +. +.Sh SYNOPSIS +.Nm mail +.Mt noc@0x7c0.com +. +PO Box 8112 Cave Creek, AZ 85327 +. +.Sh DESCRIPTION +.Pp +0x7c0 Labs is a non-profit ISP which provides connectivity for traffic +analysis-resistant communication networks and operates various value-aligned +services which promote user autonomy, privacy, and freedom on the Internet. +. +.Sh SERVICES +.Bl -tag -width Ds +.It Lk https://relays.0x7c0.com/as/AS400861/ transit +Internet connectivity via encrypted, randomized circuits +.It Lk https://ipfs.0x7c0.com/ipfs/bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze/wiki/ ipfs +Distributed file system gateway; access resources hosted on IPFS +.It Lk https://iv.0x7c0.com/ invidious +Front-end browsing proxy for YouTube, removing JS and trackers +.It Lk https://ahimsa.chat/ matrix +Decentralized encrypted communications network +.It Lk https://tracker.0x7c0.com/ opentracker +Public UDP tracker with synced IPv4 and IPv6 daemons +.It Lk https://search.0x7c0.com/ searx +Privacy-respecting search results aggregation from Google, Bing, Qwant +.It Lk https://relays.0x7c0.com/ relays list +Relay metrics and statistics rendered statically from consensus +.El +. +.Sh NETWORK +.Pp +We operate our own network at AS400861 with direct connectivity to Amazon, +Apple, Cloudflare, Fastly, Microsoft, and Netflix via KCIX and DE-CIX. diff --git a/0x7c0.com/index.html b/0x7c0.com/index.html new file mode 100644 index 0000000..c85672f --- /dev/null +++ b/0x7c0.com/index.html @@ -0,0 +1,75 @@ +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0"/> + <link rel="stylesheet" href="style.css" type="text/css" media="all"/> + <title>0x7c0 Labs(7)</title> +</head> +<body> +<table class="head"> + <tr> + <td class="head-ltitle">0x7c0 Labs(7)</td> + <td class="head-vol">Miscellaneous Information Manual</td> + <td class="head-rtitle">0x7c0 Labs(7)</td> + </tr> +</table> +<div class="manual-text"> +<section class="Sh"> +<h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1> +<p class="Pp"><code class="Nm">0x7c0 Labs</code> — + <span class="Nd">encrypted dual-stack communications + infrastructure.</span></p> +</section> +<section class="Sh"> +<h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1> +<table class="Nm"> + <tr> + <td><code class="Nm">mail</code></td> + <td><a class="Mt" href="mailto:noc@0x7c0.com">noc@0x7c0.com</a> PO Box 8112 + Cave Creek, AZ 85327</td> + </tr> +</table> +</section> +<section class="Sh"> +<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1> +<p class="Pp">0x7c0 Labs is a non-profit ISP which provides connectivity for + traffic analysis-resistant communication networks and operates various + value-aligned services which promote user autonomy, privacy, and freedom on + the Internet.</p> +</section> +<section class="Sh"> +<h1 class="Sh" id="SERVICES"><a class="permalink" href="#SERVICES">SERVICES</a></h1> +<dl class="Bl-tag"> + <dt><a class="Lk" href="https://relays.0x7c0.com/as/AS400861/">transit</a></dt> + <dd>Internet connectivity via encrypted, randomized circuits</dd> + <dt><a class="Lk" href="https://ipfs.0x7c0.com/ipfs/bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze/wiki/">ipfs</a></dt> + <dd>Distributed file system gateway; access resources hosted on IPFS</dd> + <dt><a class="Lk" href="https://iv.0x7c0.com/">invidious</a></dt> + <dd>Front-end browsing proxy for YouTube, removing JS and trackers</dd> + <dt><a class="Lk" href="https://ahimsa.chat/">matrix</a></dt> + <dd>Decentralized encrypted communications network</dd> + <dt><a class="Lk" href="https://tracker.0x7c0.com/">opentracker</a></dt> + <dd>Public UDP tracker with synced IPv4 and IPv6 daemons</dd> + <dt><a class="Lk" href="https://search.0x7c0.com/">searx</a></dt> + <dd>Privacy-respecting search results aggregation from Google, Bing, + Qwant</dd> + <dt><a class="Lk" href="https://relays.0x7c0.com/">relays list</a></dt> + <dd>Relay metrics and statistics rendered statically from consensus</dd> +</dl> +</section> +<section class="Sh"> +<h1 class="Sh" id="NETWORK"><a class="permalink" href="#NETWORK">NETWORK</a></h1> +<p class="Pp">We operate our own network at AS400861 with direct connectivity to + Amazon, Apple, Cloudflare, Fastly, Microsoft, and Netflix via KCIX and + DE-CIX.</p> +</section> +</div> +<table class="foot"> + <tr> + <td class="foot-date">May 1, 2023</td> + <td class="foot-os">Alpine Linux</td> + </tr> +</table> +</body> +</html> diff --git a/0x7c0.com/old.txt b/0x7c0.com/old.txt new file mode 100644 index 0000000..b3072a9 --- /dev/null +++ b/0x7c0.com/old.txt @@ -0,0 +1 @@ +We do not log network traffic or store sensitive information which could uniquely identify our users, except ephemerally when required by the protocol (e.g. peer-to-peer networks). In contexts where users opt-in to storing minimal account data on our systems, services are anonymized and configured to support account export and deletion. diff --git a/tracker.jordan.im/style.css b/0x7c0.com/style.css index 2524976..cf3c99e 100644 --- a/tracker.jordan.im/style.css +++ b/0x7c0.com/style.css @@ -9,7 +9,7 @@ dl.Bl-diag > dt { font-weight: bold; } code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn, code.Cd { font-weight: bold; font-family: inherit; } -html { font-family: monospace; line-height: 1.25em; } +html { font-family: monospace; line-height: 1.25em; font-size: 14px; } body { max-width: 80ch; margin: 1em auto; padding: 0 1ch; } table { border-collapse: collapse; } table.Nm code.Nm { padding-right: 1ch; } @@ -20,4 +20,3 @@ a { color: var(--ansi4); } a:visited { color: var(--ansi5); } a.permalink { color: var(--ansi3); text-decoration: none; } -img { max-width: 80ch; width: 100%; height: auto; } diff --git a/tracker.jordan.im/update-stats.py b/0x7c0.com/update-stats.py index f0a1ec7..f0a1ec7 100755 --- a/tracker.jordan.im/update-stats.py +++ b/0x7c0.com/update-stats.py diff --git a/jordan.im/index.7 b/jordan.im/index.7 index 6e8c7af..9e17afe 100644 --- a/jordan.im/index.7 +++ b/jordan.im/index.7 @@ -11,16 +11,20 @@ .Mt me@jordan.im Lk https://jordan.im/jordan.im-pub.asc 0x3702FBE9EA0CFAE0 . .Nm dove -on libera.chat +on libera, oftc . .Sh DESCRIPTION -My recreational areas of interest center around research literature, censorship -evasion, libraries, and data archival @ the Internet Archive. - +My focus areas center around academic research, traffic analysis-resistant +communication networks, libraries, archival at the Internet Archive, and +distributed systems. I operate an ISP for fun @ +.Lk https://0x7c0.com/ AS400861 . +. .Pp .Bl -tag -width Ds .It Lk https://git.jordan.im/asn/ asn Map networks to their corresponding Autonomous System via HTTP/WHOIS +.It Lk https://git.jordan.im/pigeon/ pigeon +An opinionated RFC-compliant IMAP/SMTP relay .It Lk https://git.jordan.im/crane/ crane Research literature archival and categorization web service .It Lk https://git.jordan.im/keep/ keep @@ -30,7 +34,9 @@ Listen to audiobooks with podcast apps via unique RSS feeds .It Lk https://git.jordan.im/crawl/ crawl A simple recursive web crawler which stores content in WARC/1.0 .It Lk https://git.jordan.im/allium/ allium -Tor relay metrics and statistics rendered from a single API request +Tor relay metrics and statistics rendered statically from consensus +.It Lk https://git.jordan.im/noto/ noto +Extract book highlights from Kobo readers' onboard database .It Lk https://git.jordan.im/ft-bypass/ ft-bypass Transparent caching proxy and paywall bypass for The Financial Times .It Lk https://git.jordan.im/tent/ tent @@ -39,14 +45,6 @@ A simple static web-server for low-resource environments Archive repositories from sourcehut user accounts via GraphQL .It Lk https://git.jordan.im/ember/ ember Uniquely process Kindle ebook highlights, skipping amended sequences -.It Lk https://git.jordan.im/pouch/ pouch -Save pocketed (read) articles to PDF from exported account data -.It Lk https://git.jordan.im/www/ www -Makefiles and assets for mandoc-generated sites -.It Lk https://git.jordan.im/dotfiles/ dotfiles -Personal configuration files for applications on unix-based systems -.It Lk https://git.jordan.im/bin/ bin -Miscellaneous unsorted tools and utilities .El . .Sh SEE ALSO @@ -56,10 +54,6 @@ Miscellaneous unsorted tools and utilities Public .Lk https://git.jordan.im/asn/ asn instance; map hostnames/addresses to autonomous systems -.It Lk https://iv.jordan.im/feed/trending invidious -YouTube front-end browsing proxy; no tracking or JavaScript .It Lk https://r.jordan.im/ research archive Literature discussing ethics, nutrition, ecology, and technology -.It Lk https://jordan.im/ipfs/bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze/wiki/ ipfs gateway -Access resources hosted on the IPFS network .El diff --git a/jordan.im/index.html b/jordan.im/index.html index fed7bf4..cd60945 100644 --- a/jordan.im/index.html +++ b/jordan.im/index.html @@ -33,19 +33,21 @@ <table class="Nm"> <tr> <td><code class="Nm">dove</code></td> - <td>on libera.chat</td> + <td>on libera, oftc</td> </tr> </table> </section> <section class="Sh"> <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1> -<p class="Pp">My recreational areas of interest center around research - literature, censorship evasion, libraries, and data archival @ the Internet - Archive.</p> -<p class="Pp"></p> +<p class="Pp">My focus areas center around academic research, traffic + analysis-resistant communication networks, libraries, archival at the + Internet Archive, and distributed systems. I operate an ISP for fun @ + <a class="Lk" href="https://0x7c0.com/">AS400861</a>.</p> <dl class="Bl-tag"> <dt><a class="Lk" href="https://git.jordan.im/asn/">asn</a></dt> <dd>Map networks to their corresponding Autonomous System via HTTP/WHOIS</dd> + <dt><a class="Lk" href="https://git.jordan.im/pigeon/">pigeon</a></dt> + <dd>An opinionated RFC-compliant IMAP/SMTP relay</dd> <dt><a class="Lk" href="https://git.jordan.im/crane/">crane</a></dt> <dd>Research literature archival and categorization web service</dd> <dt><a class="Lk" href="https://git.jordan.im/keep/">keep</a></dt> @@ -56,7 +58,9 @@ <dt><a class="Lk" href="https://git.jordan.im/crawl/">crawl</a></dt> <dd>A simple recursive web crawler which stores content in WARC/1.0</dd> <dt><a class="Lk" href="https://git.jordan.im/allium/">allium</a></dt> - <dd>Tor relay metrics and statistics rendered from a single API request</dd> + <dd>Tor relay metrics and statistics rendered statically from consensus</dd> + <dt><a class="Lk" href="https://git.jordan.im/noto/">noto</a></dt> + <dd>Extract book highlights from Kobo readers' onboard database</dd> <dt><a class="Lk" href="https://git.jordan.im/ft-bypass/">ft-bypass</a></dt> <dd>Transparent caching proxy and paywall bypass for The Financial Times</dd> <dt><a class="Lk" href="https://git.jordan.im/tent/">tent</a></dt> @@ -65,14 +69,6 @@ <dd>Archive repositories from sourcehut user accounts via GraphQL</dd> <dt><a class="Lk" href="https://git.jordan.im/ember/">ember</a></dt> <dd>Uniquely process Kindle ebook highlights, skipping amended sequences</dd> - <dt><a class="Lk" href="https://git.jordan.im/pouch/">pouch</a></dt> - <dd>Save pocketed (read) articles to PDF from exported account data</dd> - <dt><a class="Lk" href="https://git.jordan.im/www/">www</a></dt> - <dd>Makefiles and assets for mandoc-generated sites</dd> - <dt><a class="Lk" href="https://git.jordan.im/dotfiles/">dotfiles</a></dt> - <dd>Personal configuration files for applications on unix-based systems</dd> - <dt><a class="Lk" href="https://git.jordan.im/bin/">bin</a></dt> - <dd>Miscellaneous unsorted tools and utilities</dd> </dl> </section> <section class="Sh"> @@ -82,13 +78,8 @@ <dt><a class="Lk" href="https://whois.jordan.im/">whois</a></dt> <dd>Public <a class="Lk" href="https://git.jordan.im/asn/">asn</a> instance; map hostnames/addresses to autonomous systems</dd> - <dt><a class="Lk" href="https://iv.jordan.im/feed/trending">invidious</a></dt> - <dd>YouTube front-end browsing proxy; no tracking or JavaScript</dd> <dt><a class="Lk" href="https://r.jordan.im/">research archive</a></dt> <dd>Literature discussing ethics, nutrition, ecology, and technology</dd> - <dt><a class="Lk" href="https://jordan.im/ipfs/bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze/wiki/">ipfs - gateway</a></dt> - <dd>Access resources hosted on the IPFS network</dd> </dl> </section> </div> diff --git a/jordan.im/style.css b/jordan.im/style.css index 740b52f..cf3c99e 100644 --- a/jordan.im/style.css +++ b/jordan.im/style.css @@ -9,7 +9,7 @@ dl.Bl-diag > dt { font-weight: bold; } code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn, code.Cd { font-weight: bold; font-family: inherit; } -html { font-family: monospace; line-height: 1.25em; } +html { font-family: monospace; line-height: 1.25em; font-size: 14px; } body { max-width: 80ch; margin: 1em auto; padding: 0 1ch; } table { border-collapse: collapse; } table.Nm code.Nm { padding-right: 1ch; } diff --git a/tracker.0x7c0.com/Makefile b/tracker.0x7c0.com/Makefile new file mode 100644 index 0000000..d5e1208 --- /dev/null +++ b/tracker.0x7c0.com/Makefile @@ -0,0 +1,14 @@ +WEBROOT = /var/www/tracker.0x7c0.com + +FILES = index.html style.css + +all: ${FILES} + +index.html: index.7 + mandoc -T html -O style=style.css index.7 > index.html + +install: ${FILES} + install -c -m 644 ${FILES} ${WEBROOT} + +clean: + rm -f index.html diff --git a/tracker.0x7c0.com/index.7 b/tracker.0x7c0.com/index.7 new file mode 100644 index 0000000..b191989 --- /dev/null +++ b/tracker.0x7c0.com/index.7 @@ -0,0 +1,28 @@ +.Dd May 1, 2023 +.Dt TRACKER.0X7C0.COM 7 +.Os "Alpine Linux" +. +.Sh NAME +.Nm tracker.0x7c0.com +.Nd a free and open bittorrent tracker +. +.Sh ANNOUNCE +udp://tracker.0x7c0.com:6969/announce +. +.Sh STATS +. +.Pp +The tracker has been ... [ stats to be generated ] +. +.Sh DESCRIPTION +. +.Pp +This is a +.Lk https://en.wikipedia.org/wiki/BitTorrent_tracker "bittorrent tracker", +a network service which coordinates the reliable transmission of information +between peers. +. +.Pp +There is very little to be found here; there are no indexes or search boxes. You need to speak the +.Lk https://www.bittorrent.org/beps/bep_0003.html "bittorrent protocol" +and have knowledge of a hash to make use of this service. diff --git a/tracker.jordan.im/index.html b/tracker.0x7c0.com/index.html index 41ccd88..2c1aa87 100644 --- a/tracker.jordan.im/index.html +++ b/tracker.0x7c0.com/index.html @@ -4,50 +4,46 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> <link rel="stylesheet" href="style.css" type="text/css" media="all"/> - <title>TRACKER.JORDAN.IM(7)</title> + <title>TRACKER.0X7C0.COM(7)</title> </head> <body> <table class="head"> <tr> - <td class="head-ltitle">TRACKER.JORDAN.IM(7)</td> + <td class="head-ltitle">TRACKER.0X7C0.COM(7)</td> <td class="head-vol">Miscellaneous Information Manual</td> - <td class="head-rtitle">TRACKER.JORDAN.IM(7)</td> + <td class="head-rtitle">TRACKER.0X7C0.COM(7)</td> </tr> </table> <div class="manual-text"> <section class="Sh"> <h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1> -<code class="Nm">tracker.jordan.im</code> — -<div class="Nd">a free and open bittorrent tracker</div> +<p class="Pp"><code class="Nm">tracker.0x7c0.com</code> — + <span class="Nd">a free and open bittorrent tracker</span></p> </section> <section class="Sh"> <h1 class="Sh" id="ANNOUNCE"><a class="permalink" href="#ANNOUNCE">ANNOUNCE</a></h1> -udp://tracker.jordan.im:6969/announce +<p class="Pp">udp://tracker.0x7c0.com:6969/announce</p> </section> <section class="Sh"> <h1 class="Sh" id="STATS"><a class="permalink" href="#STATS">STATS</a></h1> -The tracker has been online for 308 hrs, serving 787590 torrents with 1984 connections per second. +<p class="Pp">The tracker has been ... [ stats to be generated ]</p> </section> <section class="Sh"> <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1> -This is a service known as a - <a class="Lk" href="https://jordan.im/ipfs/bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze/wiki/BitTorrent_tracker">bittorrent - tracker</a>, which coordinates the reliable transmission of information - between peers. -<p class="Pp">There is very little to be found here. There are no indexes or +<p class="Pp">This is a + <a class="Lk" href="https://en.wikipedia.org/wiki/BitTorrent_tracker">bittorrent + tracker</a>, a network service which coordinates the reliable transmission + of information between peers.</p> +<p class="Pp">There is very little to be found here; there are no indexes or search boxes. You need to speak the <a class="Lk" href="https://www.bittorrent.org/beps/bep_0003.html">bittorrent protocol</a> and have knowledge of a hash to make use of this service.</p> </section> -<section class="Sh"> -<h1 class="Sh" id="GRAPHS"><a class="permalink" href="#GRAPHS">GRAPHS</a></h1> -<img src="cpu.png" alt="cpu usage graph"> -<img src="net.png" alt="net usage graph"> </div> <table class="foot"> <tr> - <td class="foot-date">November 11, 2021</td> - <td class="foot-os">Debian</td> + <td class="foot-date">May 1, 2023</td> + <td class="foot-os">Alpine Linux</td> </tr> </table> </body> diff --git a/tracker.0x7c0.com/style.css b/tracker.0x7c0.com/style.css new file mode 100644 index 0000000..cf3c99e --- /dev/null +++ b/tracker.0x7c0.com/style.css @@ -0,0 +1,22 @@ +table.head, table.foot { width: 100%; } +td.head-rtitle, td.foot-os { text-align: right; } +td.head-vol { text-align: center; } +div.Pp { margin: 1ex 0ex; } +div.Nd, div.Bf, div.Op { display: inline; } +span.Pa, span.Ad { font-style: italic; } +span.Ms { font-weight: bold; } +dl.Bl-diag > dt { font-weight: bold; } +code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn, +code.Cd { font-weight: bold; font-family: inherit; } + +html { font-family: monospace; line-height: 1.25em; font-size: 14px; } +body { max-width: 80ch; margin: 1em auto; padding: 0 1ch; } +table { border-collapse: collapse; } +table.Nm code.Nm { padding-right: 1ch; } +table.foot { margin-top: 1em; } + +html { background-color: var(--ansi16); color: var(--ansi17); } +a { color: var(--ansi4); } +a:visited { color: var(--ansi5); } +a.permalink { color: var(--ansi3); text-decoration: none; } + diff --git a/tracker.0x7c0.com/update-stats.py b/tracker.0x7c0.com/update-stats.py new file mode 100755 index 0000000..2af62eb --- /dev/null +++ b/tracker.0x7c0.com/update-stats.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python3 + +import fileinput +import os +import shutil +import sys +import urllib.request + +WWW = '/var/www/tracker.0x7c0.com' + +stats = dict.fromkeys(['torrents', 'connections', 'uptime']) + +conn = urllib.request.Request( + 'http://127.0.0.1:6969/stats?format=txt&mode=conn', +) +r = urllib.request.urlopen(conn).read().decode('utf-8').split('\n') + +stats['uptime'] = int(int(r[2].split()[0]) / 3600) +stats['connections'] = r[3].split()[2] + +conn = urllib.request.Request( + 'http://127.0.0.1:6969/stats?format=txt' +) + +r = urllib.request.urlopen(conn).read().decode('utf-8').split('\n') + +stats['torrents'] = r[2].split()[2] + +s = ( + f'The tracker has been up for {stats["uptime"]} hrs, ' + f'serving {stats["torrents"]} torrents at ' + f'{stats["connections"]} requests per second.\n' +) + +for line in fileinput.input([os.path.join(WWW, 'index.html')], inplace=True): + if line.strip().startswith('The tracker has been'): + line = s + sys.stdout.write(line) + +#import code +#code.interact(local=locals()) diff --git a/tracker.jordan.im/index.7 b/tracker.jordan.im/index.7 deleted file mode 100644 index 033aebc..0000000 --- a/tracker.jordan.im/index.7 +++ /dev/null @@ -1,27 +0,0 @@ -.Dd November 11, 2021 -.Dt TRACKER.JORDAN.IM 7 -.Os "Debian" -. -.Sh NAME -.Nm tracker.jordan.im -.Nd a free and open bittorrent tracker -. -.Sh ANNOUNCE -udp://tracker.jordan.im:6969/announce -. -.Sh STATS -. -.Pp -The tracker has been ... [ stats to be generated ] -. -.Sh DESCRIPTION -. -.Pp -This is a service known as a -.Lk https://jordan.im/ipfs/bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze/wiki/BitTorrent_tracker "bittorrent tracker", -which coordinates the reliable transmission of information between peers. -. -.Pp -There is very little to be found here. There are no indexes or search boxes. You need to speak the -.Lk https://www.bittorrent.org/beps/bep_0003.html "bittorrent protocol" -and have knowledge of a hash to make use of this service. diff --git a/whois.jordan.im/index.7 b/whois.jordan.im/index.7 index 5d01226..8164652 100644 --- a/whois.jordan.im/index.7 +++ b/whois.jordan.im/index.7 @@ -58,10 +58,10 @@ via JSON. $ curl ip.jordan.im { - "host": "45.83.89.132", - "hostname": "45-83-89-132.pool.ovpn.com", - "org": "AS9009 M247 Europe SRL", - "announcement": "45.83.89.0/24" + "host": "185.73.44.145", + "hostname": "maple.jordan.im", + "org": "AS8943 Jump Networks Ltd", + "announcement": "185.73.44.0/22" } .Ed . diff --git a/whois.jordan.im/index.html b/whois.jordan.im/index.html index 344f853..00889c2 100644 --- a/whois.jordan.im/index.html +++ b/whois.jordan.im/index.html @@ -61,10 +61,10 @@ IP Address | AS Number | Country | AS Name | Announcement <pre>$ curl ip.jordan.im { - "host": "45.83.89.132", - "hostname": "45-83-89-132.pool.ovpn.com", - "org": "AS9009 M247 Europe SRL", - "announcement": "45.83.89.0/24" + "host": "185.73.44.145", + "hostname": "maple.jordan.im", + "org": "AS8943 Jump Networks Ltd", + "announcement": "185.73.44.0/22" }</pre> </div> <p class="Pp"></p> diff --git a/whois.jordan.im/style.css b/whois.jordan.im/style.css index 740b52f..b3ef920 100644 --- a/whois.jordan.im/style.css +++ b/whois.jordan.im/style.css @@ -9,7 +9,8 @@ dl.Bl-diag > dt { font-weight: bold; } code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn, code.Cd { font-weight: bold; font-family: inherit; } -html { font-family: monospace; line-height: 1.25em; } +html { font-family: monospace; line-height: 1.25em; font-size: 14px; } +pre { font-family: monospace; font-size: 14px; } body { max-width: 80ch; margin: 1em auto; padding: 0 1ch; } table { border-collapse: collapse; } table.Nm code.Nm { padding-right: 1ch; } |