Merge branch 'master' into wii-u

This commit is contained in:
James Kinsman 2019-06-23 13:48:52 +01:00 committed by GitHub
commit 5d04f7df9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 55 additions and 23 deletions

View File

@ -14,7 +14,7 @@ You can use this list one of two ways:
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
- name: shortname for the cache domain. Should match `^[0-9A-Za-z]$`
- 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
@ -43,6 +43,7 @@ There is a separate file for each cacheable service. Some notes on formatting:
- Wildcards are permitted as per below
- Lines starting with a # will be treated as a comment.
- Files must end with an empty newline.
- File names must match the regular expression `^[0-9A-Za-z].txt`
#### Wildcards

View File

@ -1 +1 @@
swcdn.apple.com
swcdn.apple.com

View File

@ -1,4 +1,4 @@
assetcdn.101.arenanetworks.com
assetcdn.102.arenanetworks.com
assetcdn.103.arenanetworks.com
live.patcher.bladeandsoul.com
live.patcher.bladeandsoul.com

View File

@ -20,6 +20,12 @@
"description": "Daybreak games CDN",
"domain_files": ["daybreak.txt"]
},
{
"name": "epicgames",
"description": "CDN for Epic Games",
"domain_files": ["epicgames.txt"],
"mixed_content": true
},
{
"name": "frontier",
"description": "CDN for frontier games",
@ -48,11 +54,11 @@
"mixed_content": true,
"domain_files": ["origin.txt"]
},
{
"name": "renegadex",
"description": "CDN for Renegade X",
"domain_files": ["renegadex.txt"]
},
{
"name": "renegadex",
"description": "CDN for Renegade X",
"domain_files": ["renegadex.txt"]
},
{
"name": "riot",
"description": "CDN for riot games",
@ -78,6 +84,12 @@
"description": "CDN for uplay downloader",
"domain_files": ["uplay.txt"]
},
{
"name": "teso",
"description": "CDN for The Elder Scrolls Online",
"mixed_content": true,
"domain_files": ["teso.txt"]
},
{
"name": "twitch",
"description": "CDN for twitch games / mods and addons",
@ -101,4 +113,3 @@
}
]
}

5
epicgames.txt Normal file
View File

@ -0,0 +1,5 @@
epicgames-download1.akamaized.net
download.epicgames.com
download2.epicgames.com
download3.epicgames.com
download4.epicgames.com

View File

@ -1 +1 @@
cdn.zaonce.net
cdn.zaonce.net

View File

@ -1 +1 @@
hirez.http.internapcdn.net
hirez.http.internapcdn.net

View File

@ -1 +1 @@
filedelivery.nexusmods.com
filedelivery.nexusmods.com

View File

@ -9,4 +9,4 @@ rxp-sg.cncirc.net
rxp-la.cncirc.net
rxp-fin.cncirc.net
denver1.renegade-x.com
seattle1.renegade-x.com
seattle1.renegade-x.com

View File

@ -1 +1 @@
patches.rockstargames.com
patches.rockstargames.com

View File

@ -1,6 +1,6 @@
{
"ips": {
"steam": "10.10.3.11",
"steam": ["10.10.3.10", "10.10.3.11"],
"origin": "10.10.3.12",
"blizzard": "10.10.3.13",
"windows": "10.10.3.14",

View File

@ -16,7 +16,7 @@ fi
cachenamedefault="disabled"
while read line; do
ip=$(jq -r ".ips[\"${line}\"]" config.json)
ip=$(jq ".ips[\"${line}\"]" config.json)
declare "cacheip$line"="$ip"
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
@ -39,7 +39,7 @@ while read entry; do
continue;
fi
cacheipname="cacheip${!cachename}"
cacheip=${!cacheipname}
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
while read fileid; do
while read filename; do
destfilename=$(echo $filename | sed -e 's/txt/conf/')
@ -54,7 +54,9 @@ while read entry; do
if grep -q "$parsed" $outputfile; then
continue
fi
echo "address=/${parsed}/${cacheip}" >> $outputfile
for i in ${cacheip}; do
echo "address=/${parsed}/${i}" >> $outputfile
done
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)

View File

@ -16,7 +16,7 @@ fi
cachenamedefault="disabled"
while read line; do
ip=$(jq -r ".ips[\"${line}\"]" config.json)
ip=$(jq ".ips[\"${line}\"]" config.json)
declare "cacheip$line"="$ip"
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
@ -39,7 +39,7 @@ while read entry; do
continue;
fi
cacheipname="cacheip${!cachename}"
cacheip=${!cacheipname}
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
while read fileid; do
while read filename; do
destfilename=$(echo $filename | sed -e 's/txt/conf/')
@ -56,7 +56,9 @@ while read entry; do
continue
fi
echo " local-zone: \"${parsed}\" redirect" >> $outputfile
echo " local-data: \"${parsed} 30 IN A ${cacheip}\"" >> $outputfile
for i in ${cacheip}; do
echo " local-data: \"${parsed} 30 IN A ${i}\"" >> $outputfile
done
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)

View File

@ -1,3 +1,3 @@
pls.patch.station.sony.com
gs2.ww.prod.dl.playstation.net
gs2.sonycoment.loris-e.llnwd.net
gs2.sonycoment.loris-e.llnwd.net

View File

@ -18,11 +18,13 @@ steampipe.akamaized.net
edgecast.steamstatic.com
steam.apac.qtlglb.com.mwcloudcdn.com
*.cs.steampowered.com
*.cm.steampowered.com
*.edgecast.steamstatic.com
*.steamcontent.com
cdn1-sea1.valve.net
cdn2-sea1.valve.net
*.steam-content-dnld-1.apac-1-cdn.cqloud.com
*.steam-content-dnld-1.eu-c1-cdn.cqloud.com
steam.apac.qtlglb.com
edge.steam-dns.top.comcast.net
edge.steam-dns-2.top.comcast.net

1
teso.txt Normal file
View File

@ -0,0 +1 @@
live.patcher.elderscrollsonline.com

View File

@ -4,8 +4,16 @@ wg.gcdn.co
wgusst-na.wargaming.net
wgusst-eu.wargaming.net
update-v4r4h10x.worldofwarships.com
dl-wows-ak.wargaming.net
wgus-wotasia.wargaming.net
dl-wot-ak.wargaming.net
dl-wot-gc.wargaming.net
dl-wot-se.wargaming.net
dl-wot-cdx.wargaming.net
dl-wows-ak.wargaming.net
dl-wows-gc.wargaming.net
dl-wows-se.wargaming.net
dl-wows-cdx.wargaming.net
dl-wowp-ak.wargaming.net
dl-wowp-gc.wargaming.net
dl-wowp-se.wargaming.net
dl-wowp-cdx.wargaming.net