Commit 0d8cb2e0 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou Committed by Athina Bekakou

BASE_PATH -> BASE_URL

parent 5ab2f557
# The path under which the ui views will be served from # The path under which the ui views will be served from
#UI_PATH = "/ui/" #UI_BASE_URL = "/ui/"
# The path used to serve the astakos identity and account endpoints. # The path used to serve the astakos identity and account endpoints.
#UI_ASTAKOS_PROXY_PATH = "_astakos" #UI_ASTAKOS_PROXY_PATH = "_astakos"
......
...@@ -19,18 +19,18 @@ from django.conf import settings ...@@ -19,18 +19,18 @@ from django.conf import settings
from synnefo.lib import parse_base_url from synnefo.lib import parse_base_url
BASE_PATH = getattr(settings, 'UI_BASE_PATH', '/ui/') BASE_URL = getattr(settings, 'UI_BASE_URL', '/ui/')
AUTH_METHOD = getattr(settings, 'UI_AUTH_METHOD', 'cookie:_pithos2_a') AUTH_METHOD = getattr(settings, 'UI_AUTH_METHOD', 'cookie:_pithos2_a')
PROXY_PATH = getattr(settings, 'UI_ASTAKOS_PROXY_PATH', '_astakos') PROXY_PATH = getattr(settings, 'UI_ASTAKOS_PROXY_PATH', '_astakos')
ASTAKOS_IDENTITY_PROXY_PATH = getattr(settings, ASTAKOS_IDENTITY_PROXY_PATH = getattr(settings,
'UI_ASTAKOS_IDENTITY_PROXY_PATH', 'UI_ASTAKOS_IDENTITY_PROXY_PATH',
'%s%s/identity' % (BASE_PATH, PROXY_PATH)) '%s%s/identity' % (BASE_URL, PROXY_PATH))
ASTAKOS_ACCOUNT_PROXY_PATH = getattr(settings, ASTAKOS_ACCOUNT_PROXY_PATH = getattr(settings,
'UI_ASTAKOS_ACCOUNT_PROXY_PATH', 'UI_ASTAKOS_ACCOUNT_PROXY_PATH',
'%s%s/account' % (BASE_PATH, PROXY_PATH)) '%s%s/account' % (BASE_URL, PROXY_PATH))
COMMON_AUTH_URL = getattr(settings, 'ASTAKOS_AUTH_URL', None) COMMON_AUTH_URL = getattr(settings, 'ASTAKOS_AUTH_URL', None)
ASTAKOS_ACCOUNT_BASE_URL = getattr(settings, ASTAKOS_ACCOUNT_BASE_URL = getattr(settings,
......
...@@ -23,7 +23,7 @@ from snf_django.lib.api.urls import api_patterns ...@@ -23,7 +23,7 @@ from snf_django.lib.api.urls import api_patterns
from snf_django.lib.api import api_endpoint_not_found from snf_django.lib.api import api_endpoint_not_found
from snf_django.utils.urls import extend_path_with_slash from snf_django.utils.urls import extend_path_with_slash
from synnefo_ui.ui_settings import BASE_PATH, ASTAKOS_IDENTITY_PROXY_PATH, \ from synnefo_ui.ui_settings import BASE_URL, ASTAKOS_IDENTITY_PROXY_PATH, \
ASTAKOS_IDENTITY_BASE_URL, ASTAKOS_ACCOUNT_PROXY_PATH, \ ASTAKOS_IDENTITY_BASE_URL, ASTAKOS_ACCOUNT_PROXY_PATH, \
ASTAKOS_ACCOUNT_BASE_URL ASTAKOS_ACCOUNT_BASE_URL
...@@ -54,7 +54,7 @@ ui_patterns = patterns( ...@@ -54,7 +54,7 @@ ui_patterns = patterns(
urlpatterns = proxy_patterns urlpatterns = proxy_patterns
urlpatterns += patterns( urlpatterns += patterns(
'', '',
(prefix_pattern(BASE_PATH), include(ui_patterns))) (prefix_pattern(BASE_URL), include(ui_patterns)))
extend_path_with_slash(urlpatterns, BASE_PATH); extend_path_with_slash(urlpatterns, BASE_URL);
...@@ -41,7 +41,7 @@ def app(request): ...@@ -41,7 +41,7 @@ def app(request):
context = { context = {
'app_settings': json.dumps(app_settings), 'app_settings': json.dumps(app_settings),
'UI_MEDIA_URL': ui_settings.UI_MEDIA_URL, 'UI_MEDIA_URL': ui_settings.UI_MEDIA_URL,
'UI_BASE_URL': ui_settings.BASE_PATH 'UI_BASE_URL': ui_settings.BASE_URL
} }
return direct_to_template(request, "snf_ui_index.html", return direct_to_template(request, "snf_ui_index.html",
extra_context=context) extra_context=context)
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