[ooo-build-commit] .: Branch 'tinderbox' - 2 commits - bin/tinderupdate.sh local_conf/TinderConfig.pm

[Jan Holesovsky]

 bin/tinderupdate.sh        |    7 +------
 local_conf/TinderConfig.pm |    5 ++---
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit f12acaac7c62479c40ad0a0fc6742b0620b1db17
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Aug 19 13:06:18 2010 +0200

    Update the location of the .cgi scripts.

diff --git a/bin/tinderupdate.sh b/bin/tinderupdate.sh
index a24321c..4272a6a 100755
--- a/bin/tinderupdate.sh
+++ b/bin/tinderupdate.sh
@@ -16,5 +16,5 @@ $TINDERBOX_BIN/get-latest-master.pl
 $TINDERBOX_BIN/bypass_postfixlimit.sh >> $TINDERBOX_LOG 2>&1
 
 # regenerate tinderbox-HTML pages
-$TINDERBOX_WWW/tinder.cgi >> $TINDERBOX_LOG 2>&1
+$TINDERBOX_WWW/cgi-bin/tinder.cgi >> $TINDERBOX_LOG 2>&1
 echo finished updating at $(date -u) >> $TINDERBOX_LOG
diff --git a/local_conf/TinderConfig.pm b/local_conf/TinderConfig.pm
index 88c7e87..c198c89 100644
--- a/local_conf/TinderConfig.pm
+++ b/local_conf/TinderConfig.pm
@@ -49,7 +49,6 @@ package TinderConfig;
 # set the path for Tinderbox.
 $ENV{'PATH'}=  (
                 '/bin'.
-':/home/kestes/mozilla/webtools/tinderbox2/build/test/vcsim'.
                 ':/usr/bin'.
                 ':/usr/local/bin'.
                 ':/opt/gnu/bin'.
@@ -79,7 +78,7 @@ $TINDERBOX_GID=100;
 
 # The url to the tinderbox server binary directory
 
-$URL_BIN = "http://tinderbox.go-oo.org";
+$URL_BIN = "http://tinderbox.go-oo.org/cgi-bin";
 
 
 # The url to the tinderbox server HTML directory
@@ -113,7 +112,7 @@ $TINDERBOX_GZLOG_DIR = $TINDERBOX_HTML_DIR;
 # The full path name tinderbox will use to access the tinderbox
 # cgi scripts.
 
-$TINDERBOX_CGIBIN_DIR = "/srv/tinderbox";
+$TINDERBOX_CGIBIN_DIR = "/srv/www/tinderbox.go-oo.org/cgi-bin";
 
 # The top level tinderbox index file. Change this if you wish to
 # provide your own index file for tinderboxes web pages.
commit e128cc6e5352d772698e381f96f2640052fc454f
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Aug 19 13:05:41 2010 +0200

    Remove the flock, tinderbox has its own locking mechanism.

diff --git a/bin/tinderupdate.sh b/bin/tinderupdate.sh
index ca05406..a24321c 100755
--- a/bin/tinderupdate.sh
+++ b/bin/tinderupdate.sh
@@ -6,9 +6,6 @@ TINDERBOX_LOG=/var/log/tinderbox/tinderbox2.log
 
 cd /srv/tinderbox
 
-(
-flock 200
-
 echo starting update at   $(date -u) >> $TINDERBOX_LOG
 # update the tag-lists
 touch $TINDERBOX_WWW/tags/tag-list.tstamp
@@ -21,5 +18,3 @@ $TINDERBOX_BIN/bypass_postfixlimit.sh >> $TINDERBOX_LOG 2>&1
 # regenerate tinderbox-HTML pages
 $TINDERBOX_WWW/tinder.cgi >> $TINDERBOX_LOG 2>&1
 echo finished updating at $(date -u) >> $TINDERBOX_LOG
-
-) 200>$TINDERBOX_BIN/tinderbox.lock