From 20a3327815fa16e1600047ee80d097fd2476e5da Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Tue, 2 Jun 2020 23:07:29 +0000
Subject: [PATCH] Minor changes - PORT is for Mullvad but also Windscribe
 (docker-compose, README.md) - Windscribe configurator does not need lookupIP
 anymore

---
 README.md                         | 7 ++++---
 docker-compose.yml                | 2 ++
 internal/windscribe/windscribe.go | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c907df40..ad63c316 100644
--- a/README.md
+++ b/README.md
@@ -58,10 +58,11 @@
 ### Windscribe
 
 - Pick the [region](https://windscribe.com/status)
+- Pick the port to use
 
 ### Surfshark
 
-- Pick the [region](https://github.com/qdm12/private-internet-access-docker/wiki/Surfshark)
+- Pick the [region](https://github.com/qdm12/private-internet-access-docker/wiki/Surfshark) or a multi hop region name
 
 ### Extra niche features
 
@@ -74,13 +75,13 @@
 
 1. Requirements
     - A VPN account with one of the service providers:
-        - Private Internet Access: **username** and **password**
+        - Private Internet Access: **username** and **password** ([sign up](https://www.privateinternetaccess.com/pages/buy-vpn/))
         - Mullvad: user ID ([sign up](https://mullvad.net/en/account/))
         - Windscribe: **username** and **password** | Signup up using my affiliate link below
 
             [![https://windscribe.com/?affid=mh7nyafu](https://raw.githubusercontent.com/qdm12/private-internet-access-docker/master/doc/windscribe.jpg)](https://windscribe.com/?affid=mh7nyafu)
 
-        - Surfshark: **username** and **password**
+        - Surfshark: **username** and **password** ([sign up](https://order.surfshark.com/))
     - 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)
 
 1. On some devices such as Synology or Qnap machines, it's required to setup your tunnel device `/dev/net/tun` on your host:
diff --git a/docker-compose.yml b/docker-compose.yml
index dc8d09ef..b40852e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,8 @@ services:
       - COUNTRY=Sweden
       - CITY=
       - ISP=
+
+      # Mullvad and Windscribe only
       - PORT=
 
       # DNS over TLS
diff --git a/internal/windscribe/windscribe.go b/internal/windscribe/windscribe.go
index 7ce3e6f9..805ef041 100644
--- a/internal/windscribe/windscribe.go
+++ b/internal/windscribe/windscribe.go
@@ -15,10 +15,9 @@ type Configurator interface {
 
 type configurator struct {
 	fileManager files.FileManager
-	lookupIP    func(host string) ([]net.IP, error)
 }
 
 // NewConfigurator returns a new Configurator object
 func NewConfigurator(fileManager files.FileManager) Configurator {
-	return &configurator{fileManager, net.LookupIP}
+	return &configurator{fileManager: fileManager}
 }