Revision a421e0b9 snf-pithos-app/pithos/api/settings.py
b/snf-pithos-app/pithos/api/settings.py | ||
---|---|---|
1 | 1 |
#coding=utf8 |
2 | 2 |
from django.conf import settings |
3 | 3 |
from synnefo.lib import parse_base_url, join_urls |
4 |
from synnefo.lib.services import fill_endpoints |
|
4 |
from synnefo.lib.services import fill_endpoints, get_public_endpoint
|
|
5 | 5 |
from synnefo.util.keypath import get_path, set_path |
6 | 6 |
from pithos.api.services import pithos_services as vanilla_pithos_services |
7 | 7 |
from astakosclient import astakos_services as vanilla_astakos_services |
... | ... | |
103 | 103 |
PUBLIC_URL_ALPHABET = getattr( |
104 | 104 |
settings, |
105 | 105 |
'PITHOS_PUBLIC_URL_ALPHABET', |
106 |
'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' |
|
107 |
) |
|
106 |
'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') |
|
107 |
|
|
108 |
ASTAKOS_UI_URL = get_public_endpoint(astakos_services, 'astakos_ui', '').rstrip('/') |
|
109 |
|
|
110 |
# Astakos login URL to redirect if the user information is missing |
|
111 |
LOGIN_URL = join_urls(ASTAKOS_UI_URL, 'login') |
Also available in: Unified diff