From 4d1eae398f4e3aa36acb1863fd4ec3b48704983c Mon Sep 17 00:00:00 2001
From: ilumos <ilumos@gmail.com>
Date: Sun, 7 Jan 2018 03:13:33 +0000
Subject: [PATCH 01/31] Adding to formatting notes

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c20e846..4434459 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,15 @@ You can use this list one of two ways:
  - Overriding DNS for these hostnames to point to the IP of your cache server.
  - Use them in Squid with WCCP to redirect content to the right cache server.
 
-There is a separate file for each caching service. Some notes on formatting:
+There is a separate file for each cacheable service. Some notes on formatting:
 
   - Every line should be a seperate hostname for that service.
-  - Wildcards can be represented with a space.
+  - Wildcards can be represented with an asterix.
+  - Only one wildcard is permitted per line.
+  - If a wildcard is used, it should be the first character on the line.
+  - Wildcards are not treated as matching null, e.g. `*.example.com` will match `a.example.com` but will not match `example.com`
   - Lines starting with a # will be treated as a comment.
+  - Files must end with an empty newline.
 
 ## Updates
 
@@ -47,4 +51,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.

From 53e6a96d29369e600e76714ca45d98be9464d662 Mon Sep 17 00:00:00 2001
From: ilumos <ilumos@gmail.com>
Date: Sun, 7 Jan 2018 03:44:01 +0000
Subject: [PATCH 02/31] Adding hostnames for Origin, Riot, Steam and Windows
 update

---
 origin.txt         | 3 ++-
 riot.txt           | 4 +++-
 steam.txt          | 5 ++++-
 windowsupdates.txt | 6 ++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/origin.txt b/origin.txt
index 25696bd..2d07963 100644
--- a/origin.txt
+++ b/origin.txt
@@ -2,4 +2,5 @@
 origin-a.akamaihd.net
 akamai.cdn.ea.com
 lvlt.cdn.ea.com
-river.data.ea.com
\ No newline at end of file
+river.data.ea.com
+origin-a.akamaihd.net.edgesuite.net
diff --git a/riot.txt b/riot.txt
index c3451b2..c3e26a1 100644
--- a/riot.txt
+++ b/riot.txt
@@ -1,2 +1,4 @@
 l3cdn.riotgames.com
-worldwide.l3cdn.riotgames.com
\ No newline at end of file
+worldwide.l3cdn.riotgames.com
+riotgamespatcher-a.akamaihd.net
+riotgamespatcher-a.akamaihd.net.edgesuite.net
diff --git a/steam.txt b/steam.txt
index ceb13f1..cbb0946 100644
--- a/steam.txt
+++ b/steam.txt
@@ -16,4 +16,7 @@ content-origin.steampowered.com
 clientconfig.akamai.steamtransparent.com
 steampipe.akamaized.net
 edgecast.steamstatic.com
-steam.apac.qtlglb.com.mwcloudcdn.com
\ No newline at end of file
+steam.apac.qtlglb.com.mwcloudcdn.com
+*.cs.steampowered.com
+*.edgecast.steamstatic.com
+*.steamcontent.com
diff --git a/windowsupdates.txt b/windowsupdates.txt
index 2738150..b900c72 100644
--- a/windowsupdates.txt
+++ b/windowsupdates.txt
@@ -1,2 +1,4 @@
-download.windowsupdate.com
-officecdn.microsoft.com
\ No newline at end of file
+officecdn.microsoft.com
+*.windowsupdate.com
+windowsupdate.com
+*.dl.delivery.mp.microsoft.com

From 1db98f3f564e1ac9dc468e05f636038d8854f107 Mon Sep 17 00:00:00 2001
From: VibroAxe <vibs@macrolevel.co.uk>
Date: Mon, 8 Jan 2018 11:54:50 +0000
Subject: [PATCH 03/31] Added new cache_domains file

Added new cache_domains.json file to allow machine readable metadata to
be added about the CDN's configured here. Initialised with skeleton for
all current files

Updated README.md to explain the structure.
---
 README.md          | 27 +++++++++++++
 cache_domains.json | 97 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 cache_domains.json

diff --git a/README.md b/README.md
index 4434459..e3d926c 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,29 @@ You can use this list one of two ways:
  - Overriding DNS for these hostnames to point to the IP of your cache server.
  - Use them in Squid with WCCP to redirect content to the right cache server.
 
+There is a cache_domains.json file to define CDNs and additional meta deta with the following structure
+
+- cache_domains: Array of cache_domain object
+	- name: shortname for the cache domain
+	- description: a longer description to aid others in identifying what this domain does (not all users of this repo will want to enable all caches)
+	- notes: implementation specific notes which may be useful for other users
+	- mixed_content: true if this domain hosts mixed https and http content (a straight dns injection is unlikely to work in this case). Assumed to be false if undefined
+	- domain_files: array of files within the repo assosciated to the cdn. Most cdn's only need one file
+	- Example domain entry for origin
+```json
+{
+	"cache_domains": [
+		{
+			"name": "origin",
+			"description": "CDN for origin",
+			"notes": "Should be enabled for HTTP traffic only or with a HTTPS proxy else origin client download fails",
+			"mixed_content": true,
+			"domain_files": ["origin.txt"]
+		}
+	]
+}
+```
+
 There is a separate file for each cacheable service. Some notes on formatting:
 
   - Every line should be a seperate hostname for that service.
@@ -25,6 +48,10 @@ There is a separate file for each cacheable service. Some notes on formatting:
 
 Please fork this repository and submit pull requests if you have any extra hostnames or services to add. We want this list to be definitive and collaborative!
 
+### New CDNs
+
+If the CDN you are adding does not already exist please remember to add an entry within cache_domains.json as well as a new .txt file
+
 ## Issues and Feedback
 
 Please raise all issues and feedback on GitHub at [uklans/cache-domains](https://github.com/uklans/cache-domains/issues).
diff --git a/cache_domains.json b/cache_domains.json
new file mode 100644
index 0000000..b2b05fd
--- /dev/null
+++ b/cache_domains.json
@@ -0,0 +1,97 @@
+{
+	"cache_domains": [
+		{
+			"name": "apple",
+			"description": "CDN for apple",
+			"domain_files": ["apple.txt"]
+		},
+		{
+			"name": "arenanet",
+			"description": "CDN for guild wars, HoT",
+			"domain_files": ["arenanet.txt"]
+		},
+		{
+			"name": "blizzard",
+			"description": "CDN for blizzard/battle.net",
+			"domain_files": ["blizzard.txt"]
+		},
+		{
+			"name": "frontier",
+			"description": "CDN for frontier games",
+			"domain_files": ["frontier.txt"]
+		},
+		{
+			"name": "gog",
+			"description": "CDN for good old games downloader",
+			"domain_files": ["gog.txt"]
+		},
+		{
+			"name": "hirez",
+			"description": "CDN for hirez",
+			"domain_files": ["hirez.txt"]
+		},
+		{
+			"name": "minecraft",
+			"description": "CDN for minecraft client and updater",
+			"domain_files": ["minecraft.txt"]
+		},
+		{
+			"name": "nexusmods",
+			"description": "Nexus mods / skyrim content",
+			"domain_files": ["nexusmods.txt"]
+		},
+		{
+			"name": "nintendo",
+			"description": "CDN for nintendo (swtich)",
+			"domain_files": ["nintendo.txt"]
+		},
+		{
+			"name": "origin",
+			"description": "CDN for origin",
+			"notes": "Should be enabled for HTTP traffic only or with a HTTPS proxy else origin client download fails",
+			"mixed_content": true,
+			"domain_files": ["origin.txt"]
+		},
+		{
+			"name": "riot",
+			"description": "CDN for riot games",
+			"domain_files": ["riot.txt"]
+		},
+		{
+			"name": "rockstar",
+			"description": "CDN for rockstar games",
+			"domain_files": ["rockstar.txt"]
+		},
+		{
+			"name": "sony",
+			"description": "CDN for sony / playstation",
+			"domain_files": ["sony.txt"]
+		},
+		{
+			"name": "steam",
+			"description": "CDN for steam platform",
+			"domain_files": ["steam.txt"]
+		},
+		{
+			"name": "uplay",
+			"description": "CDN for uplay downloader",
+			"domain_files": ["uplay.txt"]
+		},
+		{
+			"name": "wargaming",
+			"description": "CDN for wargaming.net",
+			"domain_files": ["wargaming.net.txt"]
+		},
+		{
+			"name": "wsus",
+			"description": "CDN for windows updates",
+			"domain_files": ["windowsupdates.txt"]
+		},
+		{
+			"name": "xboxlive",
+			"description": "CDN for xboxlive",
+			"domain_files": ["xboxlive.txt"]
+		}
+	]
+}
+

From 512ea8df48da607b5432c2fc40625bf6cbbd4373 Mon Sep 17 00:00:00 2001
From: Jessica Smith <jess@mintopia.net>
Date: Fri, 9 Feb 2018 23:19:19 +0000
Subject: [PATCH 04/31] Add new domains for Steam

Raised in https://github.com/steamcache/steamcache/issues/28
---
 steam.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/steam.txt b/steam.txt
index cbb0946..6509980 100644
--- a/steam.txt
+++ b/steam.txt
@@ -20,3 +20,5 @@ steam.apac.qtlglb.com.mwcloudcdn.com
 *.cs.steampowered.com
 *.edgecast.steamstatic.com
 *.steamcontent.com
+cdn1-sea1.valve.net
+cdn2-sea1.valve.net

From a7bd240a8b6875020ed82f5f685b15c8b4f3b397 Mon Sep 17 00:00:00 2001
From: Barry Zubel <barry@zubel.co.uk>
Date: Sat, 17 Feb 2018 10:45:00 +0000
Subject: [PATCH 05/31] update for Daybreak games CDN

---
 cache_domains.json | 5 +++++
 daybreak.txt       | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 daybreak.txt

diff --git a/cache_domains.json b/cache_domains.json
index b2b05fd..190ac5e 100644
--- a/cache_domains.json
+++ b/cache_domains.json
@@ -15,6 +15,11 @@
 			"description": "CDN for blizzard/battle.net",
 			"domain_files": ["blizzard.txt"]
 		},
+		{
+			"name": "daybreak",
+			"description": "Daybreak games CDN",
+			"domain_files": ["daybreak.txt"]
+		},
 		{
 			"name": "frontier",
 			"description": "CDN for frontier games",
diff --git a/daybreak.txt b/daybreak.txt
new file mode 100644
index 0000000..38d95d6
--- /dev/null
+++ b/daybreak.txt
@@ -0,0 +1,2 @@
+# Daybreak games 
+*.patch.daybreakgames.com

From ec42710c49a144d88d640a21f04ec5a100485bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikki=20S=C3=B8rensen?= <Mikki-10@users.noreply.github.com>
Date: Tue, 6 Mar 2018 01:45:54 +0100
Subject: [PATCH 06/31] Added star in front of dot

---
 uplay.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uplay.txt b/uplay.txt
index 610aa07..4042a60 100644
--- a/uplay.txt
+++ b/uplay.txt
@@ -1 +1 @@
-.cdn.ubi.com
+*.cdn.ubi.com

From f4c9329e1714885b66a98920d992f4c55d2eac59 Mon Sep 17 00:00:00 2001
From: James Kinsman <VibroAxe@users.noreply.github.com>
Date: Tue, 6 Mar 2018 09:41:06 +0000
Subject: [PATCH 07/31] Update README.md

Clarified wildcard usage and interopability with squid dst_domain acls
---
 README.md | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e3d926c..d9d606b 100644
--- a/README.md
+++ b/README.md
@@ -34,16 +34,29 @@ There is a cache_domains.json file to define CDNs and additional meta deta with
 }
 ```
 
+### Host file format
+
 There is a separate file for each cacheable service. Some notes on formatting:
 
   - Every line should be a seperate hostname for that service.
-  - Wildcards can be represented with an asterix.
-  - Only one wildcard is permitted per line.
-  - If a wildcard is used, it should be the first character on the line.
-  - Wildcards are not treated as matching null, e.g. `*.example.com` will match `a.example.com` but will not match `example.com`
+  - Only one entry is permitted per line.
+  - Wildcards are permitted as per below
   - Lines starting with a # will be treated as a comment.
   - Files must end with an empty newline.
 
+#### Wildcards
+
+The wildcard format shall be defined as per the below
+
+  - Wildcards should be represented with an asterix.
+  - If a wildcard is used, it should be the first character on the line.
+  - Wildcards are not treated as matching null, e.g. `*.example.com` will match `a.example.com` but will not match `example.com`
+  - Only simple domain wildcards will be accepted eg `*.example.com` not `*ww.example.com`
+  
+##### Notes for Squid users
+
+If you are using these files within a squid dst_domain acl you will need to reformat the wildcard entries to be compliant with the squid acl format. The following regex should suffice `s/*\./\./`
+
 ## Updates
 
 Please fork this repository and submit pull requests if you have any extra hostnames or services to add. We want this list to be definitive and collaborative!

From 177f65e5a2cd732d08bebed242cff5e4842cfb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikki=20S=C3=B8rensen?= <Mikki-10@users.noreply.github.com>
Date: Wed, 7 Mar 2018 00:39:40 +0100
Subject: [PATCH 08/31] Fix wildcard entry for Ubisoft CDN.


From 6ca6ceb48e2cb0783b574b7a31a875f33bb39f7b Mon Sep 17 00:00:00 2001
From: Tad <thomas_daykin@yahoo.co.uk>
Date: Thu, 22 Mar 2018 18:05:34 +0100
Subject: [PATCH 09/31] Added Twitch app CDN's (#12)

Signed-off-by: Toakan <tad@forthelulz.co.uk>
---
 cache_domains.json | 5 +++++
 twitchapp.txt      | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 twitchapp.txt

diff --git a/cache_domains.json b/cache_domains.json
index 190ac5e..72632fe 100644
--- a/cache_domains.json
+++ b/cache_domains.json
@@ -82,6 +82,11 @@
 			"description": "CDN for uplay downloader",
 			"domain_files": ["uplay.txt"]
 		},
+		{
+			"name": "twitch",
+			"description": "CDN for twitch games / mods and addons",
+			"domain_files": ["twitchapp.txt"]
+		},
 		{
 			"name": "wargaming",
 			"description": "CDN for wargaming.net",
diff --git a/twitchapp.txt b/twitchapp.txt
new file mode 100644
index 0000000..8a785a0
--- /dev/null
+++ b/twitchapp.txt
@@ -0,0 +1,4 @@
+d3rmjivj4k4f0t.cloudfront.net,
+addons.forgesvc.net
+media.forgecdn.net
+files.forgecdn.net

From 9ce948f2866df2a5bbf314ad5dc0eed52ffe4a68 Mon Sep 17 00:00:00 2001
From: Kevin Yatco <kmbyatco@gmail.com>
Date: Wed, 9 May 2018 15:17:03 +0800
Subject: [PATCH 10/31] Additional steam domains (#14)

---
 steam.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/steam.txt b/steam.txt
index 6509980..906dded 100644
--- a/steam.txt
+++ b/steam.txt
@@ -22,3 +22,5 @@ steam.apac.qtlglb.com.mwcloudcdn.com
 *.steamcontent.com
 cdn1-sea1.valve.net
 cdn2-sea1.valve.net
+*.steam-content-dnld-1.apac-1-cdn.cqloud.com
+steam.apac.qtlglb.com

From f20386d83d2c2786c2a277682642f5ea0925da17 Mon Sep 17 00:00:00 2001
From: Rafael Monteiro e Pereira <rafamonteiro@users.noreply.github.com>
Date: Sat, 23 Jun 2018 14:23:58 -0300
Subject: [PATCH 11/31] Added Nintendo Switch EShop (#15)

* Added Nintendo Switch EShop

* removed duplicated entry
---
 nintendo.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nintendo.txt b/nintendo.txt
index 35d5e06..0f9de4b 100644
--- a/nintendo.txt
+++ b/nintendo.txt
@@ -1 +1,8 @@
-ccs.cdn.wup.shop.nintendo.com
\ No newline at end of file
+ccs.cdn.wup.shop.nintendo.com
+pushmo.hac.lp1.eshop.nintendo.net
+ecs-lp1.hac.shop.nintendo.net
+receive-lp1.dg.srv.nintendo.net
+aqua.hac.lp1.d4c.nintendo.net
+atum.hac.lp1.d4c.nintendo.net
+bugyo.hac.lp1.eshop.nintendo.net
+tagaya.hac.lp1.eshop.nintendo.net

From b365bb205c602d7d5bff81be8ff0575e069a75a3 Mon Sep 17 00:00:00 2001
From: Crabbey <crabbey.zl@gmail.com>
Date: Sat, 23 Jun 2018 18:25:18 +0100
Subject: [PATCH 12/31] Add unbound generation script (#16)

---
 .gitignore                  |  1 +
 scripts/config.example.json | 19 +++++++++++
 scripts/create-unbound.sh   | 63 +++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 scripts/config.example.json
 create mode 100755 scripts/create-unbound.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..86af95d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+scripts/output
diff --git a/scripts/config.example.json b/scripts/config.example.json
new file mode 100644
index 0000000..6d58ee4
--- /dev/null
+++ b/scripts/config.example.json
@@ -0,0 +1,19 @@
+{
+	"ips": {
+		"steam":	"10.10.3.11",
+		"origin":	"10.10.3.12",
+		"blizzard":	"10.10.3.13",
+		"windows":	"10.10.3.14",
+		"riot":		"10.10.3.15",
+		"generic":	"10.10.3.16"
+	},
+	"cache_domains": {
+		"default": 	"generic",
+		"blizzard": 	"blizzard",
+		"origin": 	"origin",
+		"riot": 	"riot",
+		"steam": 	"steam",
+		"wsus": 	"windows",
+		"xboxlive": 	"windows"
+	}
+}
diff --git a/scripts/create-unbound.sh b/scripts/create-unbound.sh
new file mode 100755
index 0000000..c0d4c0e
--- /dev/null
+++ b/scripts/create-unbound.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+basedir=".."
+outputdir="output/unbound"
+path="${basedir}/cache_domains.json"
+
+export IFS=' '
+
+test=$(which jq);
+out=$?
+if [ $out -gt 0 ] ; then
+	echo "This script requires jq to be installed."
+	echo "Your package manager should be able to find it"
+	exit 1
+fi
+
+cachenamedefault="disabled"
+
+while read line; do 
+	ip=$(jq -r ".ips[\"${line}\"]" config.json)
+	declare "cacheip$line"="$ip"
+done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
+
+while read line; do 
+	name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
+	declare "cachename$line"="$name"
+done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
+
+rm -rf ${outputdir}
+mkdir -p ${outputdir}
+while read entry; do 
+	unset cacheip
+	unset cachename
+	key=$(jq -r ".cache_domains[$entry].name" $path)
+	cachename="cachename${key}"
+	if [ -z "${!cachename}" ]; then
+		cachename="cachenamedefault"
+	fi
+	if [[ ${!cachename} == "disabled" ]]; then
+		continue;
+	fi
+	cacheipname="cacheip${!cachename}"
+	cacheip=${!cacheipname}
+	while read fileid; do
+		while read filename; do
+			destfilename=$(echo $filename | sed -e 's/txt/conf/')
+			outputfile=${outputdir}/${destfilename}
+			touch $outputfile
+			echo "server:" >> $outputfile
+			while read fileentry; do
+				# Ignore comments
+				if [[ $fileentry == \#* ]]; then
+					continue
+				fi
+				parsed=$(echo $fileentry | sed -e "s/^\*\.//")
+				if grep -q "$parsed" $outputfile; then
+					continue
+				fi
+				echo "  local-zone: \"${parsed}\" redirect" >> $outputfile
+				echo "  local-data: \"${parsed} 30 IN A ${cacheip}\"" >> $outputfile
+			done <<< $(cat ${basedir}/$filename);
+		done <<< $(jq -r ".cache_domains[$entry].domain_files[$fileid]" $path)
+	done <<< $(jq -r ".cache_domains[$entry].domain_files | to_entries[] | .key" $path)
+done <<< $(jq -r '.cache_domains | to_entries[] | .key' $path)

From 5da319aa5199cca0f1f3c2ca155e2a0795304046 Mon Sep 17 00:00:00 2001
From: James Kinsman <VibroAxe@users.noreply.github.com>
Date: Wed, 27 Jun 2018 22:51:18 +0100
Subject: [PATCH 13/31] Update daybreak.txt

---
 daybreak.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daybreak.txt b/daybreak.txt
index 38d95d6..e2798a3 100644
--- a/daybreak.txt
+++ b/daybreak.txt
@@ -1,2 +1,2 @@
 # Daybreak games 
-*.patch.daybreakgames.com
+pls.patch.daybreakgames.com

From fb17a0cfbc74a29f63bf8a25e26217728076f23c Mon Sep 17 00:00:00 2001
From: James Kinsman <VibroAxe@users.noreply.github.com>
Date: Wed, 27 Jun 2018 22:51:51 +0100
Subject: [PATCH 14/31] Update daybreak.txt

---
 daybreak.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/daybreak.txt b/daybreak.txt
index e2798a3..56c62d0 100644
--- a/daybreak.txt
+++ b/daybreak.txt
@@ -1,2 +1,6 @@
 # Daybreak games 
+#
+# Do NOT cache manifest.patch.daybreakgames.com
+#
+#PS2
 pls.patch.daybreakgames.com

From 49f7303df5b6844501b2fc60711fa7df2a919b8e Mon Sep 17 00:00:00 2001
From: Jason Rivers <jason@jasonrivers.co.uk>
Date: Wed, 15 Aug 2018 10:04:20 +0100
Subject: [PATCH 15/31] Add comcast domain

---
 steam.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/steam.txt b/steam.txt
index 906dded..a196a45 100644
--- a/steam.txt
+++ b/steam.txt
@@ -24,3 +24,4 @@ cdn1-sea1.valve.net
 cdn2-sea1.valve.net
 *.steam-content-dnld-1.apac-1-cdn.cqloud.com
 steam.apac.qtlglb.com
+edge.steam-dns.top.comcast.net

From 8926b7b6efd91817989286ee80ff7349e733a072 Mon Sep 17 00:00:00 2001
From: Goten Xiao <me@gotenxiao.co.uk>
Date: Wed, 15 Aug 2018 13:34:54 +0100
Subject: [PATCH 16/31] Remove trailing comma from Twitch cloudfront domain

---
 twitchapp.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twitchapp.txt b/twitchapp.txt
index 8a785a0..8f18078 100644
--- a/twitchapp.txt
+++ b/twitchapp.txt
@@ -1,4 +1,4 @@
-d3rmjivj4k4f0t.cloudfront.net,
+d3rmjivj4k4f0t.cloudfront.net
 addons.forgesvc.net
 media.forgecdn.net
 files.forgecdn.net

From c6d98a94997b5d506c63008359fb7cc7bf68f011 Mon Sep 17 00:00:00 2001
From: Matthew Hayward <matthewh86@gmail.com>
Date: Thu, 23 Aug 2018 02:35:22 +0100
Subject: [PATCH 17/31] Add Renegade X CDNs

---
 cache_domains.json |  5 +++++
 renegadex.txt      | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 renegadex.txt

diff --git a/cache_domains.json b/cache_domains.json
index 72632fe..ffa8581 100644
--- a/cache_domains.json
+++ b/cache_domains.json
@@ -57,6 +57,11 @@
 			"mixed_content": true,
 			"domain_files": ["origin.txt"]
 		},
+                {
+                        "name": "renegadex",
+                        "description": "CDN for Renegade X",
+                        "domain_files": ["renegadex.txt"]
+                },
 		{
 			"name": "riot",
 			"description": "CDN for riot games",
diff --git a/renegadex.txt b/renegadex.txt
new file mode 100644
index 0000000..fa42197
--- /dev/null
+++ b/renegadex.txt
@@ -0,0 +1,12 @@
+rxp-fl.cncirc.net
+rxp-chi.cncirc.net
+rxp-nz.cncirc.net
+rxp-bgr.cncirc.net
+rxp-fr.cncirc.net
+rxp-nyc.cncirc.net
+rxp-uk.cncirc.net
+rxp-sg.cncirc.net
+rxp-la.cncirc.net
+rxp-fin.cncirc.net
+denver1.renegade-x.com
+seattle1.renegade-x.com
\ No newline at end of file

From 2a92852cb7c06186ac5ebcddb1df8bcfe0f6fc10 Mon Sep 17 00:00:00 2001
From: krandor <krandor.delmarniol@gmail.com>
Date: Thu, 23 Aug 2018 20:21:38 -0400
Subject: [PATCH 18/31] Update steam.txt with second comcast dns

---
 steam.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/steam.txt b/steam.txt
index a196a45..442a0a1 100644
--- a/steam.txt
+++ b/steam.txt
@@ -25,3 +25,4 @@ cdn2-sea1.valve.net
 *.steam-content-dnld-1.apac-1-cdn.cqloud.com
 steam.apac.qtlglb.com
 edge.steam-dns.top.comcast.net
+edge.steam-dns-2.top.comcast.net

From abec31f6eca097fd8b81725b74b85194d2afd723 Mon Sep 17 00:00:00 2001
From: Antoine Lochet <30625353+antoinelochet@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:32:56 +0200
Subject: [PATCH 19/31] Update steam.txt with new akamai dns

---
 steam.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/steam.txt b/steam.txt
index 442a0a1..fb08f95 100644
--- a/steam.txt
+++ b/steam.txt
@@ -26,3 +26,4 @@ cdn2-sea1.valve.net
 steam.apac.qtlglb.com
 edge.steam-dns.top.comcast.net
 edge.steam-dns-2.top.comcast.net
+steamcdn-a.akamaihd.net

From b3b4a5528716ed075d8b5455142b52236775fd4e Mon Sep 17 00:00:00 2001
From: ieatbedrock <ieatbedrock@gmail.com>
Date: Fri, 31 Aug 2018 00:10:41 +0930
Subject: [PATCH 20/31] Added Asia Download Server

---
 wargaming.net.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wargaming.net.txt b/wargaming.net.txt
index 6c3160e..4f98e1d 100644
--- a/wargaming.net.txt
+++ b/wargaming.net.txt
@@ -5,4 +5,5 @@ wargaming.net.edgesuite.ne
 wgusst-na.wargaming.net
 wgusst-eu.wargaming.net
 update-v4r4h10x.worldofwarships.com
-dl-wows-ak.wargaming.net
\ No newline at end of file
+dl-wows-ak.wargaming.net
+wgus-wotasia.wargaming.net

From 8ffcb6cf5a033407d9976dbd50841ef70185d9af Mon Sep 17 00:00:00 2001
From: Jason Rivers <jason@jasonrivers.co.uk>
Date: Wed, 5 Sep 2018 22:48:46 +0100
Subject: [PATCH 21/31] Add gogcdn.net

---
 gog.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gog.txt b/gog.txt
index e67f9aa..1c21ac8 100644
--- a/gog.txt
+++ b/gog.txt
@@ -1,4 +1,5 @@
 cdn.gog.com
 wpc.11df.deltacdn.net
 11df-eu-lb.wpc.edgecastcdn.net
-11df-eu-lb.apr-11df.edgecastdns.net
\ No newline at end of file
+11df-eu-lb.apr-11df.edgecastdns.net
+*.gogcdn.net

From 90634c7d569b7b129d583b8639a6e74a25095df2 Mon Sep 17 00:00:00 2001
From: unspec <unspec@users.noreply.github.com>
Date: Mon, 10 Sep 2018 17:47:16 +0100
Subject: [PATCH 22/31] Remove GOG due to switch to HTTPS (#34)

* Delete gog.txt
* Updated cache_domains.json
---
 cache_domains.json | 5 -----
 gog.txt            | 5 -----
 2 files changed, 10 deletions(-)
 delete mode 100644 gog.txt

diff --git a/cache_domains.json b/cache_domains.json
index ffa8581..699145c 100644
--- a/cache_domains.json
+++ b/cache_domains.json
@@ -25,11 +25,6 @@
 			"description": "CDN for frontier games",
 			"domain_files": ["frontier.txt"]
 		},
-		{
-			"name": "gog",
-			"description": "CDN for good old games downloader",
-			"domain_files": ["gog.txt"]
-		},
 		{
 			"name": "hirez",
 			"description": "CDN for hirez",
diff --git a/gog.txt b/gog.txt
deleted file mode 100644
index 1c21ac8..0000000
--- a/gog.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cdn.gog.com
-wpc.11df.deltacdn.net
-11df-eu-lb.wpc.edgecastcdn.net
-11df-eu-lb.apr-11df.edgecastdns.net
-*.gogcdn.net

From 4d6df09d8680aac99ed813b3706952c3799e2a71 Mon Sep 17 00:00:00 2001
From: Garret Picchioni <garret@picchioni.org>
Date: Sun, 16 Sep 2018 12:55:28 -0700
Subject: [PATCH 23/31] New blizzard domain

---
 blizzard.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/blizzard.txt b/blizzard.txt
index d52f4d7..38df1ac 100644
--- a/blizzard.txt
+++ b/blizzard.txt
@@ -9,4 +9,5 @@ blzddist3-a.akamaihd.net
 blzddist4-a.akamaihd.net
 level3.blizzard.com
 nydus.battle.net
-edge.blizzard.top.comcast.net
\ No newline at end of file
+edge.blizzard.top.comcast.net
+cdn.blizzard.com

From 3642ee7e3618a6a7f44eef660a8d7c81d1bd9be7 Mon Sep 17 00:00:00 2001
From: Marcus <marcusboon@users.noreply.github.com>
Date: Mon, 17 Sep 2018 21:34:56 +1000
Subject: [PATCH 24/31] Update windows domains to include the base domain

This potentially fixes issue with caching Windows Store app updates.
---
 windowsupdates.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/windowsupdates.txt b/windowsupdates.txt
index b900c72..169883a 100644
--- a/windowsupdates.txt
+++ b/windowsupdates.txt
@@ -2,3 +2,4 @@ officecdn.microsoft.com
 *.windowsupdate.com
 windowsupdate.com
 *.dl.delivery.mp.microsoft.com
+dl.delivery.mp.microsoft.com

From 1e51b1d623ef8be87ae691414dbfe1d81efacb1f Mon Sep 17 00:00:00 2001
From: Antoine Lochet <30625353+antoinelochet@users.noreply.github.com>
Date: Wed, 3 Oct 2018 11:49:22 +0200
Subject: [PATCH 25/31] New windows update dns (#27)

Added new windows update domains
---
 windowsupdates.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/windowsupdates.txt b/windowsupdates.txt
index 169883a..277ea3f 100644
--- a/windowsupdates.txt
+++ b/windowsupdates.txt
@@ -3,3 +3,6 @@ officecdn.microsoft.com
 windowsupdate.com
 *.dl.delivery.mp.microsoft.com
 dl.delivery.mp.microsoft.com
+*.update.microsoft.com
+*.do.dsp.mp.microsoft.com
+*.microsoft.com.edgesuite.net
\ No newline at end of file

From d9e37971489b19bf5f4832271700a6ad844904ba Mon Sep 17 00:00:00 2001
From: James Kinsman <VibroAxe@users.noreply.github.com>
Date: Wed, 3 Oct 2018 11:12:40 +0100
Subject: [PATCH 26/31] Issue and Pull Request Templates (#37)

* Created new Issue Template
* Created new pull request template
---
 .github/ISSUE_TEMPLATE.md        | 13 +++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..9525bbe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+### Describe the issue you are having
+<!-- replace this with your issue description -->
+
+### Describe your setup?
+<!-- What is your dns server, are you using steamcache/dns or another resolver -->
+
+### Are you running sniproxy
+<!-- Yes/no -->
+
+### DNS Configuration
+```
+<!-- Paste either your docker run command for the DNS container OR explain how you have setup DNS zone files etc -->
+```
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..3cdd03c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+### What CDN does this PR relate to
+<!-- Please clearly state what existing cdn this pr relates to, or which games if it's a new cdn -->
+
+### Does this require running via sniproxy
+<!-- Yes/no/untested -->
+
+### Capture method
+<!-- Please give a short description how you ascertained the updates to the domain files, wireshark, dns logs etc -->
+
+### Testing Scenario
+<!-- Please give a short description on how you have tested this and where (home, office, small lan, large lan etc) -->
+
+### Testing Configuration
+```
+<!-- Paste either your docker run command from the DNS container OR explain how you have setup DNS zone files etc to test this issue -->
+```
+

From a674fd34e7e377b52bda9cd0108c350cf7f60a65 Mon Sep 17 00:00:00 2001
From: James Kinsman <VibroAxe@users.noreply.github.com>
Date: Mon, 22 Oct 2018 10:43:42 +0100
Subject: [PATCH 27/31] Added sniproxy log messages (#38)

---
 .github/ISSUE_TEMPLATE.md        | 8 ++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9525bbe..4d9994b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -11,3 +11,11 @@
 ```
 <!-- Paste either your docker run command for the DNS container OR explain how you have setup DNS zone files etc -->
 ```
+
+### Sniproxy output
+Please paste the output from `docker logs <sniproxy container name/id> | sed 's/.*\:443 \[//;s/\].*//' | sort | uniq -c` below
+```
+<!-- If you are running sniproxy paste the output to the following command
+docker logs <sniproxy container name/id> | sed 's/.*\:443 \[//;s/\].*//' | sort | uniq -c
+-->
+```
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3cdd03c..cbabb85 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,3 +15,11 @@
 <!-- Paste either your docker run command from the DNS container OR explain how you have setup DNS zone files etc to test this issue -->
 ```
 
+### Sniproxy output
+Please paste the output from `docker logs <sniproxy container name/id> | sed 's/.*\:443 \[//;s/\].*//' | sort | uniq -c` below
+```
+<!-- If you are running sniproxy paste the output to the following command
+docker logs <sniproxy container name/id> | sed 's/.*\:443 \[//;s/\].*//' | sort | uniq -c
+-->
+```
+

From 6dd42624de0b9df24d6f3cb0c1bd9cfe5a74da32 Mon Sep 17 00:00:00 2001
From: VibroAxe <vibs@macrolevel.co.uk>
Date: Mon, 19 Nov 2018 13:13:40 +0000
Subject: [PATCH 28/31] Updated steam domains

Pulled latest region file with the help of
https://github.com/OpenSourceLAN/steam-cdn-enumerate
---
 steam.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/steam.txt b/steam.txt
index fb08f95..7b25282 100644
--- a/steam.txt
+++ b/steam.txt
@@ -27,3 +27,6 @@ steam.apac.qtlglb.com
 edge.steam-dns.top.comcast.net
 edge.steam-dns-2.top.comcast.net
 steamcdn-a.akamaihd.net
+steam.naeu.qtlglb.com
+steampipe-kr.akamaized.net
+steam.ix.asn.au

From fe66d42bcc066195b990bb3216124c36cfe23686 Mon Sep 17 00:00:00 2001
From: James Kinsman <VibroAxe@users.noreply.github.com>
Date: Wed, 21 Nov 2018 09:49:08 +0000
Subject: [PATCH 29/31] Update blizzard.txt

cdn.blizzard.com was missing a wildcard
---
 blizzard.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blizzard.txt b/blizzard.txt
index 38df1ac..7d85419 100644
--- a/blizzard.txt
+++ b/blizzard.txt
@@ -11,3 +11,4 @@ level3.blizzard.com
 nydus.battle.net
 edge.blizzard.top.comcast.net
 cdn.blizzard.com
+*.cdn.blizzard.com

From 512ae4dc46548dddcc281bb92291b86bc6c11517 Mon Sep 17 00:00:00 2001
From: iamxray <45392271+iamxray@users.noreply.github.com>
Date: Tue, 27 Nov 2018 15:48:47 +0300
Subject: [PATCH 30/31] Update steam.txt

Added steam.eca.qtlglb.com host
---
 steam.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/steam.txt b/steam.txt
index 7b25282..3d2756d 100644
--- a/steam.txt
+++ b/steam.txt
@@ -30,3 +30,4 @@ steamcdn-a.akamaihd.net
 steam.naeu.qtlglb.com
 steampipe-kr.akamaized.net
 steam.ix.asn.au
+steam.eca.qtlglb.com 

From 5e0b1dd992b652cd081e18a3a7204a8dd8710f19 Mon Sep 17 00:00:00 2001
From: VibroAxe <vibs@macrolevel.co.uk>
Date: Sat, 1 Dec 2018 12:23:41 +0000
Subject: [PATCH 31/31] Fixing invalid line ending in file

Windows Updates has invalid character
---
 windowsupdates.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windowsupdates.txt b/windowsupdates.txt
index 277ea3f..a6327ce 100644
--- a/windowsupdates.txt
+++ b/windowsupdates.txt
@@ -5,4 +5,4 @@ windowsupdate.com
 dl.delivery.mp.microsoft.com
 *.update.microsoft.com
 *.do.dsp.mp.microsoft.com
-*.microsoft.com.edgesuite.net
\ No newline at end of file
+*.microsoft.com.edgesuite.net