From 3059caf56660dd58eb2cee4cf1ecb5dae789d86c Mon Sep 17 00:00:00 2001 From: jmoore Date: Wed, 27 Nov 2019 16:40:32 +0100 Subject: [PATCH] Install ansible --- autogen_omero.sh | 2 +- omero/conf_autogen.py | 6 +++--- omero/downloads/cli/db-script-example.txt | 2 +- omero/downloads/ldap/setdn.out | 14 +++++++++----- omero/sysadmins/config.rst | 12 ++++++++++-- .../sysadmins/unix/install-web/nginx-location.conf | 2 +- omero/sysadmins/unix/install-web/nginx-omero.conf | 4 +++- .../unix/walkthrough/walkthrough_centos7.sh | 4 ++-- 8 files changed, 30 insertions(+), 16 deletions(-) diff --git a/autogen_omero.sh b/autogen_omero.sh index 9524e7441f0..403db300df0 100755 --- a/autogen_omero.sh +++ b/autogen_omero.sh @@ -27,7 +27,7 @@ if [ -e $WORKSPACE/venv ]; then fi python3 -m venv --system-site-packages $WORKSPACE/venv || virtualenv --system-site-packages $WORKSPACE/venv $WORKSPACE/venv/bin/pip install -r $WORKSPACE/OMERO.server/share/web/requirements-py27.txt -$WORKSPACE/venv/bin/pip install future +$WORKSPACE/venv/bin/pip install future 'ansible<2.7' set +u # PS1 issue . $WORKSPACE/venv/bin/activate set -u diff --git a/omero/conf_autogen.py b/omero/conf_autogen.py index 375fcbcf575..296c9598a47 100644 --- a/omero/conf_autogen.py +++ b/omero/conf_autogen.py @@ -13,6 +13,6 @@ version_dsl_plugin = "5.5.0" version_blitz_plugin = "5.5.0" version_ice_builder = "1.5.0" -version_py = "5.5.dev2" -version_web = "5.5.dev2" -version_dropbox = "5.5.dev1" +version_py = "5.6.0.dev6" +version_web = "5.6.0.dev6" +version_dropbox = "5.6.0.dev3" diff --git a/omero/downloads/cli/db-script-example.txt b/omero/downloads/cli/db-script-example.txt index 9bf1017fbfb..f5fef5a5ff5 100644 --- a/omero/downloads/cli/db-script-example.txt +++ b/omero/downloads/cli/db-script-example.txt @@ -1,4 +1,4 @@ Using OMERO5.4 for version Using 0 for patch Using password from commandline -Saving to /home/omero/OMERO5.4__0.sql +Saving to /private/home/omero/OMERO5.4__0.sql diff --git a/omero/downloads/ldap/setdn.out b/omero/downloads/ldap/setdn.out index 636a26fd5ba..07e55d01ff7 100644 --- a/omero/downloads/ldap/setdn.out +++ b/omero/downloads/ldap/setdn.out @@ -1,8 +1,12 @@ -usage: bin/omero ldap setdn [-h] [--user-id USER_ID] [--user-name USER_NAME] - [--group-id GROUP_ID] [--group-name GROUP_NAME] - [-C] [-s SERVER] [-p PORT] [-g GROUP] [-u USER] - [-w PASSWORD] [-k KEY] [--sudo ADMINUSER] [-q] - choice +usage: /tmp/ws/OMERO.server/bin/omero ldap setdn [-h] [--user-id USER_ID] + [--user-name USER_NAME] + [--group-id GROUP_ID] + [--group-name GROUP_NAME] + [-C] [-s SERVER] [-p PORT] + [-g GROUP] [-u USER] + [-w PASSWORD] [-k KEY] + [--sudo ADMINUSER] [-q] + choice Enable or disable LDAP login for user (admins only) diff --git a/omero/sysadmins/config.rst b/omero/sysadmins/config.rst index d48728e43b2..9d5b6bd8eb8 100644 --- a/omero/sysadmins/config.rst +++ b/omero/sysadmins/config.rst @@ -2183,6 +2183,14 @@ Warning: Only system administrators should use this feature. List of Django midd Default: `[{"index": 1, "class": "django.middleware.common.BrokenLinkEmailsMiddleware"},{"index": 2, "class": "django.middleware.common.CommonMiddleware"},{"index": 3, "class": "django.contrib.sessions.middleware.SessionMiddleware"},{"index": 4, "class": "django.middleware.csrf.CsrfViewMiddleware"},{"index": 5, "class": "django.contrib.messages.middleware.MessageMiddleware"},{"index": 6, "class": "django.middleware.clickjacking.XFrameOptionsMiddleware"}]` +.. property:: omero.web.nginx_server_extra_config + +omero.web.nginx_server_extra_config +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Extra configuration lines to add to the Nginx server block. Lines will be joined with \n. Remember to terminate lines with; when necessary. + +Default: `[]` + .. property:: omero.web.open_with omero.web.open_with @@ -2341,7 +2349,7 @@ omero.web.server_list ^^^^^^^^^^^^^^^^^^^^^ A list of servers the Web client can connect to. -Default: `[["localhost", 4064, "omero"]]` +Default: `[["127.0.0.1", 4064, "omero"]]` .. property:: omero.web.session_cookie_age @@ -2413,7 +2421,7 @@ omero.web.static_root ^^^^^^^^^^^^^^^^^^^^^ The absolute path to the directory where collectstatic will collect static files for deployment. If the staticfiles contrib app is enabled (default) the collectstatic management command will collect static files into this directory. -Default: `/home/omero/OMERO.server/lib/python/omeroweb/static` +Default: `/home/omero/OMERO.server/var/static` .. property:: omero.web.static_url diff --git a/omero/sysadmins/unix/install-web/nginx-location.conf b/omero/sysadmins/unix/install-web/nginx-location.conf index d8d31afb709..b5b13007f40 100644 --- a/omero/sysadmins/unix/install-web/nginx-location.conf +++ b/omero/sysadmins/unix/install-web/nginx-location.conf @@ -5,7 +5,7 @@ location @maintenance { } location /static { - alias /home/omero/OMERO.py/lib/python/omeroweb/static; + alias /home/omero/OMERO.py/var/static; } location @proxy_to_app { diff --git a/omero/sysadmins/unix/install-web/nginx-omero.conf b/omero/sysadmins/unix/install-web/nginx-omero.conf index 90ddf1e5e55..d45f6500a7d 100644 --- a/omero/sysadmins/unix/install-web/nginx-omero.conf +++ b/omero/sysadmins/unix/install-web/nginx-omero.conf @@ -9,6 +9,8 @@ server { sendfile on; client_max_body_size 0; + + # maintenance page serve from here location @maintenance { root /home/omero/OMERO.py/etc/templates/error; @@ -17,7 +19,7 @@ server { # weblitz django apps serve media from here location /static { - alias /home/omero/OMERO.py/lib/python/omeroweb/static; + alias /home/omero/OMERO.py/var/static; } location @proxy_to_app { diff --git a/omero/sysadmins/unix/walkthrough/walkthrough_centos7.sh b/omero/sysadmins/unix/walkthrough/walkthrough_centos7.sh index dc787ec9870..2a82d33d1c6 100644 --- a/omero/sysadmins/unix/walkthrough/walkthrough_centos7.sh +++ b/omero/sysadmins/unix/walkthrough/walkthrough_centos7.sh @@ -31,7 +31,7 @@ yum -y install openssl-devel bzip2-devel yum -y install ice-all-runtime -pip install https://github.com/ome/zeroc-ice-py-centos7/releases/download/0.1.0/zeroc_ice-3.6.4-cp27-cp27mu-linux_x86_64.whl +pip install "zeroc-ice>3.5,<3.7" #end-recommended-ice @@ -39,7 +39,7 @@ pip install https://github.com/ome/zeroc-ice-py-centos7/releases/download/0.1.0/ yum -y install https://yum.postgresql.org/10/redhat/rhel-7-x86_64/pgdg-redhat10-10-2.noarch.rpm yum -y install postgresql10-server postgresql10 -PGSETUP_INITDB_OPTIONS=--encoding=UTF8 /usr/pgsql-10/bin/postgresql-10-setup initdb +PGSETUP_INITDB_OPTIONS=--encoding=UTF8 /usr/pgsql-10/bin/postgresql10-setup initdb sed -i.bak -re 's/^(host.*)ident/\1md5/' /var/lib/pgsql/10/data/pg_hba.conf systemctl start postgresql-10.service