Merge 55da2b5621 into 7fbb21e32c

scripts/create-unbound.sh

@@ -13,6 +13,11 @@ if [ $out -gt 0 ] ; then
 	exit 1
 fi
 
+forward=false
+if [ ${1} == --forward ]; then
+  forward=true
+fi
+
 cachenamedefault="disabled"
 
 while read line; do
@@ -45,12 +50,36 @@ while read entry; do
 			destfilename=$(echo $filename | sed -e 's/txt/conf/')
 			outputfile=${outputdir}/${destfilename}
 			touch $outputfile
+			
+			if $forward; then
+				echo 'forward-zone:' > $outputfile
+				echo "  name: \"${key}.cache.lancache.net.\"" >> $outputfile
+				for i in ${cacheip}; do
+					echo "  forward-addr: \"${i}\"" >> $outputfile
+				done
+				echo "  forward-first: yes" >> $outputfile
+				echo "  forward-no-cache: yes" >> $outputfile
+			fi
+
 			while read fileentry; do
 				# Ignore comments and newlines
 				if [[ $fileentry == \#* ]] || [[ -z $fileentry ]]; then
 					continue
 				fi
 				parsed=$(echo $fileentry | sed -e "s/^\*\.//")
+
+				if $forward; then
+					if grep -qx "  name: \"${parsed}\"" $outputfile; then
+						continue
+					fi
+					echo 'forward-zone:' >> $outputfile
+					echo "  name: \"${parsed}.\"" >> $outputfile
+					for i in ${cacheip}; do
+						echo "  forward-addr: \"${i}\"" >> $outputfile
+					done
+					echo "  forward-first: yes" >> $outputfile
+					echo "  forward-no-cache: yes" >> $outputfile
+				else
 					if grep -qx "  local-zone: \"${parsed}\" redirect" $outputfile; then
 						continue
 					fi
@@ -61,6 +90,7 @@ while read entry; do
 					for i in ${cacheip}; do
 						echo "  local-data: \"${parsed} 30 IN A ${i}\"" >> $outputfile
 					done
+				fi
 			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)