Commit 54b52bfc authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

cyclades: remove redundant settings

Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL'
settings, since both of them can be derived from 'ASTAKOS_URL' setting.
parent dc08c40f
......@@ -24,6 +24,7 @@ Astakos
Cyclades
--------
* Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings
Pithos
------
......
......@@ -113,8 +113,6 @@ In `/etc/synnefo/cyclades.conf` add:
CYCLADES_ASTAKOS_SERVICE_TOKEN = "XXXXXXXXXX"
CYCLADES_USER_CATALOG_URL = 'https://accounts.example.com/user_catalogs'
UI_SYSTEM_IMAGES_OWNERS = {
'admin@synnefo.gr': 'system',
'images@synnefo.gr': 'system'
......
......@@ -123,14 +123,8 @@
## The token used for astakos service api calls (e.g. api to retrieve user email
## using a user uuid)
#CYCLADES_ASTAKOS_SERVICE_TOKEN = ''
#
## Astakos user_catalogs endpoint
#CYCLADES_USER_CATALOG_URL = 'https://<astakos domain>/user_catalogs'
# Let cyclades proxy user specific api calls to astakos, via self served
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the
# same machine.
#CYCLADES_PROXY_USER_SERVICES = True
#
## Astakos feedback endpoint.
#CYCLADES_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback'
......@@ -39,8 +39,9 @@ from django.views.decorators.csrf import csrf_exempt
from django.conf import settings
USER_CATALOG_URL = getattr(settings, 'CYCLADES_USER_CATALOG_URL', None)
USER_FEEDBACK_URL = getattr(settings, 'CYCLADES_USER_FEEDBACK_URL', None)
ASTAKOS_URL = getattr(settings, 'ASTAKOS_URL', None)
USER_CATALOG_URL = urlparse.urljoin(ASTAKOS_URL, "user_catalogs")
USER_FEEDBACK_URL = urlparse.urljoin(ASTAKOS_URL, "feedback")
from objpool.http import PooledHTTPConnection
......
......@@ -124,13 +124,7 @@ SECRET_ENCRYPTION_KEY= "Password Encryption Key"
# using a user uuid)
CYCLADES_ASTAKOS_SERVICE_TOKEN = ''
# Astakos user_catalogs endpoint
CYCLADES_USER_CATALOG_URL = 'https://<astakos domain>/user_catalogs'
# Let cyclades proxy user specific api calls to astakos, via self served
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the
# same machine.
CYCLADES_PROXY_USER_SERVICES = True
# Astakos user_catalogs endpoint
CYCLADES_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback'
......@@ -202,6 +202,3 @@ UI_SYSTEM_IMAGES_OWNERS = {
'admin@synnefo.gr': 'system',
'images@synnefo.gr': 'system'
}
# Astakos feedback endpoint. UI uses this setting to post error feedbacks
CYCLADES_USER_FEEDBACK_URL = 'https://accounts.synnefo.org/feedback'
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