Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop Sync Upstream #371

Merged
merged 8 commits into from
Apr 6, 2019
Merged

Develop Sync Upstream #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d547f92
Added json for nums (#367)
makew0rld Mar 24, 2019
053ac4f
Added nodes about x86
darkdrgn2k Mar 24, 2019
cb3d8c2
Removed exit for i386
darkdrgn2k Mar 25, 2019
825d3db
Removed incorrect comment
darkdrgn2k Mar 25, 2019
6129b5e
Added note about older version of grafana
darkdrgn2k Mar 25, 2019
84f690e
Merge pull request #340 from tomeshnet/i386
darkdrgn2k Mar 25, 2019
33354d3
fix spacing
garrying Mar 27, 2019
20930e4
Merge pull request #369 from tomeshnet/master
darkdrgn2k Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The following instructions will help you set up an encrypted mesh network on Raspberry Pi's. It takes about 15 minutes to set up a node with the Pi 3. Obviously, to have a mesh you will need more than one node.

Many board that run [Armbian](https://www.armbian.com/) such as many models of Orange Pi hardware are also supported. The same installation steps can be followed, except you would flash the SD card with Armbian instead of Raspbian. See [Hardware Table](#hardware-table) for the full list of supported hardware and check for board specific installation details in our [Frequently Asked Questions](./docs/FAQ.md).
The software also supports Debian running on x86 and x64 boards, and many board that run [Armbian](https://www.armbian.com/) (such as many models of Orange Pi hardware family). The same installation steps can be followed, except you would flash the SD card with Armbian instead of Raspbian or have Debian installed onto the computer. See [Hardware Table](#hardware-table) for the full list of supported hardware and check for board specific installation details in our [Frequently Asked Questions](./docs/FAQ.md).

## Set Up

Expand Down Expand Up @@ -76,6 +76,7 @@ List of tested hardware:

| Hardware | Base OS | [CJDNS Benchmark](https://github.com/phillymesh/cjdns-optimizations) <sub>(salsa20/poly1305, switching)</sub> | iPerf3 | USB | Ethernet | Notes |
| :-------------------------|:----------------|:--------------------------------------------------------------------------------------------------------------|:-------|:----|:---------|:---------|
| Genericx x86 | Debian 9 | | | | | Performance depended on underlying hardware. |
| Raspberry Pi 3b+ | [Raspbian Lite](https://www.raspberrypi.org/downloads/raspbian/) | 405k, 119k | ~90 Mbps| 2 | 10/100/1000 | Eth only ~320mbps. Onboard wifi dual band |
| Raspberry Pi 3b | [Raspbian Lite](https://www.raspberrypi.org/downloads/raspbian/) | 350k, 100k | 89 Mbps | 2 | 10/100 | |
| Raspberry Pi 2 | [Raspbian Lite](https://www.raspberrypi.org/downloads/raspbian/) | 145k, 55k | 39 Mbps | 2 | 10/100 | |
Expand All @@ -91,6 +92,7 @@ List of tested hardware:
| Pine64 | [Armbian](https://dl.armbian.com/pine/nightly/) | 227k, 151k | 78 Mbps | 2 | 10/100/1000 | Gigabit Eth |
| ESPRESSObin | [Armbian](https://dl.armbian.com/espressobin/) | 186k, 128K | 73 Mbps | 2 | 10/100/1000 | 1 USB 3.0, 3x Gigabit Eth, SATA, mPCIe. Use stable and apt-get upgrade after boot |
| MK802ii | Debian | 30k, 40k | 25Mbps | | | Android box. Single core. Onboard WiFi supports Mesh Point |

## Development

You can install from a specific tag or branch, such as `develop`, with:
Expand Down
1 change: 1 addition & 0 deletions docs/MODULES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ for typos, make sure there are "" around the whole entire string.


# Grafana
**NOTE** Older verison used for i386 deployment due to lack of support for officialy binaries

[Grafana](https://grafana.com/) is a dashboard used to display Prometheus collected data. Once installed you can visit `http://<yournodeip>:3000`. Default login is `admin`/`admin`. You can skip the welcome screen/wizard by clicking on the Grafana logo at the top left corner.

Expand Down
4 changes: 2 additions & 2 deletions scripts/ipfs/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ ipfs config --bool Experimental.FilestoreEnabled true
# Setup connection management - Reduce connections to stress the Pi less
# XXX: These values need to be tweaked and tested
ipfs config Swarm.ConnMgr.Type basic
ipfs config Swarm.ConnMgr.LowWater 100
ipfs config Swarm.ConnMgr.HighWater 200
ipfs config --json Swarm.ConnMgr.LowWater 100
ipfs config --json Swarm.ConnMgr.HighWater 200
ipfs config Swarm.ConnMgr.GracePeriod 60s

# Enable QUIC for better connections when possible
Expand Down
2 changes: 0 additions & 2 deletions scripts/yggdrasil/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ case "$ARCH" in
;;
i386 | i586 | i686 )
ARCH_VERSION="i386"
exit 0
;;
armv7l)
ARCH_VERSION="armhf"
;;
armv6l)
# Use old grafana - no new one available
ARCH_VERSION="armhf"
;;
aarch64)
Expand Down