Permalink
Browse files

updated settings to have new multi-vm puppet env support

  • Loading branch information...
1 parent 839365b commit d7d6407ce3cbebac15c8667e794087323a708cb4 @ehazlett ehazlett committed Jul 25, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 server_local_settings.template.py
  2. +1 −1 unisubs_settings.py
@@ -16,7 +16,7 @@
# along with this program. If not, see
# http://www.gnu.org/licenses/agpl-3.0.html.
-DEV, STAGING, PRODUCTION = range(1, 4)
+DEV, STAGING, PRODUCTION, LOCAL = range(1, 5)
INSTALLATION = INSERT_INSTALLATION_HERE # one of DEV, STAGING, PRODUCTION
@@ -75,7 +75,7 @@
TWITTER_CONSUMER_KEY = 'INSERT TWITTER CONSUMER KEY'
TWITTER_CONSUMER_SECRET = 'INSERT TWITTER CONSUMER SECRET'
-if INSTALLATION == STAGING or INSTALLATION == PRODUCTION:
+if INSTALLATION == STAGING or INSTALLATION == PRODUCTION or INSTALLATION == LOCAL:
uslogging_db = {
'uslogging': {
'ENGINE': 'django.db.backends.mysql',
View
@@ -62,7 +62,7 @@
# only send actual email on the production server
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
-if INSTALLATION == STAGING or INSTALLATION == PRODUCTION:
+if INSTALLATION == STAGING or INSTALLATION == PRODUCTION or INSTALLATION == LOCAL:
DATABASE_ROUTERS = ['routers.UnisubsRouter']
AWS_STORAGE_BUCKET_NAME = DEFAULT_BUCKET
COMPRESS_STORAGE = 'storages.backends.s3boto.S3BotoStorage'

0 comments on commit d7d6407

Please sign in to comment.