From 848a365f160b34e44aa54792ce262c3b59c71925 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Thu, 12 Apr 2012 15:05:44 +0200
Subject: [PATCH] Small fixes

---
 .gitignore           |  1 +
 neuf-brukerinfo.wsgi | 15 +++++++++++++++
 settings-sample.py   |  4 ++++
 urls.py              |  5 ++++-
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 neuf-brukerinfo.wsgi

diff --git a/.gitignore b/.gitignore
index 1935142..1988367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.swp
 *.pyc
 settings.py
+settings_brukerinfo.py
 test.db
 static/style/.sass-cache/
diff --git a/neuf-brukerinfo.wsgi b/neuf-brukerinfo.wsgi
new file mode 100644
index 0000000..e77fb1e
--- /dev/null
+++ b/neuf-brukerinfo.wsgi
@@ -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()
diff --git a/settings-sample.py b/settings-sample.py
index 47f0e25..73add06 100644
--- a/settings-sample.py
+++ b/settings-sample.py
@@ -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',
diff --git a/urls.py b/urls.py
index a1d16c9..73d5916 100644
--- a/urls.py
+++ b/urls.py
@@ -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',