diff --git a/scripts/README.md b/scripts/README.md index 32f3757..96fcc19 100755 --- a/scripts/README.md +++ b/scripts/README.md @@ -46,4 +46,4 @@ The `lancache.conf` should be copied into the `/etc/dnsmasq.d/` location but als You can copy the `*.hosts` file to any location other than `/etc/dnsmasq.d/` as this location is utilised only for `*.conf` files. For example if utilising Pi-hole a user can copy the `*.hosts` files to `/etc/pihole/` and modify the `lancache.conf` with the following command, prior to copying it to `/etc/dnsmasq.d/`: -`sed -i 's/dnsmasq.d/pihole/g' output/dnsmasq/lancache.conf` \ No newline at end of file +`sed -i 's/dnsmasq\/hosts/pihole/g' output/dnsmasq/lancache.conf` \ No newline at end of file diff --git a/scripts/create-dnsmasq.sh b/scripts/create-dnsmasq.sh index bf5eb81..6329f4e 100755 --- a/scripts/create-dnsmasq.sh +++ b/scripts/create-dnsmasq.sh @@ -26,7 +26,7 @@ while read -r line; do done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json) rm -rf ${outputdir} -mkdir -p ${outputdir} +mkdir -p ${outputdir}/hosts touch ${outputdir}/lancache.conf while read -r entry; do unset cacheip @@ -45,8 +45,8 @@ while read -r entry; do while read -r filename; do destfilename=$(echo $filename | sed -e 's/txt/hosts/') lancacheconf=${outputdir}/lancache.conf - outputfile=${outputdir}/${destfilename} - echo "addn-hosts=/etc/dnsmasq/${destfilename}" >> ${lancacheconf} + outputfile=${outputdir}/hosts/${destfilename} + echo "addn-hosts=/etc/dnsmasq/hosts/${destfilename}" >> ${lancacheconf} touch "$outputfile" # Wildcard entries while read -r fileentry; do