diff --git a/.env.sample b/.env.sample index 36fe1e4..f9f3e95 100644 --- a/.env.sample +++ b/.env.sample @@ -3,7 +3,6 @@ DEPLOY_ENV=local HOST=localhost DEBUG=True SECRET_KEY=7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp( -TG_BOT_TOKEN= DB_NAME=postgres DB_USER=postgres DB_PASSWD=postgres diff --git a/production_entrypoint.sh b/production_entrypoint.sh index b943776..c58bfac 100755 --- a/production_entrypoint.sh +++ b/production_entrypoint.sh @@ -4,9 +4,6 @@ if test -f "$SECRET_KEY_FILE"; then export SECRET_KEY=$(cat $SECRET_KEY_FILE) fi -if test -f "$TG_BOT_TOKEN_FILE"; then - export TG_BOT_TOKEN=$(cat $TG_BOT_TOKEN_FILE) -fi if test -f "$EMAIL_API_KEY_FILE"; then export EMAIL_API_KEY=$(cat $EMAIL_API_KEY_FILE) fi diff --git a/sikweb/settings.py b/sikweb/settings.py index aa87f7a..b7386cd 100644 --- a/sikweb/settings.py +++ b/sikweb/settings.py @@ -58,9 +58,6 @@ DEFAULT_EMAIL_FROM = "SIK" DEFAULT_EMAIL_FROM_ADDR = "noreply@sahkoinsinoorikilta.fi" ENABLE_AUTOMATIC_EMAILS = True -# Token for Telegram bot -TELEGRAM_BOT_TOKEN = os.getenv("TG_BOT_TOKEN", "") - # Database settings # Only uncomment if default settings in base.py are not ok diff --git a/stack-compose.yml b/stack-compose.yml index 01a960b..d90f298 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -32,20 +32,16 @@ services: - DB_PORT=5432 - DB_SSL=True - SECRET_KEY_FILE=/run/secrets/BACKEND_SECRET_KEY - - TG_BOT_TOKEN_FILE=/run/secrets/BACKEND_TG_BOT_TOKEN - DB_PASSWD_FILE=/run/secrets/BACKEND_DB_PASSWD - EMAIL_API_KEY_FILE=/run/secrets/BACKEND_EMAIL_API_KEY secrets: - BACKEND_SECRET_KEY - - BACKEND_TG_BOT_TOKEN - BACKEND_DB_PASSWD - BACKEND_EMAIL_API_KEY secrets: BACKEND_SECRET_KEY: external: true - BACKEND_TG_BOT_TOKEN: - external: true BACKEND_DB_PASSWD: external: true BACKEND_EMAIL_API_KEY: