flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

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

Browse Source
This commit is contained in:
Fabian Faessler 2013-09-29 01:18:36 +02:00
commit 0093aab667
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsupdate/main/templates/main/overview.html
View File

@ -14,7 +14,7 @@
<td>{{ host.last_update|date }}</td> <td>{{ host.last_update|date }}</td>
<td>{{ host.comment }}</td> <td>{{ host.comment }}</td>
<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> <a href="{% url 'delete_host' host.pk %}"><i class="icon icon-remove"></i> delete</a>
</td> </td>
</tr> </tr>

4
nsupdate/main/urls.py
View File

@ -9,8 +9,8 @@ from api.views import (
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', HomeView.as_view(), name="home"), url(r'^$', HomeView.as_view(), name="home"),
url(r'^overview/$', OverviewView.as_view(), name='overview'), url(r'^overview/$', OverviewView.as_view(), name='overview'),
url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host'), url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
url(r'^delete_host/(?P<pk>\d+)/$', DeleteHostView.as_view(), name='delete_host'), url(r'^host/(?P<pk>\d+)/delete/$', DeleteHostView.as_view(), name='delete_host'),
url(r'^myip$', MyIpView), url(r'^myip$', MyIpView),
url(r'^updateip$', UpdateIpView), url(r'^updateip$', UpdateIpView),
url(r'^nic/update$', NicUpdateView), url(r'^nic/update$', NicUpdateView),

2
nsupdate/nsupdate/settings.py
View File

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