Changeset 1673

Show
Ignore:
Timestamp:
06/23/06 18:15:16 (2 years ago)
Author:
anarcat
Message:

faire que les variables du script soient parametrables dans slavedns.conf, utiliser cmp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc-slavedns/trunk/slavedns

    r1326 r1673  
    88BINDINCLUDE=/etc/bind/slavedns.conf 
    99WGETRC=${HOME}/.wgetrc 
     10WGET=wget 
     11WGETFLAGS="" 
    1012 
    1113#NAMED9=/usr/pkg/etc/rc.d/named9 # BIND9 on NetBSD 
    …… 
    6466RELOAD="" 
    6567 
     68# source defaults 
     69. ./slavedns.conf 
     70 
    6671for conf in `ls | grep -v slavedns.conf | grep -v '~$' ` 
    6772do 
    …… 
    8691      rm -f ${CACHEDIR}/${conf}.temp 
    8792      SetWgetPass ${LOGIN} ${PASSWORD} 
    88       wget ${PROTOCOL}://${HOST}/admin/domlist.php -O ${CACHEDIR}/${conf}.temp -t 1 -T ${TIMEOUT} 2>/dev/null 
     93      ${WGET} ${PROTOCOL}://${HOST}/admin/domlist.php ${WGETFLAGS} -O ${CACHEDIR}/${conf}.temp -t 1 -T ${TIMEOUT} 2>/dev/null 
    8994      ResetWgetConf 
    9095      if [ -s "${CACHEDIR}/${conf}.temp" ] 
    9196      then 
    9297          # If the slave file has changed, synchronize it. 
    93           if  [ "$1" != "-f" ] && diff ${CACHEDIR}/${conf}.temp ${CACHEDIR}/${conf} -q &>/dev/null 
     98          if  [ "$1" != "-f" ] && cmp ${CACHEDIR}/${conf}.temp ${CACHEDIR}/${conf} > /dev/null 
    9499          then 
    95100              echo "no change found for '${conf}'" 

  • alternc-slavedns/trunk/slavedns.conf

    r1303 r1673  
    2525# you may launch manually the synchronization with "/usr/sbin/slavedns" 
    2626 
     27# you can override the default config with those settings 
     28# those are provided as examples and do not reflect the default values 
     29# CACHEDIR=/var/spool/slavedns 
     30# BINDDIR=/etc/namedb/slavedns 
     31# BINDINCLUDE=/etc/namedb/slavedns.conf 
     32# WGETFLAGS="--no-check-certificate"