Changeset 3061 for alternc/branches/stable-1.0/src/update_domains.sh

Timestamp:

06/14/11 16:26:41 (2 years ago)

Author:

benjamin

Message:

applying [3051] to stable-1.0

File:

• alternc/branches/stable-1.0/src/update_domains.sh (modified) (9 diffs)

alternc/branches/stable-1.0/src/update_domains.sh

@@ -20 +20 @@
 OLDIFS="$IFS"
 NEWIFS=" "
-RELOAD_ZONES=""
-RELOAD_WEB=false
+RELOAD_ZONES="$(mktemp /tmp/alternc_reload_zones.XXXX)"
+RELOAD_WEB="$(mktemp /tmp/alternc_reload_web.XXXX)"
 B="µµ§§" # Strange letters to make split in query
+
+echo "" > "$RELOAD_ZONES"
+echo "" > "$RELOAD_WEB"
 
 # Somes check before start operations
@@ -55 +58 @@
     host_delete ${sub/$B/ }
     mysql_query "delete from sub_domaines where concat_ws('$B',lower(type), if(length(sub)>0,concat_ws('.',sub,domaine),domaine)) = '$sub' and web_action ='DELETE';"
-    RELOAD_WEB=true
+    echo 1 > "$RELOAD_WEB"
 done
 
@@ -68 +71 @@
     host_create "$type" "$domain" "$valeur"
     mysql_query "update sub_domaines sd set web_action='OK',web_result='$?' where lower(sd.type)='$type' and if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine)='$domain' and sd.valeur='$valeur'; "
-    RELOAD_WEB=true
+    echo 1 > "$RELOAD_WEB"
 done
 
@@ -75 +78 @@
     host_enable "$type" "$domain" "$valeur"
     mysql_query "update sub_domaines sd set enable='ENABLED' where lower(sd.type)='$type' and if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine)='$domain' and sd.valeur='$valeur';"
-    RELOAD_WEB=true
+    echo 1 > "$RELOAD_WEB"
 done
 
@@ -82 +85 @@
     host_disable "$type" "$domain" "$valeur"
     mysql_query "update sub_domaines sd set enable='DISABLED' where lower(sd.type)='$type' and if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine)='$domain' and sd.valeur='$valeur';"
-    RELOAD_WEB=true
+    echo 1 > "$RELOAD_WEB"
 done
 
@@ -91 +94 @@
     dns_delete $dom
     mysql_query "update domaines set dns_action = 'OK', dns_result = '$?' where domaine = '$dom'"
-    RELOAD_ZONES="$RELOAD_ZONES $dom"
+    echo -n " $dom " >> "$RELOAD_ZONES"
 done
 
@@ -101 +104 @@
     dns_regenerate $dom
     mysql_query "update domaines set dns_action = 'OK', dns_result = '$?' where domaine = '$dom'"
-    RELOAD_ZONES="$RELOAD_ZONES $dom"
+    echo -n " $dom " >> "$RELOAD_ZONES"
 done
 
@@ -111 +114 @@
     # Web configurations have already bean cleaned previously
     mysql_query "delete from sub_domaines where domaine='$dom'; delete from domaines where domaine='$dom';"
-    RELOAD_ZONES="$RELOAD_ZONES $dom"
+    echo -n " $dom " >> "$RELOAD_ZONES"
 done
 
 
-if [ "$RELOAD_WEB" == "true" ] ; then
-  RELOAD_ZONES="$RELOAD_ZONES apache"
+if [ ! -z "$(cat "$RELOAD_WEB")" ] ; then
+  echo " apache " >> "$RELOAD_ZONES"
 
   # Concat the apaches files
@@ -133 +136 @@
 
 # we assume we run apache and bind on the master
-/usr/bin/alternc_reload $RELOAD_ZONES || true
+/usr/bin/alternc_reload $( cat "$RELOAD_ZONES") || true
 for slave in $ALTERNC_SLAVES; do
     if [ "$slave" != "localhost" ]; then
-        ssh alternc@$slave alternc_reload "$RELOAD_ZONES" || true
+        ssh alternc@$slave alternc_reload $(cat "$RELOAD_ZONES") || true
     fi
 done
 
-rm "$LOCK_FILE"
+rm -f "$LOCK_FILE" "$RELOAD_ZONES" "$RELOAD_WEB"
 
 exit 0