From 5eef208b8509f1ef700463b2cf4268d830b4fb8a Mon Sep 17 00:00:00 2001
From: jay7958 <jay.paz@rackspace.com>
Date: Mon, 21 Dec 2015 14:14:43 -0600
Subject: [PATCH] Updating setting templates to reflect new features and
 installed apps.

---
 ansible/roles/webserver/templates/settings.j2 | 11 ++++++++---
 dojo/settings.dist.py                         |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/webserver/templates/settings.j2 b/ansible/roles/webserver/templates/settings.j2
index 791a79fc339..97d0e7666a5 100644
--- a/ansible/roles/webserver/templates/settings.j2
+++ b/ansible/roles/webserver/templates/settings.j2
@@ -111,7 +111,6 @@ BOWER_INSTALLED_APPS = (
     'startbootstrap-sb-admin-2',
     'fullcalendar',
     'jquery-cookie',
-    'jquery.tablesorter',
     'jquery-ui',
     'jquery-highlight',
     # directly from github since no bower comp available
@@ -119,6 +118,7 @@ BOWER_INSTALLED_APPS = (
     'https://github.com/markrcote/flot-axislabels.git',
     'chosen',
     'chosen-bootstrap',
+    'bootswatch-dist#readable',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -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.
@@ -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',
@@ -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'
diff --git a/dojo/settings.dist.py b/dojo/settings.dist.py
index 0ebac4f05c7..5c5b675b093 100755
--- a/dojo/settings.dist.py
+++ b/dojo/settings.dist.py
@@ -111,7 +111,6 @@
     'startbootstrap-sb-admin-2',
     'fullcalendar',
     'jquery-cookie',
-    'jquery.tablesorter',
     'jquery-ui',
     'jquery-highlight',
     # directly from github since no bower comp available
@@ -119,6 +118,7 @@
     'https://github.com/markrcote/flot-axislabels.git',
     'chosen',
     'chosen-bootstrap',
+    'bootswatch-dist#readable',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -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$',
 )
 
@@ -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',