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 
Conflicts:
	nsupdate/main/views.py
This commit is contained in:
Arne Schauf 2013-09-28 16:56:53 +02:00
commit 9be82a5d01
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nsupdate/main/views.py
View File

@ -26,7 +26,9 @@ class OverviewView(TemplateView):
def MyIpView(request): def MyIpView(request):
return HttpResponse(json.dumps({'ip':request.META['REMOTE_ADDR']}), content_type="application/json") return HttpResponse(
json.dumps({'ip': request.META['REMOTE_ADDR']}),
content_type="application/json")
class UserProfileView(TemplateView): class UserProfileView(TemplateView):
@ -45,4 +47,3 @@ class PasswordChangeView(TemplateView):
context = super(PasswordChangeView, self).get_context_data(*args, **kwargs) context = super(PasswordChangeView, self).get_context_data(*args, **kwargs)
context['nav_change_password'] = True context['nav_change_password'] = True
return context return context

4
nsupdate/nsupdate/settings.py
View File

@ -22,8 +22,6 @@ DATABASES = {
} }
} }
SERVER = '85.10.192.104' # ns1.thinkmo.de (master / dynamic upd server for nsupdate.info) SERVER = '85.10.192.104' # ns1.thinkmo.de (master / dynamic upd server for nsupdate.info)
BASEDOMAIN = 'nsupdate.info' BASEDOMAIN = 'nsupdate.info'
@ -38,8 +36,6 @@ WWW_IPV6_IP = '2001:41d0:8:e00e::1'
#UPDATE_ALGO = dns.tsig.HMAC_SHA512 #UPDATE_ALGO = dns.tsig.HMAC_SHA512
UPDATE_KEY = 'YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYQ==' UPDATE_KEY = 'YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYQ=='
# Hosts/domain names that are valid for this site; required if DEBUG is False # Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
ALLOWED_HOSTS = ['nsupdate.info', 'www.nsupdate.info'] ALLOWED_HOSTS = ['nsupdate.info', 'www.nsupdate.info']