diff --git a/evenementiel/settings/common.py b/evenementiel/settings/common.py index 6519497..691730d 100644 --- a/evenementiel/settings/common.py +++ b/evenementiel/settings/common.py @@ -96,9 +96,9 @@ TEMPLATES = [ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.environ['DBNAME'], - 'USER': os.environ['DBUSER'], - 'PASSWORD': os.environ['DBPASSWD'], + 'NAME': DBNAME, + 'USER': DBUSER, + 'PASSWORD': DBPASSWD, 'PORT': 5432, 'HOST': 'localhost', } diff --git a/provisioning/bootstrap.sh b/provisioning/bootstrap.sh index 6483f30..2cbda4b 100644 --- a/provisioning/bootstrap.sh +++ b/provisioning/bootstrap.sh @@ -97,7 +97,6 @@ fill_template evenementiel/settings/secret.py # Run the usual django admin commands function venv_python { sudo -H -u vagrant DJANGO_SETTINGS_MODULE=$SETTINGS \ - DBUSER=$DBUSER DBNAME=$DBNAME DBPASSWD=$DBPASSWD \ ~vagrant/venv/bin/python \ $@ } @@ -112,18 +111,13 @@ venv_python manage.py migrate cat >> ~vagrant/.bashrc <