- when multiple files option is "yes" don't try to parse /etc/awffull.conf

Changed files:
    awffull.cron -> 1.5
    awffull.sysconfig -> 1.3

diff --git a/awffull.cron b/awffull.cron
index 0c93c2252892f1a66a3542ee38217e3debe57856..e5d272fac2e1f8502f31cf563718ee9a1bb3c087 100644 (file)
--- a/awffull.cron
+++ b/awffull.cron
@@ -16,14 +16,14 @@ if [ -n "$ENABLE" ] && [ "$ENABLE" = "yes" -o "$ENABLE" = "YES" ]; then
                AWFFULL_OPTS="-q"
        fi
        
-       if [ -f /etc/awffull.conf ]; then
-               CONFIG_LIST="/etc/awffull.conf"
-       fi
        if [ -n "$MULTIPLE" ] && [ "$MULTIPLE" = "yes" -o "$MULTIPLE" = "YES" ]; then
                for config in $(ls /etc/awffull/*.conf 2>/dev/null); do\
                        CONFIG_LIST="${CONFIG_LIST} ${config}"
                done
+       else
+               CONFIG_LIST="/etc/awffull.conf"
        fi
+
        for singleconfig in ${CONFIG_LIST}; do
                if [ -n "${USE_DNSHISTORY}" ] && [ "${USE_DNSHISTORY}" = "yes" -o "${USE_DNSHISTORY}" = "YES" ]; then
                        TMPCONFIG=`mktemp -q /var/lib/dnshistory/awffull_config.XXXXXX`

diff --git a/awffull.sysconfig b/awffull.sysconfig
index 802764c328be04607f3b2834fd6b9ef0f383a9d4..0f982c549fd49f5ca813d59c02524ab7786c77f5 100644 (file)
--- a/awffull.sysconfig
+++ b/awffull.sysconfig
@@ -7,6 +7,9 @@ ENABLE="no"
 # LANG="pl_PL"
 
 # Allow multiple configs in /etc/awffull/
+# Files must have names: *.conf
+# Warning: it disables parsing /etc/awffull.conf. If you want to make use
+# of that file - move it into /etc/awffull/
 MULTIPLE="yes"
 
 # Use dnshistory for resolving IP into DNS-name