diff --git a/openvpn/pia/AU Melbourne.ovpn b/openvpn/pia/AU Melbourne.ovpn index 0ef2d295e..864e90ace 100644 --- a/openvpn/pia/AU Melbourne.ovpn +++ b/openvpn/pia/AU Melbourne.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote aus-melbourne.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/AU Sydney.ovpn b/openvpn/pia/AU Sydney.ovpn index bbb87da7a..114aa9783 100644 --- a/openvpn/pia/AU Sydney.ovpn +++ b/openvpn/pia/AU Sydney.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote aus.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Brazil.ovpn b/openvpn/pia/Brazil.ovpn index 39465ad6e..e682e3a77 100644 --- a/openvpn/pia/Brazil.ovpn +++ b/openvpn/pia/Brazil.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote brazil.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/CA North York.ovpn b/openvpn/pia/CA North York.ovpn index f14bfea24..fa03b42b1 100644 --- a/openvpn/pia/CA North York.ovpn +++ b/openvpn/pia/CA North York.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote ca.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/CA Toronto.ovpn b/openvpn/pia/CA Toronto.ovpn index d44b9612c..69c2d4359 100644 --- a/openvpn/pia/CA Toronto.ovpn +++ b/openvpn/pia/CA Toronto.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote ca-toronto.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Denmark.ovpn b/openvpn/pia/Denmark.ovpn new file mode 100644 index 000000000..dda51bb10 --- /dev/null +++ b/openvpn/pia/Denmark.ovpn @@ -0,0 +1,18 @@ +client +dev tun +proto udp +remote denmark.privateinternetaccess.com 1194 +resolv-retry infinite +nobind +persist-key +persist-tun +ca /etc/openvpn/pia/ca.crt +tls-client +remote-cert-tls server +auth-user-pass /config/openvpn-credentials.txt +comp-lzo +verb 1 +reneg-sec 0 +crl-verify /etc/openvpn/pia/crl.pem + + diff --git a/openvpn/pia/Finland.ovpn b/openvpn/pia/Finland.ovpn new file mode 100644 index 000000000..d7339c1d5 --- /dev/null +++ b/openvpn/pia/Finland.ovpn @@ -0,0 +1,18 @@ +client +dev tun +proto udp +remote fi.privateinternetaccess.com 1194 +resolv-retry infinite +nobind +persist-key +persist-tun +ca /etc/openvpn/pia/ca.crt +tls-client +remote-cert-tls server +auth-user-pass /config/openvpn-credentials.txt +comp-lzo +verb 1 +reneg-sec 0 +crl-verify /etc/openvpn/pia/crl.pem + + diff --git a/openvpn/pia/France.ovpn b/openvpn/pia/France.ovpn index deaa23c1b..a6bfea7ff 100644 --- a/openvpn/pia/France.ovpn +++ b/openvpn/pia/France.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote france.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Germany.ovpn b/openvpn/pia/Germany.ovpn index eae39ed3f..d95140477 100644 --- a/openvpn/pia/Germany.ovpn +++ b/openvpn/pia/Germany.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote germany.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Hong Kong.ovpn b/openvpn/pia/Hong Kong.ovpn index 3ac2425c9..48e15ad4a 100644 --- a/openvpn/pia/Hong Kong.ovpn +++ b/openvpn/pia/Hong Kong.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote hk.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/India.ovpn b/openvpn/pia/India.ovpn new file mode 100644 index 000000000..4c558371e --- /dev/null +++ b/openvpn/pia/India.ovpn @@ -0,0 +1,18 @@ +client +dev tun +proto udp +remote in.privateinternetaccess.com 1194 +resolv-retry infinite +nobind +persist-key +persist-tun +ca /etc/openvpn/pia/ca.crt +tls-client +remote-cert-tls server +auth-user-pass /config/openvpn-credentials.txt +comp-lzo +verb 1 +reneg-sec 0 +crl-verify /etc/openvpn/pia/crl.pem + + diff --git a/openvpn/pia/Ireland.ovpn b/openvpn/pia/Ireland.ovpn index eb22425b0..ead4494f9 100644 --- a/openvpn/pia/Ireland.ovpn +++ b/openvpn/pia/Ireland.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote ireland.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Israel.ovpn b/openvpn/pia/Israel.ovpn index 6c2c2375e..bb6f6a01c 100644 --- a/openvpn/pia/Israel.ovpn +++ b/openvpn/pia/Israel.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote israel.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Italy.ovpn b/openvpn/pia/Italy.ovpn index f39208aee..d87644bd7 100644 --- a/openvpn/pia/Italy.ovpn +++ b/openvpn/pia/Italy.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote italy.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Japan.ovpn b/openvpn/pia/Japan.ovpn index 03a1716fd..ebfb0a4a5 100644 --- a/openvpn/pia/Japan.ovpn +++ b/openvpn/pia/Japan.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote japan.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Mexico.ovpn b/openvpn/pia/Mexico.ovpn index 3d5bdcc02..4fd43d818 100644 --- a/openvpn/pia/Mexico.ovpn +++ b/openvpn/pia/Mexico.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote mexico.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Netherlands.ovpn b/openvpn/pia/Netherlands.ovpn index 6a608ce5d..b3491d84f 100644 --- a/openvpn/pia/Netherlands.ovpn +++ b/openvpn/pia/Netherlands.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote nl.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/New Zealand.ovpn b/openvpn/pia/New Zealand.ovpn new file mode 100644 index 000000000..ecddfb03f --- /dev/null +++ b/openvpn/pia/New Zealand.ovpn @@ -0,0 +1,18 @@ +client +dev tun +proto udp +remote nz.privateinternetaccess.com 1194 +resolv-retry infinite +nobind +persist-key +persist-tun +ca /etc/openvpn/pia/ca.crt +tls-client +remote-cert-tls server +auth-user-pass /config/openvpn-credentials.txt +comp-lzo +verb 1 +reneg-sec 0 +crl-verify /etc/openvpn/pia/crl.pem + + diff --git a/openvpn/pia/Norway.ovpn b/openvpn/pia/Norway.ovpn new file mode 100644 index 000000000..94f433df2 --- /dev/null +++ b/openvpn/pia/Norway.ovpn @@ -0,0 +1,18 @@ +client +dev tun +proto udp +remote no.privateinternetaccess.com 1194 +resolv-retry infinite +nobind +persist-key +persist-tun +ca /etc/openvpn/pia/ca.crt +tls-client +remote-cert-tls server +auth-user-pass /config/openvpn-credentials.txt +comp-lzo +verb 1 +reneg-sec 0 +crl-verify /etc/openvpn/pia/crl.pem + + diff --git a/openvpn/pia/Romania.ovpn b/openvpn/pia/Romania.ovpn index d1d339518..746ca1edc 100644 --- a/openvpn/pia/Romania.ovpn +++ b/openvpn/pia/Romania.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote ro.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Russia.ovpn b/openvpn/pia/Russia.ovpn index 05cde5419..6be120ea3 100644 --- a/openvpn/pia/Russia.ovpn +++ b/openvpn/pia/Russia.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote russia.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Singapore.ovpn b/openvpn/pia/Singapore.ovpn index 14876209f..6f4a26329 100644 --- a/openvpn/pia/Singapore.ovpn +++ b/openvpn/pia/Singapore.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote sg.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Sweden.ovpn b/openvpn/pia/Sweden.ovpn index 66c82316f..a8036a093 100644 --- a/openvpn/pia/Sweden.ovpn +++ b/openvpn/pia/Sweden.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote sweden.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Switzerland.ovpn b/openvpn/pia/Switzerland.ovpn index bf8dc9c22..9654e85bf 100644 --- a/openvpn/pia/Switzerland.ovpn +++ b/openvpn/pia/Switzerland.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote swiss.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/Turkey.ovpn b/openvpn/pia/Turkey.ovpn index b5ca8b739..a25e9acc2 100644 --- a/openvpn/pia/Turkey.ovpn +++ b/openvpn/pia/Turkey.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote turkey.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/UK London.ovpn b/openvpn/pia/UK London.ovpn index 958ef9356..4fac3ffe1 100644 --- a/openvpn/pia/UK London.ovpn +++ b/openvpn/pia/UK London.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote uk-london.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/UK Southampton.ovpn b/openvpn/pia/UK Southampton.ovpn index 85ef3531c..d867f95e1 100644 --- a/openvpn/pia/UK Southampton.ovpn +++ b/openvpn/pia/UK Southampton.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote uk-southampton.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US California.ovpn b/openvpn/pia/US California.ovpn index b9f90c23d..527c7b3e6 100644 --- a/openvpn/pia/US California.ovpn +++ b/openvpn/pia/US California.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-california.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US East.ovpn b/openvpn/pia/US East.ovpn index eb7efcb17..385cacc47 100644 --- a/openvpn/pia/US East.ovpn +++ b/openvpn/pia/US East.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-east.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US Florida.ovpn b/openvpn/pia/US Florida.ovpn index c4e7c9df0..16e137079 100644 --- a/openvpn/pia/US Florida.ovpn +++ b/openvpn/pia/US Florida.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-florida.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US Midwest.ovpn b/openvpn/pia/US Midwest.ovpn index c85b3a6f3..2c124d197 100644 --- a/openvpn/pia/US Midwest.ovpn +++ b/openvpn/pia/US Midwest.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-midwest.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US New York City.ovpn b/openvpn/pia/US New York City.ovpn index 0b6db8234..127db52c1 100644 --- a/openvpn/pia/US New York City.ovpn +++ b/openvpn/pia/US New York City.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-newyorkcity.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US Seattle.ovpn b/openvpn/pia/US Seattle.ovpn index 8f8dd3d58..9dca4941c 100644 --- a/openvpn/pia/US Seattle.ovpn +++ b/openvpn/pia/US Seattle.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-seattle.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US Silicon Valley.ovpn b/openvpn/pia/US Silicon Valley.ovpn index 1d9d25fb7..c6f7e7710 100644 --- a/openvpn/pia/US Silicon Valley.ovpn +++ b/openvpn/pia/US Silicon Valley.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-siliconvalley.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US Texas.ovpn b/openvpn/pia/US Texas.ovpn index 60bfb05c1..a0cbb2e1e 100644 --- a/openvpn/pia/US Texas.ovpn +++ b/openvpn/pia/US Texas.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-texas.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/pia/US West.ovpn b/openvpn/pia/US West.ovpn index 2f4bb3b55..f9c6fa548 100644 --- a/openvpn/pia/US West.ovpn +++ b/openvpn/pia/US West.ovpn @@ -1,5 +1,5 @@ client -dev tun0 +dev tun proto udp remote us-west.privateinternetaccess.com 1194 resolv-retry infinite @@ -16,9 +16,3 @@ reneg-sec 0 crl-verify /etc/openvpn/pia/crl.pem - - -# OpenVPN controls startup and shut down of transmission -script-security 2 -up /etc/transmission/start.sh -down /etc/transmission/stop.sh diff --git a/openvpn/start.sh b/openvpn/start.sh index 07a1c5261..0e7f4f8f3 100755 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -45,4 +45,6 @@ echo $TRANSMISSION_RPC_PASSWORD >> /config/transmission-credentials.txt # Persist transmission settings for use by transmission-daemon dockerize -template /etc/transmission/environment-variables.tmpl:/etc/transmission/environment-variables.sh /bin/true -exec openvpn $OPENVPN_OPTS --config "$OPENVPN_CONFIG" +TRANSMISSION_CONTROL_OPTS="--script-security 2 --up /etc/transmission/start.sh --down /etc/transmission/stop.sh" + +exec openvpn $TRANSMISSION_CONTROL_OPTS $OPENVPN_OPTS --config "$OPENVPN_CONFIG"