From 0ce04a64cbc6da1f2116c07247281ba8211e458c Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Mon, 4 Nov 2013 22:17:41 +0100
Subject: [PATCH] urls.py: cosmetic changes, added comments, reorder

---
 nsupdate/main/urls.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/nsupdate/main/urls.py b/nsupdate/main/urls.py
index 2a9a55a..c28807b 100644
--- a/nsupdate/main/urls.py
+++ b/nsupdate/main/urls.py
@@ -10,10 +10,10 @@ from ..api.views import (
 
 urlpatterns = patterns(
     '',
+    # interactive web ui
     url(r'^$', HomeView.as_view(), name="home"),
     url(r'^about/$', AboutView.as_view(), name="about"),
-    url(r'^legal/$',
-        TemplateView.as_view(template_name='main/legal.html'), name="legal"),
+    url(r'^legal/$', TemplateView.as_view(template_name='main/legal.html'), name="legal"),
     url(r'^screenshots/$', ScreenshotsView.as_view(), name="screenshots"),
     url(r'^overview/$', OverviewView.as_view(), name='overview'),
     url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
@@ -21,18 +21,17 @@ urlpatterns = patterns(
     url(r'^status/$', StatusView.as_view(), name='status'),
     url(r'^generate_secret/(?P<pk>\d+)/$', GenerateSecretView.as_view(), name='generate_secret_view'),
     url(r'^generate_ns_secret/(?P<pk>\d+)/$', GenerateNSSecretView.as_view(), name='generate_ns_secret_view'),
-    url(r'^host/(?P<pk>\d+)/delete/$',
-        DeleteHostView.as_view(), name='delete_host'),
-    url(r'^domain_overview/$',
-        DomainOverwievView.as_view(), name='domain_overview'),
-    url(r'^domain/(?P<pk>\d+)/delete/$',
-        DeleteDomainView.as_view(), name='delete_domain'),
-    url(r'^myip$', MyIpView),
-    url(r'^detectip/$', DetectIpView),
+    url(r'^host/(?P<pk>\d+)/delete/$', DeleteHostView.as_view(), name='delete_host'),
+    url(r'^domain_overview/$', DomainOverwievView.as_view(), name='domain_overview'),
+    url(r'^domain/(?P<pk>\d+)/delete/$', DeleteDomainView.as_view(), name='delete_domain'),
+    # internal use by the web ui
+    url(r'^detectip/$', DetectIpView),  # XXX for what is this used WITHOUT a secret?
     url(r'^detectip/(?P<secret>\w+)/$', DetectIpView),
     url(r'^ajax_get_ips/$', AjaxGetIps, name="ajax_get_ips"),
+    url(r'^nic/update_authorized$', AuthorizedNicUpdateView, name='nic_update_authorized'),
+    # api (for update clients)
+    url(r'^myip$', MyIpView),
     url(r'^nic/update$', NicUpdateView),
-    url(r'^nic/update_authorized$',
-        AuthorizedNicUpdateView, name='nic_update_authorized'),
+    # for bots
     url(r'^robots.txt$', RobotsTxtView),
 )