Changeset 3105

Timestamp:

10/18/11 20:38:24 (20 months ago)

Author:

xals

Message:

Merged changesets 3086, 3090, 3104 from trunk to branch stable-1.0

Location:

alternc/branches/stable-1.0

Files:

• . (modified) (1 prop)
• debian/alternc.cron.d (modified) (1 diff)
• etc/alternc/functions_hosting (modified) (1 prop)
• etc/alternc/templates/apache2/url.conf (modified) (1 prop)
• etc/alternc/templates/apache2/vhost.conf (modified) (1 prop)
• src/alternc_reload (modified) (4 diffs)
• src/functions_dns.sh (modified) (3 diffs, 1 prop)
• src/functions_hosting.sh (modified) (1 prop)
• src/update_domains.sh (modified) (2 diffs)

alternc/branches/stable-1.0/debian/alternc.cron.d

@@ -18 +18 @@
 # Once a week at 7am, optimise the AlternC database
 0 1 * * 7   root  /usr/lib/alternc/alternc-dboptimize
+
+# We change the session directory... debian's patch modified :
+# Look for and purge old sessions every 30 minutes
+09,39 *     * * *     root   [ -x /usr/lib/php5/maxlifetime ] && [ -d /var/lib/php5 ] && find /var/alternc/sessions/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -delete
+

alternc/branches/stable-1.0/src/alternc_reload

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 #
 # $Id: update_domaines.sh,v 1.31 2005/08/29 19:21:31 anarcat Exp $
@@ -54 +54 @@
 }
 
+dns_restart() {
+  if [ -x /etc/init.d/bind9 ]; then
+    $sudo /etc/init.d/bind9 restart || echo "Cannot restart dns daemon (bind9)"  
+  fi
+}
+
 RELOAD_ZONES="$*"
+echo $RELOAD_ZONES
 
 if [ ! -z "$RELOAD_ZONES" ]; then
@@ -60 +67 @@
     case $zone in
       "all")
-        $sudo rndc reload  || echo "Cannot reload bind" 
+        $sudo rndc reload || echo "Cannot reload bind" 
         apache_reload # keep for compatibility
+        ;;
+      "dns_daemon")
+        dns_restart
         ;;
       "apache")
@@ -67 +77 @@
         ;;
       *)
-        $sudo rndc reload "$zone"  || echo "Cannot reload bind for zone $zone" 
+        $sudo rndc reload "$zone" || echo "Cannot reload bind for zone $zone" 
         ;;
     esac

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

@@ -50 +50 @@
   fi
 
-  grep -q "$domain" "$NAMED_CONF"
+  # Add the entry
+  grep -q "\"$domain\"" "$NAMED_CONF"
   if [ $? -ne 0 ] ; then
     local tempo=$(cat "$NAMED_TEMPLATE")
@@ -57 +58 @@
     echo $tempo >> "$NAMED_CONF"
   fi
+
+  # Ask for restart of dns server
+  touch "$DNS_DO_RESTART"
 }
 
@@ -70 +74 @@
   local file=$(cat "$NAMED_CONF")
   echo -e "$file" |grep -v "\"$domain\"" > "$NAMED_CONF"
+
+  # Ask for restart of dns server
+  touch "$DNS_DO_RESTART"
 }
 

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

@@ -22 +22 @@
 RELOAD_ZONES="$(mktemp /tmp/alternc_reload_zones.XXXX)"
 RELOAD_WEB="$(mktemp /tmp/alternc_reload_web.XXXX)"
+DNS_DO_RESTART="/tmp/alternc.do_do_restart.$$"
 B="µµ§§" # Strange letters to make split in query
 
@@ -135 +136 @@
 fi
 
+# What do we reload ?
+lst_zones=$(cat "$RELOAD_ZONES"|tr '\n' ' ')
+if [ -e "$DNS_DO_RESTART" ] ; then
+  lst_zones="dns_daemon $lst_zones" 
+fi
+
 # we assume we run apache and bind on the master
-tempo=$(cat "$RELOAD_ZONES"|tr '\n' ' ')
-/usr/bin/alternc_reload $tempo || true
+/usr/bin/alternc_reload $lst_zones || true
 for slave in $ALTERNC_SLAVES; do
     if [ "$slave" != "localhost" ]; then
-        ssh alternc@$slave alternc_reload $tempo || true
+        ssh alternc@$slave alternc_reload $lst_zones || true
     fi
 done
 
-rm -f "$LOCK_FILE" "$RELOAD_ZONES" "$RELOAD_WEB"
+rm -f "$LOCK_FILE" "$RELOAD_ZONES" "$RELOAD_WEB" "$DNS_DO_RESTART"
 
 exit 0