aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--thatcomputerscientist/hosts.py1
-rw-r--r--thatcomputerscientist/settings.py2
-rw-r--r--thatcomputerscientist/urls.py1
3 files changed, 1 insertions, 3 deletions
diff --git a/thatcomputerscientist/hosts.py b/thatcomputerscientist/hosts.py
index 94254b43..9af2e6ec 100644
--- a/thatcomputerscientist/hosts.py
+++ b/thatcomputerscientist/hosts.py
@@ -6,5 +6,4 @@ host_patterns = patterns(
host(r'', settings.ROOT_URLCONF, name='default'),
host(r'www', settings.ROOT_URLCONF, name='www'),
host(r'solitude', 'solitude.urls', name='solitude'),
- host(r'solitude.shi.foo', 'solitude.urls', name='solitude'),
)
diff --git a/thatcomputerscientist/settings.py b/thatcomputerscientist/settings.py
index bbaa51e8..7b6289d2 100644
--- a/thatcomputerscientist/settings.py
+++ b/thatcomputerscientist/settings.py
@@ -41,7 +41,7 @@ CSRF_TRUSTED_ORIGINS = ['https://*.thatcomputerscientist.com', 'http://*.thatcom
SESSION_COOKIE_DOMAIN = None
DOMAIN_NAME = "shi.foo"
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-HOST_ROOTCONF = 'thatcomputerscientist.urls'
+ROOT_HOSTCONF = 'thatcomputerscientist.hosts'
ROOT_URLCONF = 'thatcomputerscientist.urls'
DEFAULT_HOST = 'default'
diff --git a/thatcomputerscientist/urls.py b/thatcomputerscientist/urls.py
index 1aa51f52..a2d9cdfd 100644
--- a/thatcomputerscientist/urls.py
+++ b/thatcomputerscientist/urls.py
@@ -40,7 +40,6 @@ urlpatterns = [
path('blog-admin', include('blog_admin.urls', namespace='blog-admin')),
path('repositories', include(('dev_status.urls', 'dev_status'), namespace='dev_status')),
path('ignis', include(('ignis.urls', 'ignis'), namespace='ignis')),
- path('@solitude', include(('solitude.urls', 'solitude'), namespace='solitude')),
path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'),
]