From b486b87ad106cd753fcde4884452163b827438dd Mon Sep 17 00:00:00 2001 From: Martin Vandenbussche Date: Thu, 15 Aug 2024 18:11:34 +0200 Subject: [PATCH 1/3] Update ProtonVPN instructions to include recent addition of Wireguard support (see https://github.com/qdm12/gluetun/pull/2390) --- setup/providers/protonvpn.md | 9 +++------ setup/wireguard.md | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/setup/providers/protonvpn.md b/setup/providers/protonvpn.md index a01afe7..2146f5a 100644 --- a/setup/providers/protonvpn.md +++ b/setup/providers/protonvpn.md @@ -31,8 +31,6 @@ services: - SERVER_COUNTRIES=Netherlands ``` -💁 To use with Wireguard, download a configuration file from [account.proton.me/u/0/vpn/WireGuard](https://account.proton.me/u/0/vpn/WireGuard) and head to [the custom provider Wireguard section](custom.md#wireguard). Thanks to [@pvanryn](https://github.com/pvanryn) for pointing this out. Note however you cannot filter servers as easily as with OpenVPN since each server uses its own private key and/or peer address. - ## Required environment variables - `VPN_SERVICE_PROVIDER=protonvpn` @@ -66,11 +64,10 @@ services: ## VPN server port forwarding -Requirements: - -- Add `+pmp` to your OpenVPN username (thanks to [@mortimr](https://github.com/qdm12/gluetun/issues/1760#issuecomment-1669518288)) - `VPN_PORT_FORWARDING=on` -- If you use **Wireguard** using the custom provider, set `VPN_PORT_FORWARDING_PROVIDER=protonvpn` + +### OpenVPN only +- Also add `+pmp` to your OpenVPN username (thanks to [@mortimr](https://github.com/qdm12/gluetun/issues/1760#issuecomment-1669518288)) ## Multi hop regions diff --git a/setup/wireguard.md b/setup/wireguard.md index c929330..bbbbb6c 100644 --- a/setup/wireguard.md +++ b/setup/wireguard.md @@ -10,6 +10,7 @@ Gluetun supports Wireguard with native integration for the following providers: - [NordVPN](providers/nordvpn.md) - [Surfshark](providers/surfshark.md) - [Windscribe](providers/windscribe.md) +- [ProtonVPN](providers/protonvpn.md) And you should refer to their respective page to set up easily Wireguard with them. From 95ec3128faa6a89124f4f94afcb897237e13016c Mon Sep 17 00:00:00 2001 From: Martin Vandenbussche Date: Thu, 15 Aug 2024 18:42:37 +0200 Subject: [PATCH 2/3] Remove reference to ProtonVPN in VPN_PORT_FORWARDING_PROVIDER option documentation (not necessary anymore) --- setup/options/port-forwarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/options/port-forwarding.md b/setup/options/port-forwarding.md index 2745998..362b677 100644 --- a/setup/options/port-forwarding.md +++ b/setup/options/port-forwarding.md @@ -7,6 +7,6 @@ | Variable | Default | Choices | Description | | --- | --- | --- | --- | | `VPN_PORT_FORWARDING` | `off` | `off` or `on` | Enable custom port forwarding code for supported providers | -| `VPN_PORT_FORWARDING_PROVIDER` | Current provider in use | `private internet access` or `protonvpn` | Choose the custom port forwarding code to use. This is useful when using the custom provider with Wireguard. For PIA, make sure you set `SERVER_NAMES=`. | +| `VPN_PORT_FORWARDING_PROVIDER` | Current provider in use | `private internet access` | Choose the custom port forwarding code to use. This is useful when using the custom provider with Wireguard. For PIA, make sure you set `SERVER_NAMES=`. | | `VPN_PORT_FORWARDING_STATUS_FILE` | `/tmp/gluetun/forwarded_port` | Valid filepath | File path to use for writing the forwarded port obtained. | | `VPN_PORT_FORWARDING_LISTENING_PORT` | | Valid port number | Port redirection for the VPN server side port forwarded. | From 8f0b2c9f44ec0ec42a0f3df7f50b7b8c2ea0d968 Mon Sep 17 00:00:00 2001 From: Martin Vandenbussche Date: Sat, 14 Sep 2024 14:44:28 +0200 Subject: [PATCH 3/3] Fixing linting & integrating review --- setup/providers/protonvpn.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup/providers/protonvpn.md b/setup/providers/protonvpn.md index 2146f5a..994ca21 100644 --- a/setup/providers/protonvpn.md +++ b/setup/providers/protonvpn.md @@ -64,10 +64,7 @@ services: ## VPN server port forwarding -- `VPN_PORT_FORWARDING=on` - -### OpenVPN only -- Also add `+pmp` to your OpenVPN username (thanks to [@mortimr](https://github.com/qdm12/gluetun/issues/1760#issuecomment-1669518288)) +- `VPN_PORT_FORWARDING=on` : this option is applicable for both OpenVPN and Wireguard. ## Multi hop regions