From 2d85768527870e8c083656b9710f3e7c5b2be36f Mon Sep 17 00:00:00 2001 From: aluvare Date: Tue, 26 Jan 2021 18:35:22 +0100 Subject: [PATCH 1/2] email config in env --- config.py | 18 +++++++++--------- start.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/config.py b/config.py index 1e0530c..9711b3f 100644 --- a/config.py +++ b/config.py @@ -24,15 +24,15 @@ } } -#DEFAULT_FROM_EMAIL = "john@doe.com" -#CHANGE_NOTIFICATIONS_MIN_INTERVAL = 300 #seconds -#EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -#EMAIL_USE_TLS = False -#EMAIL_USE_SSL = False # You cannot use both (TLS and SSL) at the same time! -#EMAIL_HOST = 'localhost' -#EMAIL_PORT = 25 -#EMAIL_HOST_USER = 'user' -#EMAIL_HOST_PASSWORD = 'password' +DEFAULT_FROM_EMAIL = "$DEFAULT_FROM_EMAIL" +CHANGE_NOTIFICATIONS_MIN_INTERVAL = $CHANGE_NOTIFICATIONS_MIN_INTERVAL #seconds +EMAIL_BACKEND = '$EMAIL_BACKEND' +EMAIL_USE_TLS = $EMAIL_USE_TLS +EMAIL_USE_SSL = $EMAIL_USE_SSL # You cannot use both (TLS and SSL) at the same time! +EMAIL_HOST = '$EMAIL_HOST' +EMAIL_PORT = $EMAIL_PORT +EMAIL_HOST_USER = '$EMAIL_HOST_USER' +EMAIL_HOST_PASSWORD = '$EMAIL_HOST_PASSWORD' EVENTS_PUSH_BACKEND = "taiga.events.backends.rabbitmq.EventsPushBackend" EVENTS_PUSH_BACKEND_OPTIONS = {"url": "amqp://$RABBIT_USER:$RABBIT_PASSWORD@$RABBIT_HOST:$RABBIT_PORT/$RABBIT_VHOST"} diff --git a/start.sh b/start.sh index cb4039b..2f4ec14 100755 --- a/start.sh +++ b/start.sh @@ -31,6 +31,52 @@ if [ ! -f $INITIAL_SETUP_LOCK ]; then -e 's/$RABBIT_PASSWORD/'$RABBIT_PASSWORD_ESCAPED'/' \ -e 's/$RABBIT_VHOST/'$RABBIT_VHOST'/' \ -i /tmp/taiga-conf/config.py + + if [ "$DEFAULT_FROM_EMAIL" ];then + sed -e 's/$DEFAULT_FROM_EMAIL/'$DEFAULT_FROM_EMAIL'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$CHANGE_NOTIFICATIONS_MIN_INTERVAL" ];then + sed -e 's/$CHANGE_NOTIFICATIONS_MIN_INTERVAL/'$CHANGE_NOTIFICATIONS_MIN_INTERVAL'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_BACKEND" ];then + sed -e 's/$EMAIL_BACKEND/'$EMAIL_BACKEND'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_USE_TLS" ];then + sed -e 's/$EMAIL_USE_TLS/'$EMAIL_USE_TLS'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_USE_SSL" ];then + sed -e 's/$EMAIL_USE_SSL/'$EMAIL_USE_SSL'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_HOST" ];then + sed -e 's/$EMAIL_HOST/'$EMAIL_HOST'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_PORT" ];then + sed -e 's/$EMAIL_PORT/'$EMAIL_PORT'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_HOST_USER" ];then + sed -e 's/$EMAIL_HOST_USER/'$EMAIL_HOST_USER'/ + -i /tmp/taiga-conf/config.py + fi + + if [ "$EMAIL_HOST_PASSWORD" ];then + sed -e 's/$EMAIL_HOST_PASSWORD/'$EMAIL_HOST_PASSWORD'/ + -i /tmp/taiga-conf/config.py + fi + cp /tmp/taiga-conf/config.py /taiga-conf/ ln -sf /taiga-conf/config.py /srv/taiga/back/settings/local.py From fdc0852ca80c141cbc6b6a8dd6572bba797e8e64 Mon Sep 17 00:00:00 2001 From: aluvare Date: Tue, 26 Jan 2021 18:40:38 +0100 Subject: [PATCH 2/2] email config in env --- start.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/start.sh b/start.sh index 2f4ec14..10b6cb8 100755 --- a/start.sh +++ b/start.sh @@ -38,42 +38,42 @@ if [ ! -f $INITIAL_SETUP_LOCK ]; then fi if [ "$CHANGE_NOTIFICATIONS_MIN_INTERVAL" ];then - sed -e 's/$CHANGE_NOTIFICATIONS_MIN_INTERVAL/'$CHANGE_NOTIFICATIONS_MIN_INTERVAL'/ + sed -e 's/$CHANGE_NOTIFICATIONS_MIN_INTERVAL/'$CHANGE_NOTIFICATIONS_MIN_INTERVAL'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_BACKEND" ];then - sed -e 's/$EMAIL_BACKEND/'$EMAIL_BACKEND'/ + sed -e 's/$EMAIL_BACKEND/'$EMAIL_BACKEND'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_USE_TLS" ];then - sed -e 's/$EMAIL_USE_TLS/'$EMAIL_USE_TLS'/ + sed -e 's/$EMAIL_USE_TLS/'$EMAIL_USE_TLS'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_USE_SSL" ];then - sed -e 's/$EMAIL_USE_SSL/'$EMAIL_USE_SSL'/ + sed -e 's/$EMAIL_USE_SSL/'$EMAIL_USE_SSL'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_HOST" ];then - sed -e 's/$EMAIL_HOST/'$EMAIL_HOST'/ + sed -e 's/$EMAIL_HOST/'$EMAIL_HOST'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_PORT" ];then - sed -e 's/$EMAIL_PORT/'$EMAIL_PORT'/ + sed -e 's/$EMAIL_PORT/'$EMAIL_PORT'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_HOST_USER" ];then - sed -e 's/$EMAIL_HOST_USER/'$EMAIL_HOST_USER'/ + sed -e 's/$EMAIL_HOST_USER/'$EMAIL_HOST_USER'/' \ -i /tmp/taiga-conf/config.py fi if [ "$EMAIL_HOST_PASSWORD" ];then - sed -e 's/$EMAIL_HOST_PASSWORD/'$EMAIL_HOST_PASSWORD'/ + sed -e 's/$EMAIL_HOST_PASSWORD/'$EMAIL_HOST_PASSWORD'/' \ -i /tmp/taiga-conf/config.py fi