From 57e4ae3c26df0fa86d077b8e8b76bc60cf9b1254 Mon Sep 17 00:00:00 2001
From: Arne Schauf <arne@as-webservices.de>
Date: Sun, 29 Sep 2013 01:08:52 +0200
Subject: [PATCH 1/3] minor fixes

---
 nsupdate/main/templates/main/overview.html | 2 +-
 nsupdate/main/urls.py                      | 6 +++---
 nsupdate/nsupdate/settings.py              | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nsupdate/main/templates/main/overview.html b/nsupdate/main/templates/main/overview.html
index 23c3ca1..8ad4c6e 100644
--- a/nsupdate/main/templates/main/overview.html
+++ b/nsupdate/main/templates/main/overview.html
@@ -14,7 +14,7 @@
                     <td>{{ host.last_update|date }}</td>
                     <td>{{ host.comment }}</td>
                     <td>
-                        <a href="{% url 'host' host.pk %}"><i class="icon icon-pencil"></i> edit</a> |
+                        <a href="{% url 'host_view' host.pk %}"><i class="icon icon-pencil"></i> edit</a> |
                         <a href="{% url 'delete_host' host.pk %}"><i class="icon icon-remove"></i> delete</a>
                     </td>
                 </tr>
diff --git a/nsupdate/main/urls.py b/nsupdate/main/urls.py
index f8a7e0a..ca8ca77 100644
--- a/nsupdate/main/urls.py
+++ b/nsupdate/main/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, include, url
 from main.views import (
-    HomeView, OverviewView, HostView, DeleteHostView,
+    HomeView, OverviewView, HostView, HostDeleteView,
 )
 from api.views import (
     MyIpView, UpdateIpView, NicUpdateView
@@ -9,8 +9,8 @@ from api.views import (
 urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),
     url(r'^overview/$', OverviewView.as_view(), name='overview'),
-    url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host'),
-    url(r'^delete_host/(?P<pk>\d+)/$', DeleteHostView.as_view(), name='delete_host'),
+    url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
+    url(r'^host/(?P<pk>\d+)/delete/$', HostDeleteView.as_view(), name='host_delete'),
     url(r'^myip$', MyIpView),
     url(r'^updateip$', UpdateIpView),
     url(r'^nic/update$', NicUpdateView),
diff --git a/nsupdate/nsupdate/settings.py b/nsupdate/nsupdate/settings.py
index d49452a..71c02da 100644
--- a/nsupdate/nsupdate/settings.py
+++ b/nsupdate/nsupdate/settings.py
@@ -196,6 +196,8 @@ LOGGING = {
     },
 }
 
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
 ACCOUNT_ACTIVATION_DAYS = 7
 
 LOGIN_REDIRECT_URL = '/account/profile/'

From 8b95f4dd40a1d706981b062250454d47af8a7cc7 Mon Sep 17 00:00:00 2001
From: Arne Schauf <arne@as-webservices.de>
Date: Sun, 29 Sep 2013 01:15:55 +0200
Subject: [PATCH 2/3] first test - then commit

---
 nsupdate/main/urls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nsupdate/main/urls.py b/nsupdate/main/urls.py
index ca8ca77..73759ff 100644
--- a/nsupdate/main/urls.py
+++ b/nsupdate/main/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, include, url
 from main.views import (
-    HomeView, OverviewView, HostView, HostDeleteView,
+    HomeView, OverviewView, HostView, DeleteHostView,
 )
 from api.views import (
     MyIpView, UpdateIpView, NicUpdateView
@@ -10,7 +10,7 @@ urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),
     url(r'^overview/$', OverviewView.as_view(), name='overview'),
     url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
-    url(r'^host/(?P<pk>\d+)/delete/$', HostDeleteView.as_view(), name='host_delete'),
+    url(r'^host/(?P<pk>\d+)/delete/$', DeleteHostView.as_view(), name='host_delete'),
     url(r'^myip$', MyIpView),
     url(r'^updateip$', UpdateIpView),
     url(r'^nic/update$', NicUpdateView),

From 5d4aec123d4bd59bc980be3c5e9c24e54123e59b Mon Sep 17 00:00:00 2001
From: Arne Schauf <arne@as-webservices.de>
Date: Sun, 29 Sep 2013 01:16:49 +0200
Subject: [PATCH 3/3] quick fixes are dirty

---
 nsupdate/main/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nsupdate/main/urls.py b/nsupdate/main/urls.py
index 73759ff..c5fd914 100644
--- a/nsupdate/main/urls.py
+++ b/nsupdate/main/urls.py
@@ -10,7 +10,7 @@ urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),
     url(r'^overview/$', OverviewView.as_view(), name='overview'),
     url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
-    url(r'^host/(?P<pk>\d+)/delete/$', DeleteHostView.as_view(), name='host_delete'),
+    url(r'^host/(?P<pk>\d+)/delete/$', DeleteHostView.as_view(), name='delete_host'),
     url(r'^myip$', MyIpView),
     url(r'^updateip$', UpdateIpView),
     url(r'^nic/update$', NicUpdateView),