diff --git a/production_entrypoint.sh b/production_entrypoint.sh index 4676b15..5baf141 100755 --- a/production_entrypoint.sh +++ b/production_entrypoint.sh @@ -4,7 +4,6 @@ export SECRET_KEY=$(cat $SECRET_KEY_FILE) export TG_BOT_TOKEN=$(cat $TG_BOT_TOKEN_FILE) export EMAIL_PASSWD=$(cat $EMAIL_PASSWD_FILE) -export DB_NAME=$(cat $DB_NAME_FILE) export DB_USER=$(cat $DB_USER_FILE) export DB_PASSWD=$(cat $DB_PASSWD_FILE) diff --git a/sikweb/settings-sample-prod.py b/sikweb/settings-sample-prod.py index 6920a2d..9715b86 100644 --- a/sikweb/settings-sample-prod.py +++ b/sikweb/settings-sample-prod.py @@ -41,7 +41,7 @@ TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN') DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': os.getenv('DB_NAME', ''), + 'NAME': os.getenv('DB_USER', ''), 'USER': os.getenv('DB_USER', ''), 'PASSWORD': os.getenv('DB_PASSWD', ''), 'HOST': os.getenv('DB_HOST', '127.0.0.1'), diff --git a/stack-compose.yml b/stack-compose.yml index 34238ce..9f0a2fe 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -5,11 +5,9 @@ services: environment: - POSTGRES_USER_FILE=/run/secrets/DJANGO_DB_USER - POSTGRES_PASSWORD_FILE=/run/secrets/DJANGO_DB_PASSWD - - POSTGRES_DB_FILE=/run/secrets/DJANGO_DB_NAME ports: - 5432:5432 secrets: - - DJANGO_DB_NAME - DJANGO_DB_USER - DJANGO_DB_PASSWD @@ -21,7 +19,6 @@ services: - SECRET_KEY_FILE=/run/secrets/DJANGO_SECRET_KEY - TG_BOT_TOKEN_FILE=/run/secrets/DJANGO_TG_BOT_TOKEN - EMAIL_PASSWD_FILE=/run/secrets/DJANGO_EMAIL_PASSWD - - DB_NAME_FILE=/run/secrets/DJANGO_DB_NAME - DB_USER_FILE=/run/secrets/DJANGO_DB_USER - DB_PASSWD_FILE=/run/secrets/DJANGO_DB_PASSWD - DB_HOST=db @@ -31,7 +28,6 @@ services: - DJANGO_SECRET_KEY - DJANGO_TG_BOT_TOKEN - DJANGO_EMAIL_PASSWD - - DJANGO_DB_NAME - DJANGO_DB_USER - DJANGO_DB_PASSWD secrets: