diff --git a/config/settings/vm/base.py b/config/settings/vm/base.py index b782d8b094f1286b85f073f212d959cf6a02b7ed..83a66e850c4c99ec6ebab30a01d08afffb23ff6f 100644 --- a/config/settings/vm/base.py +++ b/config/settings/vm/base.py @@ -7,25 +7,10 @@ from ..secret import * import socket # Nested dict of settings for all databases -# Original mysql database -#DATABASES = { -# 'default' : { -# 'NAME': 'gracedb', -# 'ENGINE': 'django.db.backends.mysql', -# 'USER': 'gracedb', -# 'PASSWORD': DB_PASSWORD, -# 'OPTIONS': { -# 'init_command': 'SET storage_engine=MyISAM', -# }, -# } -#} - -# New postgresql database DATABASES = { 'default' : { 'NAME': 'gracedb', 'ENGINE': 'django.db.backends.postgresql_psycopg2', - #ENGINE': 'django.db.backends.postgresql', 'USER': 'gracedb', 'PASSWORD': DB_PASSWORD, 'HOST':'127.0.0.1', @@ -34,28 +19,6 @@ DATABASES = { }, } -# option to have both databases connected at the same time. Use with care. -#DATABASES = { -# 'default' : { -# 'NAME': 'gracedb', -# 'ENGINE': 'django.db.backends.mysql', -# 'USER': 'gracedb', -# 'PASSWORD': DB_PASSWORD, -# 'OPTIONS': { -# 'init_command': 'SET storage_engine=MyISAM', -# }, -# }, -# 'pgsql' : { -# 'NAME': 'gracedb', -# 'ENGINE': 'django.db.backends.postgresql_psycopg2', -# 'USER': 'gracedb', -# 'PASSWORD': 'ligo150914', -# 'HOST':'127.0.0.1', -# 'PORT':'5432', -# } -#} - - # Set up allowed hosts SERVER_FQDN = socket.getfqdn() SERVER_HOSTNAME = INTERNAL_HOSTNAME