Remove cookie_path configuration documentation since it's now set

automatically.
This commit is contained in:
Nate Coraor
2019-04-16 17:48:36 -04:00
committed by John Chilton
parent 58d311f2e0
commit fed86eb598
10 changed files with 2 additions and 98 deletions
-7
View File
@@ -98,13 +98,6 @@ uwsgi:
galaxy:
# 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.
#cookie_path: ''
# By default, Galaxy uses a SQLite database at
# 'database/universe.sqlite'. You may use a SQLAlchemy connection
# string to specify an external database instead. This string takes
-7
View File
@@ -80,13 +80,6 @@ uwsgi:
reports:
# 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.
#cookie_path: null
# Verbosity of console log messages. Acceptable values can be found
# here: https://docs.python.org/2/library/logging.html#logging-levels
#log_level: DEBUG
-7
View File
@@ -351,13 +351,6 @@ tool_shed:
# store this information.
#citation_cache_lock_dir: database/citations/lock
# When running multiple Tool Shed 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.
#cookie_path: null
# Turn on logging of user actions to the database. Actions currently
# logged are grid views, tool searches, and use of "recently" used
# tools menu. The log_events and log_actions functionality will
+1 -9
View File
@@ -223,8 +223,7 @@ previous section:
```
2. The Galaxy application needs to be aware that it is running with a prefix (for generating URLs in dynamic pages).
This is accomplished by configuring uWSGI and Galaxy (the `uwsgi` and `galaxy` sections in `config/galaxy.yml`
respectively) like so and restarting Galaxy:
This is accomplished by configuring uWSGI (the `uwsgi` section in `config/galaxy.yml`) like so and restarting Galaxy:
```yaml
uwsgi:
@@ -234,15 +233,8 @@ previous section:
manage-script-name: true
# `module` MUST NOT be set when `mount` is in use
#module: galaxy.webapps.galaxy.buildapp:uwsgi_app()
galaxy:
#...
cookie_path: /galaxy
```
`cookie_path` should be set to prevent Galaxy's session cookies from clobbering each other if you are running more
than one instance of Galaxy under different URL prefixes on the same hostname.
Be sure to consult the [Scaling and Load Balancing](scaling.md) documentation, other options unrelated to proxying
should also be set in the `uwsgi` section of the config.
-14
View File
@@ -1,17 +1,3 @@
~~~~~~~~~~~~~~~
``cookie_path``
~~~~~~~~~~~~~~~
:Description:
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
~~~~~~~~~~~~~~~~~~~~~~~
``database_connection``
~~~~~~~~~~~~~~~~~~~~~~~
+1 -9
View File
@@ -215,8 +215,7 @@ previous section:
```
2. The Galaxy application needs to be aware that it is running with a prefix (for generating URLs in dynamic pages).
This is accomplished by configuring uWSGI and Galaxy (the `uwsgi` and `galaxy` sections in `config/galaxy.yml`
respectively) like so and restarting Galaxy:
This is accomplished by configuring uWSGI (the `uwsgi` section in `config/galaxy.yml`) like so and restarting Galaxy:
```yaml
uwsgi:
@@ -226,15 +225,8 @@ previous section:
manage-script-name: true
# `module` MUST NOT be set when `mount` is in use
#module: galaxy.webapps.galaxy.buildapp:uwsgi_app()
galaxy:
#...
cookie_path: /galaxy
```
`cookie_path` should be set to prevent Galaxy's session cookies from clobbering each other if you are running more
than one instance of Galaxy under different URL prefixes on the same hostname.
Be sure to consult the [Scaling and Load Balancing](scaling.md) documentation, other options unrelated to proxying
should also be set in the `uwsgi` section of the config.
-15
View File
@@ -1,18 +1,3 @@
~~~~~~~~~~~~~~~
``cookie_path``
~~~~~~~~~~~~~~~
:Description:
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
~~~~~~~~~~~~~
``log_level``
~~~~~~~~~~~~~
@@ -25,17 +25,6 @@ mapping:
required: true
mapping:
cookie_path:
type: str
default: ''
required: false
desc: |
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.
database_connection:
type: str
default: sqlite:///./database/universe.sqlite?isolation_level=IMMEDIATE
@@ -7,14 +7,6 @@ mapping:
desc: |
Galaxy Reports configuration options.
mapping:
cookie_path:
type: str
desc: |
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.
log_level:
type: str
@@ -516,17 +516,6 @@ mapping:
external sources such as https://doi.org/ by Galaxy - the following
parameters can be used to control the caching used to store this information.
cookie_path:
type: str
default: null
required: false
desc: |
When running multiple Tool Shed 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.
log_actions:
type: bool
default: true