From 35226c352d56643befb2aaf57e6bc0cd8d3a41fc Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 15 Dec 2012 08:42:12 -0500 Subject: [PATCH] Enable postgres on prod server. (imported from commit 4cf25c4ffe685dcfeb8d6c87ade3fcca7a92a807) --- humbug/settings.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/humbug/settings.py b/humbug/settings.py index 26f05e758e..08d6b75b56 100644 --- a/humbug/settings.py +++ b/humbug/settings.py @@ -32,7 +32,7 @@ DATABASES = { }, } -if STAGING_DEPLOYED or platform.node() == 'postgres.humbughq.com': +if DEPLOYED: DATABASES["default"] = { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'humbug', @@ -56,13 +56,6 @@ if STAGING_DEPLOYED or platform.node() == 'postgres.humbughq.com': 'sslmode': 'verify-ca', }, } -elif DEPLOYED: - DATABASES['default'] = { - 'ENGINE': 'django.db.backends.mysql', - 'OPTIONS': { - 'read_default_file': '/etc/mysql/my.cnf', - }, - } elif False: DATABASES["default"] = { 'ENGINE': 'django.db.backends.postgresql_psycopg2',