diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 96ad5a7b..31bc01fb 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,12 +4,12 @@ Contributions are [released](https://help.github.com/articles/github-terms-of-se ## Submitting a pull request -1. [Fork](https://github.com/qdm12/private-internet-access-docker/fork) and clone the repository +1. [Fork](https://github.com/qdm12/gluetun/fork) and clone the repository 1. Create a new branch `git checkout -b my-branch-name` 1. Modify the code 1. Ensure the docker build succeeds `docker build .` 1. Commit your modifications -1. Push to your fork and [submit a pull request](https://github.com/qdm12/private-internet-access-docker/compare) +1. Push to your fork and [submit a pull request](https://github.com/qdm12/gluetun/compare) ## Resources @@ -20,10 +20,10 @@ Contributions are [released](https://help.github.com/articles/github-terms-of-se Thanks for all the contributions, whether small or not so small! -- [@JeordyR](https://github.com/JeordyR) for testing the Mullvad version and opening a [PR with a few fixes](https://github.com/qdm12/private-internet-access-docker/pull/84/files) 👍 -- [@rorph](https://github.com/rorph) for a [PR to pick a random region for PIA](https://github.com/qdm12/private-internet-access-docker/pull/70) and a [PR to make the container work with kubernetes](https://github.com/qdm12/private-internet-access-docker/pull/69) -- [@JesterEE](https://github.com/JesterEE) for a [PR to fix silly line endings in block lists back then](https://github.com/qdm12/private-internet-access-docker/pull/55) 📎 -- [@elmerfdz](https://github.com/elmerfdz) for a [PR to add timezone information to have correct log timestampts](https://github.com/qdm12/private-internet-access-docker/pull/51) 🕙 -- [@Juggels](https://github.com/Juggels) for a [PR to write the PIA forwarded port to a file](https://github.com/qdm12/private-internet-access-docker/pull/43) -- [@gdlx](https://github.com/gdlx) for a [PR to fix and improve PIA port forwarding script](https://github.com/qdm12/private-internet-access-docker/pull/32) -- [@janaz](https://github.com/janaz) for keeping an eye on [updating things in the Dockerfile](https://github.com/qdm12/private-internet-access-docker/pull/8) +- [@JeordyR](https://github.com/JeordyR) for testing the Mullvad version and opening a [PR with a few fixes](https://github.com/qdm12/gluetun/pull/84/files) 👍 +- [@rorph](https://github.com/rorph) for a [PR to pick a random region for PIA](https://github.com/qdm12/gluetun/pull/70) and a [PR to make the container work with kubernetes](https://github.com/qdm12/gluetun/pull/69) +- [@JesterEE](https://github.com/JesterEE) for a [PR to fix silly line endings in block lists back then](https://github.com/qdm12/gluetun/pull/55) 📎 +- [@elmerfdz](https://github.com/elmerfdz) for a [PR to add timezone information to have correct log timestampts](https://github.com/qdm12/gluetun/pull/51) 🕙 +- [@Juggels](https://github.com/Juggels) for a [PR to write the PIA forwarded port to a file](https://github.com/qdm12/gluetun/pull/43) +- [@gdlx](https://github.com/gdlx) for a [PR to fix and improve PIA port forwarding script](https://github.com/qdm12/gluetun/pull/32) +- [@janaz](https://github.com/janaz) for keeping an eye on [updating things in the Dockerfile](https://github.com/qdm12/gluetun/pull/8) diff --git a/Dockerfile b/Dockerfile index 75097c1e..9e2aeb73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,9 +28,9 @@ LABEL \ org.opencontainers.image.created=$BUILD_DATE \ org.opencontainers.image.version=$VERSION \ org.opencontainers.image.revision=$VCS_REF \ - org.opencontainers.image.url="https://github.com/qdm12/private-internet-access-docker" \ - org.opencontainers.image.documentation="https://github.com/qdm12/private-internet-access-docker" \ - org.opencontainers.image.source="https://github.com/qdm12/private-internet-access-docker" \ + org.opencontainers.image.url="https://github.com/qdm12/gluetun" \ + org.opencontainers.image.documentation="https://github.com/qdm12/gluetun" \ + org.opencontainers.image.source="https://github.com/qdm12/gluetun" \ org.opencontainers.image.title="VPN client for PIA, Mullvad, Windscribe, Surfshark and Cyberghost" \ org.opencontainers.image.description="VPN client to tunnel to PIA, Mullvad, Windscribe, Surfshark and Cyberghost servers using OpenVPN, IPtables, DNS over TLS and Alpine Linux" ENV VPNSP=pia \ diff --git a/README.md b/README.md index d12f32de..65ad26d3 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ iptables, DNS over TLS, ShadowSocks and Tinyproxy* **ANNOUNCEMENT**: *[Video of the Git history of Gluetun](https://youtu.be/khipOYJtGJ0)* - + -[![Build status](https://github.com/qdm12/private-internet-access-docker/workflows/Buildx%20latest/badge.svg)](https://github.com/qdm12/private-internet-access-docker/actions?query=workflow%3A%22Buildx+latest%22) +[![Build status](https://github.com/qdm12/gluetun/workflows/Buildx%20latest/badge.svg)](https://github.com/qdm12/gluetun/actions?query=workflow%3A%22Buildx+latest%22) [![Docker Pulls](https://img.shields.io/docker/pulls/qmcgaw/private-internet-access.svg)](https://hub.docker.com/r/qmcgaw/private-internet-access) [![Docker Stars](https://img.shields.io/docker/stars/qmcgaw/private-internet-access.svg)](https://hub.docker.com/r/qmcgaw/private-internet-access) -[![GitHub last commit](https://img.shields.io/github/last-commit/qdm12/private-internet-access-docker.svg)](https://github.com/qdm12/private-internet-access-docker/issues) -[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/qdm12/private-internet-access-docker.svg)](https://github.com/qdm12/private-internet-access-docker/issues) -[![GitHub issues](https://img.shields.io/github/issues/qdm12/private-internet-access-docker.svg)](https://github.com/qdm12/private-internet-access-docker/issues) +[![GitHub last commit](https://img.shields.io/github/last-commit/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/issues) +[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/issues) +[![GitHub issues](https://img.shields.io/github/issues/qdm12/gluetun.svg)](https://github.com/qdm12/gluetun/issues) [![Image size](https://images.microbadger.com/badges/image/qmcgaw/private-internet-access.svg)](https://microbadger.com/images/qmcgaw/private-internet-access) [![Image version](https://images.microbadger.com/badges/version/qmcgaw/private-internet-access.svg)](https://microbadger.com/images/qmcgaw/private-internet-access) @@ -31,8 +31,8 @@ iptables, DNS over TLS, ShadowSocks and Tinyproxy* - Built in firewall kill switch to allow traffic only with needed the VPN servers and LAN devices - Built in SOCKS5 proxy (Shadowsocks, tunnels TCP+UDP) - Built in HTTP proxy (Tinyproxy, tunnels TCP) -- [Connect other containers to it](https://github.com/qdm12/private-internet-access-docker#connect-to-it) -- [Connect LAN devices to it](https://github.com/qdm12/private-internet-access-docker#connect-to-it) +- [Connect other containers to it](https://github.com/qdm12/gluetun#connect-to-it) +- [Connect LAN devices to it](https://github.com/qdm12/gluetun#connect-to-it) - Compatible with amd64, i686 (32 bit), **ARM** 64 bit, ARM 32 bit v6 and v7 🎆 - VPN server side port forwarding for Private Internet Access and Vyprvpn - Possibility of split horizon DNS by selecting multiple DNS over TLS providers @@ -44,9 +44,9 @@ iptables, DNS over TLS, ShadowSocks and Tinyproxy* 1. Requirements - A VPN account with one of the service providers supported - - If you have a host or router firewall, please refer [to the firewall documentation](https://github.com/qdm12/private-internet-access-docker/blob/master/doc/firewall.md) + - If you have a host or router firewall, please refer [to the firewall documentation](https://github.com/qdm12/gluetun/blob/master/doc/firewall.md) 1. On some devices you may need to setup your tunnel kernel module on your host with `insmod /lib/modules/tun.ko` or `modprobe tun` - - *Synology users*: please read [this part of the Wiki](https://github.com/qdm12/private-internet-access-docker/wiki/Common-issues#synology) + - *Synology users*: please read [this part of the Wiki](https://github.com/qdm12/gluetun/wiki/Common-issues#synology) 1. Launch the container with: ```bash @@ -55,7 +55,7 @@ iptables, DNS over TLS, ShadowSocks and Tinyproxy* qmcgaw/private-internet-access ``` - or use [docker-compose.yml](https://github.com/qdm12/private-internet-access-docker/blob/master/docker-compose.yml) with: + or use [docker-compose.yml](https://github.com/qdm12/gluetun/blob/master/docker-compose.yml) with: ```bash docker-compose up -d @@ -68,9 +68,9 @@ iptables, DNS over TLS, ShadowSocks and Tinyproxy* - Use `-p 8388:8388/tcp -p 8388:8388/udp` to access the SOCKS5 proxy (and put your LAN in `EXTRA_SUBNETS` environment variable, in example `192.168.1.0/24`) - Use `-p 8000:8000/tcp` to access the [HTTP control server](#HTTP-control-server) built-in - **If you encounter an issue with the tun device not being available, see [the FAQ](https://github.com/qdm12/private-internet-access-docker/blob/master/doc/faq.md#how-to-fix-openvpn-failing-to-start)** + **If you encounter an issue with the tun device not being available, see [the FAQ](https://github.com/qdm12/gluetun/blob/master/doc/faq.md#how-to-fix-openvpn-failing-to-start)** -1. You can update the image with `docker pull qmcgaw/private-internet-access:latest`. See the [wiki](https://github.com/qdm12/private-internet-access-docker/wiki/Common-issues#use-a-release-tag) for more information on other tags available. +1. You can update the image with `docker pull qmcgaw/private-internet-access:latest`. See the [wiki](https://github.com/qdm12/gluetun/wiki/Common-issues#use-a-release-tag) for more information on other tags available. ## Testing @@ -80,7 +80,7 @@ Check the VPN IP address matches your expectations docker run --rm --network=container:gluetun alpine:3.12 wget -qO- https://ipinfo.io ``` -Want more testing? ▶ [see the Wiki](https://github.com/qdm12/private-internet-access-docker/wiki/Testing) +Want more testing? ▶ [see the Wiki](https://github.com/qdm12/gluetun/wiki/Testing) ## Environment variables @@ -137,7 +137,7 @@ Want more testing? ▶ [see the Wiki](https://github.com/qdm12/private-internet- | --- | --- | --- | --- | | 🏁 `USER` | | | Your **service** username, found at the bottom of the [manual setup page](https://account.surfshark.com/setup/manual) | | 🏁 `PASSWORD` | | | Your **service** password | - | `REGION` | | One of the [Surfshark regions](https://github.com/qdm12/private-internet-access-docker/wiki/surfshark) | VPN server region | + | `REGION` | | One of the [Surfshark regions](https://github.com/qdm12/gluetun/wiki/surfshark) | VPN server region | - Cyberghost @@ -146,8 +146,8 @@ Want more testing? ▶ [see the Wiki](https://github.com/qdm12/private-internet- | 🏁 `USER` | | | Your username | | 🏁 `PASSWORD` | | | Your password | | 🏁 `CLIENT_KEY` | | | Your device client key content, **see below** | - | `REGION` | | One of the [Cyberghost countries](https://github.com/qdm12/private-internet-access-docker/wiki/Cyberghost#regions) | VPN server country | - | `CYBERGHOST_GROUP` | `Premium UDP Europe` | One of the [server groups](https://github.com/qdm12/private-internet-access-docker/wiki/Cyberghost#server-groups) | Server group | + | `REGION` | | One of the [Cyberghost countries](https://github.com/qdm12/gluetun/wiki/Cyberghost#regions) | VPN server country | + | `CYBERGHOST_GROUP` | `Premium UDP Europe` | One of the [server groups](https://github.com/qdm12/gluetun/wiki/Cyberghost#server-groups) | Server group | To specify your client key, you can either: @@ -351,28 +351,28 @@ You can also use the HTTP control server (see below) to get the port forwarded. ## HTTP control server -See [its Wiki page](https://github.com/qdm12/private-internet-access-docker/wiki/HTTP-control-server) +See [its Wiki page](https://github.com/qdm12/gluetun/wiki/HTTP-control-server) ## Development and contributing -- Contribute with code: see [the Wiki](https://github.com/qdm12/private-internet-access-docker/wiki/Contributing). -- [The list of existing contributors 👍](https://github.com/qdm12/private-internet-access-docker/blob/master/.github/CONTRIBUTING.md#Contributors) -- [Github workflows](https://github.com/qdm12/private-internet-access-docker/actions) to know what's building -- [List of issues and feature requests](https://github.com/qdm12/private-internet-access-docker/issues) +- Contribute with code: see [the Wiki](https://github.com/qdm12/gluetun/wiki/Contributing). +- [The list of existing contributors 👍](https://github.com/qdm12/gluetun/blob/master/.github/CONTRIBUTING.md#Contributors) +- [Github workflows](https://github.com/qdm12/gluetun/actions) to know what's building +- [List of issues and feature requests](https://github.com/qdm12/gluetun/issues) ## License -This repository is under an [MIT license](https://github.com/qdm12/private-internet-access-docker/master/license) +This repository is under an [MIT license](https://github.com/qdm12/gluetun/master/license) ## Support Sponsor me on [Github](https://github.com/sponsors/qdm12), donate to [paypal.me/qmcgaw](https://www.paypal.me/qmcgaw) or subscribe to a VPN provider through one of my affiliate links: -[![https://github.com/sponsors/qdm12](https://raw.githubusercontent.com/qdm12/private-internet-access-docker/master/doc/sponsors.jpg)](https://github.com/sponsors/qdm12) -[![https://www.paypal.me/qmcgaw](https://raw.githubusercontent.com/qdm12/private-internet-access-docker/master/doc/paypal.jpg)](https://www.paypal.me/qmcgaw) +[![https://github.com/sponsors/qdm12](https://raw.githubusercontent.com/qdm12/gluetun/master/doc/sponsors.jpg)](https://github.com/sponsors/qdm12) +[![https://www.paypal.me/qmcgaw](https://raw.githubusercontent.com/qdm12/gluetun/master/doc/paypal.jpg)](https://www.paypal.me/qmcgaw) -[![https://windscribe.com/?affid=mh7nyafu](https://raw.githubusercontent.com/qdm12/private-internet-access-docker/master/doc/windscribe.jpg)](https://windscribe.com/?affid=mh7nyafu) +[![https://windscribe.com/?affid=mh7nyafu](https://raw.githubusercontent.com/qdm12/gluetun/master/doc/windscribe.jpg)](https://windscribe.com/?affid=mh7nyafu) -Feel also free to have a look at [the Kanban board](https://github.com/qdm12/private-internet-access-docker/projects/1) and [contribute](#Development-and-contributing) to the code or the issues discussion. +Feel also free to have a look at [the Kanban board](https://github.com/qdm12/gluetun/projects/1) and [contribute](#Development-and-contributing) to the code or the issues discussion. Many thanks to @Frepke, @Ralph521, G. Mendez, M. Otmar Weber, J. Perez and A. Cooper for supporting me financially 🥇👍 diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go index d6b2ab53..cb600d38 100644 --- a/cmd/gluetun/main.go +++ b/cmd/gluetun/main.go @@ -10,24 +10,24 @@ import ( "syscall" "time" + "github.com/qdm12/gluetun/internal/alpine" + "github.com/qdm12/gluetun/internal/cli" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/dns" + "github.com/qdm12/gluetun/internal/firewall" + gluetunLogging "github.com/qdm12/gluetun/internal/logging" + "github.com/qdm12/gluetun/internal/openvpn" + "github.com/qdm12/gluetun/internal/params" + "github.com/qdm12/gluetun/internal/publicip" + "github.com/qdm12/gluetun/internal/routing" + "github.com/qdm12/gluetun/internal/server" + "github.com/qdm12/gluetun/internal/settings" + "github.com/qdm12/gluetun/internal/shadowsocks" + "github.com/qdm12/gluetun/internal/tinyproxy" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/alpine" - "github.com/qdm12/private-internet-access-docker/internal/cli" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/dns" - "github.com/qdm12/private-internet-access-docker/internal/firewall" - gluetunLogging "github.com/qdm12/private-internet-access-docker/internal/logging" - "github.com/qdm12/private-internet-access-docker/internal/openvpn" - "github.com/qdm12/private-internet-access-docker/internal/params" - "github.com/qdm12/private-internet-access-docker/internal/publicip" - "github.com/qdm12/private-internet-access-docker/internal/routing" - "github.com/qdm12/private-internet-access-docker/internal/server" - "github.com/qdm12/private-internet-access-docker/internal/settings" - "github.com/qdm12/private-internet-access-docker/internal/shadowsocks" - "github.com/qdm12/private-internet-access-docker/internal/tinyproxy" ) func main() { diff --git a/cmd/mapper/main.go b/cmd/mapper/main.go index 1b256ccb..3abe457d 100644 --- a/cmd/mapper/main.go +++ b/cmd/mapper/main.go @@ -12,8 +12,8 @@ import ( "strings" "time" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/models" ) func main() { diff --git a/go.mod b/go.mod index dda9c6d7..080ded43 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/qdm12/private-internet-access-docker +module github.com/qdm12/gluetun go 1.14 diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 9dfb7a09..cd0a28cb 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -7,11 +7,11 @@ import ( "net" + "github.com/qdm12/gluetun/internal/params" + "github.com/qdm12/gluetun/internal/provider" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/params" - "github.com/qdm12/private-internet-access-docker/internal/provider" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) func ClientKey(args []string) error { diff --git a/internal/constants/cyberghost.go b/internal/constants/cyberghost.go index 960807ed..27db68a6 100644 --- a/internal/constants/cyberghost.go +++ b/internal/constants/cyberghost.go @@ -4,7 +4,7 @@ import ( "net" "sort" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/dns.go b/internal/constants/dns.go index 4f7a5c93..902302de 100644 --- a/internal/constants/dns.go +++ b/internal/constants/dns.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/mullvad.go b/internal/constants/mullvad.go index a995996c..95b3b39d 100644 --- a/internal/constants/mullvad.go +++ b/internal/constants/mullvad.go @@ -4,7 +4,7 @@ import ( "net" "sort" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/nordvpn.go b/internal/constants/nordvpn.go index ec33bb7b..d3147018 100644 --- a/internal/constants/nordvpn.go +++ b/internal/constants/nordvpn.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/openvpn.go b/internal/constants/openvpn.go index d878805f..e90a910c 100644 --- a/internal/constants/openvpn.go +++ b/internal/constants/openvpn.go @@ -1,7 +1,7 @@ package constants import ( - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/paths.go b/internal/constants/paths.go index 23c8b3fa..deb5a995 100644 --- a/internal/constants/paths.go +++ b/internal/constants/paths.go @@ -1,7 +1,7 @@ package constants import ( - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/pia.go b/internal/constants/pia.go index 0b43a538..b3dee40d 100644 --- a/internal/constants/pia.go +++ b/internal/constants/pia.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/purevpn.go b/internal/constants/purevpn.go index d64bb55e..ddb68407 100644 --- a/internal/constants/purevpn.go +++ b/internal/constants/purevpn.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/splash.go b/internal/constants/splash.go index 9af30ab5..ae45132d 100644 --- a/internal/constants/splash.go +++ b/internal/constants/splash.go @@ -9,5 +9,5 @@ const ( const ( // IssueLink is the link for users to use to create issues - IssueLink = "https://github.com/qdm12/private-internet-access-docker/issues/new" + IssueLink = "https://github.com/qdm12/gluetun/issues/new" ) diff --git a/internal/constants/surfshark.go b/internal/constants/surfshark.go index 0deeeab6..77aec059 100644 --- a/internal/constants/surfshark.go +++ b/internal/constants/surfshark.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/tinyproxy.go b/internal/constants/tinyproxy.go index d239a847..9ea15ece 100644 --- a/internal/constants/tinyproxy.go +++ b/internal/constants/tinyproxy.go @@ -1,7 +1,7 @@ package constants import ( - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/vpn.go b/internal/constants/vpn.go index e9a64c89..1168290b 100644 --- a/internal/constants/vpn.go +++ b/internal/constants/vpn.go @@ -1,7 +1,7 @@ package constants import ( - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/vyprvpn.go b/internal/constants/vyprvpn.go index 5e4d3e7a..55a3355f 100644 --- a/internal/constants/vyprvpn.go +++ b/internal/constants/vyprvpn.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/constants/windscribe.go b/internal/constants/windscribe.go index d6e21421..df05ba5b 100644 --- a/internal/constants/windscribe.go +++ b/internal/constants/windscribe.go @@ -3,7 +3,7 @@ package constants import ( "net" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) const ( diff --git a/internal/dns/command.go b/internal/dns/command.go index 64356602..2db494b9 100644 --- a/internal/dns/command.go +++ b/internal/dns/command.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func (c *configurator) Start(ctx context.Context, verbosityDetailsLevel uint8) (stdout io.ReadCloser, waitFn func() error, err error) { diff --git a/internal/dns/command_test.go b/internal/dns/command_test.go index f0843f10..8aace668 100644 --- a/internal/dns/command_test.go +++ b/internal/dns/command_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func Test_Start(t *testing.T) { diff --git a/internal/dns/conf.go b/internal/dns/conf.go index 37ce282e..19cc1ad1 100644 --- a/internal/dns/conf.go +++ b/internal/dns/conf.go @@ -6,11 +6,11 @@ import ( "sort" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) func (c *configurator) MakeUnboundConf(settings settings.DNS, uid, gid int) (err error) { diff --git a/internal/dns/conf_test.go b/internal/dns/conf_test.go index dc118a79..86697457 100644 --- a/internal/dns/conf_test.go +++ b/internal/dns/conf_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/logging/mock_logging" "github.com/qdm12/golibs/network/mock_network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/settings" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/dns/dns.go b/internal/dns/dns.go index e76afc83..56221eac 100644 --- a/internal/dns/dns.go +++ b/internal/dns/dns.go @@ -5,11 +5,11 @@ import ( "io" "net" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) type Configurator interface { diff --git a/internal/dns/loop.go b/internal/dns/loop.go index 28018f15..fccbebd0 100644 --- a/internal/dns/loop.go +++ b/internal/dns/loop.go @@ -6,10 +6,10 @@ import ( "sync" "time" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) type Looper interface { diff --git a/internal/dns/nameserver.go b/internal/dns/nameserver.go index 4fc30581..07030280 100644 --- a/internal/dns/nameserver.go +++ b/internal/dns/nameserver.go @@ -5,7 +5,7 @@ import ( "net" "strings" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) // UseDNSInternally is to change the Go program DNS only diff --git a/internal/dns/nameserver_test.go b/internal/dns/nameserver_test.go index d17ed4c7..915fc922 100644 --- a/internal/dns/nameserver_test.go +++ b/internal/dns/nameserver_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/files/mock_files" "github.com/qdm12/golibs/logging/mock_logging" - "github.com/qdm12/private-internet-access-docker/internal/constants" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/dns/roots.go b/internal/dns/roots.go index c8e91147..74c8e821 100644 --- a/internal/dns/roots.go +++ b/internal/dns/roots.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/files" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) func (c *configurator) DownloadRootHints(uid, gid int) error { diff --git a/internal/dns/roots_test.go b/internal/dns/roots_test.go index c31cbb93..637283a1 100644 --- a/internal/dns/roots_test.go +++ b/internal/dns/roots_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func Test_DownloadRootHints(t *testing.T) { //nolint:dupl diff --git a/internal/firewall/enable.go b/internal/firewall/enable.go index 09faab0c..a2251f92 100644 --- a/internal/firewall/enable.go +++ b/internal/firewall/enable.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func (c *configurator) SetEnabled(ctx context.Context, enabled bool) (err error) { diff --git a/internal/firewall/firewall.go b/internal/firewall/firewall.go index 26610ff8..f4d4d07a 100644 --- a/internal/firewall/firewall.go +++ b/internal/firewall/firewall.go @@ -5,11 +5,11 @@ import ( "net" "sync" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/routing" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/routing" ) // Configurator allows to change firewall rules and modify network routes diff --git a/internal/firewall/iptables.go b/internal/firewall/iptables.go index c0b98543..1a2f293d 100644 --- a/internal/firewall/iptables.go +++ b/internal/firewall/iptables.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) func appendOrDelete(remove bool) string { diff --git a/internal/firewall/vpn.go b/internal/firewall/vpn.go index fa123c03..5e3924fa 100644 --- a/internal/firewall/vpn.go +++ b/internal/firewall/vpn.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" ) func (c *configurator) SetVPNConnections(ctx context.Context, connections []models.OpenVPNConnection) (err error) { diff --git a/internal/logging/line.go b/internal/logging/line.go index 02a6d7d0..6a9155ab 100644 --- a/internal/logging/line.go +++ b/internal/logging/line.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/fatih/color" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) var regularExpressions = struct { //nolint:gochecknoglobals diff --git a/internal/logging/splash.go b/internal/logging/splash.go index 29a933bb..ee7b82ac 100644 --- a/internal/logging/splash.go +++ b/internal/logging/splash.go @@ -6,7 +6,7 @@ import ( "time" "github.com/kyokomi/emoji" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) // Splash returns the welcome spash message diff --git a/internal/openvpn/auth.go b/internal/openvpn/auth.go index a07c5c7a..b3043fc7 100644 --- a/internal/openvpn/auth.go +++ b/internal/openvpn/auth.go @@ -3,8 +3,8 @@ package openvpn import ( "strings" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/files" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) // WriteAuthFile writes the OpenVPN auth file to disk with the right permissions diff --git a/internal/openvpn/command.go b/internal/openvpn/command.go index a428e56d..6a1f0f2a 100644 --- a/internal/openvpn/command.go +++ b/internal/openvpn/command.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func (c *configurator) Start(ctx context.Context) (stdout io.ReadCloser, waitFn func() error, err error) { diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go index 1f672d1d..fac935c9 100644 --- a/internal/openvpn/loop.go +++ b/internal/openvpn/loop.go @@ -6,15 +6,15 @@ import ( "sync" "time" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/firewall" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/provider" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/firewall" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/provider" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) type Looper interface { diff --git a/internal/openvpn/tun.go b/internal/openvpn/tun.go index cd6ddce4..947217a1 100644 --- a/internal/openvpn/tun.go +++ b/internal/openvpn/tun.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" "golang.org/x/sys/unix" ) diff --git a/internal/params/cyberghost.go b/internal/params/cyberghost.go index b20b7c30..1e13873f 100644 --- a/internal/params/cyberghost.go +++ b/internal/params/cyberghost.go @@ -3,8 +3,8 @@ package params import ( "strings" + "github.com/qdm12/gluetun/internal/constants" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) // GetCyberghostGroup obtains the server group for the Cyberghost server from the diff --git a/internal/params/dns.go b/internal/params/dns.go index 653d1259..0a8536d9 100644 --- a/internal/params/dns.go +++ b/internal/params/dns.go @@ -6,9 +6,9 @@ import ( "strings" "time" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // GetDNSOverTLS obtains if the DNS over TLS should be enabled diff --git a/internal/params/mullvad.go b/internal/params/mullvad.go index 8abff3d4..5503a255 100644 --- a/internal/params/mullvad.go +++ b/internal/params/mullvad.go @@ -1,8 +1,8 @@ package params import ( + "github.com/qdm12/gluetun/internal/constants" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) // GetMullvadCountry obtains the country for the Mullvad server from the diff --git a/internal/params/nordvpn.go b/internal/params/nordvpn.go index 15603ed7..1a0eee27 100644 --- a/internal/params/nordvpn.go +++ b/internal/params/nordvpn.go @@ -1,8 +1,8 @@ package params import ( + "github.com/qdm12/gluetun/internal/constants" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) // GetNordvpnRegion obtains the region (country) for the NordVPN server from the diff --git a/internal/params/openvpn.go b/internal/params/openvpn.go index 811b1b74..552f741b 100644 --- a/internal/params/openvpn.go +++ b/internal/params/openvpn.go @@ -4,8 +4,8 @@ import ( "fmt" "net" + "github.com/qdm12/gluetun/internal/models" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // GetUser obtains the user to use to connect to the VPN servers diff --git a/internal/params/params.go b/internal/params/params.go index 5a6d9b57..bb6c1d6f 100644 --- a/internal/params/params.go +++ b/internal/params/params.go @@ -5,11 +5,11 @@ import ( "os" "time" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" libparams "github.com/qdm12/golibs/params" "github.com/qdm12/golibs/verification" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // Reader contains methods to obtain parameters diff --git a/internal/params/pia.go b/internal/params/pia.go index c3844ede..1f6d7e98 100644 --- a/internal/params/pia.go +++ b/internal/params/pia.go @@ -3,9 +3,9 @@ package params import ( "fmt" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // GetPortForwarding obtains if port forwarding on the VPN provider server diff --git a/internal/params/purevpn.go b/internal/params/purevpn.go index 2c30abad..ce40f9b8 100644 --- a/internal/params/purevpn.go +++ b/internal/params/purevpn.go @@ -1,7 +1,7 @@ package params import ( - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) // GetPurevpnRegion obtains the region (continent) for the PureVPN server from the diff --git a/internal/params/surfshark.go b/internal/params/surfshark.go index ca6c69c3..1669c827 100644 --- a/internal/params/surfshark.go +++ b/internal/params/surfshark.go @@ -1,7 +1,7 @@ package params import ( - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) // GetSurfsharkRegion obtains the region for the Surfshark server from the diff --git a/internal/params/system.go b/internal/params/system.go index 0cb82cfb..40b2d0e8 100644 --- a/internal/params/system.go +++ b/internal/params/system.go @@ -1,8 +1,8 @@ package params import ( + "github.com/qdm12/gluetun/internal/models" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // GetUID obtains the user ID to use from the environment variable UID diff --git a/internal/params/tinyproxy.go b/internal/params/tinyproxy.go index 22ab9260..ade88f3f 100644 --- a/internal/params/tinyproxy.go +++ b/internal/params/tinyproxy.go @@ -3,8 +3,8 @@ package params import ( "strconv" + "github.com/qdm12/gluetun/internal/models" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // GetTinyProxy obtains if TinyProxy is on from the environment variable diff --git a/internal/params/vypervpn.go b/internal/params/vypervpn.go index 372201df..76775a30 100644 --- a/internal/params/vypervpn.go +++ b/internal/params/vypervpn.go @@ -1,7 +1,7 @@ package params import ( - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) // GetVyprvpnRegion obtains the region for the Vyprvpn server from the diff --git a/internal/params/windscribe.go b/internal/params/windscribe.go index 2287dfd4..7dcda745 100644 --- a/internal/params/windscribe.go +++ b/internal/params/windscribe.go @@ -3,9 +3,9 @@ package params import ( "fmt" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" libparams "github.com/qdm12/golibs/params" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // GetWindscribeRegion obtains the region for the Windscribe server from the diff --git a/internal/provider/cyberghost.go b/internal/provider/cyberghost.go index da26eec8..3a17acab 100644 --- a/internal/provider/cyberghost.go +++ b/internal/provider/cyberghost.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type cyberghost struct{} diff --git a/internal/provider/mullvad.go b/internal/provider/mullvad.go index b613bccf..7c454e4d 100644 --- a/internal/provider/mullvad.go +++ b/internal/provider/mullvad.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type mullvad struct{} diff --git a/internal/provider/nordvpn.go b/internal/provider/nordvpn.go index 3289729c..e695596a 100644 --- a/internal/provider/nordvpn.go +++ b/internal/provider/nordvpn.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type nordvpn struct{} diff --git a/internal/provider/pia.go b/internal/provider/pia.go index e1bc0917..2611593f 100644 --- a/internal/provider/pia.go +++ b/internal/provider/pia.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/crypto/random" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type pia struct { diff --git a/internal/provider/provider.go b/internal/provider/provider.go index e7b90755..284c53f6 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -1,9 +1,9 @@ package provider import ( + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) // Provider contains methods to read and modify the openvpn configuration to connect as a client diff --git a/internal/provider/purevpn.go b/internal/provider/purevpn.go index a90857b1..f01e96c6 100644 --- a/internal/provider/purevpn.go +++ b/internal/provider/purevpn.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type purevpn struct{} diff --git a/internal/provider/surfshark.go b/internal/provider/surfshark.go index e1e3f57d..2260be8e 100644 --- a/internal/provider/surfshark.go +++ b/internal/provider/surfshark.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type surfshark struct{} diff --git a/internal/provider/vyprvpn.go b/internal/provider/vyprvpn.go index 3eb28677..3c769bd8 100644 --- a/internal/provider/vyprvpn.go +++ b/internal/provider/vyprvpn.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type vyprvpn struct{} diff --git a/internal/provider/windscribe.go b/internal/provider/windscribe.go index da757352..d7914974 100644 --- a/internal/provider/windscribe.go +++ b/internal/provider/windscribe.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type windscribe struct{} diff --git a/internal/publicip/loop.go b/internal/publicip/loop.go index 70cad477..8740b591 100644 --- a/internal/publicip/loop.go +++ b/internal/publicip/loop.go @@ -5,10 +5,10 @@ import ( "sync" "time" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" "github.com/qdm12/golibs/network" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type Looper interface { diff --git a/internal/routing/mutate_test.go b/internal/routing/mutate_test.go index fa7b2d2a..7af904c8 100644 --- a/internal/routing/mutate_test.go +++ b/internal/routing/mutate_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/command/mock_command" "github.com/qdm12/golibs/files/mock_files" "github.com/qdm12/golibs/logging/mock_logging" - "github.com/qdm12/private-internet-access-docker/internal/constants" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/routing/reader.go b/internal/routing/reader.go index 70298906..08515f6f 100644 --- a/internal/routing/reader.go +++ b/internal/routing/reader.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func parseRoutingTable(data []byte) (entries []routingEntry, err error) { diff --git a/internal/routing/reader_test.go b/internal/routing/reader_test.go index df1240f3..82306b6c 100644 --- a/internal/routing/reader_test.go +++ b/internal/routing/reader_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/files/mock_files" "github.com/qdm12/golibs/logging/mock_logging" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) const exampleRouteData = `Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT diff --git a/internal/server/server.go b/internal/server/server.go index 905d528e..6ef6f6a8 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) type Server interface { diff --git a/internal/settings/dns.go b/internal/settings/dns.go index 9dd6c1ff..283b6374 100644 --- a/internal/settings/dns.go +++ b/internal/settings/dns.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/params" ) // DNS contains settings to configure Unbound for DNS over TLS operation diff --git a/internal/settings/firewall.go b/internal/settings/firewall.go index 14c7203d..bd8026dd 100644 --- a/internal/settings/firewall.go +++ b/internal/settings/firewall.go @@ -5,7 +5,7 @@ import ( "net" "strings" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/params" ) // Firewall contains settings to customize the firewall operation diff --git a/internal/settings/openvpn.go b/internal/settings/openvpn.go index 787fb463..3192e3ce 100644 --- a/internal/settings/openvpn.go +++ b/internal/settings/openvpn.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/params" ) // OpenVPN contains settings to configure the OpenVPN client diff --git a/internal/settings/openvpn_test.go b/internal/settings/openvpn_test.go index 8b0f3861..8ff6e3ee 100644 --- a/internal/settings/openvpn_test.go +++ b/internal/settings/openvpn_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/settings/providers.go b/internal/settings/providers.go index ecfe8acf..51a65304 100644 --- a/internal/settings/providers.go +++ b/internal/settings/providers.go @@ -1,9 +1,9 @@ package settings import ( - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/params" ) // GetPIASettings obtains PIA settings from environment variables using the params package. diff --git a/internal/settings/settings.go b/internal/settings/settings.go index 003cb90d..1eac74e8 100644 --- a/internal/settings/settings.go +++ b/internal/settings/settings.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/params" ) // Settings contains all settings for the program to run diff --git a/internal/settings/shadowsocks.go b/internal/settings/shadowsocks.go index be6e6915..8cacee35 100644 --- a/internal/settings/shadowsocks.go +++ b/internal/settings/shadowsocks.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/params" ) // ShadowSocks contains settings to configure the Shadowsocks server diff --git a/internal/settings/system.go b/internal/settings/system.go index 83324c78..769e66b0 100644 --- a/internal/settings/system.go +++ b/internal/settings/system.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/params" ) // System contains settings to configure system related elements diff --git a/internal/settings/tinyproxy.go b/internal/settings/tinyproxy.go index 4b4c42b2..c55300de 100644 --- a/internal/settings/tinyproxy.go +++ b/internal/settings/tinyproxy.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/qdm12/private-internet-access-docker/internal/models" - "github.com/qdm12/private-internet-access-docker/internal/params" + "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/params" ) // TinyProxy contains settings to configure TinyProxy diff --git a/internal/shadowsocks/command.go b/internal/shadowsocks/command.go index 47910e4e..4c7d08cb 100644 --- a/internal/shadowsocks/command.go +++ b/internal/shadowsocks/command.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/qdm12/private-internet-access-docker/internal/constants" + "github.com/qdm12/gluetun/internal/constants" ) func (c *configurator) Start(ctx context.Context, server string, port uint16, password string, log bool) (stdout, stderr io.ReadCloser, waitFn func() error, err error) { diff --git a/internal/shadowsocks/conf.go b/internal/shadowsocks/conf.go index d3a399dc..d861adec 100644 --- a/internal/shadowsocks/conf.go +++ b/internal/shadowsocks/conf.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/files" - "github.com/qdm12/private-internet-access-docker/internal/constants" ) func (c *configurator) MakeConf(port uint16, password, method, nameserver string, uid, gid int) (err error) { diff --git a/internal/shadowsocks/conf_test.go b/internal/shadowsocks/conf_test.go index 2165b859..eeae7854 100644 --- a/internal/shadowsocks/conf_test.go +++ b/internal/shadowsocks/conf_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/files/mock_files" "github.com/qdm12/golibs/logging/mock_logging" - "github.com/qdm12/private-internet-access-docker/internal/constants" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/shadowsocks/loop.go b/internal/shadowsocks/loop.go index d7e11ef1..0e2e7855 100644 --- a/internal/shadowsocks/loop.go +++ b/internal/shadowsocks/loop.go @@ -5,10 +5,10 @@ import ( "sync" "time" + "github.com/qdm12/gluetun/internal/firewall" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/firewall" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) type Looper interface { diff --git a/internal/tinyproxy/conf.go b/internal/tinyproxy/conf.go index 8a433307..c79e4998 100644 --- a/internal/tinyproxy/conf.go +++ b/internal/tinyproxy/conf.go @@ -4,9 +4,9 @@ import ( "fmt" "sort" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/files" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" ) func (c *configurator) MakeConf(logLevel models.TinyProxyLogLevel, port uint16, user, password string, uid, gid int) error { diff --git a/internal/tinyproxy/conf_test.go b/internal/tinyproxy/conf_test.go index 253fc03e..56ebb07e 100644 --- a/internal/tinyproxy/conf_test.go +++ b/internal/tinyproxy/conf_test.go @@ -3,8 +3,8 @@ package tinyproxy import ( "testing" - "github.com/qdm12/private-internet-access-docker/internal/constants" - "github.com/qdm12/private-internet-access-docker/internal/models" + "github.com/qdm12/gluetun/internal/constants" + "github.com/qdm12/gluetun/internal/models" "github.com/stretchr/testify/assert" ) diff --git a/internal/tinyproxy/loop.go b/internal/tinyproxy/loop.go index 598ea042..7ab2e3d7 100644 --- a/internal/tinyproxy/loop.go +++ b/internal/tinyproxy/loop.go @@ -5,10 +5,10 @@ import ( "sync" "time" + "github.com/qdm12/gluetun/internal/firewall" + "github.com/qdm12/gluetun/internal/settings" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/firewall" - "github.com/qdm12/private-internet-access-docker/internal/settings" ) type Looper interface { diff --git a/internal/tinyproxy/tinyproxy.go b/internal/tinyproxy/tinyproxy.go index 9e85b527..c5f1c1a6 100644 --- a/internal/tinyproxy/tinyproxy.go +++ b/internal/tinyproxy/tinyproxy.go @@ -4,10 +4,10 @@ import ( "context" "io" + "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/command" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" - "github.com/qdm12/private-internet-access-docker/internal/models" ) type Configurator interface {