Skip to content

Commit

Permalink
change DB connection
Browse files Browse the repository at this point in the history
  • Loading branch information
fjmora committed Dec 23, 2015
1 parent 885a1b3 commit acb9880
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions Thermomix1/Thermomix1/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,28 @@

MANAGERS = ADMINS

# DATABASES = {
# 'default': {
# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
# 'NAME': 'thermomix1',
# 'USER': 'postgres',
# 'PASSWORD': 'master',
# 'HOST': 'localhost',
# 'PORT': '',
# }
# }

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'thermomix1',
'USER': 'postgres',
'PASSWORD': 'master',
'HOST': 'localhost',
'NAME': 'project',
'USER': 'admin1kkvai9',
'PASSWORD': '1AZau2YNI3dx',
'HOST': 'postgresql://$OPENSHIFT_POSTGRESQL_DB_HOST:$OPENSHIFT_POSTGRESQL_DB_PORT',
'PORT': '',
}
}

# Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
ALLOWED_HOSTS = '*'
Expand Down Expand Up @@ -143,7 +155,7 @@

'base',
'recipes',
'shopping'
#'shopping'
)

DATE_FORMAT = 'Y-m-d'
Expand Down

0 comments on commit acb9880

Please sign in to comment.