Merge 56a6d2f00f into 170c0905e4

Add create script for blocky custom dns yaml configuration

.editorconfig

@@ -11,4 +11,5 @@ insert_final_newline = true
 indent_size = 0
 
 [*.sh]
-indent_style = tab
+indent_style = tab
+

scripts/create-adguardhome.sh

@@ -13,7 +13,6 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
-cachenamedefault="disabled"
 combinedoutput=$(jq -r ".combined_output" config.json)
 
 while read -r line; do
@@ -34,7 +33,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[$entry].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename=${cachenamedefault}
+		cachename="cachenamedefault"
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

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

scripts/create-dnsmasq.sh

@@ -13,7 +13,6 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
-cachenamedefault="disabled"
 combinedoutput=$(jq -r ".combined_output" config.json)
 
 while read -r line; do
@@ -34,7 +33,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[${entry}].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename=${cachenamedefault}
+		cachename="cachenamedefault"
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-rpz.sh

@@ -14,8 +14,6 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
-cachenamedefault="disabled"
-
 while read -r line; do
 	ip=$(jq ".ips[\"${line}\"]" config.json)
 	declare "cacheip${line}"="${ip}"
@@ -50,7 +48,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[${entry}].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename=${cachenamedefault}
+		cachename="cachenamedefault"
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-squid.sh

@@ -14,8 +14,6 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
-cachenamedefault="disabled"
-
 while read -r line; do
 	name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
 	declare "cachename${line}"="${name}"
@@ -28,7 +26,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[$entry].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename=${cachenamedefault}
+		cachename="cachenamedefault"
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-unbound.sh

@@ -13,7 +13,6 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
-cachenamedefault="disabled"
 combinedoutput=$(jq -r ".combined_output" config.json)
 
 while read -r line; do
@@ -34,7 +33,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[${entry}].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename=${cachenamedefault}
+		cachename="cachenamedefault"
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue