Remove nested URLconfs.

8 files changed, 7 insertions, 60 deletions

diff --git a/pysite/hosts.py b/pysite/hosts.py
index bb261dee..03fb610b 100644
--- a/pysite/hosts.py
+++ b/pysite/hosts.py
@@ -2,14 +2,12 @@ from django.conf import settings
 from django_hosts import host, patterns
 
 host_patterns = patterns(
-    "pysite.urls",
-
+    ''
     # > | Subdomain | URL Module   | Host entry name |
-    host(r"admin",    "admin",  name="admin"),
-    host(r"api",      "api",    name="api"),
-    host(r"staff",    "staff",  name="staff"),
-    host(r"wiki",     "wiki",   name="wiki"),
-    host(r"ws",       "ws",     name="ws"),
-
-    host(r".*",       "main",   name=settings.DEFAULT_HOST)
+    #host(r"admin",    "admin",  name="admin"),
+    #host(r"api",      "api",    name="api"),
+    #host(r"staff",    "staff",  name="staff"),
+    #host(r"wiki",     "wiki",   name="wiki"),
+    #host(r"ws",       "ws",     name="ws"),
+    host(r'.*',       'home.urls',   name=settings.DEFAULT_HOST)
 )
diff --git a/pysite/urls/__init__.py b/pysite/urls/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/pysite/urls/__init__.py
+++ /dev/null
diff --git a/pysite/urls/admin.py b/pysite/urls/admin.py
deleted file mode 100644
index dfc73621..00000000
--- a/pysite/urls/admin.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]
diff --git a/pysite/urls/api.py b/pysite/urls/api.py
deleted file mode 100644
index dfc73621..00000000
--- a/pysite/urls/api.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]
diff --git a/pysite/urls/main.py b/pysite/urls/main.py
deleted file mode 100644
index 90453f65..00000000
--- a/pysite/urls/main.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""pydis_django URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/2.1/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]
diff --git a/pysite/urls/staff.py b/pysite/urls/staff.py
deleted file mode 100644
index dfc73621..00000000
--- a/pysite/urls/staff.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]
diff --git a/pysite/urls/wiki.py b/pysite/urls/wiki.py
deleted file mode 100644
index dfc73621..00000000
--- a/pysite/urls/wiki.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]
diff --git a/pysite/urls/ws.py b/pysite/urls/ws.py
deleted file mode 100644
index dfc73621..00000000
--- a/pysite/urls/ws.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]