PC-Heini/LanCache-Domains
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140 from nightah/dnsmasq-refactor

Browse Source 
Refactor Dnsmasq script to support multiple cache ips
This commit is contained in:
James Kinsman 2020-08-20 11:26:58 +01:00 committed by GitHub
commit 6487d71677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/create-dnsmasq.sh
View File

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