Revision c08d0b66

b/README.upgrade
3 3

  
4 4
0.7.9 -> 0.7.10
5 5
---------------
6
* Update settings.py (BACKEND*, SERVICE_NAME, *_EMAIL, *_TARGET)
6
* Update settings.py (BACKEND*, SERVICE_NAME, *_EMAIL, *_TARGET, IM_*)
7 7
* Update 'attributes' table in mysql:
8 8
    
9 9
	mysql> update attributes set `key`='ETag' where `key`='hash';
b/pithos/im/templates/index.html
7 7
    
8 8
{% block body%}
9 9
    <div class="row">
10
        {% if "local" in standard_modules %}
10
    {% if "local" in standard_modules %}
11 11
      <div class="span4">
12 12
        <h4>Local account</h4>
13 13
        <form action="{% url pithos.im.target.local.login %}" method="post" class="form-stacked">
......
38 38
          </div>
39 39
        </form>
40 40
      </div>
41
  {% endif %}
42
  {% if "invitation" in standard_modules %}
41
    {% endif %}
42
    {% if "invitation" in standard_modules %}
43 43
      <div class="span4">
44 44
        <h4>Invitation</h4>
45 45
        <form action="{% url pithos.im.target.invitation.login %}" class="form-stacked">
......
57 57
          </div>
58 58
        </form>
59 59
      </div>
60
  {% endif %}
61
  {% if other_modules %}
60
    {% endif %}
61
    {% if other_modules %}
62 62
      <div class="span8">
63 63
        <h4>Other provider</h4>
64 64
        {% for o in other_modules %}
65 65
            <a href="/im/login/{{ o }}{% ifnotequal next "" %}?next={{ next|urlencode }}{% endifnotequal %}" alt="{{ o|title }}"><img src="/im/static/{{ o }}.png" width="120" height="120"></a>
66 66
        {% endfor %}
67 67
      </div>
68
  {% endif %}
68
    {% endif %}
69 69
    </div>
70 70
{% endblock body%}
b/pithos/im/urls.py
45 45
    (r'^admin/users/(\d+)/?$', 'users_info'),
46 46
    (r'^admin/users/create$', 'users_create'),
47 47
    (r'^admin/users/(\d+)/modify/?$', 'users_modify'),
48
    (r'^admin/users/(\d+)/delete/?$', 'users_delete'),
49
    
50
    (r'^invite/?$', 'invite'),
51
    (r'^local/create/?$', 'local_create'),
52
    (r'^local/reclaim/?$', 'reclaim_password'),
53
    
48
    (r'^admin/users/(\d+)/delete/?$', 'users_delete')
54 49
)
55 50

  
56 51
urlpatterns += patterns('pithos.im.target',
57
    (r'^login/shibboleth/?$', 'shibboleth.login'),
58
    (r'^login/twitter/?$', 'twitter.login'),
59
    (r'^login/twitter/authenticated/?$', 'twitter.authenticated'),
60
    (r'^login/invitation/?$', 'invitation.login'),
61
    (r'^local/?$', 'local.login'),
62
    (r'^local/activate/?$', 'local.activate'),
63
    (r'^local/reset/?$', 'local.reset_password'),
64 52
    (r'^login/dummy/?$', 'dummy.login')
65 53
)
66 54

  
......
68 56
    (r'^static/(?P<path>.*)$', 'django.views.static.serve',
69 57
                                {'document_root': settings.PROJECT_PATH + '/im/static'})
70 58
)
59

  
60
if 'local' in settings.IM_STANDARD_MODULES:
61
    urlpatterns += patterns('pithos.im.views',
62
        (r'^local/create/?$', 'local_create'),
63
        (r'^local/reclaim/?$', 'reclaim_password')
64
    )
65
    urlpatterns += patterns('pithos.im.target',
66
        (r'^local/?$', 'local.login'),
67
        (r'^local/activate/?$', 'local.activate'),
68
        (r'^local/reset/?$', 'local.reset_password')
69
    )
70

  
71
if 'invitation' in settings.IM_STANDARD_MODULES:
72
    urlpatterns += patterns('pithos.im.views',
73
        (r'^invite/?$', 'invite'),
74
    )
75
    urlpatterns += patterns('pithos.im.target',
76
        (r'^login/invitation/?$', 'invitation.login')
77
    )
78

  
79
if 'shibboleth' in settings.IM_OTHER_MODULES:
80
    urlpatterns += patterns('pithos.im.target',
81
        (r'^login/shibboleth/?$', 'shibboleth.login')
82
    )
83

  
84
if 'twitter' in settings.IM_OTHER_MODULES:
85
    urlpatterns += patterns('pithos.im.target',
86
        (r'^login/twitter/?$', 'twitter.login'),
87
        (r'^login/twitter/authenticated/?$', 'twitter.authenticated')
88
    )
b/pithos/settings.py.dist
74 74
BACKEND_BLOCK_MODULE = 'pithos.backends.lib.hashfiler'
75 75
BACKEND_BLOCK_PATH = os.path.join(PROJECT_PATH, 'data/')
76 76

  
77

  
78 77
# Bypass authentication for user administration.
79 78
BYPASS_ADMIN_AUTH = False
80 79

  
......
211 210
LOGFILE = None
212 211

  
213 212
# Identity Management enabled modules
214
IM_STANDARD_MODULES = ['invitation']
213
IM_STANDARD_MODULES = ['local', 'invitation']
215 214
IM_OTHER_MODULES = ['twitter', 'shibboleth']

Also available in: Unified diff