From 17ece2d1b5259e04b5043431dcdfce254b3ab25f Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 27 Mar 2020 18:40:10 +0100 Subject: [PATCH] Setup SMTP mailing --- ansible/pre-deploy.yml | 5 +++++ ansible/vars/all.yml | 5 +++++ ansible/vars/smtp_passwd.yml | 8 ++++++++ sbin/entrypoint.sh | 6 ++++++ 4 files changed, 24 insertions(+) create mode 100644 ansible/vars/smtp_passwd.yml diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml index c781387..57d4dad 100644 --- a/ansible/pre-deploy.yml +++ b/ansible/pre-deploy.yml @@ -99,8 +99,13 @@ HTTP_PORT: "{{ http_port }}" INSTALL_LOCK: "{{ install_lock }}" JWT_SECRET: "{{ jwt_secret }}" + MAILER_ENABLED: "{{ mailer_enabled }}" RUN_MODE: "prod" SECRET_KEY: "{{ secret_key}}" + SMTP_FROM: "{{ smtp_from }}" + SMTP_HOST: "{{ smtp_host }}" + SMTP_TLS_ENABLED: "{{ smtp_tls_enabled }}" + SMTP_USER: "{{ smtp_user }}" SSH_DOMAIN: "{{ ssh_domain }}" SSH_LISTEN_PORT: "{{ ssh_listen_port }}" SSH_PORT: "{{ ssh_port }}" diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml index c6a4c18..e05a159 100644 --- a/ansible/vars/all.yml +++ b/ansible/vars/all.yml @@ -11,6 +11,11 @@ enable_openid_signin: "true" enable_openid_signup: "true" http_port: "3020" install_lock: "true" +mailer_enabled: "true" +smtp_from: "gitea-autonomic@decentral1.se" +smtp_host: "mail.gandi.net" +smtp_tls_enabled: "true" +smtp_user: "gitea-autonomic@decentral1.se" ssh_domain: "git.autonomic.zone" ssh_listen_port: "2222" ssh_port: "222" diff --git a/ansible/vars/smtp_passwd.yml b/ansible/vars/smtp_passwd.yml new file mode 100644 index 0000000..b4d481e --- /dev/null +++ b/ansible/vars/smtp_passwd.yml @@ -0,0 +1,8 @@ +--- +smtp_passwd: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 62393535383032333039343365653034353739323962356536386461346534643831303465353865 + 6662326163653231663036313663353135613131373131610a336131393862333533356536313565 + 34663065323635326532343537623564363164333965313538306637636136353361373265363264 + 3832643061366636390a333362326663343066646335303465633163316530306563366463393538 + 37366337663562333231326162326139313037643962613430623832656365623534 diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh index ad90960..d9f9da6 100755 --- a/sbin/entrypoint.sh +++ b/sbin/entrypoint.sh @@ -80,6 +80,12 @@ setup_app_ini() { crudini --set "$app_ini" openid WHITELIST_URIS "${WHITELIST_URIS}" crudini --set "$app_ini" indexer STARTUP_TIMEOUT "${STARTUP_TIMEOUT}" + + crudini --set "$app_ini" mailer ENABLED "${MAILER_ENABLED}" + crudini --set "$app_ini" mailer FROM "${SMTP_FROM}" + crudini --set "$app_ini" mailer HOST "${SMTP_HOST}" + crudini --set "$app_ini" mailer USER "${USER}" + crudini --set "$app_ini" mailer PASSWD "${PASSWD}" } main() {