Skip to content

Commit 5eef208

Browse files
author
jay7958
committed
Updating setting templates to reflect new features and installed apps.
1 parent 65d4d6b commit 5eef208

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

ansible/roles/webserver/templates/settings.j2

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ BOWER_INSTALLED_APPS = (
111111
'startbootstrap-sb-admin-2',
112112
'fullcalendar',
113113
'jquery-cookie',
114-
'jquery.tablesorter',
115114
'jquery-ui',
116115
'jquery-highlight',
117116
# directly from github since no bower comp available
118117
'https://github.com/jumjum123/JUMFlot.git',
119118
'https://github.com/markrcote/flot-axislabels.git',
120119
'chosen',
121120
'chosen-bootstrap',
121+
'bootswatch-dist#readable',
122122
)
123123

124124
# Make this unique, and don't share it with anybody.
@@ -155,10 +155,13 @@ ROOT_URLCONF = 'dojo.urls'
155155
LOGIN_URL = '/login'
156156
LOGIN_EXEMPT_URLS = (
157157
r'^static/',
158-
r'^metrics/all$'
158+
r'^metrics/all$',
159159
r'^metrics$',
160160
r'^metrics/product/type/(?P<mtype>\d+)$',
161161
r'^metrics/simple$',
162+
r'^api/v1/',
163+
r'^ajax/v1/',
164+
r'^reports/cover$',
162165
)
163166

164167
# Python dotted path to the WSGI application used by Django's runserver.
@@ -178,12 +181,13 @@ INSTALLED_APPS = (
178181
'django.contrib.sites',
179182
'django.contrib.messages',
180183
'django.contrib.staticfiles',
184+
'polymorphic', # provides admin templates
185+
'overextends',
181186
'django.contrib.admin',
182187
'django.contrib.humanize',
183188
'gunicorn',
184189
'tastypie',
185190
'djangobower',
186-
'easy_pdf',
187191
'auditlog',
188192
'dojo',
189193
'tastypie_swagger',
@@ -210,6 +214,7 @@ CELERY_SEND_TASK_ERROR_EMAILS = True
210214
CELERY_IGNORE_RESULT = True
211215
CELERY_TIMEZONE = TIME_ZONE
212216
CELERY_TASK_RESULT_EXPIRES = 86400
217+
CELERYBEAT_SCHEDULE_FILENAME = DOJO_ROOT + '/dojo.celery.beat.db'
213218

214219
# wkhtmltopdf settings
215220
WKHTMLTOPDF_PATH = '/usr/local/bin/wkhtmltopdf'

dojo/settings.dist.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@
111111
'startbootstrap-sb-admin-2',
112112
'fullcalendar',
113113
'jquery-cookie',
114-
'jquery.tablesorter',
115114
'jquery-ui',
116115
'jquery-highlight',
117116
# directly from github since no bower comp available
118117
'https://github.com/jumjum123/JUMFlot.git',
119118
'https://github.com/markrcote/flot-axislabels.git',
120119
'chosen',
121120
'chosen-bootstrap',
121+
'bootswatch-dist#readable',
122122
)
123123

124124
# Make this unique, and don't share it with anybody.
@@ -155,11 +155,12 @@
155155
LOGIN_URL = '/login'
156156
LOGIN_EXEMPT_URLS = (
157157
r'^static/',
158-
r'^metrics/all$'
158+
r'^metrics/all$',
159159
r'^metrics$',
160160
r'^metrics/product/type/(?P<mtype>\d+)$',
161161
r'^metrics/simple$',
162162
r'^api/v1/',
163+
r'^ajax/v1/',
163164
r'^reports/cover$',
164165
)
165166

@@ -180,6 +181,8 @@
180181
'django.contrib.sites',
181182
'django.contrib.messages',
182183
'django.contrib.staticfiles',
184+
'polymorphic', # provides admin templates
185+
'overextends',
183186
'django.contrib.admin',
184187
'django.contrib.humanize',
185188
'gunicorn',

0 commit comments

Comments
 (0)