diff --git a/2017.pycon-au.org.conf b/2017.pycon-au.org.conf index c7ebfd542502120bb234d6a6acec842ac1fab62d..f3240105eae8292e6cd9195d28bb1c0811599803 100644 --- a/2017.pycon-au.org.conf +++ b/2017.pycon-au.org.conf @@ -1,40 +1,40 @@ -WSGIPythonPath /srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages +WSGIPythonPath /srv/http/2017.pycon-au.org/symposion/website:/srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages ServerAdmin webmaster@pycon-au.org - ServerName uat2017.pycon-au.org - ServerAlias uat2017.pycon-au.org + ServerName 2017.pycon-au.org + ServerAlias 2017.pycon-au.org - Alias /favicon.ico /srv/http/uat.2017.pycon-au.org/symposion/website/static/dist/pyconau2017/images/favicon.ico - Alias /site_media/static/pyconau2017/ /srv/http/uat.2017.pycon-au.org/symposion/website/static/dist/pyconau2017/ + Alias /favicon.ico /srv/http/2017.pycon-au.org/symposion/website/static/dist/pyconau2017/images/favicon.ico + Alias /site_media/static/pyconau2017/ /srv/http/2017.pycon-au.org/symposion/website/static/dist/pyconau2017/ - Alias /site_media/static/admin/ /srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages/django/contrib/admin/static/admin/ - Alias /site_media/static/wagtailadmin/ /srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages/wagtail/wagtailadmin/static/wagtailadmin/ + Alias /site_media/static/admin/ /srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages/django/contrib/admin/static/admin/ + Alias /site_media/static/wagtailadmin/ /srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages/wagtail/wagtailadmin/static/wagtailadmin/ - + Order allow,deny Allow from all # Require all granted - WSGIDaemonProcess uat2017.pycon-au.org python-path="/srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages" home=/srv/http/uat.2017.pycon-au.org/symposion/website user=nicks group=www-data - WSGIProcessGroup uat2017.pycon-au.org + WSGIDaemonProcess 2017.pycon-au.org python-path="/srv/http/2017.pycon-au.org/symposion/website:/srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages" home=/srv/http/2017.pycon-au.org/symposion/website user=nicks group=www-data + WSGIProcessGroup 2017.pycon-au.org - + Order allow,deny Allow from all # Require all granted - WSGIScriptAlias / /srv/http/uat.2017.pycon-au.org/symposion/website/pinaxcon/wsgi.py + WSGIScriptAlias / /srv/http/2017.pycon-au.org/symposion/website/pinaxcon/wsgi.py - ErrorLog /srv/http/uat.2017.pycon-au.org/log/error.log + ErrorLog /srv/http/2017.pycon-au.org/log/error.log # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. LogLevel debug - CustomLog /srv/http/uat.2017.pycon-au.org/log/access.log combined + CustomLog /srv/http/2017.pycon-au.org/log/access.log combined ServerSignature On diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 603154e310a0ddf6943d233861c8b29a848042d0..9c8e2c09ca2f34c4603ffdc7013e50f8d7282abc 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -6,7 +6,7 @@ PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) BASE_DIR = PACKAGE_ROOT -DEBUG = bool(int(os.environ.get("DEBUG", "1"))) +DEBUG = False #bool(int(os.environ.get("DEBUG", "1"))) DATABASES = { "default": { @@ -22,7 +22,7 @@ CACHES = { } -ALLOWED_HOSTS = ['uat2017.pycon-au.org'] +ALLOWED_HOSTS = ['2017.pycon-au.org', 'zookeepr1.linux.org.au'] # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 85a818ca4217ce9a2fd418dd9d6d57bce24726e2..95b94852e2342e8f9fefb82c9f876f0d75371a79 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -15,39 +15,41 @@ import symposion.views urlpatterns = [ + # matches homepage until we bring the CMS on-line. url(r"^$", TemplateView.as_view(template_name="pyconau2017-homepage.html"), name="home"), - url(r"^admin/", include(admin.site.urls)), - url(r"^account/", include("account.urls")), + # url(r"^admin/", include(admin.site.urls)), - url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), + # url(r"^account/", include("account.urls")), - url(r"^speaker/", include("symposion.speakers.urls")), - url(r"^proposals/", include("symposion.proposals.urls")), - #url(r"^sponsors/", include("symposion.sponsorship.urls")), - url(r"^reviews/", include("symposion.reviews.urls")), - url(r"^schedule/", include("symposion.schedule.urls")), + # url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), - url(r"^teams/", include("symposion.teams.urls")), + # url(r"^speaker/", include("symposion.speakers.urls")), + # url(r"^proposals/", include("symposion.proposals.urls")), + ## url(r"^sponsors/", include("symposion.sponsorship.urls")), + # url(r"^reviews/", include("symposion.reviews.urls")), + # url(r"^schedule/", include("symposion.schedule.urls")), - url(r"^boxes/", include("pinax.boxes.urls")), + # url(r"^teams/", include("symposion.teams.urls")), - url(r'^cms/', include(wagtailadmin_urls)), + # url(r"^boxes/", include("pinax.boxes.urls")), + + # url(r'^cms/', include(wagtailadmin_urls)), # Required by registrasion - url(r'^tickets/payments/', include('registripe.urls')), - url(r'^tickets/', include('registrasion.urls')), - url(r'^nested_admin/', include('nested_admin.urls')), + # url(r'^tickets/payments/', include('registripe.urls')), + # url(r'^tickets/', include('registrasion.urls')), + # url(r'^nested_admin/', include('nested_admin.urls')), # Wiki - url(r'^notifications/', get_nyt_pattern()), - url(r'^wiki/', get_wiki_pattern()), + # url(r'^notifications/', get_nyt_pattern()), + # url(r'^wiki/', get_wiki_pattern()), # Default catch-all for wagtail pages. - url(r'^', include(wagtail_urls)), + # url(r'^', include(wagtail_urls)), # 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 # url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),