ap/omero: Disabled indexing by default; stop Icegrid when

stopping Omero.

ap/omero/omero-config.patch

@@ -1,8 +1,12 @@
 diff -Naur omero.orig/etc/grid/default.xml omero/etc/grid/default.xml
 --- omero.orig/etc/grid/default.xml	2009-05-08 13:32:22.000000000 +0200
-+++ omero/etc/grid/default.xml	2009-07-25 22:30:05.000000000 +0200
-@@ -44,7 +44,7 @@
-       <server-instance template="DropBoxTemplate"/>
++++ omero/etc/grid/default.xml	2009-08-20 00:30:01.000000000 +0200
+@@ -41,10 +41,10 @@
+         server-endpoints="tcp -h 127.0.0.1"/>
+       <server-instance template="BlitzTemplate" index="0" config="default"/>
+       <server-instance template="IndexerTemplate" index="0"/>
+-      <server-instance template="DropBoxTemplate"/>
++      <!-- <server-instance template="DropBoxTemplate"/> -->
        <server-instance template="FSTemplate"/>
        <server-instance template="ProcessorTemplate" index="0"/>
 -      <server-instance template="ShellTemplate" id="Web" act="on-demand"/>
@@ -12,7 +16,7 @@ diff -Naur omero.orig/etc/grid/default.xml omero/etc/grid/default.xml
  
 diff -Naur omero.orig/etc/grid/templates.xml omero/etc/grid/templates.xml
 --- omero.orig/etc/grid/templates.xml	2009-05-08 13:32:22.000000000 +0200
-+++ omero/etc/grid/templates.xml	2009-07-25 22:30:34.000000000 +0200
++++ omero/etc/grid/templates.xml	2009-08-20 00:28:26.000000000 +0200
 @@ -115,6 +115,7 @@
          <option>manage.py</option>
          <option>runserver</option>
@@ -23,7 +27,7 @@ diff -Naur omero.orig/etc/grid/templates.xml omero/etc/grid/templates.xml
        </server>
 diff -Naur omero.orig/lib/python/omero/plugins/server.py omero/lib/python/omero/plugins/server.py
 --- omero.orig/lib/python/omero/plugins/server.py	2009-05-08 13:32:22.000000000 +0200
-+++ omero/lib/python/omero/plugins/server.py	2009-07-25 22:29:48.000000000 +0200
++++ omero/lib/python/omero/plugins/server.py	2009-08-20 00:28:26.000000000 +0200
 @@ -72,7 +72,7 @@
          subprocess.call(["python","manage.py","syncdb","--noinput"], cwd=str(omero_web), env = os.environ)
          # Now exec

ap/omero/omero.SlackBuild

@@ -35,7 +35,7 @@ WGET=${WGET:-http://cvs.openmicroscopy.org.uk/snapshots/omero/$ARCHIVE}
 
 # Build infos
 NAMETGZ=${NAMETGZ:-omero}
-BUILD=${BUILD:-1GGD}
+BUILD=${BUILD:-2GGD}
 ARCH=${ARCH:-i486}
 
 # Directories

ap/omero/rc.omero

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 CONFIG_FILE=/etc/omero.conf
+ICEGRID_PIDFILE=/opt/omero/var/master/master.pid
 
 omero_initialize()
 {
@@ -59,6 +60,7 @@ omero_start()
 omero_stop()
 {
     su -u omero omero admin stop
+    [ -f $ICEGRID_PIDFILE ] && kill -TERM $(< $ICEGRID_PIDFILE)
 }
 
 case "$1" in