Skip to content

Commit 93d84ba

Browse files
committed
feat(ossupport): Add Alpine & Jammy support info
add alipine documentation update README update hardware and OS info make information more clear add info about multiple protocols Remove about, this info stays only on website and project README Update feedback & support with only relevant data, avoid duplication cross repositories update contributions add info about experimental docker support remove projects dead links
1 parent 1b3a6df commit 93d84ba

File tree

5 files changed

+109
-107
lines changed

5 files changed

+109
-107
lines changed

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ PiVPN Documentation is powered by [MKDocs-Material](https://squidfunk.github.io/
1414

1515
Please refer to [MKDocs Documentation](https://www.mkdocs.org/user-guide/) and [MKDocs-Material Documentation](https://squidfunk.github.io/mkdocs-material/) for more detailed information for information on how to install or more detailed documentation
1616

17-
1817
To add a new link on the navigation panel you need to edit the `mkdocs.yml` file in the root of the repo. There is a guide for building the navbar at [mkdocs wiki](https://www.mkdocs.org/user-guide/configuration/#nav)
1918

2019
To add a new document
@@ -24,6 +23,7 @@ To add a new document
2423
EG. `docs/url-friendly.md` or `docs/guides/url-friendly.md`
2524
- Edit your document using Markdown, there are loads of resources available for the correct syntax.
2625

26+
2727
### Test your changes
2828

2929
When working on this repo, it is advised that you review your changes locally before committing them. The `mkdocs serve` command can be used to live preview your changes (as you type) on your local machine.
@@ -38,6 +38,11 @@ When working on this repo, it is advised that you review your changes locally be
3838
* Push code to your fork `git push origin master`
3939
* Make Pull Request
4040

41+
42+
### Commit message style
43+
44+
when commiting changes, use [Angular commit message format](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-format).
45+
4146
### Deployment
4247

4348
Once changes are merged to master branch, CI Pipeline will run and take care of everything.

docs/faq.md

+39-8
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,52 @@ summary: Frequently asked questions
55

66
## What boards/OSes does PiVPN support?
77

8-
PiVPN runs at least on the following boards:
8+
### PiVPN runs at least on the following hardware
99

10-
* Raspberry Pi models (1/2/3/4/Zero) running Raspbian Stretch, Raspberry Pi OS Buster (32-bit), Ubuntu Server 20.04 Focal Fossa (32-bit and 64-bit).
11-
* All SBC's running DietPi.
12-
* Odroid C1, Odroid C2 (arm64), Odroid XU3/4, Pine A64, NanoPi NEO, NanoPi NEO Air, NanoPi M1.
13-
* Most x86_64 (Intel and AMD) servers running a Debian or Ubuntu based distro.
10+
* Raspberry Pi models (1/2/3/4/Zero)
11+
* All SBC's supported by [DietPi](https://dietpi.com/).
12+
* x86_64 (Intel and AMD) servers
1413

15-
## What About Octopi?
14+
### PiVPN Supports the following systems
15+
16+
* Raspbian and Raspberry PI OS
17+
* Stretch
18+
* Buster
19+
* Bullseye
20+
* Ubuntu Server
21+
* Bionic Beaver (18.04)
22+
* Focal Fossa (20.04)
23+
* Jammy Jellyfish (22.04)
24+
* [DietPi](https://dietpi.com/)
25+
* [Alpine Linux](install.md#alpine)
26+
27+
### What about other Debian / Ubuntu based distributions?
28+
29+
PiVPN may be able run and install VPN Protocols on any other Debian or Ubuntu based distributions however we do not provide support for them.
30+
31+
### What about docker?
32+
33+
Support for docker images is currently experimental and we do not provide any official images or official support. There is no ETA for full support.
34+
35+
### What About Octopi?
1636

1737
As per [Github Issue #373 on Octpi](https://github.com/guysoft/OctoPi/issues/373) OctoPi doesn't play well with PiVPN installer as they use a git wrapper that blocks it from running as root user. To disable the git wrapper please do: `sudo rm /root/bin/git`
1838

19-
## How do I know what changed in stable/master branch?
39+
### Can I have Wireguard and OpenVPN at the same time?
2040

21-
To know what has changed in the master branch read: [CHANGELOG.md](https://github.com/pivpn/pivpn/blob/master/CHANGELOG.md)
41+
Yes! All you have to do is to run PiVPN installation again. PiVPN will ask you what intend to do and setup everything for you. After the installation is finished all you have to do is to use `pivpn wg [options]` and `pivpn ovpn [options]` to manage each protocol.
2242

43+
```
44+
# pivpn help
45+
::: To pass off to the pivpn command for each protocol
46+
:::
47+
::: Usage: pivpn wg <command> [option]
48+
::: Usage: pivpn ovpn <command> [option]
49+
:::
50+
::: -h, help Show this help dialog
51+
::: -u, uninstall Uninstall pivpn from your system!
52+
::: -bk, backup Backup VPN configs and user profiles
53+
```
2354

2455
## My ISP doesn't give me a static external IP address and my server IP address keeps changing!
2556

docs/index.md

+21-90
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,9 @@ Authors: 4s3ti
44

55
# Welcome to PiVPN Docs
66

7-
![Logos](img/pivpnbanner.png)
8-
9-
## About
10-
11-
PiVPN is a set of shell scripts initially developed by **@0-kaladin** that serve to easily turn your Raspberry Pi (TM)
12-
into a VPN server using two free, open-source protocols:
13-
* [WireGuard](https://www.wireguard.com/)
14-
* [OpenVPN](https://openvpn.net)
15-
16-
Have you been looking for a good guide or tutorial for setting up a VPN server on a Raspberry Pi or Ubuntu based server?
17-
Run this script and you don't need a guide or tutorial, this will do it all for you, in a fraction of the time and with hardened security settings in place by default.
18-
19-
The master branch of this script installs and configures either WireGuard or OpenVPN (or both) on Raspbian, Debian or Ubuntu and it as been tested to run not only on Raspberry Pi but also in any Cloud Provider VPS.
20-
We recommend using the latest Raspbian Lite image on a Raspberry Pi in your home so you can VPN into your home from a unsecure remote locations and safely use the internet.
21-
However, the scripts do try to detect different distributions and make adjustments accordingly.
22-
They should work on the majority of Ubuntu and Debian based distributions including those using UFW by default instead of raw iptables.
23-
24-
This script's primary mission in life is to allow a user to have a home VPN for as cost effective as possible and without being a technical wizard.
25-
Hence the design of PiVPN to work on a Raspberry Pi ($35) and then one command installer.
26-
Followed by easy management of the VPN thereafter with the 'pivpn' command.
27-
That being said...
28-
29-
> This will also work on a free-tier Amazon AWS server using Ubuntu or Debian. I don't want to support every scenario there but getting it to run and install successfully on a free server in the cloud was also important.
30-
Many people have untrustworthy ISP's so running on a server elsewhere means you can connect to the VPN from home and your ISP will just see encrypted traffic as your traffic will now be leaving out the Amazon infrastructure.
31-
32-
## Prerequisites
33-
34-
To follow this guide and use the script to setup a VPN, you will need to have
35-
a Raspberry Pi Model B or later with, an SD or microSD card with Raspbian installed,
36-
a power adapter appropriate to the power needs of your model, and an ethernet cable or wifi
37-
adapter to connect your Pi to your router or gateway.
38-
It is recommended that you use a fresh image of the latest Raspbian Lite from
39-
the [Raspberry Pi's downloads page](https://raspberrypi.org/downloads), but if you don't, be sure to make a backup
40-
image of your existing installation before proceeding.
41-
You should also setup your Pi with a static IP address
42-
but it is not required as the script can do this for you.
43-
You will need to have your router forwarding UDP port 1194 or whatever custom
44-
port you may have chose in the installer
45-
(varies by model & manufacturer; consult your router manufacturer's documentation to do this).
46-
Enabling SSH on your Pi is also highly recommended, so that you can run a very
47-
compact headless server without a monitor or keyboard and be able to access it
48-
even more conveniently.
49-
50-
## How it works
7+
[![Logos](img/pivpnbanner.png)](https://pivpn.io)
8+
9+
## How does PiVPN work?
5110

5211
The script will first update your APT repositories, upgrade packages, and install WireGuard (default) or OpenVPN, which will take some time.
5312

@@ -72,64 +31,36 @@ The script will also make some changes to your system to allow it to forward int
7231

7332
After the installation is complete you can use the command `pivpn` to manage the server. Have a look at the [OpenVPN](https://github.com/pivpn/pivpn/wiki/OpenVPN) or [WireGuard](https://github.com/pivpn/pivpn/wiki/WireGuard) wiki for some example commands, connection instructions, FAQs, [troubleshooting steps](https://github.com/pivpn/pivpn/wiki/FAQ#how-do-i-troubleshoot-connection-issues).
7433

34+
---
7535
## Feedback & Support
7636

77-
PiVPN is purely community driven, and we are interested in making this script work for as many people as possible, we welcome any feedback on your experience.
78-
Please be respectful and be aware that this is maintained with our free time!
79-
80-
### General Guidelines
81-
82-
* Please check our documentation
83-
* Please carefully read the [contributors' guide](https://github.com/pivpn/pivpn/blob/master/CONTRIBUTING.md)
84-
* Please read the pinned posts on [Github Discussions](https://github.com/pivpn/pivpn/discussions)
85-
* Please use Github [Github Discussions](https://github.com/pivpn/pivpn/discussions) instead of Issues
86-
* Please provide as much information as you can
87-
* Fill the adequate template and provide all the requested data
88-
* If you can't find the adequate template, please ask first in any of our official channels
89-
* The Github issues page is not intended for general support usage or feature requests
90-
* PiVPN team may close any Discussion/Issue without any warning if they don't follow the Guidelines
91-
92-
### Official PiVPN Community support
37+
Our prefered contact method is through [Github Discussions page](https://github.com/pivpn/pivpn/discussions), please make sure you read the [General Guidelines](https://github.com/pivpn/pivpn/blob/master/README.md#feedback--support) before opening any new issue or discussion.
9338

94-
If you have any questions or need any support, feel free to reach out at any of the following platforms
39+
You can also reach out at:
9540

96-
* [Github Discussions](https://github.com/pivpn/pivpn/discussions)
97-
* Reddit at [r/pivpn](https://www.reddit.com/r/pivpn/)
9841
* \#pivpn at [libera.chat](https://libera.chat) IRC network
9942
* \#pivpn:matrix.org at [matrix.org](https://matrix.org)
43+
* Reddit at [r/pivpn](https://www.reddit.com/r/pivpn/)
10044

10145

102-
### Feature requests
103-
104-
Feature requests are very welcome, please do so at:
105-
106-
* [Feature requests](https://github.com/pivpn/pivpn/discussions/categories/feature-requests)
107-
108-
### Bug reports
109-
110-
* [Open Github Issue](https://github.com/pivpn/pivpn/issues)
111-
112-
!!! Note
113-
Because it didn't work doesn't mean its a bug!
114-
please make sure you have read all the documentation and you have reached out through the official channels! before claiming a bug!
115-
46+
---
11647
## contributions
11748

118-
PiVPN is not taking donations at this time but if you want to show your appreciation, then contribute or leave feedback on suggestions or improvements.
49+
PiVPN is not taking donations but if you want to show your appreciation, then contribute or leave feedback on suggestions or improvements.
11950

120-
Contributions can come in all kinds of different ways and you don't need to be a developer to be able to help out, here are some ways you can help out:
51+
Contributions can come in all kinds of different ways! You don't need to be a developer to help out.
12152

122-
* Please check the current [issues](https://github.com/pivpn/pivpn/issues) and [discussions](https://github.com/pivpn/pivpn/discussions)
123-
to see where you can help.
124-
* Help improving [documentation](https://github.com/pivpn/docs), either with new content or improving the existing writing.
125-
* Testing!! Run pivpn in different ways, different systems, different configurations and let us know if you find something!
53+
* Please check the current [issues](https://github.com/pivpn/pivpn/issues) and [discussions](https://github.com/pivpn/pivpn/discussions). Maybe there is something you can help with
54+
* [Documentation](https://github.com/pivpn/docs)! Documentation is never good enough! There is always something missing, or typos, or better English!
55+
* Our [website](https://pivpn.io) is also Open Source. feel free to suggest any changes or improvements [here](https://github.com/pivpn/pivpn.io)
56+
* Testing!! Run pivpn in different ways, different systems, different configurations! Let us know if you find something!
12657
* Assisting other users in any of our official channels is also very welcomed
12758

59+
Still, if you consider PiVPN useful and want to Donate instead, then consider donating to:
12860

129-
Still if you have found this tool to be useful and want to Donate instead, then consider the following sources.
130-
131-
1. [OpenVPNSetup](https://github.com/StarshipEngineer/OpenVPN-Setup)
132-
2. [pi-hole.net](https://github.com/pi-hole/pi-hole)
133-
3. [OpenVPN](https://openvpn.net)
134-
4. [WireGuard](https://www.wireguard.com/)
135-
5. [EFF](https://www.eff.org/)
61+
1. [PiVPN Contributors](https://github.com/pivpn/pivpn/graphs/contributors)
62+
2. [OpenVPNSetup](https://github.com/StarshipEngineer/OpenVPN-Setup)
63+
3. [pi-hole.net](https://github.com/pi-hole/pi-hole)
64+
4. [OpenVPN](https://openvpn.net)
65+
5. [WireGuard](https://www.wireguard.com/)
66+
6. [EFF](https://www.eff.org/)

docs/install.md

+42-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ title: Installation
22
summary: How to install
33
Authors: 4s3ti
44

5+
56
# Installation
67

78
## Method 1
@@ -70,7 +71,47 @@ pivpnGitUrl="https://github.com/userthatforked/pivpn.git"
7071
pivpnGitBranch="myfeaturebranch"
7172
```
7273

73-
### Updating pivpn
74+
## Alpine
75+
76+
### Requirements
77+
78+
* Bash
79+
* `apk add bash`
80+
* busybox-initscripts
81+
* `apk add busybox-initscripts`
82+
* run as root or have sudo installed
83+
* `apk add sudo; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel`
84+
85+
#### AWS Cloud Images (AMI)
86+
87+
On AWS sudo is is not available by default in the the Alpine AMI'and you should use `doas` to install the required dependencies.
88+
89+
```
90+
doas su
91+
apk add bash
92+
apk add busybox-initscripts
93+
apk add sudo
94+
echo '%wheel ALL=(ALL) ALL' > wheel
95+
mv wheel /etc/sudoers.d/
96+
chown root:root /etc/sudoers.d/wheel
97+
```
98+
99+
## Docker (experimental)
100+
101+
It is currently possible to use PiVPN on Alpine Containers
102+
103+
* The container should meet the [Alpine requirements](#alpine)
104+
* The container should run with `--cap_add NET_ADMIN`
105+
* The container needs to have access to `/sys/fs/cgroup` (`-v /sys/fs/cgroup` or `VOLUME [ "/sys/fs/cgroup" ]` in the Dockerfile)
106+
107+
!!! note
108+
This is experimental and we are not providing offical support or images.
109+
110+
Sharing PiVPN/Wireguard/OpenVPN Images is not advised
111+
112+
Feel free to open a [Discussion](https://github.com/pivpn/pivpn/discussions)
113+
114+
## Updating pivpn
74115

75116
VPN protocols are updated via system package manager
76117

docs/projects.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,14 @@ The links below showcase some good write-ups and tutorials that use PiVPN.
1010
Some other decent information may also be contained regarding VPNs and security in general.
1111
If you find you have more questions on this area then read and/or watch some of them below!
1212

13-
* [Setup OpenVPN and cli email client](https://peppe7o.com/raspberry-pi-vpn-server-with-pivpn/)
14-
* [Maintainer post about where to properly place a VPN](https://blog.4s3ti.net/vpn-where-to.html)
15-
* [Create your own VPN server with the Raspberry Pi](http://kamilslab.com/2016/0/21/how-to-turn-your-raspberry-pi-into-a-home-vpn-server-using-pivpn/)
16-
* [PiVPN - Create your own VPN for your home network](http://chasingtech.net/wp/2016/0/2/pivpn-create-your-own-vpn-for-your-home-network/)
13+
* [Maintainer post about where to properly place a VPN](https://4s3ti.net/en/posts/vpnusage/)
1714

1815
## Video Guides</b>
1916

2017
* [Raspberry Pi - OpenVPN Setup via PiVPN](https://www.youtube.com/watch?v=pUBMcsvJfe4).
2118
> Note: I don't think you'd have to do anything with iptables as he shows.
2219
This shows connecting with Windows client.
2320

24-
* [How to Setup PiVPN on the Raspberry Pi Tutorial](https://www.youtube.com/watch?v=8RSHSt3RuLk)
25-
* [Raspberry Pi - OpenVPN Setup via PiVPN](https://www.youtube.com/watch?v=pUBMcsvJfe3)
26-
2721

2822
## Related Projects
2923

0 commit comments

Comments
 (0)