Browse Source

n/omero: Upgraded to omero-4.4.6.

slackware-14.2
Damien Goutte-Gattat 8 years ago
parent
commit
119bb376b5
5 changed files with 37 additions and 24 deletions
  1. +0
    -1
      n/omero/OMERO.server-4.4.2-ice34-b3.zip.sha1
  2. +1
    -0
      n/omero/OMERO.server-4.4.6-ice34-b102.zip.sha1
  3. +17
    -11
      n/omero/README
  4. +5
    -5
      n/omero/omero.SlackBuild
  5. +14
    -7
      n/omero/rc.omero

+ 0
- 1
n/omero/OMERO.server-4.4.2-ice34-b3.zip.sha1 View File

@ -1 +0,0 @@
56eef9685e34ef783049c0a80755380795936bed OMERO.server-4.4.2-ice34-b3.zip

+ 1
- 0
n/omero/OMERO.server-4.4.6-ice34-b102.zip.sha1 View File

@ -0,0 +1 @@
898fb042983e92d38a16b95b86117423ee54fdf1 OMERO.server-4.4.6-ice34-b102.zip

+ 17
- 11
n/omero/README View File

@ -86,27 +86,33 @@
5. OMERO.web
The Django-based web application OMERO.web is needed at least to
create OMERO users. The SlackBuild and associated scripts do *not*
automatically set up that application to work,
create OMERO users. By default this application is not enabled. Edit
the control script /etc/rc.d/rc.omero to automatically start and stop
the application alongside the OMERO server itself:
First, install n/mod_fastcgi, the Apache module for FastCGI support.
---8<----------------------------------------------------------------
OMERO_WEB_ENABLED=yes
--->8----------------------------------------------------------------
Second, configure OMERO by appending the following lines to the main
configuration file /etc/omero/omero.properties:
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:
---8<----------------------------------------------------------------
omero.web.application_server=fastcgi
omero.web.application_host=http://<server.hostname>:80
omero.web.application_server=development
omero.web.debug=false
--->8----------------------------------------------------------------
(Do not forget the port number in omero.web.application_host.)
The recommended deployment mode requires more work to setup. First,
install n/mod_fastcgi, the Apache module for FastCGI support.
Edit the control script /etc/rc.d/rc.omero to automatically start and
stop the FastCGI OMERO workers alongside the OMERO server itself:
Second, configure OMERO by appending the following lines to the main
configuration file /etc/omero/omero.properties:
---8<----------------------------------------------------------------
OMERO_WEB_ENABLED=yes
omero.web.application_server=fastcgi
omero.web.application_host=http://<server.hostname>:80
omero.web.debug=false
--->8----------------------------------------------------------------
Third, configure Apache httpd to publish the OMERO web application.


+ 5
- 5
n/omero/omero.SlackBuild View File

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2009,2010,2011,2012 Damien Goutte-Gattat
# Copyright (C) 2009,2010,2011,2012,2013 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -29,9 +29,9 @@
# Source package infos
NAMESRC=${NAMESRC:-OMERO.server}
VERSION=${VERSION:-4.4.2}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION-ice34-b3.zip}
WGET=${WGET:-http://cvs.openmicroscopy.org.uk/snapshots/omero/4_4_2/$ARCHIVE}
VERSION=${VERSION:-4.4.6}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION-ice34-b102.zip}
WGET=${WGET:-http://cvs.openmicroscopy.org.uk/snapshots/omero/4.4.6/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-omero}
@ -69,7 +69,7 @@ sha1sum -c $ARCHIVE.sha1
mkdir -p $PKG/opt
cd $PKG/opt
unzip $CWD/$ARCHIVE
mv OMERO.server-$VERSION-ice34-b3 omero
mv OMERO.server-$VERSION-ice34-b102 omero
rm omero/bin/*.bat
# Install config files in /etc/omero


+ 14
- 7
n/omero/rc.omero View File

@ -16,6 +16,7 @@ init)
DATADIR=$(sed -nre 's/^omero\.data\.dir=(.*)$/\1/p' $CONFIG_FILE)
DB_HOST=$(sed -nre 's/^omero\.db\.host=(.*)$/\1/p' $CONFIG_FILE)
DB_PORT=$(sed -nre 's/^omero\.db\.port=(.*)$/\1/p' $CONFIG_FILE)
[ -n "$DB_PORT" ] || DB_PORT=5432
DB_NAME=$(sed -nre 's/^omero\.db\.name=(.*)$/\1/p' $CONFIG_FILE)
DB_USER=$(sed -nre 's/^omero\.db\.user=(.*)$/\1/p' $CONFIG_FILE)
PGOPTS="-h $DB_HOST -p $DB_PORT -U $DB_ROOT"
@ -50,19 +51,25 @@ init)
start)
sudo -H -u omero omero admin start
if [ "x$OMERO_WEB_ENABLED" = xyes ]; then
sudo -H -u omero omero web start
(
sleep 3
chgrp apache /opt/omero/var/django_fcgi.sock
chmod 775 /opt/omero/var/django_fcgi.sock
) &
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
fi
;;
stop)
if [ -f $ICEGRID_PIDFILE ] && kill -0 $(< $ICEGRID_PIDFILE) 2>/dev/null ; then
if [ "x$OMERO_WEB_ENABLED" = xyes ]; then
sudo -H -u omero omero web stop
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
fi
sudo -H -u omero omero admin stop
fi


Loading…
Cancel
Save