A few mods to be able to use the runserver site for debugging. We'll back these out once the real
(via apache) site is up and running.
This commit is contained in:
parent
bd4b61003a
commit
1759a07630
5 changed files with 26 additions and 24 deletions
|
@ -6,7 +6,7 @@
|
||||||
"timezone": "US/Eastern",
|
"timezone": "US/Eastern",
|
||||||
"start_date": "2040-01-01",
|
"start_date": "2040-01-01",
|
||||||
"end_date": "2040-01-04",
|
"end_date": "2040-01-04",
|
||||||
"title": "PinaxCon"
|
"title": "PyconAU 2017"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"model": "sites.site",
|
"model": "sites.site",
|
||||||
"fields": {
|
"fields": {
|
||||||
"domain": "localhost:8000",
|
"domain": "localhost:8000",
|
||||||
"name": "PinaxCon"
|
"name": "PyconAU 2017"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
"model": "sites.site",
|
"model": "sites.site",
|
||||||
"fields": {
|
"fields": {
|
||||||
"domain": "conference.pinaxproject.com",
|
"domain": "conference.pinaxproject.com",
|
||||||
"name": "PinaxCon"
|
"name": "PyconAU 2017"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -66,11 +66,13 @@ MEDIA_URL = "/site_media/media/"
|
||||||
# Don"t put anything in this directory yourself; store your static files
|
# Don"t put anything in this directory yourself; store your static files
|
||||||
# in apps" "static/" subdirectories and in STATICFILES_DIRS.
|
# in apps" "static/" subdirectories and in STATICFILES_DIRS.
|
||||||
# Example: "/home/media/media.lawrence.com/static/"
|
# Example: "/home/media/media.lawrence.com/static/"
|
||||||
STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static")
|
#STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static")
|
||||||
|
STATIC_ROOT = os.path.join(PROJECT_ROOT, "static", "dist")
|
||||||
|
|
||||||
# URL prefix for static files.
|
# URL prefix for static files.
|
||||||
# Example: "http://media.lawrence.com/static/"
|
# Example: "http://media.lawrence.com/static/"
|
||||||
STATIC_URL = "/site_media/static/"
|
#STATIC_URL = "/site_media/static/"
|
||||||
|
STATIC_URL = "/static/dist/"
|
||||||
|
|
||||||
# Additional locations of static files
|
# Additional locations of static files
|
||||||
STATICFILES_DIRS = [
|
STATICFILES_DIRS = [
|
||||||
|
@ -249,7 +251,7 @@ LOGGING = {
|
||||||
'log_file':{
|
'log_file':{
|
||||||
'level': 'DEBUG',
|
'level': 'DEBUG',
|
||||||
'class': 'logging.handlers.RotatingFileHandler',
|
'class': 'logging.handlers.RotatingFileHandler',
|
||||||
'filename': os.path.join('/srv/http/uat.2017.pycon-au.org', 'log/django.log'),
|
'filename': os.path.join('/srv/http/2017.pycon-au.org', 'log/django.log'),
|
||||||
'maxBytes': '16777216', # 16megabytes
|
'maxBytes': '16777216', # 16megabytes
|
||||||
'formatter': 'verbose'
|
'formatter': 'verbose'
|
||||||
},
|
},
|
||||||
|
|
|
@ -18,38 +18,38 @@ urlpatterns = [
|
||||||
#url(r"^$", TemplateView.as_view(template_name="pyconau2017-homepage.html"), name="home"),
|
#url(r"^$", TemplateView.as_view(template_name="pyconau2017-homepage.html"), name="home"),
|
||||||
url(r"^admin/", include(admin.site.urls)),
|
url(r"^admin/", include(admin.site.urls)),
|
||||||
|
|
||||||
# url(r"^admin/", include(admin.site.urls)),
|
url(r"^admin/", include(admin.site.urls)),
|
||||||
|
|
||||||
# url(r"^account/", include("account.urls")),
|
url(r"^account/", include("account.urls")),
|
||||||
|
|
||||||
# url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
|
url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
|
||||||
|
|
||||||
# url(r"^speaker/", include("symposion.speakers.urls")),
|
url(r"^speaker/", include("symposion.speakers.urls")),
|
||||||
# url(r"^proposals/", include("symposion.proposals.urls")),
|
url(r"^proposals/", include("symposion.proposals.urls")),
|
||||||
## url(r"^sponsors/", include("symposion.sponsorship.urls")),
|
url(r"^sponsors/", include("symposion.sponsorship.urls")),
|
||||||
# url(r"^reviews/", include("symposion.reviews.urls")),
|
url(r"^reviews/", include("symposion.reviews.urls")),
|
||||||
# url(r"^schedule/", include("symposion.schedule.urls")),
|
url(r"^schedule/", include("symposion.schedule.urls")),
|
||||||
|
|
||||||
# url(r"^teams/", include("symposion.teams.urls")),
|
url(r"^teams/", include("symposion.teams.urls")),
|
||||||
|
|
||||||
# url(r"^boxes/", include("pinax.boxes.urls")),
|
url(r"^boxes/", include("pinax.boxes.urls")),
|
||||||
|
|
||||||
# url(r'^cms/', include(wagtailadmin_urls)),
|
url(r'^cms/', include(wagtailadmin_urls)),
|
||||||
|
|
||||||
# Required by registrasion
|
# Required by registrasion
|
||||||
# url(r'^tickets/payments/', include('registripe.urls')),
|
url(r'^tickets/payments/', include('registripe.urls')),
|
||||||
# url(r'^tickets/', include('registrasion.urls')),
|
url(r'^tickets/', include('registrasion.urls')),
|
||||||
# url(r'^nested_admin/', include('nested_admin.urls')),
|
url(r'^nested_admin/', include('nested_admin.urls')),
|
||||||
|
|
||||||
# Wiki
|
# Wiki
|
||||||
# url(r'^notifications/', get_nyt_pattern()),
|
url(r'^notifications/', get_nyt_pattern()),
|
||||||
# url(r'^wiki/', get_wiki_pattern()),
|
url(r'^wiki/', get_wiki_pattern()),
|
||||||
|
|
||||||
# Default catch-all for wagtail pages.
|
# Default catch-all for wagtail pages.
|
||||||
# url(r'^', include(wagtail_urls)),
|
url(r'^', include(wagtail_urls)),
|
||||||
|
|
||||||
# Matches *NOTHING* -- remove once site_tree is fixed
|
# Matches *NOTHING* -- remove once site_tree is fixed
|
||||||
# url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),
|
#url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),
|
||||||
|
|
||||||
# Demo payment gateway and related features
|
# Demo payment gateway and related features
|
||||||
# url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),
|
# url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),
|
||||||
|
|
BIN
static/src/pyconau2017/special-events-2017.pdf
Normal file
BIN
static/src/pyconau2017/special-events-2017.pdf
Normal file
Binary file not shown.
Loading…
Reference in a new issue