Revision 02d94254

b/docs/i-pithos.rst
58 58

  
59 59
    PITHOS_AUTHENTICATION_URL = 'https:/accounts.example.com/im/authenticate'
60 60
    PITHOS_AUTHENTICATION_USERS = None
61
    PITHOS_USER_CATALOG_URL = 'https://accounts.example.com/user_catalogs'
62
    PITHOS_USER_FEEDBACK_URL = 'https://accounts.example.com/feedback'
63
    PITHOS_USER_LOGIN_URL = 'https://accounts.example.com/login'
64

  
61 65
    PITHOS_BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@db.example.com:5432/snf_pithos'
62 66
    PITHOS_BACKEND_BLOCK_PATH = '/srv/pithos/data'
63 67
    PITHOS_BACKEND_QUOTA = 20 * 1024 * 1024 * 1024
b/docs/quick-install-admin-guide.rst
271 271
     RewriteEngine On
272 272
     RewriteCond %{THE_REQUEST} ^.*(\\r|\\n|%0A|%0D).* [NC]
273 273
     RewriteRule ^(.*)$ - [F,L]
274
     RewriteRule ^/login(.*) /im/login/redirect$1 [PT,NE]
275 274

  
276 275
     SSLEngine on
277 276
     SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
......
822 821
   PITHOS_AUTHENTICATION_USERS = None
823 822

  
824 823
   PITHOS_SERVICE_TOKEN = 'pithos_service_token22w=='
824
   PITHOS_USER_CATALOG_URL = 'http://node1.example.com/user_catalogs'
825
   PITHOS_USER_FEEDBACK_URL = 'http://node1.example.com/feedback'
826
   PITHOS_USER_LOGIN_URL = 'http://node1.example.com/login'
827

  
825 828

  
826 829
The ``PITHOS_BACKEND_DB_CONNECTION`` option tells to the pithos+ app where to
827 830
find the pithos+ backend database. Above we tell pithos+ that its database is
......
854 857
.. code-block:: console
855 858

  
856 859
   PITHOS_UI_LOGIN_URL = "https://node1.example.com/im/login?next="
857
   PITHOS_UI_FEEDBACK_URL = "https://node1.example.com/im/feedback"
860
   PITHOS_UI_FEEDBACK_URL = "https://node2.example.com/feedback"
858 861

  
859 862
The ``PITHOS_UI_LOGIN_URL`` option tells the client where to redirect you, if
860 863
you are not logged in. The ``PITHOS_UI_FEEDBACK_URL`` option points at the
b/snf-pithos-app/Changelog
3 3

  
4 4
v0.13.0
5 5
------
6
* setting *PITHOS_SERVICE_TOKEN* is no longer required for feedback to work
7 6
* settings *PITHOS_PROXY_USER_SERVICES*, *PITHOS_USER_CATALOG_URL*, *PITHOS_USER_FEEDBACK_URL*,
8 7
*PITHOS_USER_LOGIN_URL* should be set
9 8

  
b/snf-pithos-app/README
48 48
PITHOS_BACKEND_VERSIONING        auto                                                   Default versioning policy for containers
49 49
PITHOS_BACKEND_FREE_VERSIONING   True                                                   Default versioning debit policy (default free)
50 50
PITHOS_UPDATE_MD5                True                                                   Update object checksums when using hashmaps
51
PITHOS_SERVICE_TOKEN             ''                                                     Service token acquired by the identity provider (astakos)
51 52
===============================  ====================================================   ============================================================
52 53

  
53 54
To update checksums asynchronously, enable the queue, install snf-pithos-tools and use ``pithos-dispatcher``::
b/snf-pithos-app/conf/20-snf-pithos-app-settings.conf
42 42

  
43 43
# Disable if checksums are not required or are computed asynchronously by an external process.
44 44
#PITHOS_UPDATE_MD5 = True
45

  
46
# Service Token acquired by identity provider.
47
#PITHOS_SERVICE_TOKEN = ''
b/snf-pithos-app/pithos/api/settings.py
62 62
# Update object checksums when using hashmaps.
63 63
UPDATE_MD5 = getattr(settings, 'PITHOS_UPDATE_MD5', True)
64 64

  
65
# Service Token acquired by identity provider.
66
SERVICE_TOKEN = getattr(settings, 'PITHOS_SERVICE_TOKEN', '')
67

  
65 68
RADOS_STORAGE = getattr(settings, 'PITHOS_RADOS_STORAGE', False)
66 69
RADOS_POOL_BLOCKS= getattr(settings, 'PITHOS_RADOS_POOL_BLOCKS', 'blocks')
67 70
RADOS_POOL_MAPS = getattr(settings, 'PITHOS_RADOS_POOL_MAPS', 'maps')

Also available in: Unified diff