Merge branch 'master' of github.com:asmaps/nsupdate.info

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>

nsupdate/main/urls.py

@@ -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/$', DeleteHostView.as_view(), name='delete_host'),
     url(r'^myip$', MyIpView),
     url(r'^updateip$', UpdateIpView),
     url(r'^nic/update$', NicUpdateView),

nsupdate/nsupdate/settings.py

@@ -201,6 +201,8 @@ LOGGING = {
     },
 }
 
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
 ACCOUNT_ACTIVATION_DAYS = 7
 
 LOGIN_REDIRECT_URL = '/overview/'