From 626c3d31183de705afca312b6a0ebbaf1dc6d64a Mon Sep 17 00:00:00 2001 From: Antoine Jeanselme <67123340+ajeanselme@users.noreply.github.com> Date: Sun, 10 Mar 2024 20:38:34 +0100 Subject: [PATCH 1/2] Add NetBird to VPN --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fa38985..1336ee5 100644 --- a/README.md +++ b/README.md @@ -685,6 +685,7 @@ VPN software. - [Firezone](https://www.firez.one/) - WireGuard based VPN Server and Firewall. ([Source Code](https://github.com/firezone/firezone)) `Apache-2.0` `Docker` - [Headscale](https://github.com/juanfont/headscale) - Self-hostable fork of [Tailscale](https://tailscale.com), cross-platform clients, simple to use, built-in (currently experimental) monitoring tools. `BSD-3-Clause` `Go` - [Nebula](https://github.com/slackhq/nebula) - A scalable p2p VPN with a focus on performance, simplicity and security. `MIT` `Go` +- [NetBird](https://netbird.io) - NetBird combines a configuration-free peer-to-peer private network and a centralized access control system in a single platform, making it easy to create secure private networks for your organization or home. ([Source Code](https://github.com/netbirdio/netbird)) `BSD-3-Clause` `Go` - [ocserv](https://www.infradead.org/ocserv/) - Cisco AnyConnect-compatible VPN server. ([Source Code](https://gitlab.com/ocserv/ocserv)) `GPL-2.0` `C` - [OpenVPN](https://community.openvpn.net) - Uses a custom security protocol that utilizes SSL/TLS for key exchange. ([Source Code](https://github.com/OpenVPN/openvpn)) `GPL-2.0` `C` - [PiVPN](https://www.pivpn.io/) - The simplest way to setup and manage a VPN, designed for Raspberry Pi. ([Source Code](https://github.com/pivpn/pivpn)) `MIT` `Shell` From c1d746b8052dd63800c3d6bab6197c2bf77d1810 Mon Sep 17 00:00:00 2001 From: Blue Falcon <130698314+anonhostpi@users.noreply.github.com> Date: Tue, 1 Jul 2025 14:58:22 -0700 Subject: [PATCH 2/2] Fix grammar in Pull Request template (#626) This a fix for the Pull Request template. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4cfd4e1..a14d236 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ Thank you for taking the time to work on a PR for Awesome-Sysadmin! To ensure your PR is dealt with swiftly please check the following: - [ ] Your additions are [Free software](https://en.wikipedia.org/wiki/Free_software) -- [ ] Software your are submitting is not your own, unless you have a healthy ecosystem with a few contributors (which aren't your sock puppet accounts). +- [ ] Software you are submitting is not your own, unless you have a healthy ecosystem with a few contributors (which aren't your sock puppet accounts). - [ ] Submit one item per pull request. This eases reviewing and speeds up inclusion. - [ ] Format your submission as follows, where `Demo` and `Clients` are optional. Do not add a duplicate `Source code` link if it is the same as the main link.