Revision a5fbc00d

b/Changelog
30 30 
------
31 31 
* Remove PITHOS_AUTHENTICATION_USERS setting, which was used to override
32 32 
  astakos users.
33 
* Remove 'PITHOS_USER_CATALOG_URL', 'PITHOS_USER_FEEDBACK_URL' and
34 
  'PITHOS_USER_LOGIN_URL' settings.
33 35 

  		





  34
  36
  
    
Tools


  		





  35
  37
  
    
-----


  		












  

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






  854
  854
  
    

  		





  855
  855
  
    

  		





  856
  856
  
    
   PITHOS_SERVICE_TOKEN = 'pithos_service_token22w=='


  		





  857
  
  
    
   PITHOS_USER_CATALOG_URL = 'https://node1.example.com/user_catalogs'


  		





  858
  
  
    
   PITHOS_USER_FEEDBACK_URL = 'https://node1.example.com/feedback'


  		





  859
  
  
    
   PITHOS_USER_LOGIN_URL = 'https://node1.example.com/login'


  		





  860
  857
  
    

  		





  861
  858
  
    
   PITHOS_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'


  		





  862
  859
  
    
   PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'


  		












  

    
      b/docs/scale/i-pithos.rst
    
  






  58
  58
  
    
.. code-block:: console


  		





  59
  59
  
    

  		





  60
  60
  
    
    ASTAKOS_URL = 'https:/accounts.example.com/'


  		





  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
  62
  
    
    PITHOS_BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@db.example.com:5432/snf_pithos'


  		





  66
  63
  
    
    PITHOS_BACKEND_BLOCK_PATH = '/srv/pithos/data'


  		












  

    
      b/snf-pithos-app/README
    
  






  52
  52
  
    
PITHOS_RADOS_POOL_MAPS           None                                                               RADOS pool to be used for maps storage


  		





  53
  53
  
    
PITHOS_TRANSLATE_UUIDS           False                                                              Enables a ui compatibility layer for the introduction of UUIDs in identity management.


  		





  54
  54
  
    
PITHOS_PROXY_USER_SERVICES       True                                                               Whether to proxy user feedback and catalog services


  		





  55
  
  
    
PITHOS_USER_CATALOG_URL          \https://<astakos.host>/user_catalogs/                             Astakos User Catalog URL


  		





  56
  
  
    
PITHOS_USER_FEEDBACK_URL         \https://<astakos.host>/feedback/                                  Astakos User Feedback URL


  		





  57
  
  
    
PITHOS_USER_LOGIN_URL            \https://<astakos.host>/login/                                     Astakos User Login URL


  		





  58
  55
  
    
PITHOS_USE_QUOTAHOLDER           True                                                               Enable quotaholder


  		





  59
  56
  
    
PITHOS_QUOTAHOLDER_URL           ''                                                                 Quotaholder URL


  		





  60
  57
  
    
PITHOS_QUOTAHOLDER_TOKEN         ''                                                                 Quotaholder token


  		












  

    
      b/snf-pithos-app/conf/20-snf-pithos-app-settings.conf
    
  






  41
  41
  
    
# Set to False if snf astakos-app is running on the same machine, so it handles


  		





  42
  42
  
    
# the requests on its own.


  		





  43
  43
  
    
#PROXY_USER_SERVICES = True


  		





  44
  
  
    
#PITHOS_USER_CATALOG_URL = 'https://accounts.example.synnefo.org/user_catalogs/'


  		





  45
  
  
    
#PITHOS_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback/'


  		





  46
  
  
    
#PITHOS_USER_LOGIN_URL = 'https://accounts.example.synnefo.org/login/'


  		





  47
  44
  
    

  		





  48
  45
  
    
# Enable and configure quotaholder


  		





  49
  46
  
    
#PITHOS_USE_QUOTAHOLDER = False


  		












  

    
      b/snf-pithos-app/pithos/api/settings.py
    
  






  1
  1
  
    
#coding=utf8


  		





  2
  2
  
    
from django.conf import settings


  		





  
  3
  
    
from urlparse import urljoin


  		





  3
  4
  
    

  		





  4
  5
  
    
ASTAKOS_URL = getattr(settings, "ASTAKOS_URL",


  		





  5
  6
  
    
                      "https://accounts.example.synnefo.org/")


  		





  ......




  57
  58
  
    
# the requests on its own.


  		





  58
  59
  
    
PROXY_USER_SERVICES = getattr(settings, 'PITHOS_PROXY_USER_SERVICES', True)


  		





  59
  60
  
    

  		





  60
  
  
    
USER_CATALOG_URL = getattr(settings, 'PITHOS_USER_CATALOG_URL',


  		





  61
  
  
    
                           'https://accounts.example.synnefo.org/user_catalogs/')


  		





  62
  
  
    
USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL',


  		





  63
  
  
    
                            'https://accounts.example.synnefo.org/feedback/')


  		





  64
  
  
    
USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL',


  		





  65
  
  
    
                         'https://accounts.example.synnefo.org/login/')


  		





  
  61
  
    
USER_CATALOG_URL = urljoin(ASTAKOS_URL, "user_catalogs")


  		





  
  62
  
    
USER_FEEDBACK_URL = urljoin(ASTAKOS_URL, "feedback")


  		





  
  63
  
    
USER_LOGIN_URL = urljoin(ASTAKOS_URL, "login")


  		





  66
  64
  
    

  		





  67
  65
  
    
# Set the quota holder component URI


  		





  68
  66
  
    
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False)


  		












Also available in:
  Unified diff