Commit 74eaf322 authored by Jean-Pierre Thomasset's avatar Jean-Pierre Thomasset

Merge branch '2018.05' into Aldebaran.08 to get documentation for...

Merge branch '2018.05' into Aldebaran.08 to get documentation for CAS_LOGOUT_ENABLE feature wrongly added to the 2018.05 branch
parents 987cf606 70c45d83
...@@ -247,7 +247,7 @@ To enable CAS authentication and single sign on feature, you need to have an exi ...@@ -247,7 +247,7 @@ To enable CAS authentication and single sign on feature, you need to have an exi
XiVOCC Configuration XiVOCC Configuration
-------------------- --------------------
* Edit the docker compose file ``/etc/docker/compose/docker-xivocc.yml`` to add the following configuration in the xuc section (use your CAS server URL instead of ``https://cas-server.example.org/cas``): * Edit the docker compose file ``/etc/docker/compose/docker-xivocc.yml`` to add the following configuration in the xuc section (use your CAS server URL instead of ``https://cas-server.example.org/cas`` and set ``CAS_LOGOUT_ENABLE`` to ``true`` if you want to logout from CAS when logging out from the application):
.. code-block:: dockerfile .. code-block:: dockerfile
...@@ -263,6 +263,7 @@ XiVOCC Configuration ...@@ -263,6 +263,7 @@ XiVOCC Configuration
# ... # ...
environment: environment:
- CAS_SERVER_URL=https://cas-server.example.org/cas - CAS_SERVER_URL=https://cas-server.example.org/cas
- CAS_LOGOUT_ENABLE=false
- ... - ...
# ... # ...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment