Skip to content

Commit

Permalink
Updating setting templates to reflect new features and installed apps.
Browse files Browse the repository at this point in the history
  • Loading branch information
jay7958 committed Dec 21, 2015
1 parent 65d4d6b commit 5eef208
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
11 changes: 8 additions & 3 deletions ansible/roles/webserver/templates/settings.j2
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ BOWER_INSTALLED_APPS = (
'startbootstrap-sb-admin-2',
'fullcalendar',
'jquery-cookie',
'jquery.tablesorter',
'jquery-ui',
'jquery-highlight',
# directly from github since no bower comp available
'https://github.com/jumjum123/JUMFlot.git',
'https://github.com/markrcote/flot-axislabels.git',
'chosen',
'chosen-bootstrap',
'bootswatch-dist#readable',
)

# Make this unique, and don't share it with anybody.
Expand Down Expand Up @@ -155,10 +155,13 @@ ROOT_URLCONF = 'dojo.urls'
LOGIN_URL = '/login'
LOGIN_EXEMPT_URLS = (
r'^static/',
r'^metrics/all$'
r'^metrics/all$',
r'^metrics$',
r'^metrics/product/type/(?P<mtype>\d+)$',
r'^metrics/simple$',
r'^api/v1/',
r'^ajax/v1/',
r'^reports/cover$',
)

# Python dotted path to the WSGI application used by Django's runserver.
Expand All @@ -178,12 +181,13 @@ INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'polymorphic', # provides admin templates
'overextends',
'django.contrib.admin',
'django.contrib.humanize',
'gunicorn',
'tastypie',
'djangobower',
'easy_pdf',
'auditlog',
'dojo',
'tastypie_swagger',
Expand All @@ -210,6 +214,7 @@ CELERY_SEND_TASK_ERROR_EMAILS = True
CELERY_IGNORE_RESULT = True
CELERY_TIMEZONE = TIME_ZONE
CELERY_TASK_RESULT_EXPIRES = 86400
CELERYBEAT_SCHEDULE_FILENAME = DOJO_ROOT + '/dojo.celery.beat.db'

# wkhtmltopdf settings
WKHTMLTOPDF_PATH = '/usr/local/bin/wkhtmltopdf'
Expand Down
7 changes: 5 additions & 2 deletions dojo/settings.dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@
'startbootstrap-sb-admin-2',
'fullcalendar',
'jquery-cookie',
'jquery.tablesorter',
'jquery-ui',
'jquery-highlight',
# directly from github since no bower comp available
'https://github.com/jumjum123/JUMFlot.git',
'https://github.com/markrcote/flot-axislabels.git',
'chosen',
'chosen-bootstrap',
'bootswatch-dist#readable',
)

# Make this unique, and don't share it with anybody.
Expand Down Expand Up @@ -155,11 +155,12 @@
LOGIN_URL = '/login'
LOGIN_EXEMPT_URLS = (
r'^static/',
r'^metrics/all$'
r'^metrics/all$',
r'^metrics$',
r'^metrics/product/type/(?P<mtype>\d+)$',
r'^metrics/simple$',
r'^api/v1/',
r'^ajax/v1/',
r'^reports/cover$',
)

Expand All @@ -180,6 +181,8 @@
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'polymorphic', # provides admin templates
'overextends',
'django.contrib.admin',
'django.contrib.humanize',
'gunicorn',
Expand Down

0 comments on commit 5eef208

Please sign in to comment.