Revision 4ab620b6 docs/quick-install-admin-guide.rst

b/docs/quick-install-admin-guide.rst
847 847

  
848 848
.. code-block:: console
849 849

  
850
   PITHOS_BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@node1.example.com:5432/snf_pithos'
850
   ASTAKOS_URL = 'https://node1.example.com/'
851 851

  
852
   PITHOS_BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@node1.example.com:5432/snf_pithos'
852 853
   PITHOS_BACKEND_BLOCK_PATH = '/srv/pithos/data'
853 854

  
854
   PITHOS_AUTHENTICATION_URL = 'https://node1.example.com/im/authenticate'
855
   PITHOS_AUTHENTICATION_USERS = None
856 855

  
857 856
   PITHOS_SERVICE_TOKEN = 'pithos_service_token22w=='
858 857
   PITHOS_USER_CATALOG_URL = 'https://node1.example.com/user_catalogs'
......
878 877
``/srv/pithos/data``, which is visible by both nodes. We have already setup this
879 878
directory at node1's "Pithos+ data directory setup" section.
880 879

  
881
The ``PITHOS_AUTHENTICATION_URL`` option tells to the pithos+ app in which URI
882
is available the astakos authentication api. If not set, pithos+ tries to
883
authenticate using the ``PITHOS_AUTHENTICATION_USERS`` user pool.
880
The ``ASTAKOS_URL`` option tells to the pithos+ app in which URI
881
is available the astakos authentication api.
884 882

  
885 883
The ``PITHOS_SERVICE_TOKEN`` should be the Pithos+ token returned by running on
886 884
the Astakos node (node1 in our case):
......
1705 1703

  
1706 1704
.. code-block:: console
1707 1705

  
1708
   ASTAKOS_URL = 'https://node1.example.com/im/authenticate'
1706
   ASTAKOS_URL = 'https://node1.example.com/'
1709 1707

  
1710 1708
   # Set to False if astakos & cyclades are on the same host
1711 1709
   CYCLADES_PROXY_USER_SERVICES = False
1712 1710

  
1713 1711
The ``ASTAKOS_URL`` denotes the authentication endpoint for Cyclades and is set
1714 1712
to point to Astakos (this should have the same value with Pithos+'s
1715
``PITHOS_AUTHENTICATION_URL``, setup :ref:`previously <conf-pithos>`).
1713
``ASTAKOS_URL``, setup :ref:`previously <conf-pithos>`).
1716 1714

  
1717 1715
.. warning::
1718 1716

  

Also available in: Unified diff