Changeset 1298 for trunk/slavedns

Show
Ignore:
Timestamp:
06/02/04 19:31:12 (5 years ago)
Author:
anonymous
Message:

- pleins de correctifs
- ajout du fichier bind included
- ca doit maintenant marcher ...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/slavedns

    r1293 r1298  
    66CACHEDIR=/var/cache/slavedns 
    77BINDDIR=/etc/bind/slavedns 
     8BINDINCLUDE=/etc/bind/slavedns.conf 
    89 
    910function CreateBindConf { 
    1011    CFILE="$1" 
    1112    MASTER="$2" 
    12     rm ${BINDDIR}/${CFILE} 
    13     cat ${CFILE} | (read A; while [ "$A" ];  # Treat each domain one by one. 
     13    rm -f ${BINDDIR}/${CFILE} 
     14    cat ${CACHEDIR}/${CFILE} | (read A; while [ "$A" ];  # Treat each domain one by one. 
    1415          do  
    1516          echo "zone \"$A\" { type slave; allow-query { any; }; file \"$A\"; masters { $MASTER; }; };" >>${BINDDIR}/${CFILE} 
    1617          read A 
    1718          done) 
     19    echo "include \"${BINDDIR}/${CFILE}\"" >>${BINDINCLUDE}.temp 
    1820} 
    1921 
    …… 
    2527 
    2628RELOAD="" 
    27 for i in `ls * | grep -v slavedns.conf` 
     29rm -f ${BINDINCLUDE}.temp 
     30 
     31for i in `ls * | grep -v slavedns.conf | grep -v '~$' ` 
    2832  do 
    2933  # HOST LOGIN PASSWORD  
    …… 
    3337  SSL="" 
    3438  . $i 
    35   if [ -n "$HOST" -o -n "$LOGIN" -o -n "$PASSWORD" ] 
     39  if [ -z "$HOST" -o -z "$LOGIN" -o -z "$PASSWORD" ] 
    3640      then 
    3741      echo "Error in the config file '$i'" 
    …… 
    4650      touch ${CACHEDIR}/${i} 
    4751      rm -f ${CACHEDIR}/${i}.temp 
    48       wget ${PROTOCOL}://${HOST}/admin/slavedns.php --http-passwd ${LOGIN} --http-user ${PASSWORD} -o ${CACHEDIR}/${i}.temp -t 1 -T 5 2>/dev/null 
     52      wget ${PROTOCOL}://${HOST}/admin/domlist.php --http-user ${LOGIN} --http-passwd ${PASSWORD} -O ${CACHEDIR}/${i}.temp -t 1 -T 5 2>/dev/null 
    4953      if [ -s "${CACHEDIR}/${i}.temp" ] 
    5054          then 
    …… 
    5256          if diff ${CACHEDIR}/${i}.temp ${CACHEDIR}/${i} -q &>/dev/null 
    5357              then 
    54               echo "Change detected for '$i', applying" 
     58              echo -n "No change found for '$i'" 
     59              else 
     60              echo -n "Change detected for '$i', applying" 
    5561              cp -f ${CACHEDIR}/${i}.temp ${CACHEDIR}/${i} 
    5662              # Now parse the slave file and send it to /etc/bind/slavedns 
    …… 
    6773if [ "$RELOAD" ] 
    6874then 
     75    rm -f ${BINDINCLUDE} 
     76    mv ${BINDINCLUDE}.temp ${BINDINCLUDE} 
    6977    if [ -e "/etc/init.d/bind" ] 
    7078        then