n/omero: Updated for OMERO.web.

n/omero/README

@@ -1,4 +1,4 @@
-                 PACKAGER'S README FOR OMERO-Beta4.2.2
+                 PACKAGER'S README FOR OMERO-4.4.6
 
             Damien Goutte-Gattat <dgouttegattat@incenp.org>
 
@@ -8,7 +8,7 @@
    This file does not come from the OMERO project and the OMERO
    developers don't endorse anything of it. Official documentation and
    instructions for installing and running OMERO server should be looked
-   for at <http://www.openmicroscopy.org/site/support/omero4/server/>.
+   for at <http://www.openmicroscopy.org/site/support/omero4/sysadmins/>.
 
 
 2. SYSTEM USERS AND GROUPS
@@ -85,6 +85,27 @@
 
 5. OMERO.web
 
+   The Django-based web application OMERO.web is not enabled by default,
+   as it requires some configuration.
+
+   Add the following lines to the OMERO configuration file
+   /etc/omero/omero.properties:
+
+   ---8<----------------------------------------------------------------
+   omero.web.application_server=fastcgi-tcp
+   omero.web.application_server.host=localhost
+   omero.web.application_server.port=4080
+   omero.web.application_host=<hostname>:80
+   omero.web.debug=false
+   --->8----------------------------------------------------------------
+
+   Then, edit the control script /etc/rc.d/rc.omero to automatically
+   start and start the FCGI workers alongside the OMERO server itself:
+
+   ---8<----------------------------------------------------------------
+   OMERO_WEB_ENABLED=yes
+   --->8----------------------------------------------------------------
+
    The Django-based web application OMERO.web is needed at least to
    create OMERO users. By default this application is not enabled. Edit
    the control script /etc/rc.d/rc.omero to automatically start and stop
@@ -94,34 +115,42 @@
    OMERO_WEB_ENABLED=yes
    --->8----------------------------------------------------------------
 
-   OMERO.web exists in two flavors. The simplest is the "development"
-   mode. To use it, add the following lines to the main configuration
-   file /etc/omero/omero.properties:
+   Then, you need to install and configure the Apache HTTP server to
+   actually serve the application.
 
-   ---8<----------------------------------------------------------------
-   omero.web.application_server=development
-   omero.web.debug=false
-   --->8----------------------------------------------------------------
+   NOTE: Do *not* follow the official OMERO documentation from this
+   point, as it does not support running OMERO.web with Apache 2.4 and
+   the mod_proxy_fcgi module. In particular, the configuration lines
+   produced by the following command:
+
+     omero web config apache
 
-   The recommended deployment mode requires more work to setup. First,
-   install n/mod_fastcgi, the Apache module for FastCGI support.
+   is not suitable for Apache 2.4.
 
-   Second, configure OMERO by appending the following lines to the main
-   configuration file /etc/omero/omero.properties:
+   Instead, add the following stanza to your Apache configuration:
 
    ---8<----------------------------------------------------------------
-   omero.web.application_server=fastcgi
-   omero.web.application_host=http://<server.hostname>:80
-   omero.web.debug=false
-   --->8----------------------------------------------------------------
+   RewriteEngine On
+   RewriteRule ^/?$ /omero/ [R]
+
+   ProxyPass /webclient fcgi://localhost:4080
+   ProxyPass /webadmin  fcgi://localhost:4080
 
-   Third, configure Apache httpd to publish the OMERO web application.
-   When OMERO is started, run the following command to obtain the
-   appropriate configuration stanza:
+   Alias /static /opt/omero/lib/python/omeroweb/static
+
+   <Directory "/opt/omero/lib/python/omeroweb/static">
+       Options -Indexes +FollowSymLinks
+       Require all granted
+   </Directory>
+   --->8----------------------------------------------------------------
 
-     # sudo -H -u omero omero web config apache
+   (Make sure the mod_rewrite, mod_proxy and mod_proxy_fcgi modules are
+   loaded. This is normally done in the default httpd configuration file
+   provided by Slackware.)
 
-   and paste the result in the Apache configuration file.
+   Start the web server. OMERO.web should now be reachable at
+   <http://<hostname>/webclient> (for the main client interface) and at
+   <http://<hostname>/webadmin> (for the administration interface).
 
    Note that the OMERO web application does not seem to support being
    published at any other place than the server root ("/"). If your
@@ -133,7 +162,7 @@
    <VirtualHost server_ip:80>
        ServerName server.hostname
 
-       ...output of the 'omero web config apache' command...
+       ...insert the above-mentioned configuration stanza...
    </VirtualHost>
    --->8----------------------------------------------------------------
 
@@ -165,7 +194,7 @@
        
     http://www.openmicroscopy.org/site/support/omero4/server/upgrade
 
-   To upgrade OMERO 4.2.x to OMERO-4.3.x:
+   To upgrade OMERO 4.3.x to OMERO-4.4.x:
 
     - stop OMERO if it is running;
 

n/omero/omero.SlackBuild

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

n/omero/rc.omero

@@ -12,6 +12,9 @@ init)
         exit 1
     fi
 
+    echo Reseting previous configuration
+    rm -f ${CONFIG_FILE%/omero.properties}/grid/config.xml
+
     echo Reading configuration from $CONFIG_FILE...
     DATADIR=$(sed -nre 's/^omero\.data\.dir=(.*)$/\1/p' $CONFIG_FILE)
     DB_HOST=$(sed -nre 's/^omero\.db\.host=(.*)$/\1/p' $CONFIG_FILE)
@@ -51,25 +54,14 @@ init)
 start)
     sudo -H -u omero omero admin start
     if [ "x$OMERO_WEB_ENABLED" = xyes ]; then
-        omeroweb_mode=$(sed -nre 's/^omero.web.application_server=(.*)$/\1/p' $CONFIG_FILE)
-        if [ "x$omeroweb_mode" = xfastcgi ]; then
-            sudo -H -u omero omero web start
-        else
-            sudo -H -u omero omero web start >/dev/null 2>&1 &
-        fi
+        sudo -H -u omero omero web start
     fi
     ;;
 
 stop)
     if [ -f $ICEGRID_PIDFILE ] && kill -0 $(< $ICEGRID_PIDFILE) 2>/dev/null ; then
         if [ "x$OMERO_WEB_ENABLED" = xyes ]; then
-            omeroweb_mode=$(sed -nre 's/^omero.web.application_server=(.*)$/\1/p' $CONFIG_FILE)
-            if [ "x$omeroweb_mode" = xfastcgi ] ; then
-                sudo -H -u omero omero web stop
-            else
-                omeroweb_pid=$(ps -ef | sed -nre 's/^omero +([0-9]+).* manage.py runserver .*$/\1/p')
-                [ -n "$omeroweb_pid" ] && kill $omeroweb_pid
-            fi
+            sudo -H -u omero omero web stop
         fi
         sudo -H -u omero omero admin stop
     fi