Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set up 'prod' branch and made appropriate changes thereto.

Browse source
This commit is contained in:
Nick Seidenman (N6) 2017-01-12 09:01:49 +11:00
parent 3100047760
commit a8e6a5b6d9
3 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
2017.pycon-au.org.conf
View file

@ -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
<VirtualHost 192.55.98.190:80> <VirtualHost 192.55.98.190:80>
ServerAdmin webmaster@pycon-au.org ServerAdmin webmaster@pycon-au.org
ServerName uat2017.pycon-au.org ServerName 2017.pycon-au.org
ServerAlias uat2017.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 /favicon.ico /srv/http/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 /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/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/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages/wagtail/wagtailadmin/static/wagtailadmin/ Alias /site_media/static/wagtailadmin/ /srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages/wagtail/wagtailadmin/static/wagtailadmin/
<Directory /srv/http/uat.2017.pycon-au.org/symposion/website/static/dist/pyconau2017> <Directory /srv/http/2017.pycon-au.org/symposion/website/static/dist/pyconau2017>
Order allow,deny Order allow,deny
Allow from all Allow from all
# Require all granted # Require all granted
</Directory> </Directory>
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 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 uat2017.pycon-au.org WSGIProcessGroup 2017.pycon-au.org
<Directory /srv/http/uat.2017.pycon-au.org/symposion/website> <Directory /srv/http/2017.pycon-au.org/symposion/website>
Order allow,deny Order allow,deny
Allow from all Allow from all
# Require all granted # Require all granted
</Directory> </Directory>
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, # Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg. # alert, emerg.
LogLevel debug 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 ServerSignature On
</VirtualHost> </VirtualHost>

4
pinaxcon/settings.py
View file

@ -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__)) PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
BASE_DIR = PACKAGE_ROOT BASE_DIR = PACKAGE_ROOT
DEBUG = bool(int(os.environ.get("DEBUG", "1"))) DEBUG = False #bool(int(os.environ.get("DEBUG", "1")))
DATABASES = { DATABASES = {
"default": { "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: # Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name

38
pinaxcon/urls.py
View file

@ -15,39 +15,41 @@ import symposion.views
urlpatterns = [ urlpatterns = [
# matches homepage until we bring the CMS on-line.
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"^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"^dashboard/", symposion.views.dashboard, name="dashboard"),
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"^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 # 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")),