n/omero: Moved from ap/omero.

n/omero/README

@@ -1,4 +1,4 @@
-                 PACKAGER'S README FOR OMERO-Beta4.2.0
+                 PACKAGER'S README FOR OMERO-Beta4.2.2
 
             Damien Goutte-Gattat <dgouttegattat@incenp.org>
 
@@ -61,8 +61,7 @@
    usermod(8). Restart OMERO for the change to take effect.
 
    The data repository is defined by the key `omero.data.dir' in the
-   main configuration file `/etc/omero/omero.properties'. Restart OMERO
-   for the change to take effect.
+   main configuration file `/etc/omero/omero.properties'.
 
 
 4. OMERO CONFIGURATION AND CONTROL
@@ -74,13 +73,14 @@
    (`omero.db.*'), in `/etc/omero/omero.properties'.
 
    Starting and stoping OMERO is done with the `/etc/rc.d/rc.omero'
-   control script. At startup, the script will ensure the data
-   repository and the database backend are ready to use; this implies
-   automatically creating the PostgreSQL account and database if those
-   specified in `/etc/omero/omero.properties' does not exist on the
-   server. The script will attempt to connect to PostgreSQL using the
-   `postgres' account; change the value of the `DB_ROOT' variable if you
-   want/need to use another superuser account.
+   control script. Before starting OMERO the first time, run
+   `/etc/rc.d/rc.omero init'; the script will read the configuration
+   files and ensure the data repository and the database backend are
+   ready to use (this includes automatically creating the PostgreSQL
+   account and database if those  specified in
+   `/etc/omero/omero.properties' does not exist on the server). This
+   initialization step should be performed each time a configuration
+   file is modified.
 
 
 5. OMERO.web
@@ -134,20 +134,20 @@
 
 6. BACKUP AND RESTORE
 
-    There are three different items to backup:
+   There are three different items to backup:
 
-     - configuration settings in /etc/omero/;
+    - configuration settings in /etc/omero/;
 
-     - the data directory (/OMERO by default, see 4. above);
+    - the data directory (/OMERO by default, see 4. above);
 
-     - the PostgreSQL database.
+    - the PostgreSQL database.
 
-    The following commands backup everything into /backup:
+   The following commands backup everything into /backup:
 
-     $ pg_dump -h localhost -U postgres -C omero > /backup/omero.sql
-     $ rsync --archive --delete --compress --prune-empty-dirs \
-         /OMERO /backup/omero.data
+    $ pg_dump -h localhost -U postgres -C omero > /backup/omero.sql
+    $ rsync --archive --delete --compress --prune-empty-dirs \
+        /OMERO /backup/omero.data
 
 
-    To restore, copy the configuration and data files back to their
-    and reload the database from the SQL dump.
+   To restore, copy the configuration and data files back to their
+   locations and reload the database from the SQL dump.

n/omero/omero.SlackBuild

@@ -25,7 +25,7 @@
 # Latest omero sourcecode is available at: <http://www.openmicroscopy.org/>.
 #
 # Depends: d/ice, ap/postgresql
-# Recommends: l/numpy, n/mod_fastcgi
+# Optional: l/numpy, n/mod_fastcgi
 
 # Source package infos
 NAMESRC=${NAMESRC:-OMERO.server}

n/omero/rc.omero

@@ -5,8 +5,8 @@ CONFIG_FILE=/etc/omero/omero.properties
 ICEGRID_PIDFILE=/opt/omero/var/master/master.pid
 OMERO_WEB_ENABLED=no
 
-omero_initialize()
-{
+case "$1" in
+init)
     if [ ! -f $CONFIG_FILE ]; then
         echo Configuration file $CONFIG_FILE not found! Aborting...
         exit 1
@@ -45,15 +45,9 @@ omero_initialize()
           rm -rf OMERO4.2__0.sql
         )
     fi
-}
-
-case "$1" in
-init)
-    omero_initialize
     ;;
 
 start)
-    omero_initialize
     sudo -H -u omero omero admin start
     if [ "x$OMERO_WEB_ENABLED" = xyes ]; then
         sudo -H -u omero omero web start