opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release_18.09' into release_19.01

Browse Source
This commit is contained in:
Nate Coraor
2019-02-22 13:23:16 -05:00
parent 8651e1eea3 9b72f5a880
commit 808aa5bef7
9 changed files with 108 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/admin/galaxy_options.rst
+11 -19
View File
@@ -1,25 +1,13 @@
~~~~~~~~~~~~~~~
``filter-with``
~~~~~~~~~~~~~~~
:Description:
If running behind a proxy server and Galaxy is served from a
subdirectory, enable the proxy-prefix filter and set the prefix in
the [filter:proxy-prefix] section above.
:Default: ``proxy-prefix``
:Type: str
~~~~~~~~~~~~~~~
``cookie_path``
~~~~~~~~~~~~~~~
:Description:
If proxy-prefix is enabled and you're running more than one Galaxy
instance behind one hostname, you will want to set this to the
same path as the prefix in the filter above. This value becomes
the "path" attribute set in the cookie so the cookies from each
instance will not clobber each other.
When running multiple Galaxy instances under separate URL prefixes
on a single hostname, you will want to set this to the same path
as the prefix set in the uWSGI "mount" configuration option above.
This value becomes the "path" attribute set in the cookie so the
cookies from one instance will not clobber those from another.
:Default: ````
:Type: str
@@ -173,7 +161,9 @@
~~~~~~~~~~~~~
:Description:
Dataset files are stored in this directory.
Where dataset files are stored. It must accessible at the same
path on any cluster nodes that will run Galaxy jobs, unless using
Pulsar.
:Default: ``database/files``
:Type: str
@@ -183,7 +173,9 @@
~~~~~~~~~~~~~~~~~
:Description:
Temporary files are stored in this directory.
Where temporary files are stored. It must accessible at the same
path on any cluster nodes that will run Galaxy jobs, unless using
Pulsar.
:Default: ``database/tmp``
:Type: str
doc/source/admin/reports_options.rst
+9 -22
View File
@@ -1,25 +1,14 @@
~~~~~~~~~~~~~~~
``filter-with``
~~~~~~~~~~~~~~~
:Description:
If running behind a proxy server and Galaxy is served from a
subdirectory, enable the proxy-prefix filter and set the prefix in
the [filter:proxy-prefix] section above.
:Default: ``proxy-prefix``
:Type: str
~~~~~~~~~~~~~~~
``cookie_path``
~~~~~~~~~~~~~~~
:Description:
If proxy-prefix is enabled and you're running more than one Galaxy
instance behind one hostname, you will want to set this to the
same path as the prefix in the filter above. This value becomes
the "path" attribute set in the cookie so the cookies from each
instance will not clobber each other.
When running multiple Galaxy Reports instances under separate URL
prefixes on a single hostname, you will want to set this to the
same path as the prefix set in the uWSGI "mount" configuration
option above. This value becomes the "path" attribute set in the
cookie so the cookies from one instance will not clobber those
from another.
:Default: ``None``
:Type: str
@@ -41,7 +30,7 @@
~~~~~~~~~~~~~~~~~~~~~~~
:Description:
Database connection Galaxy reports are intended for production
Database connection. Galaxy Reports are intended for production
Galaxy instances, so sqlite (and the default value below) is not
supported. An SQLAlchemy connection string should be used specify
an external database.
@@ -54,8 +43,7 @@
~~~~~~~~~~~~~
:Description:
Where dataset files are saved Temporary storage for additional
datasets, this should be shared through the cluster
Where dataset files are stored.
:Default: ``database/files``
:Type: str
@@ -65,8 +53,7 @@
~~~~~~~~~~~~~~~~~
:Description:
Where dataset files are saved Temporary storage for additional
datasets, this should be shared through the cluster
Where temporary files are stored.
:Default: ``database/tmp``
:Type: str