summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
Diffstat (limited to 'project')
-rw-r--r--project/development.py4
-rw-r--r--project/production.py4
-rw-r--r--project/urls.py8
3 files changed, 12 insertions, 4 deletions
diff --git a/project/development.py b/project/development.py
index e6aad51..df95ac1 100644
--- a/project/development.py
+++ b/project/development.py
@@ -4,7 +4,7 @@ from project.settings import *
DEBUG=True
TEMPLATE_DEBUG=DEBUG
-SITE_ID = 1
+SITE_ID = 2
INSTALLED_APPS = (
'django.contrib.auth',
@@ -15,6 +15,7 @@ INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.flatpages',
'django.contrib.markup',
+ 'django.contrib.sitemaps',
'project.scipycon',
'project.scipycon.base',
'project.scipycon.proceedings',
@@ -22,6 +23,7 @@ INSTALLED_APPS = (
'project.scipycon.user',
'project.scipycon.talk',
'tagging',
+ 'robots',
)
DATABASE_ENGINE = 'sqlite3'
diff --git a/project/production.py b/project/production.py
index b809fcf..c7b55c7 100644
--- a/project/production.py
+++ b/project/production.py
@@ -3,7 +3,7 @@ from project.settings import *
DEBUG=False
TEMPLATE_DEBUG=DEBUG
-SITE_ID = 1
+SITE_ID = 3
INSTALLED_APPS = (
'django.contrib.auth',
@@ -14,6 +14,7 @@ INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.flatpages',
'django.contrib.markup',
+ 'django.contrib.sitemaps',
'project.scipycon',
'project.scipycon.base',
'project.scipycon.proceedings',
@@ -21,6 +22,7 @@ INSTALLED_APPS = (
'project.scipycon.talk',
'project.scipycon.user',
'tagging',
+ 'robots',
)
DATABASE_ENGINE = 'mysql'
diff --git a/project/urls.py b/project/urls.py
index d7d34f5..f04ffa8 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -14,11 +14,15 @@ EVENT_PATTERN_CORE =r'(?:[0-9a-z]|_[0-9a-z])*'
SCOPE_ARG_PATTERN = r'(?P<scope>%s/%s)' % (
PROGRAM_PATTERN_CORE, EVENT_PATTERN_CORE)
+sitemaps = {}
+
# Admin
urlpatterns = patterns('',
- url(r'^$', redirect_to, {'url': '/%s/' % (settings.CURRENT_SCOPE)}),
- (r'^comments/', include('django.contrib.comments.urls')),
(r'^admin/(.*)', admin.site.root),
+ (r'^comments/', include('django.contrib.comments.urls')),
+ (r'^robots\.txt$', include('robots.urls')),
+ (r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
+ url(r'^$', redirect_to, {'url': '/%s/' % (settings.CURRENT_SCOPE)}),
url(r'^%s/$' % (SCOPE_ARG_PATTERN),
direct_to_template, {"template": "home.html"}, name='home'),
)