Merge stable 1.0 into trunk.

This commit is contained in:
Alexis Lahouze 2011-07-27 21:58:07 +00:00
parent d485dc06ca
commit 6de665ceb5
2 changed files with 4 additions and 3 deletions

View File

@ -467,6 +467,7 @@ class m_dom {
if (preg_match('#^whois:#', $ligne)) { $serveur=preg_replace('/whois:\ */','',$ligne,1); }
}
}
$serveur=str_replace(array(" ","\n"),"",$serveur);
$egal="";
switch($ext) {

View File

@ -135,10 +135,11 @@ if [ ! -z "$(cat "$RELOAD_WEB")" ] ; then
fi
# we assume we run apache and bind on the master
/usr/bin/alternc_reload $( cat "$RELOAD_ZONES") || true
tempo=$(cat "$RELOAD_ZONES"|tr '\n' ' ')
/usr/bin/alternc_reload $tempo || true
for slave in $ALTERNC_SLAVES; do
if [ "$slave" != "localhost" ]; then
ssh alternc@$slave alternc_reload $(cat "$RELOAD_ZONES") || true
ssh alternc@$slave alternc_reload $tempo || true
fi
done
@ -146,4 +147,3 @@ rm -f "$LOCK_FILE" "$RELOAD_ZONES" "$RELOAD_WEB"
exit 0