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

Conflicts:
	nsupdate/main/views.py

nsupdate/main/views.py

@@ -26,7 +26,9 @@ class OverviewView(TemplateView):
 
 
 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):
@@ -45,4 +47,3 @@ class PasswordChangeView(TemplateView):
         context = super(PasswordChangeView, self).get_context_data(*args, **kwargs)
         context['nav_change_password'] = True
         return context
-

nsupdate/nsupdate/settings.py

@@ -22,8 +22,6 @@ DATABASES = {
     }
 }
 
-
-
 SERVER = '85.10.192.104'  # ns1.thinkmo.de (master / dynamic upd server for nsupdate.info)
 BASEDOMAIN = 'nsupdate.info'
 
@@ -38,8 +36,6 @@ WWW_IPV6_IP = '2001:41d0:8:e00e::1'
 #UPDATE_ALGO = dns.tsig.HMAC_SHA512
 UPDATE_KEY = 'YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYQ=='
 
-
-
 # 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
 ALLOWED_HOSTS = ['nsupdate.info', 'www.nsupdate.info']