Revision 6e27e449

b/Changelog
24 24 

  		





  25
  25
  
    
Cyclades


  		





  26
  26
  
    
--------


  		





  
  27
  
    
* Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings


  		





  27
  28
  
    

  		





  28
  29
  
    
Pithos


  		





  29
  30
  
    
------


  		












  

    
      b/docs/scale/i-cyclades.rst
    
  






  113
  113
  
    

  		





  114
  114
  
    
    CYCLADES_ASTAKOS_SERVICE_TOKEN = "XXXXXXXXXX"


  		





  115
  115
  
    

  		





  116
  
  
    
    CYCLADES_USER_CATALOG_URL = 'https://accounts.example.com/user_catalogs'


  		





  117
  
  
    

  		





  118
  116
  
    
    UI_SYSTEM_IMAGES_OWNERS = {


  		





  119
  117
  
    
        'admin@synnefo.gr': 'system',


  		





  120
  118
  
    
        'images@synnefo.gr': 'system'


  		












  

    
      b/snf-cyclades-app/conf/20-snf-cyclades-app-api.conf
    
  






  123
  123
  
    
## The token used for astakos service api calls (e.g. api to retrieve user email


  		





  124
  124
  
    
## using a user uuid)


  		





  125
  125
  
    
#CYCLADES_ASTAKOS_SERVICE_TOKEN = ''


  		





  126
  
  
    
#


  		





  127
  
  
    
## Astakos user_catalogs endpoint


  		





  128
  
  
    
#CYCLADES_USER_CATALOG_URL = 'https://<astakos domain>/user_catalogs'


  		





  129
  126
  
    

  		





  130
  127
  
    
# Let cyclades proxy user specific api calls to astakos, via self served


  		





  131
  128
  
    
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the


  		





  132
  129
  
    
# same machine.


  		





  133
  130
  
    
#CYCLADES_PROXY_USER_SERVICES = True


  		





  134
  
  
    
#


  		





  135
  
  
    
## Astakos feedback endpoint.


  		





  136
  
  
    
#CYCLADES_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback'


  		












  

    
      b/snf-cyclades-app/synnefo/api/delegate.py
    
  






  39
  39
  
    

  		





  40
  40
  
    
from django.conf import settings


  		





  41
  41
  
    

  		





  42
  
  
    
USER_CATALOG_URL = getattr(settings, 'CYCLADES_USER_CATALOG_URL', None)


  		





  43
  
  
    
USER_FEEDBACK_URL = getattr(settings, 'CYCLADES_USER_FEEDBACK_URL', None)


  		





  
  42
  
    
ASTAKOS_URL = getattr(settings, 'ASTAKOS_URL', None)


  		





  
  43
  
    
USER_CATALOG_URL = urlparse.urljoin(ASTAKOS_URL, "user_catalogs")


  		





  
  44
  
    
USER_FEEDBACK_URL = urlparse.urljoin(ASTAKOS_URL, "feedback")


  		





  44
  45
  
    

  		





  45
  46
  
    
from objpool.http import PooledHTTPConnection


  		





  46
  47
  
    

  		












  

    
      b/snf-cyclades-app/synnefo/app_settings/default/api.py
    
  






  124
  124
  
    
# using a user uuid)


  		





  125
  125
  
    
CYCLADES_ASTAKOS_SERVICE_TOKEN = ''


  		





  126
  126
  
    

  		





  127
  
  
    
# Astakos user_catalogs endpoint


  		





  128
  
  
    
CYCLADES_USER_CATALOG_URL = 'https://<astakos domain>/user_catalogs'


  		





  129
  
  
    

  		





  130
  127
  
    
# Let cyclades proxy user specific api calls to astakos, via self served


  		





  131
  128
  
    
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the


  		





  132
  129
  
    
# same machine.


  		





  133
  130
  
    
CYCLADES_PROXY_USER_SERVICES = True


  		





  134
  
  
    

  		





  135
  
  
    
# Astakos user_catalogs endpoint


  		





  136
  
  
    
CYCLADES_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback'


  		












  

    
      b/snf-cyclades-app/synnefo/app_settings/default/ui.py
    
  






  202
  202
  
    
    'admin@synnefo.gr': 'system',


  		





  203
  203
  
    
    'images@synnefo.gr': 'system'


  		





  204
  204
  
    
}


  		





  205
  
  
    

  		





  206
  
  
    
# Astakos feedback endpoint. UI uses this setting to post error feedbacks


  		





  207
  
  
    
CYCLADES_USER_FEEDBACK_URL = 'https://accounts.synnefo.org/feedback'


  		












Also available in:
  Unified diff