mirror of
https://github.com/pia-foss/manual-connections.git
synced 2025-02-05 14:08:29 +00:00
fixed merge conflict on README.md
This commit is contained in:
commit
9ee75c4df1
|
@ -61,7 +61,7 @@ Some users have created their own repositories for manual connections, based on
|
||||||
| Linux | No | Python | WireGuard, PF | [milahu/python-piavpn](https://github.com/milahu/python-piavpn) |
|
| Linux | No | Python | WireGuard, PF | [milahu/python-piavpn](https://github.com/milahu/python-piavpn) |
|
||||||
| Linux | No | Bash | WireGuard, PF,<br/>router and android config | [triffid/pia-wg](https://github.com/triffid/pia-wg) |
|
| Linux | No | Bash | WireGuard, PF,<br/>router and android config | [triffid/pia-wg](https://github.com/triffid/pia-wg) |
|
||||||
| Linux/FreeBSD/Win | No | Go | WireGuard,<br />config generation | [ddb_db/piawgcli](https://gitlab.com/ddb_db/piawgcli) |
|
| Linux/FreeBSD/Win | No | Go | WireGuard,<br />config generation | [ddb_db/piawgcli](https://gitlab.com/ddb_db/piawgcli) |
|
||||||
| OPNsense | No | Python | WireGuard, PF | [FingerlessGlov3s/OPNsensePIAWireguard](https://github.com/FingerlessGlov3s/OPNsensePIAWireguard) |
|
| OPNsense | No | Python | WireGuard, PF, DIP | [FingerlessGlov3s/OPNsensePIAWireguard](https://github.com/FingerlessGlov3s/OPNsensePIAWireguard) |
|
||||||
| pfSense | No | Sh | OpenVPN, PF | [fm407/PIA-NextGen-PortForwarding](https://github.com/fm407/PIA-NextGen-PortForwarding) |
|
| pfSense | No | Sh | OpenVPN, PF | [fm407/PIA-NextGen-PortForwarding](https://github.com/fm407/PIA-NextGen-PortForwarding) |
|
||||||
| pfSense | No | Java/PHP | WireGuard, PF | [ddb_db/pfpiamgr](https://gitlab.com/ddb_db/pfpiamgr) |
|
| pfSense | No | Java/PHP | WireGuard, PF | [ddb_db/pfpiamgr](https://gitlab.com/ddb_db/pfpiamgr) |
|
||||||
| Synology | Yes | Bash | Compatibility | [steff2632/manual-connections](https://github.com/steff2632/manual-connections) |
|
| Synology | Yes | Bash | Compatibility | [steff2632/manual-connections](https://github.com/steff2632/manual-connections) |
|
||||||
|
@ -69,6 +69,7 @@ Some users have created their own repositories for manual connections, based on
|
||||||
| TrueNAS | No | Bash | PF | [dak180/TrueNAS-Scripts](https://github.com/dak180/TrueNAS-Scripts/blob/master/pia-port-forward.sh) |
|
| TrueNAS | No | Bash | PF | [dak180/TrueNAS-Scripts](https://github.com/dak180/TrueNAS-Scripts/blob/master/pia-port-forward.sh) |
|
||||||
| UFW | Yes | Bash | Firewall Rules | [iPherian/manual-connections](https://github.com/iPherian/manual-connections) |
|
| UFW | Yes | Bash | Firewall Rules | [iPherian/manual-connections](https://github.com/iPherian/manual-connections) |
|
||||||
| Windows | No | PowerShell | Windows comptaibility | [ImjuzCY/pia-posh](https://github.com/ImjuzCY/pia-posh) |
|
| Windows | No | PowerShell | Windows comptaibility | [ImjuzCY/pia-posh](https://github.com/ImjuzCY/pia-posh) |
|
||||||
|
| Windows | No | Powershell | OpenVPN, PF | [dougbenham/PIA-OpenVPN-Script](https://github.com/dougbenham/PIA-OpenVPN-Script) |
|
||||||
|
|
||||||
## PIA Port Forwarding
|
## PIA Port Forwarding
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@ $dnsSettingForVPN
|
||||||
[Peer]
|
[Peer]
|
||||||
PersistentKeepalive = 25
|
PersistentKeepalive = 25
|
||||||
PublicKey = $(echo "$wireguard_json" | jq -r '.server_key')
|
PublicKey = $(echo "$wireguard_json" | jq -r '.server_key')
|
||||||
AllowedIPs = 0.0.0.0/0
|
AllowedIPs = 0.0.0.0/1, 128.0.0.0/1
|
||||||
Endpoint = ${WG_SERVER_IP}:$(echo "$wireguard_json" | jq -r '.server_port')
|
Endpoint = ${WG_SERVER_IP}:$(echo "$wireguard_json" | jq -r '.server_port')
|
||||||
" > /etc/wireguard/pia.conf || exit 1
|
" > /etc/wireguard/pia.conf || exit 1
|
||||||
echo -e "${green}OK!${nc}"
|
echo -e "${green}OK!${nc}"
|
||||||
|
|
|
@ -69,7 +69,7 @@ fi
|
||||||
echo -n "Checking login credentials..."
|
echo -n "Checking login credentials..."
|
||||||
|
|
||||||
generateTokenResponse=$(curl -s -u "$PIA_USER:$PIA_PASS" \
|
generateTokenResponse=$(curl -s -u "$PIA_USER:$PIA_PASS" \
|
||||||
"https://privateinternetaccess.com/gtoken/generateToken")
|
"https://www.privateinternetaccess.com/gtoken/generateToken")
|
||||||
|
|
||||||
if [[ $(echo "$generateTokenResponse" | jq -r '.status') != "OK" ]]; then
|
if [[ $(echo "$generateTokenResponse" | jq -r '.status') != "OK" ]]; then
|
||||||
echo
|
echo
|
||||||
|
|
Loading…
Reference in New Issue
Block a user