Merge 56a6d2f00f into e7fc17ae5b

This change looks to address some missing domains that seem to be included in the [11notes/windows-update-cache](https://github.com/11notes/docker-windows-update-cache/blob/main/rootfs/etc/nginx/.default/nginx.conf) project.

Closes #231.

cache_domains.json

@@ -126,6 +126,11 @@
 			"name": "xboxlive",
 			"description": "CDN for xboxlive",
 			"domain_files": ["xboxlive.txt"]
-		}
+		},
+		{
+            "name": "test",
+            "description": "Test CDN, recommended to enable for additional diagnostics",
+            "domain_files": ["test.txt"]
+        }
 	]
 }

nintendo.txt

@@ -1,4 +1,3 @@
-ccs.cdn.wup.shop.nintendo.net
 ccs.cdn.wup.shop.nintendo.net.edgesuite.net
 geisha-wup.cdn.nintendo.net
 geisha-wup.cdn.nintendo.net.edgekey.net

scripts/create-adguardhome.sh

@@ -60,6 +60,7 @@ while read entry; do
                 fi
                 for i in ${cacheip}; do
                     echo "${domainprefix}${parsed}^\$dnsrewrite=${i}" >> ${outputfile}
+                    echo "${domainprefix}${parsed}^\$dnstype=AAAA" >> ${outputfile}
                 done
             done <<< $(cat ${basedir}/$filename | sort);
         done <<< $(jq -r ".cache_domains[${entry}].domain_files[${fileid}]" ${path})

scripts/create-blocky.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+basedir=".."
+outputdir="output/blocky"
+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 -r line; do
+        ip=$(jq ".ips[\"${line}\"]" config.json)
+        declare "cacheip${line}"="${ip}"
+done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
+
+
+while read -r 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}
+outputfile=${outputdir}/custom_dns.yml
+
+cat > $outputfile << EOF
+customDNS:
+  customTTL: 1h
+  filterUnmappedTypes: true
+  mapping:
+EOF
+
+while read -r entry; do
+        unset cacheip
+        unset cachename
+        unset cacheip_count
+        unset ciplist
+        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=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
+        while read -r fileid; do
+                while read -r filename; do
+                        while read -r fileentry; do
+                                # Ignore comments, newlines and wildcards
+                                if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
+                                        continue
+                                fi
+                                parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
+                                cacheip_count=1
+                                for i in ${cacheip}; do
+                                  if [ $cacheip_count -gt 1 ]
+                                  then
+                                      ciplist="${ciplist}, ${i}"
+                                  else
+                                      ciplist="${i}"
+                                  fi
+                                  cacheip_count=$((cacheip_count+1))
+                                done
+                                if grep -qx "    ${parsed}: ${ciplist}" "${outputfile}"; then
+                                       continue
+                                fi
+                                       echo "    ${parsed}: ${ciplist}" >> "${outputfile}"
+                        done <<< $(cat ${basedir}/${filename} | sort);
+                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})
+
+cat << EOF
+Configuration generation completed.
+
+Please copy output/blocky/custom_dns.yml to your blocky config directory, or integrate
+it into your main config.yml
+
+EOF

test.txt

@@ -0,0 +1,6 @@
+canary.uklans.net
+litmus.uklans.net
+trigger.uklans.net
+canary.lancache.net
+litmus.lancache.net
+trigger.lancache.net

windowsupdates.txt

@@ -9,3 +9,5 @@ amupdatedl2.microsoft.com
 amupdatedl3.microsoft.com
 amupdatedl4.microsoft.com
 amupdatedl5.microsoft.com
+officecdn.microsoft.com
+officecdn.microsoft.com.edgesuite.net