mirror of
https://github.com/uklans/cache-domains
synced 2025-11-04 13:08:53 +01:00
Update scripts and add combined_output flag
This commit is contained in:
Amir Zarrinkafsh
parent
7fbb21e32c
commit
6099f46ab9
@ -5,9 +5,11 @@
|
|||||||
The respective shell scripts contained within this directory can be utilised to generate application specific compliant
|
The respective shell scripts contained within this directory can be utilised to generate application specific compliant
|
||||||
configuration which can be utilised with:
|
configuration which can be utilised with:
|
||||||
|
|
||||||
* Dnsmasq
|
|
||||||
* Unbound
|
|
||||||
* AdGuard Home
|
* AdGuard Home
|
||||||
|
* BIND9
|
||||||
|
* Dnsmasq/Pi-hole
|
||||||
|
* Squid
|
||||||
|
* Unbound
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
@ -16,25 +18,27 @@ configuration which can be utilised with:
|
|||||||
The following example assumes a single shared Cacheserver IP:
|
The following example assumes a single shared Cacheserver IP:
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"ips": {
|
"combined_output": false,
|
||||||
"generic": ["10.10.10.200"]
|
"ips": {
|
||||||
},
|
"generic": ["10.10.10.200"]
|
||||||
"cache_domains": {
|
},
|
||||||
"blizzard": "generic",
|
"cache_domains": {
|
||||||
"epicgames": "generic",
|
"blizzard": "generic",
|
||||||
"nintendo": "generic",
|
"epicgames": "generic",
|
||||||
"origin": "generic",
|
"nintendo": "generic",
|
||||||
"riot": "generic",
|
"origin": "generic",
|
||||||
"sony": "generic",
|
"riot": "generic",
|
||||||
"steam": "generic",
|
"sony": "generic",
|
||||||
"uplay": "generic",
|
"steam": "generic",
|
||||||
"wsus": "generic"
|
"uplay": "generic",
|
||||||
}
|
"wsus": "generic"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
3. Run generation script relative to your DNS implementation: `bash create-dnsmasq.sh`.
|
3. Run generation script relative to your DNS implementation: `bash create-dnsmasq.sh`.
|
||||||
4. Copy files from `output/{dnsmasq,unbound}/*` to the respective locations for Dnsmasq/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 or Unbound).
|
||||||
5. Restart Dnsmasq or Unbound.
|
5. Copy files from `output/{adguardhome,dnsmasq,rpz,squid,unbound}/*` to the respective locations for Dnsmasq/Unbound.
|
||||||
|
6. Restart the appropriate service.
|
||||||
|
|
||||||
### Notes for Dnsmasq users
|
### Notes for Dnsmasq users
|
||||||
|
|
||||||
@ -44,5 +48,5 @@ Multi-IP Lancache setups are only supported with Dnsmasq or Pi-hole versions >=
|
|||||||
|
|
||||||
### Notes for AdGuard Home users
|
### Notes for AdGuard Home users
|
||||||
|
|
||||||
1. In the `config.json`, you may want to add an entry for your non-cached DNS upstreams. You can input this in `ip.adguardhome_upstream` as an array.
|
1. Utilising `"combined_output": true` is more convenient.
|
||||||
2. Once you have ran the script, you can point the upstream list to the text file generated. For example: `upstream_dns_file: "/root/cache-domains/scripts/output/adguardhome/cache-domains.txt"`
|
2. Once you have run the script and uploaded the file to the appropriate location, you should navigate to Adguard Home -> Filters -> DNS blocklists -> Add blocklist -> Add a custom list.
|
||||||
|
|||||||
@ -1,20 +1,20 @@
|
|||||||
{
|
{
|
||||||
"ips": {
|
"combined_output": false,
|
||||||
"adguardhome_upstream": ["94.140.14.140", "tls://dns.google", "https://dns.google/dns-query"],
|
"ips": {
|
||||||
"steam": ["10.10.3.10", "10.10.3.11"],
|
"steam": ["10.10.3.10", "10.10.3.11"],
|
||||||
"origin": "10.10.3.12",
|
"origin": "10.10.3.12",
|
||||||
"blizzard": "10.10.3.13",
|
"blizzard": "10.10.3.13",
|
||||||
"windows": "10.10.3.14",
|
"windows": "10.10.3.14",
|
||||||
"riot": "10.10.3.15",
|
"riot": "10.10.3.15",
|
||||||
"generic": "10.10.3.16"
|
"generic": "10.10.3.16"
|
||||||
},
|
},
|
||||||
"cache_domains": {
|
"cache_domains": {
|
||||||
"default": "generic",
|
"default": "generic",
|
||||||
"blizzard": "blizzard",
|
"blizzard": "blizzard",
|
||||||
"origin": "origin",
|
"origin": "origin",
|
||||||
"riot": "riot",
|
"riot": "riot",
|
||||||
"steam": "steam",
|
"steam": "steam",
|
||||||
"wsus": "windows",
|
"wsus": "windows",
|
||||||
"xboxlive": "windows"
|
"xboxlive": "windows"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
109
scripts/create-adguardhome.sh
Normal file → Executable file
109
scripts/create-adguardhome.sh
Normal file → Executable file
@ -6,72 +6,75 @@ path="${basedir}/cache_domains.json"
|
|||||||
export IFS=' '
|
export IFS=' '
|
||||||
|
|
||||||
test=$(which jq);
|
test=$(which jq);
|
||||||
out=$?
|
if [ $? -gt 0 ] ; then
|
||||||
if [ $out -gt 0 ] ; then
|
echo "This script requires jq to be installed."
|
||||||
echo "This script requires jq to be installed."
|
echo "Your package manager should be able to find it"
|
||||||
echo "Your package manager should be able to find it"
|
exit 1
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cachenamedefault="disabled"
|
cachenamedefault="disabled"
|
||||||
|
combinedoutput=$(jq -r ".combined_output" config.json)
|
||||||
|
|
||||||
while read -r line; do
|
while read line; do
|
||||||
ip=$(jq ".ips[\"${line}\"]" config.json)
|
ip=$(jq ".ips[\"${line}\"]" config.json)
|
||||||
declare "cacheip${line}"="${ip}"
|
declare "cacheip${line}"="${ip}"
|
||||||
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
agh_upstreams=$(jq -r ".ips[\"adguardhome_upstream\"] | .[]" config.json)
|
while read line; do
|
||||||
|
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
||||||
while read -r line; do
|
declare "cachename$line"="$name"
|
||||||
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
|
||||||
declare "cachename${line}"="${name}"
|
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
rm -rf ${outputdir}
|
rm -rf ${outputdir}
|
||||||
mkdir -p ${outputdir}
|
mkdir -p ${outputdir}
|
||||||
|
while read entry; do
|
||||||
# add upstreams
|
unset cacheip
|
||||||
echo "${agh_upstreams}" >> "${outputdir}/cache-domains.txt"
|
unset cachename
|
||||||
|
key=$(jq -r ".cache_domains[$entry].name" ${path})
|
||||||
while read -r entry; do
|
cachename="cachename${key}"
|
||||||
unset cacheip
|
if [ -z "${!cachename}" ]; then
|
||||||
unset cachename
|
cachename="cachenamedefault"
|
||||||
key=$(jq -r ".cache_domains[$entry].name" $path)
|
fi
|
||||||
cachename="cachename${key}"
|
if [[ ${!cachename} == "disabled" ]]; then
|
||||||
if [ -z "${!cachename}" ]; then
|
continue;
|
||||||
cachename="cachenamedefault"
|
fi
|
||||||
fi
|
cacheipname="cacheip${!cachename}"
|
||||||
if [[ ${!cachename} == "disabled" ]]; then
|
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
|
||||||
continue;
|
while read fileid; do
|
||||||
fi
|
while read filename; do
|
||||||
cacheipname="cacheip${!cachename}"
|
destfilename=$(echo ${filename} | sed -e 's/txt/conf/')
|
||||||
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
|
outputfile=${outputdir}/${destfilename}
|
||||||
while read -r fileid; do
|
touch ${outputfile}
|
||||||
while read -r filename; do
|
while read fileentry; do
|
||||||
destfilename="cache-domains.txt" #$(echo $filename | sed -e 's/txt/conf/')
|
# Ignore comments and newlines
|
||||||
outputfile=${outputdir}/${destfilename}
|
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
||||||
touch ${outputfile}
|
continue
|
||||||
while read -r fileentry; do
|
fi
|
||||||
# Ignore comments, newlines and wildcards
|
domainprefix="|"
|
||||||
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
if [[ $fileentry =~ ^\*\. ]]; then
|
||||||
continue
|
domainprefix="||"
|
||||||
fi
|
fi
|
||||||
parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
|
parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
|
||||||
for i in ${cacheip}; do
|
if grep -q "${domainprefix}${parsed}^\$dnsrewrite" ${outputfile}; then
|
||||||
if grep -qx "\[/${parsed}/\]${i}" "${outputfile}"; then
|
continue
|
||||||
continue
|
fi
|
||||||
fi
|
for i in ${cacheip}; do
|
||||||
echo "[/${parsed}/]${i}" >> "${outputfile}"
|
echo "${domainprefix}${parsed}^\$dnsrewrite=${i}" >> ${outputfile}
|
||||||
done
|
done
|
||||||
done <<< $(cat ${basedir}/${filename} | sort);
|
done <<< $(cat ${basedir}/$filename | sort);
|
||||||
done <<< $(jq -r ".cache_domains[${entry}].domain_files[$fileid]" ${path})
|
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[${entry}].domain_files | to_entries[] | .key" ${path})
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' ${path})
|
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 "# ${f^}" >> ${outputdir}/lancache.conf && cat ${file} >> ${outputdir}/lancache.conf && rm ${file}; done
|
||||||
|
fi
|
||||||
|
|
||||||
cat << EOF
|
cat << EOF
|
||||||
Configuration generation completed.
|
Configuration generation completed.
|
||||||
|
|
||||||
Please point the setting upstream_dns_file in AdGuardHome.yaml to the generated file.
|
Please copy the following files:
|
||||||
For example:
|
- ./${outputdir}/*.conf to /opt/adguardhome/work/userfilters/
|
||||||
upstream_dns_file: "/root/cache-domains/scripts/output/adguardhome/cache-domains.txt"
|
- Navigate to Adguard Home -> Filters -> DNS blocklists -> Add blocklist -> Add a custom list
|
||||||
|
- Add list for each service or utilise the combined output for a single list
|
||||||
EOF
|
EOF
|
||||||
@ -6,14 +6,14 @@ path="${basedir}/cache_domains.json"
|
|||||||
export IFS=' '
|
export IFS=' '
|
||||||
|
|
||||||
test=$(which jq);
|
test=$(which jq);
|
||||||
out=$?
|
if [ $? -gt 0 ] ; then
|
||||||
if [ $out -gt 0 ] ; then
|
echo "This script requires jq to be installed."
|
||||||
echo "This script requires jq to be installed."
|
echo "Your package manager should be able to find it"
|
||||||
echo "Your package manager should be able to find it"
|
exit 1
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cachenamedefault="disabled"
|
cachenamedefault="disabled"
|
||||||
|
combinedoutput=$(jq -r ".combined_output" config.json)
|
||||||
|
|
||||||
while read -r line; do
|
while read -r line; do
|
||||||
ip=$(jq ".ips[\"${line}\"]" config.json)
|
ip=$(jq ".ips[\"${line}\"]" config.json)
|
||||||
@ -28,42 +28,46 @@ done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
|||||||
rm -rf ${outputdir}
|
rm -rf ${outputdir}
|
||||||
mkdir -p ${outputdir}
|
mkdir -p ${outputdir}
|
||||||
while read -r entry; do
|
while read -r entry; do
|
||||||
unset cacheip
|
unset cacheip
|
||||||
unset cachename
|
unset cachename
|
||||||
key=$(jq -r ".cache_domains[$entry].name" $path)
|
key=$(jq -r ".cache_domains[${entry}].name" ${path})
|
||||||
cachename="cachename${key}"
|
cachename="cachename${key}"
|
||||||
if [ -z "${!cachename}" ]; then
|
if [ -z "${!cachename}" ]; then
|
||||||
cachename="cachenamedefault"
|
cachename="cachenamedefault"
|
||||||
fi
|
fi
|
||||||
if [[ ${!cachename} == "disabled" ]]; then
|
if [[ ${!cachename} == "disabled" ]]; then
|
||||||
continue;
|
continue;
|
||||||
fi
|
fi
|
||||||
cacheipname="cacheip${!cachename}"
|
cacheipname="cacheip${!cachename}"
|
||||||
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/conf/')
|
||||||
outputfile=${outputdir}/${destfilename}
|
outputfile=${outputdir}/${destfilename}
|
||||||
touch ${outputfile}
|
touch ${outputfile}
|
||||||
while read -r fileentry; do
|
while read -r fileentry; do
|
||||||
# Ignore comments, newlines and wildcards
|
# Ignore comments, newlines and wildcards
|
||||||
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
|
parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
|
||||||
for i in ${cacheip}; do
|
for i in ${cacheip}; do
|
||||||
if ! grep -qx "address=/${parsed}/${i}" "${outputfile}"; then
|
if ! grep -qx "address=/${parsed}/${i}" "${outputfile}"; then
|
||||||
echo "address=/${parsed}/${i}" >> "${outputfile}"
|
echo "address=/${parsed}/${i}" >> "${outputfile}"
|
||||||
fi
|
fi
|
||||||
if ! grep -qx "local=/${parsed}/" "${outputfile}"; then
|
if ! grep -qx "local=/${parsed}/" "${outputfile}"; then
|
||||||
echo "local=/${parsed}/" >> "${outputfile}"
|
echo "local=/${parsed}/" >> "${outputfile}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done <<< $(cat ${basedir}/${filename} | sort);
|
done <<< $(cat ${basedir}/${filename} | sort);
|
||||||
done <<< $(jq -r ".cache_domains[${entry}].domain_files[$fileid]" ${path})
|
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[${entry}].domain_files | to_entries[] | .key" ${path})
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' ${path})
|
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 "# ${f^}" >> ${outputdir}/lancache.conf && cat ${file} >> ${outputdir}/lancache.conf && rm ${file}; done
|
||||||
|
fi
|
||||||
|
|
||||||
cat << EOF
|
cat << EOF
|
||||||
Configuration generation completed.
|
Configuration generation completed.
|
||||||
|
|
||||||
|
|||||||
@ -7,108 +7,107 @@ basedomain=${1:-lancache.net}
|
|||||||
export IFS=' '
|
export IFS=' '
|
||||||
|
|
||||||
test=$(which jq);
|
test=$(which jq);
|
||||||
out=$?
|
if [ $? -gt 0 ] ; then
|
||||||
if [ $out -gt 0 ] ; then
|
echo "This script requires jq to be installed."
|
||||||
echo "This script requires jq to be installed."
|
echo "Your package manager should be able to find it"
|
||||||
echo "Your package manager should be able to find it"
|
exit 1
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cachenamedefault="disabled"
|
cachenamedefault="disabled"
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
ip=$(jq ".ips[\"${line}\"]" config.json)
|
ip=$(jq ".ips[\"${line}\"]" config.json)
|
||||||
declare "cacheip$line"="$ip"
|
declare "cacheip${line}"="${ip}"
|
||||||
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
||||||
declare "cachename$line"="$name"
|
declare "cachename${line}"="${name}"
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
rm -rf ${outputdir}
|
rm -rf ${outputdir}
|
||||||
mkdir -p ${outputdir}
|
mkdir -p ${outputdir}
|
||||||
outputfile=${outputdir}/db.rpz.$basedomain
|
outputfile=${outputdir}/db.rpz.${basedomain}
|
||||||
cat > $outputfile << EOF
|
cat > ${outputfile} << EOF
|
||||||
\$TTL 60 ; default TTL
|
\$TTL 60 ; default TTL
|
||||||
\$ORIGIN rpz.$basedomain.
|
\$ORIGIN rpz.${basedomain}.
|
||||||
@ SOA ns1.$basedomain. admin.$basedomain. (
|
@ SOA ns1.${basedomain}. admin.${basedomain}. (
|
||||||
$(date +%Y%m%d01) ; serial
|
$(date +%Y%m%d01) ; serial
|
||||||
604800 ; refresh (1 week)
|
604800 ; refresh (1 week)
|
||||||
600 ; retry (10 mins)
|
600 ; retry (10 mins)
|
||||||
600 ; expire (10 mins)
|
600 ; expire (10 mins)
|
||||||
600 ; minimum (10 mins)
|
600 ; minimum (10 mins)
|
||||||
)
|
)
|
||||||
NS ns1.$basedomain.
|
NS ns1.${basedomain}.
|
||||||
NS ns2.$basedomain.
|
NS ns2.${basedomain}.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
while read entry; do
|
while read entry; do
|
||||||
unset cacheip
|
unset cacheip
|
||||||
unset cachename
|
unset cachename
|
||||||
key=$(jq -r ".cache_domains[$entry].name" $path)
|
key=$(jq -r ".cache_domains[${entry}].name" ${path})
|
||||||
cachename="cachename${key}"
|
cachename="cachename${key}"
|
||||||
if [ -z "${!cachename}" ]; then
|
if [ -z "${!cachename}" ]; then
|
||||||
cachename="cachenamedefault"
|
cachename="cachenamedefault"
|
||||||
fi
|
fi
|
||||||
if [[ ${!cachename} == "disabled" ]]; then
|
if [[ ${!cachename} == "disabled" ]]; then
|
||||||
continue;
|
continue;
|
||||||
fi
|
fi
|
||||||
cacheipname="cacheip${!cachename}"
|
cacheipname="cacheip${!cachename}"
|
||||||
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
|
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
|
||||||
while read fileid; do
|
while read fileid; do
|
||||||
while read filename; do
|
while read filename; do
|
||||||
echo "" >> $outputfile
|
echo "" >> ${outputfile}
|
||||||
echo "; $(echo $filename | sed -e 's/.txt$//')" >> $outputfile
|
echo "; $(echo ${filename} | sed -e 's/.txt$//')" >> ${outputfile}
|
||||||
destfilename=$(echo $filename | sed -e 's/txt/conf/')
|
destfilename=$(echo ${filename} | sed -e 's/txt/conf/')
|
||||||
while read fileentry; do
|
while read fileentry; do
|
||||||
# Ignore comments and newlines
|
# Ignore comments and newlines
|
||||||
if [[ $fileentry == \#* ]] || [[ -z $fileentry ]]; then
|
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
parsed=$(echo $fileentry)
|
parsed=$(echo ${fileentry})
|
||||||
if grep -qx "^\"${parsed}\". " $outputfile; then
|
if grep -qx "^\"${parsed}\". " ${outputfile}; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
t=""
|
t=""
|
||||||
for i in ${cacheip}; do
|
for i in ${cacheip}; do
|
||||||
# only one cname per domain is allowed
|
# only one cname per domain is allowed
|
||||||
if [[ ${t} = "CNAME" ]]; then
|
if [[ ${t} = "CNAME" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# for cnames you must use a fqdn with trailing dot
|
# for cnames you must use a fqdn with trailing dot
|
||||||
t="CNAME"
|
t="CNAME"
|
||||||
if [[ ${i} =~ ^[0-9\.]+$ ]] ; then
|
if [[ ${i} =~ ^[0-9\.]+$ ]] ; then
|
||||||
t="A"
|
t="A"
|
||||||
elif [[ ! ${i} =~ \.$ ]] ; then
|
elif [[ ! ${i} =~ \.$ ]] ; then
|
||||||
i="${i}."
|
i="${i}."
|
||||||
fi
|
fi
|
||||||
printf "%-50s IN %s %s\n" \
|
printf "%-50s IN %s %s\n" \
|
||||||
"${parsed}" \
|
"${parsed}" \
|
||||||
"${t}" \
|
"${t}" \
|
||||||
"${i}" \
|
"${i}" \
|
||||||
>> $outputfile
|
>> ${outputfile}
|
||||||
done
|
done
|
||||||
done <<< $(cat ${basedir}/$filename | sort);
|
done <<< $(cat ${basedir}/${filename} | sort);
|
||||||
done <<< $(jq -r ".cache_domains[$entry].domain_files[$fileid]" $path)
|
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[${entry}].domain_files | to_entries[] | .key" ${path})
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' $path)
|
done <<< $(jq -r '.cache_domains | to_entries[] | .key' ${path})
|
||||||
|
|
||||||
cat << EOF
|
cat << EOF
|
||||||
Configuration generation completed.
|
Configuration generation completed.
|
||||||
|
|
||||||
Please include the rpz zone in your bind configuration"
|
Please include the rpz zone in your bind configuration"
|
||||||
- cp $outputfile /etc/bind
|
- cp ${outputfile} /etc/bind
|
||||||
- configure the zone and use it
|
- configure the zone and use it
|
||||||
|
|
||||||
options {
|
options {
|
||||||
[...]
|
[...]
|
||||||
response-policy {zone "rpz.$basedomain";};
|
response-policy {zone "rpz.${basedomain}";};
|
||||||
[...]
|
[...]
|
||||||
}
|
}
|
||||||
zone "rpz.$basedomain" {
|
zone "rpz.$basedomain" {
|
||||||
type master;
|
type master;
|
||||||
file "/etc/bind/db.rpz.$basedomain";
|
file "/etc/bind/db.rpz.${basedomain}";
|
||||||
};
|
};
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
@ -7,61 +7,59 @@ REGEX="^\\*\\.(.*)$"
|
|||||||
export IFS=' '
|
export IFS=' '
|
||||||
|
|
||||||
test=$(which jq);
|
test=$(which jq);
|
||||||
out=$?
|
if [ $? -gt 0 ] ; then
|
||||||
if [ $out -gt 0 ] ; then
|
echo "This script requires jq to be installed."
|
||||||
echo "This script requires jq to be installed."
|
echo "Your package manager should be able to find it"
|
||||||
echo "Your package manager should be able to find it"
|
exit 1
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cachenamedefault="disabled"
|
cachenamedefault="disabled"
|
||||||
|
|
||||||
while read -r line; do
|
while read -r line; do
|
||||||
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
||||||
declare "cachename${line}"="${name}"
|
declare "cachename${line}"="${name}"
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
rm -rf ${outputdir}
|
rm -rf ${outputdir}
|
||||||
mkdir -p ${outputdir}
|
mkdir -p ${outputdir}
|
||||||
while read -r entry; do
|
while read -r entry; do
|
||||||
unset cachename
|
unset cachename
|
||||||
key=$(jq -r ".cache_domains[$entry].name" $path)
|
key=$(jq -r ".cache_domains[$entry].name" ${path})
|
||||||
cachename="cachename${key}"
|
cachename="cachename${key}"
|
||||||
if [ -z "${!cachename}" ]; then
|
if [ -z "${!cachename}" ]; then
|
||||||
cachename="cachenamedefault"
|
cachename="cachenamedefault"
|
||||||
fi
|
fi
|
||||||
if [[ ${!cachename} == "disabled" ]]; then
|
if [[ ${!cachename} == "disabled" ]]; then
|
||||||
continue;
|
continue;
|
||||||
fi
|
fi
|
||||||
while read -r fileid; do
|
while read -r fileid; do
|
||||||
while read -r filename; do
|
while read -r filename; do
|
||||||
destfilename=$(echo ${!cachename}.txt)
|
destfilename=$(echo ${!cachename}.txt)
|
||||||
outputfile=${outputdir}/${destfilename}
|
outputfile=${outputdir}/${destfilename}
|
||||||
touch ${outputfile}
|
touch ${outputfile}
|
||||||
while read -r fileentry; do
|
while read -r fileentry; do
|
||||||
# Ignore comments
|
# Ignore comments
|
||||||
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
# Handle wildcards to squid wildcards
|
# Ha wildcards to squid wildcards
|
||||||
parsed=$(echo ${fileentry} | sed -e "s/^\*\./\./")
|
parsed=$(echo ${fileentry} | sed -e "s/^\*\./\./")
|
||||||
# If we have cdn.thing and *.cdn.thing in cache_domains
|
# If we have cdn.thing and *.cdn.thing in cache_domains
|
||||||
# Squid requires ONLY cdn.thing
|
# Squid requires ONLY cdn.thing
|
||||||
#
|
#
|
||||||
# If the fileentry starts with *.cdn.thing
|
# If the fileentry starts with *.cdn.thing
|
||||||
if [[ ${fileentry} =~ $REGEX ]]; then
|
if [[ ${fileentry} =~ $REGEX ]]; then
|
||||||
# Does the cache_domains file also contain cdn.thing
|
# Does the cache_domains file also contain cdn.thing
|
||||||
grep "${BASH_REMATCH[1]}" ${basedir}/${filename} | grep -v "${fileentry}" > /dev/null
|
grep "${BASH_REMATCH[1]}" ${basedir}/${filename} | grep -v "${fileentry}" > /dev/null
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
# Skip *.cdn.thing as cdn.thing will be collected earlier/later
|
# Skip *.cdn.thing as cdn.thing will be collected earlier/later
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
echo "${parsed}" >> "${outputfile}"
|
||||||
echo "${parsed}" >> "${outputfile}"
|
done <<< $(cat ${basedir}/${filename} | sort);
|
||||||
done <<< $(cat ${basedir}/${filename} | sort);
|
done <<< $(jq -r ".cache_domains[${entry}].domain_files[${fileid}]" ${path})
|
||||||
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[${entry}].domain_files | to_entries[] | .key" ${path})
|
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' ${path})
|
done <<< $(jq -r '.cache_domains | to_entries[] | .key' ${path})
|
||||||
|
|
||||||
cat << EOF
|
cat << EOF
|
||||||
|
|||||||
@ -6,65 +6,69 @@ path="${basedir}/cache_domains.json"
|
|||||||
export IFS=' '
|
export IFS=' '
|
||||||
|
|
||||||
test=$(which jq);
|
test=$(which jq);
|
||||||
out=$?
|
if [ $? -gt 0 ] ; then
|
||||||
if [ $out -gt 0 ] ; then
|
echo "This script requires jq to be installed."
|
||||||
echo "This script requires jq to be installed."
|
echo "Your package manager should be able to find it"
|
||||||
echo "Your package manager should be able to find it"
|
exit 1
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cachenamedefault="disabled"
|
cachenamedefault="disabled"
|
||||||
|
combinedoutput=$(jq -r ".combined_output" config.json)
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
ip=$(jq ".ips[\"${line}\"]" config.json)
|
ip=$(jq ".ips[\"${line}\"]" config.json)
|
||||||
declare "cacheip$line"="$ip"
|
declare "cacheip${line}"="${ip}"
|
||||||
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.ips | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
|
||||||
declare "cachename$line"="$name"
|
declare "cachename${line}"="${name}"
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
done <<< $(jq -r '.cache_domains | to_entries[] | .key' config.json)
|
||||||
|
|
||||||
rm -rf ${outputdir}
|
rm -rf ${outputdir}
|
||||||
mkdir -p ${outputdir}
|
mkdir -p ${outputdir}
|
||||||
while read entry; do
|
while read entry; do
|
||||||
unset cacheip
|
unset cacheip
|
||||||
unset cachename
|
unset cachename
|
||||||
key=$(jq -r ".cache_domains[$entry].name" $path)
|
key=$(jq -r ".cache_domains[${entry}].name" ${path})
|
||||||
cachename="cachename${key}"
|
cachename="cachename${key}"
|
||||||
if [ -z "${!cachename}" ]; then
|
if [ -z "${!cachename}" ]; then
|
||||||
cachename="cachenamedefault"
|
cachename="cachenamedefault"
|
||||||
fi
|
fi
|
||||||
if [[ ${!cachename} == "disabled" ]]; then
|
if [[ ${!cachename} == "disabled" ]]; then
|
||||||
continue;
|
continue;
|
||||||
fi
|
fi
|
||||||
cacheipname="cacheip${!cachename}"
|
cacheipname="cacheip${!cachename}"
|
||||||
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
|
cacheip=$(jq -r 'if type == "array" then .[] else . end' <<< ${!cacheipname} | xargs)
|
||||||
while read fileid; do
|
while read fileid; do
|
||||||
while read filename; do
|
while read filename; do
|
||||||
destfilename=$(echo $filename | sed -e 's/txt/conf/')
|
destfilename=$(echo ${filename} | sed -e 's/txt/conf/')
|
||||||
outputfile=${outputdir}/${destfilename}
|
outputfile=${outputdir}/${destfilename}
|
||||||
touch $outputfile
|
touch ${outputfile}
|
||||||
while read fileentry; do
|
while read fileentry; do
|
||||||
# Ignore comments and newlines
|
# Ignore comments and newlines
|
||||||
if [[ $fileentry == \#* ]] || [[ -z $fileentry ]]; then
|
if [[ ${fileentry} == \#* ]] || [[ -z ${fileentry} ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
parsed=$(echo $fileentry | sed -e "s/^\*\.//")
|
parsed=$(echo ${fileentry} | sed -e "s/^\*\.//")
|
||||||
if grep -qx " local-zone: \"${parsed}\" redirect" $outputfile; then
|
if grep -qx " local-zone: \"${parsed}\" redirect" ${outputfile}; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if [[ $(head -n 1 $outputfile) != "server:" ]]; then
|
if [[ $(head -n 1 ${outputfile}) != "server:" ]]; then
|
||||||
echo "server:" >> $outputfile
|
echo "server:" >> ${outputfile}
|
||||||
fi
|
fi
|
||||||
echo " local-zone: \"${parsed}\" redirect" >> $outputfile
|
echo " local-zone: \"${parsed}\" redirect" >> ${outputfile}
|
||||||
for i in ${cacheip}; do
|
for i in ${cacheip}; do
|
||||||
echo " local-data: \"${parsed} 30 IN A ${i}\"" >> $outputfile
|
echo " local-data: \"${parsed} 30 IN A ${i}\"" >> ${outputfile}
|
||||||
done
|
done
|
||||||
done <<< $(cat ${basedir}/$filename | sort);
|
done <<< $(cat ${basedir}/${filename} | sort);
|
||||||
done <<< $(jq -r ".cache_domains[$entry].domain_files[$fileid]" $path)
|
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[${entry}].domain_files | to_entries[] | .key" ${path})
|
||||||
done <<< $(jq -r '.cache_domains | to_entries[] | .key' $path)
|
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 "# ${f^}" >> ${outputdir}/lancache.conf && cat ${file} >> ${outputdir}/lancache.conf && rm ${file}; done
|
||||||
|
fi
|
||||||
|
|
||||||
cat << EOF
|
cat << EOF
|
||||||
Configuration generation completed.
|
Configuration generation completed.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user