Merge pull request #613 from grycap/devel

Devel
grycap · May 17, 2018 · 0db32b9 · 0db32b9
2 parents 56240c3 + d910bfb
commit 0db32b9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/IM/config.py b/IM/config.py
@@ -95,7 +95,7 @@ class Config:
     SINGLE_SITE_IMAGE_URL_PREFIX = ''
     OIDC_ISSUERS = []
     OIDC_AUDIENCE = None
-    INF_CACHE_TIME = None
+    INF_CACHE_TIME = 0
     VMINFO_JSON = False
     OIDC_CLIENT_ID = None
     OIDC_CLIENT_SECRET = None

diff --git a/doc/source/endpoints.rst b/doc/source/endpoints.rst
@@ -0,0 +1,23 @@
+Public IM Endpoints at UPV
+==========================
+
+UPV offers an IM endpoint deployed in H.A. mode over a kubernetes cluster on it premises. 
+
+This service exposes the **web-based GUI and REST API** in the following URLs:
+
+* IM web portal: `https://appsgrycap.i3m.upv.es:31443/im-web/ <https://appsgrycap.i3m.upv.es:31443/im-web/>`_.
+* IM REST API: `https://appsgrycap.i3m.upv.es:31443/im/ <https://appsgrycap.i3m.upv.es:31443/im/>`_.
+
+This IM instance is provided by the `Grid and High Performance Computing Group (GRyCAP) <http://www.grycap.upv.es>`_ at 
+the `Instituto de Instrumentación para Imagen Molecular (I3M) <http://www.i3m.upv.es>`_ 
+from the `Universitat Politècnica de València (UPV) <http://www.upv.es>`_.
+
+.. image:: images/grycap.png
+   :scale: 50 %
+
+.. image:: images/i3m.png
+   :scale: 50 %
+
+.. image:: images/upv.png
+   :scale: 50 %
+
diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -19,6 +19,7 @@ Contents:
    REST
    client
    web
+   endpoints
 
 ..   mods
 

diff --git a/doc/source/manual.rst b/doc/source/manual.rst
@@ -551,6 +551,11 @@ It is a experimental issue currently it is not intended to be used in a producti
 
 This is an example of the HAProxy configuration file::
 
+    defaults
+        timeout connect 600s
+        timeout client 600s
+        timeout server 600s
+
 	frontend http-frontend
 	    mode http
 	    bind *:8800
@@ -571,6 +576,10 @@ This is an example of the HAProxy configuration file::
 
 See more details of HAProxy configuration at `HAProxy Documentation <https://cbonte.github.io/haproxy-dconv/>`_.
 
+Also the ``INF_CACHE_TIME`` variable of the IM config file must be set to a time in seconds lower or equal to the time
+set in the stick-table ``expire`` value (in the example 60m). So for this example INF_CACHE_TIME must be set to less
+than or equals to 3600.
+
 Purgue IM DB
 ============
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ Contents: @@
        REST
        client
        web
+       endpoints
     ..   mods
@@ Expand Down @@