Merge remote-tracking branch 'upstream/master'

epicgames.txt

@@ -1,5 +1,10 @@
-epicgames-download1.akamaized.net
+cdn1.epicgames.com
+cdn.unrealengine.com
+cdn1.unrealengine.com
+cdn2.unrealengine.com
+cdn3.unrealengine.com
 download.epicgames.com
 download2.epicgames.com
 download3.epicgames.com
 download4.epicgames.com
+epicgames-download1.akamaized.net

scripts/create-dnsmasq.sh

@@ -27,6 +27,7 @@ done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
 
 rm -rf ${outputdir}
 mkdir -p ${outputdir}
+touch ${outputdir}/lancache.conf
 while read -r entry; do
         unset cacheip
         unset cachename
@@ -42,8 +43,9 @@ while read -r entry; do
         cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
         while read -r fileid; do
                 while read -r filename; do
-                        destfilename=$(echo $filename | sed -e 's/txt/conf/')
+                        destfilename=$(echo $filename | sed -e 's/txt/hosts/')
                         outputfile=${outputdir}/${destfilename}
+                        echo "addn-hosts=/etc/dnsmasq.d/${destfilename}" >> ${outputdir}/lancache.conf
                         touch "$outputfile"
                         while read -r fileentry; do
                                 # Ignore comments
@@ -55,7 +57,7 @@ while read -r entry; do
                                         continue
                                 fi
                                 for i in ${cacheip}; do
-                                        echo "address=/${parsed}/${i}" >> "$outputfile"
+                                        echo "${i} ${parsed}" >> "$outputfile"
                                 done
                         done <<< $(cat ${basedir}/$filename);
                 done <<< $(jq -r ".cache_domains[$entry].domain_files[$fileid]" $path)

xboxlive.txt

@@ -6,3 +6,4 @@ xboxone.loris.llnwd.net
 xboxone.vo.llnwd.net
 xbox-mbr.xboxlive.com
 assets1.xboxlive.com.nsatc.net
+xvcf1.xboxlive.com