[Pkg-drupal-commits] r1887 - in /branches/drupal-5.0/debian: changelog cron.sh

[luigi at users.alioth.debian.org]

Author: luigi
Date: Mon Jun  2 17:30:41 2008
New Revision: 1887

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1887
Log:
Fixed cron script for multisite setups (Closes: #471230)

Modified:
    branches/drupal-5.0/debian/changelog
    branches/drupal-5.0/debian/cron.sh

Modified: branches/drupal-5.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/changelog?rev=1887&op=diff
==============================================================================
--- branches/drupal-5.0/debian/changelog (original)
+++ branches/drupal-5.0/debian/changelog Mon Jun  2 17:30:41 2008
@@ -5,6 +5,9 @@
   [ Luigi Gangitano ]
   * debian/watch
     - Fixed watch file to ignore 6.x versions (Closes: #468647)
+
+  * debian/cron.sh
+    - Fixed cron script for multisite setups (Closes: #471230)
 
  -- Luigi Gangitano <luigi at debian.org>  Mon,  2 Jun 2008 19:14:12 +0100
 

Modified: branches/drupal-5.0/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/cron.sh?rev=1887&op=diff
==============================================================================
--- branches/drupal-5.0/debian/cron.sh (original)
+++ branches/drupal-5.0/debian/cron.sh Mon Jun  2 17:30:41 2008
@@ -1,9 +1,9 @@
 #!/bin/sh
 # $Id$
 
+BASE_URL=""
+
 for site in /etc/drupal/5/sites/* ; do
-	BASE_URL=""
-
 	for file in $site/baseurl.php $site/settings.php; do
 		[ -f "$file" ] && BASE_URL=`grep '^$base_url' $file | cut -d"'" -f2`
 		[ "X$BASE_URL" != "X" ] && break
@@ -15,3 +15,8 @@
 
 	curl --silent --compressed --location $BASE_URL/cron.php
 done
+
+# no site found with base_url - fall back to localhost (only once)
+if [ "X$BASE_URL" = "X" ] ; then
+   curl --silent --compressed --location http://localhost/drupal5/cron.php
+fi