Commit 94459980 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Fixed im static files configuration

parent a9658bb2
...@@ -2,8 +2,6 @@ from django.conf import settings ...@@ -2,8 +2,6 @@ from django.conf import settings
from os.path import abspath, dirname, join from os.path import abspath, dirname, join
from urlparse import urlparse from urlparse import urlparse
PROJECT_PATH = getattr(settings, 'PROJECT_PATH', dirname(dirname(abspath(__file__))))
# Set the expiration time of newly created auth tokens # Set the expiration time of newly created auth tokens
# to be this many hours after their creation time. # to be this many hours after their creation time.
AUTH_TOKEN_DURATION = getattr(settings, 'ASTAKOS_AUTH_TOKEN_DURATION', 30 * 24) AUTH_TOKEN_DURATION = getattr(settings, 'ASTAKOS_AUTH_TOKEN_DURATION', 30 * 24)
...@@ -39,7 +37,7 @@ COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a') ...@@ -39,7 +37,7 @@ COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a')
COOKIE_DOMAIN = getattr(settings, 'ASTAKOS_COOKIE_DOMAIN', None) COOKIE_DOMAIN = getattr(settings, 'ASTAKOS_COOKIE_DOMAIN', None)
COOKIE_SECURE = getattr(settings, 'ASTAKOS_COOKIE_SECURE', True) COOKIE_SECURE = getattr(settings, 'ASTAKOS_COOKIE_SECURE', True)
IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/im/static/im/') IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/')
# If set to False and invitations not enabled newly created user will be automatically accepted # If set to False and invitations not enabled newly created user will be automatically accepted
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True) MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True)
......
...@@ -63,7 +63,7 @@ middlware_classes = [ ...@@ -63,7 +63,7 @@ middlware_classes = [
] ]
static_files = {'im': ''} static_files = {'astakos.im': ''}
# The following settings will replace the default django settings # The following settings will replace the default django settings
AUTHENTICATION_BACKENDS = ('astakos.im.auth_backends.EmailBackend', AUTHENTICATION_BACKENDS = ('astakos.im.auth_backends.EmailBackend',
......
# Copyright 2011-2012 GRNET S.A. All rights reserved. # Copyright 2011-2012 GRNET S.A. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or # Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following # without modification, are permitted provided that the following
# conditions are met: # conditions are met:
# #
# 1. Redistributions of source code must retain the above # 1. Redistributions of source code must retain the above
# copyright notice, this list of conditions and the following # copyright notice, this list of conditions and the following
# disclaimer. # disclaimer.
# #
# 2. Redistributions in binary form must reproduce the above # 2. Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following # copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials # disclaimer in the documentation and/or other materials
# provided with the distribution. # provided with the distribution.
# #
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS # THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
# The views and conclusions contained in the software and # The views and conclusions contained in the software and
# documentation are those of the authors and should not be # documentation are those of the authors and should not be
# interpreted as representing official policies, either expressed # interpreted as representing official policies, either expressed
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
from django.conf.urls.defaults import patterns, include, url from django.conf.urls.defaults import patterns, include, url
from astakos.im.forms import ExtendedPasswordResetForm from astakos.im.forms import ExtendedPasswordResetForm
from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, PROJECT_PATH from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED
urlpatterns = patterns('astakos.im.views', urlpatterns = patterns('astakos.im.views',
url(r'^$', 'index'), url(r'^$', 'index'),
...@@ -50,11 +50,6 @@ urlpatterns += patterns('astakos.im.target', ...@@ -50,11 +50,6 @@ urlpatterns += patterns('astakos.im.target',
url(r'^login/redirect/?$', 'redirect.login') url(r'^login/redirect/?$', 'redirect.login')
) )
urlpatterns += patterns('',
url(r'^static/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': PROJECT_PATH + '/im/static'})
)
if 'local' in IM_MODULES: if 'local' in IM_MODULES:
urlpatterns += patterns('astakos.im.target', urlpatterns += patterns('astakos.im.target',
url(r'^local/?$', 'local.login') url(r'^local/?$', 'local.login')
......
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