Merge a036429193 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/README.md

@@ -10,6 +10,7 @@ configuration which can be utilised with:
 * Dnsmasq/Pi-hole
 * Squid
 * Unbound
+* FortiOS
 
 ## Usage
 
@@ -37,7 +38,7 @@ The following example assumes a single shared Cacheserver IP:
 }
 ```
 3. Run generation script relative to your DNS implementation: `bash create-dnsmasq.sh`.
-4. If `combined_output` is set to `true` this will result in a single output file: `lancache.conf` with all your enabled services (applies to Adguard Home, Dnsmasq or Unbound).
+4. If `combined_output` is set to `true` this will result in a single output file: `lancache.conf` with all your enabled services (applies to Adguard Home, Dnsmasq, Unbound or FortiOS).
 5. Copy files from `output/{adguardhome,dnsmasq,rpz,squid,unbound}/*` to the respective locations for Dnsmasq/Unbound.
 6. Restart the appropriate service.
 

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-fortios.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+basedir=".."
+outputdir="output/fortios"
+path="${basedir}/cache_domains.json"
+
+export IFS=' '
+
+test=$(which jq);
+if [ $? -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"
+combinedoutput=$(jq -r ".combined_output" config.json)
+
+while read line; do
+    ip=$(jq ".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=$(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/')
+            outputfile=${outputdir}/${destfilename}
+            touch ${outputfile}
+            tab="    "
+            echo "config system dns-database" >> ${outputfile}
+            while read fileentry; do
+                # Ignore comments and newlines
+                if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
+                    continue
+                fi
+                parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
+                echo -e "${tab}edit \"${parsed}\"\n${tab}${tab}set domain \"${parsed}\"\n${tab}${tab}set authoritative disable\n${tab}${tab}config dns-entry" >> ${outputfile}
+                j=1
+                for i in ${cacheip}; do
+                    echo -e "${tab}${tab}${tab}edit ${j}\n${tab}${tab}${tab}${tab}set hostname \"@\"\n${tab}${tab}${tab}${tab}set ip ${i}\n${tab}${tab}${tab}next" >> ${outputfile}
+                    j=$((j+1))
+                done
+                echo -e "${tab}${tab}end\n${tab}next" >> ${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})
+    echo "end" >> ${outputfile}
+done <<< $(jq -r '.cache_domains | to_entries[] | .key' ${path})
+if [[ ${combinedoutput} == "true" ]]; then
+    for file in ${outputdir}/*; do f=${file//${outputdir}\/} && f=${f//.conf} && echo -e "# ${f}" >> ${outputdir}/lancache.conf && cat ${file} >> ${outputdir}/lancache.conf && rm ${file}; done
+fi
+
+cat << EOF
+Configuration generation completed.
+
+Please paste the contents of the following files:
+- ./${outputdir}/*.conf to the FortiOS CLI
+- Paste the configuration of each service or utilise the combined output for a single list
+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