Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15979 from G-M0N3Y-2503/cache-domains-fix-wildcard

Browse source 
cache-domains: Fixed missing wildcard entries
This commit is contained in:
Rosen Penev 2021-06-29 14:50:12 -07:00 committed by GitHub
commit dfee9d005d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/cache-domains/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cache-domains PKG_NAME:=cache-domains
PKG_VERSION:=2.2.1 PKG_VERSION:=2.2.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>

38
utils/cache-domains/files/cache-domains
View file

@ -6,20 +6,15 @@ set -e
CACHE_DOMAINS_SRC="https://api.github.com/repos/uklans/cache-domains/tarball/master" CACHE_DOMAINS_SRC="https://api.github.com/repos/uklans/cache-domains/tarball/master"
CACHE_DOMAINS_DIR="/var/cache-domains" CACHE_DOMAINS_DIR="/var/cache-domains"
CACHE_DOMAINS_HOSTS_DIR="${CACHE_DOMAINS_DIR}/scripts/output/dnsmasq/hosts" CACHE_DOMAINS_OUTPUT="${CACHE_DOMAINS_DIR}/scripts/output/dnsmasq"
CACHE_DOMAINS_HOSTS_DIR="${CACHE_DOMAINS_OUTPUT}/hosts"
CACHE_DOMAINS_CONF_FILE="${CACHE_DOMAINS_OUTPUT}/lancache.conf"
CONFIG_FILE="/etc/cache-domains.json" CONFIG_FILE="/etc/cache-domains.json"
uci_changes() {
local PACKAGE="$1"
local STATE="$2"
CHANGES=$(/sbin/uci ${UCI_CONFIG_DIR:+-c ${UCI_CONFIG_DIR}} ${STATE:+-P ${STATE}} -q changes "${PACKAGE}" | wc -l)
return "${CHANGES}"
}
configure() { configure() {
local INITIAL_DIR local INITIAL_DIR
local I=0 local I=0
local DNSMASQ_CONF_DIR
mkdir -p "${CACHE_DOMAINS_DIR}" mkdir -p "${CACHE_DOMAINS_DIR}"
rm -fr "${CACHE_DOMAINS_DIR:?}/"* rm -fr "${CACHE_DOMAINS_DIR:?}/"*
@ -42,18 +37,15 @@ configure() {
cd "${CACHE_DOMAINS_DIR}/scripts/" cd "${CACHE_DOMAINS_DIR}/scripts/"
cp "${CONFIG_FILE}" "config.json" cp "${CONFIG_FILE}" "config.json"
./create-dnsmasq.sh > /dev/null ./create-dnsmasq.sh > /dev/null
rm "config.json" "${CACHE_DOMAINS_HOSTS_DIR}/../lancache.conf" rm "config.json"
cd "${INITIAL_DIR}" cd "${INITIAL_DIR}"
# just change addn-hosts path instead of copying the files around
sed -i -r "s|/etc/dnsmasq/hosts|${CACHE_DOMAINS_HOSTS_DIR}|" "${CACHE_DOMAINS_CONF_FILE}"
while uci_get "dhcp" "@dnsmasq[${I}]" > /dev/null; do while uci_get "dhcp" "@dnsmasq[${I}]" > /dev/null; do
if uci_changes "dhcp"; then DNSMASQ_CONF_DIR="$(uci_get "dhcp" "@dnsmasq[${I}]" "confdir" "/tmp/dnsmasq.d" || :)"
uci_remove_list "dhcp" "@dnsmasq[${I}]" "addnhosts" "${CACHE_DOMAINS_HOSTS_DIR}" cp -u "${CACHE_DOMAINS_CONF_FILE}" "${DNSMASQ_CONF_DIR}/"
uci_add_list "dhcp" "@dnsmasq[${I}]" "addnhosts" "${CACHE_DOMAINS_HOSTS_DIR}"
uci_commit "dhcp"
else
echo "ERROR: Unexpected changes in the dhcp configuration, commit changes and try again"
exit 1
fi
I=$((${I} + 1)) I=$((${I} + 1))
done done
@ -63,15 +55,11 @@ configure() {
cleanup() { cleanup() {
local I=0 local I=0
local DNSMASQ_CONF_DIR
while uci_get "dhcp" "@dnsmasq[${I}]" > /dev/null; do while uci_get "dhcp" "@dnsmasq[${I}]" > /dev/null; do
if uci_changes "dhcp"; then DNSMASQ_CONF_DIR="$(uci_get "dhcp" "@dnsmasq[${I}]" "confdir" "/tmp/dnsmasq.d" || :)"
uci_remove_list "dhcp" "@dnsmasq[${I}]" "addnhosts" "${CACHE_DOMAINS_HOSTS_DIR}" rm -f "${DNSMASQ_CONF_DIR}/$(basename "${CACHE_DOMAINS_CONF_FILE}")"
uci_commit "dhcp"
else
echo "ERROR: Unexpected changes in the dhcp configuration, commit changes and try again"
exit 1
fi
I=$((${I} + 1)) I=$((${I} + 1))
done done