Revision 2a54b2dd snf-pithos-app/pithos/api/urls.py

b/snf-pithos-app/pithos/api/urls.py
37 37
from snf_django.lib.api.utils import prefix_pattern
38 38
from pithos.api.settings import (
39 39
    BASE_PATH, ASTAKOS_BASE_URL, BASE_ASTAKOS_PROXY_PATH,
40
    ASTAKOS_ACCOUNTS_PREFIX, PROXY_USER_SERVICES)
40
    ASTAKOS_ACCOUNT_PREFIX, PROXY_USER_SERVICES,
41
    PITHOS_PREFIX, PUBLIC_PREFIX, UI_PREFIX)
41 42
from urlparse import urlparse
42 43

  
43 44

  
......
53 54

  
54 55
pithos_patterns = patterns(
55 56
    '',
56
    (r'^v1(?:$|/)', include(pithos_api_patterns)),
57
    (r'^v1\.0(?:$|/)', include(pithos_api_patterns)),
58
    (r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'))
57
    (r'{0}v1/'.format(prefix_pattern(PITHOS_PREFIX)),
58
        include(pithos_api_patterns)),
59
    (r'{0}(?P<v_public>.+?)/?$'.format(prefix_pattern(PUBLIC_PREFIX)),
60
        'pithos.api.public.public_demux'))
59 61

  
60 62
urlpatterns = patterns(
61 63
    '',
......
71 73
        (r'^login/?$', astakos_proxy),
72 74
        (r'^feedback/?$', astakos_proxy),
73 75
        (r'^user_catalogs/?$', astakos_proxy),
74
        (prefix_pattern(ASTAKOS_ACCOUNTS_PREFIX), astakos_proxy),
76
        (prefix_pattern(ASTAKOS_ACCOUNT_PREFIX), astakos_proxy),
75 77
    )
76 78

  
77 79
    urlpatterns += patterns(

Also available in: Unified diff