Archived
Small fixes
This commit is contained in:
1 parent
824f450927
commit
848a365f16
4 files changed
+24
-1
No files matched your search
@@ -1,5 +1,6 @@
|
||||
*.swp
|
||||
*.pyc
|
||||
settings.py
|
||||
settings_brukerinfo.py
|
||||
test.db
|
||||
static/style/.sass-cache/
|
||||
@@ -0,0 +1,15 @@
|
||||
import os
|
||||
import sys
|
||||
from os.path import dirname, join
|
||||
|
||||
def map_path(target_name=''):
|
||||
'''Enables path names to be decided at runtime.'''
|
||||
return join(dirname(__file__), target_name).replace('\\', '/')
|
||||
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings_brukerinfo'
|
||||
|
||||
path = map_path(".")
|
||||
if path not in sys.path:
|
||||
sys.path.append(path)
|
||||
import django.core.handlers.wsgi
|
||||
application = django.core.handlers.wsgi.WSGIHandler()
|
||||
@@ -111,6 +111,10 @@ INSTALLED_APPS = (
|
||||
'ldapdb',
|
||||
'django.contrib.admin',
|
||||
)
|
||||
|
||||
EMAIL_HOST = 'snes.neuf.no'
|
||||
FROM_EMAIL = 'no-reply@neuf.no'
|
||||
|
||||
AUTHENTICATION_BACKENDS = (
|
||||
'django_auth_ldap.backend.LDAPBackend',
|
||||
'django.contrib.auth.backends.ModelBackend',
|
||||
|
||||
@@ -3,6 +3,8 @@ from django.contrib import admin
|
||||
from main.forms import LDAPPasswordChangeForm, LDAPSetPasswordForm, LDAPPasswordResetForm
|
||||
admin.autodiscover()
|
||||
|
||||
import settings
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^admin/', include(admin.site.urls)),
|
||||
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
|
||||
@@ -16,7 +18,8 @@ urlpatterns = patterns('',
|
||||
(r'^accounts/password/change/done$', 'django.contrib.auth.views.password_change_done'),
|
||||
# Reset password (forgot password)
|
||||
(r'^accounts/password/reset$', 'django.contrib.auth.views.password_reset',
|
||||
{'password_reset_form' : LDAPPasswordResetForm}),
|
||||
{'password_reset_form' : LDAPPasswordResetForm,
|
||||
'from_email' : settings.FROM_EMAIL}),
|
||||
(r'^accounts/password/reset/done$', 'django.contrib.auth.views.password_reset_done'),
|
||||
# Set password
|
||||
(r'^accounts/password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)$', 'main.views.password_reset_confirm',
|
||||
|
||||
Reference in new issue
Block a user