Updated documentation

This commit is contained in:
Tristan B. Kildaire 2020-07-26 14:35:19 +02:00 committed by GitHub
parent a0d8d9229d
commit 2798107f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 230 additions and 119 deletions

View File

@ -0,0 +1,156 @@
Subnet specifics
================
Information regarding the use of the allocated subnets.
== Deavmi's subnet allocations ==
****
*IRC:* _deavmi_ on BonoboNET/Freenode
*E-mail:* _deavmi@disroot.org_
****
=== Subnet (A) ===
****
This is my network services subnet where all my servers for
Git, IRC, sshchat, redmine and more live.
****
*Subnet:* `10.0.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
-------------------------------
10.0.0.1 is my Pi router
10.0.0.2 is deavmi.mammoth (services for community)
10.0.0.3 is deavmi.rivaldont (services for community)
-------------------------------
=== Subnet (B) ===
****
This is the subnet for my personal devices.
****
*Subnet:* `10.1.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
------------------------------------------
10.1.0.1 is my Pi router
10.1.0.2 is my Pi personal (web server for homepage)
10.1.0.3 is my Lockdown.BNET IRC server
------------------------------------------
=== Subnet (C) ===
****
This subnet is for personal devices in Stellenbosch (as I go to
university there) along with some network services I run from there
too.
****
*Subnet:* `10.4.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
---------------------------------
10.4.0.1 is my VM
---------------------------------
=== Subnet (D) ===
****
This subnet is for personal devices in Stellenbosch (as I go to
university there) along with some network services I run from there
too.
****
*Subnet:* `10.6.3.0`
*Subnet mask/prefix:* `255.255.255.0` or `/24`
*Known devices:*
-------------------------------
10.6.3.1 is my Pi router
10.6.3.2 is my laptop
10.6.3.3 is my desktop
-------------------------------
== Skippy's subnet allocations ==
****
*IRC:* _skippy_ on BonoboNET, _ohmyskippy_ on Freenode
****
=== Subnet (A) ===
****
No description
****
*Subnet:* `10.2.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
---------------
10.2.0.1 router
10.2.0.2 laptop
---------------
== Chris's subnet allocations ==
****
*IRC:* _chris_ on BonoboNET
****
=== Subnet (A) ===
****
No description
****
*Subnet:* `10.5.0.1`
*Subnet mask/prefix:* `255.255.255.255` or `/32`
*Known devices:*
-------------------------------
10.5.0.1 Router for IPv6 NETMAP-NAT
-------------------------------
== Kaotisk's subnet allocations ==
****
*IRC:* _kaotisk_ on BonoboNET
****
=== Subnet (A) ===
****
TODO
****
*Subnet:* `10.6.0.0`
*Subnet mask/prefix:* `255.255.255.0` or `/24`
*Known devices:*
-------------------------------
10.6.0.1 Router or Laptop (TODO)
-------------------------------

View File

@ -3,115 +3,19 @@ Subnet allocations
Subnet assignments in `10/8` subnet (CRXN inter-network)
== Deavmi's subnet allocations ==
== Table of assignments ==
****
*IRC:* _deavmi_ on BonoboNET/Freenode
*E-mail:* _deavmi@disroot.org_
****
=== Subnet (A) ===
****
This is my network services subnet where all my servers for
Git, IRC, sshchat, redmine and more live.
****
*Subnet:* `10.0.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
-------------------------------
10.0.0.1 is my Pi router
10.0.0.4 is my home laptop
-------------------------------
=== Subnet (B) ===
****
This is the subnet for my personal devices.
****
*Subnet:* `10.1.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
------------------------------------------
10.1.0.1 is my Pi router
10.1.0.2 is my Pi personal
10.1.0.3 is my Lockdown.BNET IRC server
10.1.0.4 is my laptop
10.1.0.7 is my desktop
10.1.0.11 is my x86 server
10.1.0.12 is my other x86 server
------------------------------------------
=== Subnet (D) ===
****
This subnet is for personal devices in Stellenbosch (as I go to
university there) along with some network services I run from there
too.
****
*Subnet:* `10.4.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
---------------------------------
10.4.0.1 is my Pi router
10.4.0.2 is my University Desktop
10.4.0.3 is my University Laptop
---------------------------------
== Skippy's subnet allocations ==
****
*IRC:* _skippy_ on BonoboNET, _ohmyskippy_ on Freenode
****
=== Subnet (A) ===
****
No description
****
*Subnet:* `10.2.0.0`
*Subnet mask/prefix:* `255.255.0.0` or `/16`
*Known devices:*
---------------
10.2.0.1 router
10.2.0.2 laptop
---------------
== Chris's subnet allocations ==
****
*IRC:* _chris_ on BonoboNET
****
=== Subnet (A) ===
****
No description
****
*Subnet:* `10.5.0.1`
*Subnet mask/prefix:* `255.255.255.255` or `/32`
*Known devices:*
-------------------------------
10.5.0.1 Router for IPv6 NETMAP-NAT
-------------------------------
[options="header"]
|=======
| Subnet | Peerable via | Status | Location | Owner | Contact
| *10.0.0.0/16* | physical | active | Worcester, South Africa | deavmi | link:mailto:deavmi@disroot.org[deavmi@disroot.org]
| *10.1.0.0/16* | yggdrasil, physical | active | Worcester, South Africa | deavmi | link:mailto:deavmi@disroot.org[deavmi@disroot.org]
| *10.4.0.0/16* | N/A | to be removed, active | Worcester, South Africa | deavmi | link:mailto:deavmi@disroot.org[deavmi@disroot.org]
| *10.5.0.1/32* | yggdrasil | active | Germany | chris | TODO
| *10.6.1.0/24* | yggdrasil | active | Greece | kaotisk | kaotisk@arching-kaos.tk
| *10.6.2.0/24* | yggdrasil | active | Durbanville, Cape Town, South Africa | skippy | ohmyskippy@disroot.org
| *10.6.3.0/24* | yggdrasil | active | Stellenbosch, South Africa | deavmi | link:mailto:deavmi@disroot.org[deavmi@disroot.org]
| *10.6.4.0/24* | yggdrasil | inactive (planned) | Brackenfell, Cape Town, South Africa | reddawn | TODO
| *10.6.5.0/24* | yggdrasil | inactive (planned) | India | clickme.sh | TODO
| *10.6.6.0/24* | yggdrasil | inactive (planned) | United States | Zambyte | TODO
|=======

View File

@ -3,7 +3,7 @@ CRXN
== What is CRXN? ==
CRXN stands for *Community Run eXperimental Network* and is a computer network created by Tristan B. Kildaire during April 2020 to experiment with
CRXN stands for *Community Run eXpansive Network* and is a computer network created by Tristan B. Kildaire during April 2020 to experiment with
networking and have fun building a large scaled network with like-minded people. The network is an IP-only network running, so far, only IPv4.
Other than creating a network to learn about networking it is also a fun way to connect distant network services that would otherwise be impossible
@ -20,10 +20,12 @@ or who want to join the network.
=== Links ===
1. link:allocations.html[Subnet allocations]
* Allocations of subnets to people and their uses
2. link:network.html[Network services]
* Allocations of subnets to people
2. link:allocation_specifics.html[Subnet specifics]
* What some subnets are used for
3. link:network.html[Network services]
* List of publically available network services on CRXN
3. link:things.html[Other things]
4. link:things.html[Other things]
* Any interesting exprimental things being done with or on CRXN
== Getting started ==
@ -91,4 +93,4 @@ As I said, if it works, then use it. I am just an Yggdrasil shill because of the
=== Subnet assignnment ===
If you want to get assigned a subnet then the easiest way is joining the `#crxn` channel on BonoboNET and asking `deavmi`. From there I can assign you
a subnet and then I or someone else can sort out peering with you and then we can all update our routing tables.
a subnet and then I or someone else can sort out peering with you and then we can all update our routing tables.

View File

@ -12,7 +12,7 @@ An instance of the KiwiIRC web IRC client is available
for users wanting to connect to the BonoboNET IRC
network.
*HTTP Address:* link:http://10.0.0.5:81[]
*HTTP Address:* link:http://10.0.0.2:81[]
=== BonoboNET IRC network ===
@ -23,6 +23,7 @@ So far there are only two BNET nodes available over CRXN:
1. *lockdown.bnet:* `irc://10.1.0.3:6667`
2. *shitpoes.bnet:* `irc://10.1.0.12:6667`
3. TODO: Add Kaotisk's node
More information regarding BonoboNET can be found
link:http://10.1.0.2/projects/bonobonet[here].
@ -38,13 +39,13 @@ and you end up with a chat program that requires only ssh to be installed!
Deavmi's sshchat server can be accessed via the given parameters:
* *Server address:* `10.0.0.5`
* *Server address:* `10.0.0.2`
* *Server port:* `2227`
Use it like so:
****
ssh <username>@10.0.0.5 -p 2227
ssh <username>@10.0.0.2 -p 2227
****
Where `<username>` is your screen name.

View File

@ -0,0 +1,48 @@
Yggdrasil-based peering
=======================
This document aims to describe how one can setup Yggdrasil-based peering to connect to the CRXN inter-network.
== Getting a peer to peer with ==
First you must find an Yggdrasil user who is on CRXN and also willing to peer with you.
You will need to open up your `/etc/yggdrasil.conf` files on both ends and exchange
your public keys, specifically the `EncryptionPublicKey` fields.
Then you will both need to scroll down to the `TunnelRouting` section and make sure you
both have the following configured.
.Person you are peering with's `TunnelRouting` configuration
[source, json]
----------------------------
TunnelRouting: {
Enabled: true
TODO
}
----------------------------
.Your `TunnelRouting` configuration
[source, json]
----------------------------
TunnelRouting: {
Enabled: true
TODO
}
----------------------------
== Addresses ==
We're going to need to add an address to an interface on the machine, it can be any. So that packets
that get routed onto this machien that *were* destined to it can be accepted rather then being dropped.
*TODO*
== Packet forwarding ==
This only needs to be done if the machine you have set this up on is to be a router on your
network.
TODO