Revision 94459980

b/snf-astakos-app/astakos/im/settings.py
2 2
from os.path import abspath, dirname, join
3 3
from urlparse import urlparse
4 4

  
5
PROJECT_PATH = getattr(settings, 'PROJECT_PATH', dirname(dirname(abspath(__file__))))
6

  
7 5
# Set the expiration time of newly created auth tokens
8 6
# to be this many hours after their creation time.
9 7
AUTH_TOKEN_DURATION = getattr(settings, 'ASTAKOS_AUTH_TOKEN_DURATION', 30 * 24)
......
39 37
COOKIE_DOMAIN = getattr(settings, 'ASTAKOS_COOKIE_DOMAIN', None)
40 38
COOKIE_SECURE = getattr(settings, 'ASTAKOS_COOKIE_SECURE', True)
41 39

  
42
IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/im/static/im/')
40
IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/')
43 41

  
44 42
# If set to False and invitations not enabled newly created user will be automatically accepted
45 43
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True)
b/snf-astakos-app/astakos/im/synnefo_settings.py
63 63
]
64 64

  
65 65

  
66
static_files = {'im': ''}
66
static_files = {'astakos.im': ''}
67 67

  
68 68
# The following settings will replace the default django settings
69 69
AUTHENTICATION_BACKENDS = ('astakos.im.auth_backends.EmailBackend',
b/snf-astakos-app/astakos/im/urls.py
1 1
# Copyright 2011-2012 GRNET S.A. All rights reserved.
2
# 
2
#
3 3
# Redistribution and use in source and binary forms, with or
4 4
# without modification, are permitted provided that the following
5 5
# conditions are met:
6
# 
6
#
7 7
#   1. Redistributions of source code must retain the above
8 8
#      copyright notice, this list of conditions and the following
9 9
#      disclaimer.
10
# 
10
#
11 11
#   2. Redistributions in binary form must reproduce the above
12 12
#      copyright notice, this list of conditions and the following
13 13
#      disclaimer in the documentation and/or other materials
14 14
#      provided with the distribution.
15
# 
15
#
16 16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17 17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
......
25 25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26 26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 27
# POSSIBILITY OF SUCH DAMAGE.
28
# 
28
#
29 29
# The views and conclusions contained in the software and
30 30
# documentation are those of the authors and should not be
31 31
# interpreted as representing official policies, either expressed
......
34 34
from django.conf.urls.defaults import patterns, include, url
35 35

  
36 36
from astakos.im.forms import ExtendedPasswordResetForm
37
from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, PROJECT_PATH
37
from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED
38 38

  
39 39
urlpatterns = patterns('astakos.im.views',
40 40
    url(r'^$', 'index'),
......
50 50
    url(r'^login/redirect/?$', 'redirect.login')
51 51
)
52 52

  
53
urlpatterns += patterns('',
54
    url(r'^static/(?P<path>.*)$', 'django.views.static.serve',
55
                                {'document_root': PROJECT_PATH + '/im/static'})
56
)
57

  
58 53
if 'local' in IM_MODULES:
59 54
    urlpatterns += patterns('astakos.im.target',
60 55
        url(r'^local/?$', 'local.login')

Also available in: Unified diff