cache-domains: Improved ifup hotplug reliability

I've noticed that in deployment on some reboots it won't configure,
This seems to be due to running before the system/network is ready.

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>

diff --git a/utils/cache-domains/Makefile b/utils/cache-domains/Makefile
index cd14a3783cf26484830a2bfdeee9d2ce3630d937..649cb7d92853637f2ac8a1337a4512d64df0aaf7 100644 (file)
--- a/utils/cache-domains/Makefile
+++ b/utils/cache-domains/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cache-domains
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.1.0
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>

diff --git a/utils/cache-domains/files/30-cache-domains b/utils/cache-domains/files/30-cache-domains
index adc9cb0dff2f842e2620e07665393d46c93a1a6d..0b7189bbf95ef0f381a839cec0a6c78931a5c94c 100644 (file)
--- a/utils/cache-domains/files/30-cache-domains
+++ b/utils/cache-domains/files/30-cache-domains
@@ -1,8 +1,14 @@
 #!/bin/sh
 
-source /lib/functions/network.sh
+. /lib/functions/network.sh
 network_find_wan WAN_IFACE
 
-if [ "${ACTION}" == "ifup" ] && [ "${INTERFACE}" == "${WAN_IFACE}" ] && [ ! -d /var/cache-domains ]; then
-       /usr/bin/cache-domains configure
+if [ "${ACTION}" = "ifup" ] && [ "${INTERFACE}" = "${WAN_IFACE}" ] && [ ! -d /var/cache-domains ]; then
+       for ATTEMPT in $(seq 1 3); do
+               if /usr/bin/cache-domains configure; then
+                       break
+               else
+                       sleep 30
+               fi
+       done
 fi

diff --git a/utils/cache-domains/files/cache-domains b/utils/cache-domains/files/cache-domains
index cdf388a1efe62755051dfff373438db655094f83..fe451bebeb3c85ebbfe066cc58998eacaa244b7d 100644 (file)
--- a/utils/cache-domains/files/cache-domains
+++ b/utils/cache-domains/files/cache-domains
@@ -1,39 +1,42 @@
 #!/bin/sh
 
+set -e
+
 CACHE_DOMAINS_DIR="/var/cache-domains"
 CACHE_DOMAINS_SRC="https://api.github.com/repos/uklans/cache-domains/tarball/master"
 CONFIG_FILE="/etc/cache-domains.json"
 
 configure() {
-       mkdir -p ${CACHE_DOMAINS_DIR}
-       rm -fr ${CACHE_DOMAINS_DIR}/*
+       mkdir -p "${CACHE_DOMAINS_DIR}"
+       rm -fr "${CACHE_DOMAINS_DIR:?}/"*
 
-       if ! wget -qO - ${CACHE_DOMAINS_SRC} | tar -xzC ${CACHE_DOMAINS_DIR}; then
+       if ! wget -qO - "${CACHE_DOMAINS_SRC}" | tar -xzC "${CACHE_DOMAINS_DIR}"; then
+               rm -fr "${CACHE_DOMAINS_DIR}"
                echo "ERROR: Could not retrieve ${CACHE_DOMAINS_SRC}"
-               return 1
+               exit 1
        fi
 
        INITIAL_DIR="$(pwd)"
-       cd ${CACHE_DOMAINS_DIR}/*/scripts/
+       cd "${CACHE_DOMAINS_DIR}/"*"/scripts/"
 
-       if [ ! -f ${CONFIG_FILE} ]; then
-               cp config.example.json ${CONFIG_FILE}
+       if [ ! -f "${CONFIG_FILE}" ]; then
+               cp "config.example.json" "${CONFIG_FILE}"
                echo "Using example config file ${CONFIG_FILE}"
        fi
 
-       cp ${CONFIG_FILE} config.json
+       cp "${CONFIG_FILE}" "config.json"
        ./create-dnsmasq.sh
-       cp ./output/dnsmasq/* /var/dnsmasq.d/
+       cp "./output/dnsmasq/"* "/var/dnsmasq.d/"
 
-       cd ${INITIAL_DIR}
+       cd "${INITIAL_DIR}"
 
        /etc/init.d/dnsmasq restart
 }
 
 cleanup() {
        # leave dnsmasq in a clean state
-       for FILE in ${CACHE_DOMAINS_DIR}/*/scripts/output/dnsmasq/*; do
-               rm -f /tmp/dnsmasq.d/$(basename ${FILE})
+       for FILE in "${CACHE_DOMAINS_DIR}/"*"/scripts/output/dnsmasq/"*; do
+               rm -f "/tmp/dnsmasq.d/$(basename "${FILE}")"
        done
 
        /etc/init.d/dnsmasq restart