From 8cb2c53d2d01c13761627231e3d182002e3742d5 Mon Sep 17 00:00:00 2001 From: Linux User Date: Sat, 24 Jun 2023 00:13:26 +0000 Subject: 0x7c0, misc updates --- 0x7c0.com/Makefile | 14 ++++++++ 0x7c0.com/index.7 | 42 ++++++++++++++++++++++ 0x7c0.com/index.html | 75 +++++++++++++++++++++++++++++++++++++++ 0x7c0.com/old.txt | 1 + 0x7c0.com/style.css | 22 ++++++++++++ 0x7c0.com/update-stats.py | 55 ++++++++++++++++++++++++++++ jordan.im/index.7 | 28 ++++++--------- jordan.im/index.html | 29 ++++++--------- jordan.im/style.css | 2 +- tracker.0x7c0.com/Makefile | 14 ++++++++ tracker.0x7c0.com/index.7 | 28 +++++++++++++++ tracker.0x7c0.com/index.html | 50 ++++++++++++++++++++++++++ tracker.0x7c0.com/style.css | 22 ++++++++++++ tracker.0x7c0.com/update-stats.py | 41 +++++++++++++++++++++ tracker.jordan.im/Makefile | 14 -------- tracker.jordan.im/index.7 | 27 -------------- tracker.jordan.im/index.html | 54 ---------------------------- tracker.jordan.im/style.css | 23 ------------ tracker.jordan.im/update-stats.py | 55 ---------------------------- whois.jordan.im/index.7 | 8 ++--- whois.jordan.im/index.html | 8 ++--- whois.jordan.im/style.css | 3 +- 22 files changed, 396 insertions(+), 219 deletions(-) create mode 100644 0x7c0.com/Makefile create mode 100644 0x7c0.com/index.7 create mode 100644 0x7c0.com/index.html create mode 100644 0x7c0.com/old.txt create mode 100644 0x7c0.com/style.css create mode 100755 0x7c0.com/update-stats.py create mode 100644 tracker.0x7c0.com/Makefile create mode 100644 tracker.0x7c0.com/index.7 create mode 100644 tracker.0x7c0.com/index.html create mode 100644 tracker.0x7c0.com/style.css create mode 100755 tracker.0x7c0.com/update-stats.py delete mode 100644 tracker.jordan.im/Makefile delete mode 100644 tracker.jordan.im/index.7 delete mode 100644 tracker.jordan.im/index.html delete mode 100644 tracker.jordan.im/style.css delete mode 100755 tracker.jordan.im/update-stats.py diff --git a/0x7c0.com/Makefile b/0x7c0.com/Makefile new file mode 100644 index 0000000..e5f0645 --- /dev/null +++ b/0x7c0.com/Makefile @@ -0,0 +1,14 @@ +WEBROOT = /var/www/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/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 @@ + + + + + + + 0x7c0 Labs(7) + + + + + + + + +
0x7c0 Labs(7)Miscellaneous Information Manual0x7c0 Labs(7)
+
+
+

+

0x7c0 Labs — + encrypted dual-stack communications + infrastructure.

+
+
+

+ + + + + +
mailnoc@0x7c0.com PO Box 8112 + Cave Creek, AZ 85327
+
+
+

+

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.

+
+
+

+
+
transit
+
Internet connectivity via encrypted, randomized circuits
+
ipfs
+
Distributed file system gateway; access resources hosted on IPFS
+
invidious
+
Front-end browsing proxy for YouTube, removing JS and trackers
+
matrix
+
Decentralized encrypted communications network
+
opentracker
+
Public UDP tracker with synced IPv4 and IPv6 daemons
+
searx
+
Privacy-respecting search results aggregation from Google, Bing, + Qwant
+
relays list
+
Relay metrics and statistics rendered statically from consensus
+
+
+
+

+

We operate our own network at AS400861 with direct connectivity to + Amazon, Apple, Cloudflare, Fastly, Microsoft, and Netflix via KCIX and + DE-CIX.

+
+
+ + + + + +
May 1, 2023Alpine Linux
+ + 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/0x7c0.com/style.css b/0x7c0.com/style.css new file mode 100644 index 0000000..cf3c99e --- /dev/null +++ b/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/0x7c0.com/update-stats.py b/0x7c0.com/update-stats.py new file mode 100755 index 0000000..f0a1ec7 --- /dev/null +++ b/0x7c0.com/update-stats.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python3 + +import fileinput +import os +import shutil +import sys +import urllib.request + +WWW = '/var/www/html/tracker.jordan.im' + +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 online for {stats["uptime"]} hrs, ' + f'serving {stats["torrents"]} torrents ' + f'with {stats["connections"]} connections 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) + +cpu = 'https://service.greenhost.net/cloud/Instance/graph?id=7615&template=cpu&timeframe=24' +conn = urllib.request.Request(cpu) +conn.add_header('Cookie', 'PHPSESSID=XXXXXXXXXXXXXXXXXXXXXXXXXX') + +with urllib.request.urlopen(conn) as r, open(os.path.join(WWW, 'cpu.png'), 'wb') as out: + out.write(r.read()) + +net = 'https://service.greenhost.net/cloud/Instance/graph?id=7615&template=net1&timeframe=24' +conn = urllib.request.Request(net) +conn.add_header('Cookie', 'PHPSESSID=XXXXXXXXXXXXXXXXXXXXXXXXXX') + +with urllib.request.urlopen(conn) as r, open(os.path.join(WWW, 'net.png'), 'wb') as out: + out.write(r.read()) + +#import code +#code.interact(local=locals()) 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 @@ - +
doveon libera.chaton libera, oftc

-

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 @ + AS400861.

asn
Map networks to their corresponding Autonomous System via HTTP/WHOIS
+
pigeon
+
An opinionated RFC-compliant IMAP/SMTP relay
crane
Research literature archival and categorization web service
keep
@@ -56,7 +58,9 @@
crawl
A simple recursive web crawler which stores content in WARC/1.0
allium
-
Tor relay metrics and statistics rendered from a single API request
+
Tor relay metrics and statistics rendered statically from consensus
+
noto
+
Extract book highlights from Kobo readers' onboard database
ft-bypass
Transparent caching proxy and paywall bypass for The Financial Times
tent
@@ -65,14 +69,6 @@
Archive repositories from sourcehut user accounts via GraphQL
ember
Uniquely process Kindle ebook highlights, skipping amended sequences
-
pouch
-
Save pocketed (read) articles to PDF from exported account data
-
www
-
Makefiles and assets for mandoc-generated sites
-
dotfiles
-
Personal configuration files for applications on unix-based systems
-
bin
-
Miscellaneous unsorted tools and utilities
@@ -82,13 +78,8 @@
whois
Public asn instance; map hostnames/addresses to autonomous systems
-
invidious
-
YouTube front-end browsing proxy; no tracking or JavaScript
research archive
Literature discussing ethics, nutrition, ecology, and technology
-
ipfs - gateway
-
Access resources hosted on the IPFS network
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.0x7c0.com/index.html b/tracker.0x7c0.com/index.html new file mode 100644 index 0000000..2c1aa87 --- /dev/null +++ b/tracker.0x7c0.com/index.html @@ -0,0 +1,50 @@ + + + + + + + TRACKER.0X7C0.COM(7) + + + + + + + + +
TRACKER.0X7C0.COM(7)Miscellaneous Information ManualTRACKER.0X7C0.COM(7)
+
+
+

+

tracker.0x7c0.com — + a free and open bittorrent tracker

+
+
+

+

udp://tracker.0x7c0.com:6969/announce

+
+
+

+

The tracker has been ... [ stats to be generated ]

+
+
+

+

This is a + bittorrent + tracker, a network service which coordinates the reliable transmission + of information between peers.

+

There is very little to be found here; there are no indexes or + search boxes. You need to speak the + bittorrent + protocol and have knowledge of a hash to make use of this service.

+
+
+ + + + + +
May 1, 2023Alpine Linux
+ + 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/Makefile b/tracker.jordan.im/Makefile deleted file mode 100644 index 8ebf663..0000000 --- a/tracker.jordan.im/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -WEBROOT = /var/www/html/tracker.jordan.im - -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.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/tracker.jordan.im/index.html b/tracker.jordan.im/index.html deleted file mode 100644 index 41ccd88..0000000 --- a/tracker.jordan.im/index.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - TRACKER.JORDAN.IM(7) - - - - - - - - -
TRACKER.JORDAN.IM(7)Miscellaneous Information ManualTRACKER.JORDAN.IM(7)
-
-
-

-tracker.jordan.im — -
a free and open bittorrent tracker
-
-
-

-udp://tracker.jordan.im:6969/announce -
-
-

-The tracker has been online for 308 hrs, serving 787590 torrents with 1984 connections per second. -
-
-

-This is a service known as a - bittorrent - tracker, which coordinates the reliable transmission of information - between peers. -

There is very little to be found here. There are no indexes or - search boxes. You need to speak the - bittorrent - protocol and have knowledge of a hash to make use of this service.

-
-
-

-cpu usage graph -net usage graph -
- - - - - -
November 11, 2021Debian
- - diff --git a/tracker.jordan.im/style.css b/tracker.jordan.im/style.css deleted file mode 100644 index 2524976..0000000 --- a/tracker.jordan.im/style.css +++ /dev/null @@ -1,23 +0,0 @@ -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; } -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; } - -img { max-width: 80ch; width: 100%; height: auto; } diff --git a/tracker.jordan.im/update-stats.py b/tracker.jordan.im/update-stats.py deleted file mode 100755 index f0a1ec7..0000000 --- a/tracker.jordan.im/update-stats.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python3 - -import fileinput -import os -import shutil -import sys -import urllib.request - -WWW = '/var/www/html/tracker.jordan.im' - -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 online for {stats["uptime"]} hrs, ' - f'serving {stats["torrents"]} torrents ' - f'with {stats["connections"]} connections 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) - -cpu = 'https://service.greenhost.net/cloud/Instance/graph?id=7615&template=cpu&timeframe=24' -conn = urllib.request.Request(cpu) -conn.add_header('Cookie', 'PHPSESSID=XXXXXXXXXXXXXXXXXXXXXXXXXX') - -with urllib.request.urlopen(conn) as r, open(os.path.join(WWW, 'cpu.png'), 'wb') as out: - out.write(r.read()) - -net = 'https://service.greenhost.net/cloud/Instance/graph?id=7615&template=net1&timeframe=24' -conn = urllib.request.Request(net) -conn.add_header('Cookie', 'PHPSESSID=XXXXXXXXXXXXXXXXXXXXXXXXXX') - -with urllib.request.urlopen(conn) as r, open(os.path.join(WWW, 'net.png'), 'wb') as out: - out.write(r.read()) - -#import code -#code.interact(local=locals()) 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 
$ 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"
 }

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; } -- cgit v1.2.3-54-g00ecf