From 5df35b0988ba56562f4121e4ade108d3ea41eba1 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 18 Feb 2021 22:32:49 +0100 Subject: [PATCH 1/4] Add new package dependency --- vars/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/main.yml b/vars/main.yml index 591fbb2..d832f1f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -15,6 +15,7 @@ packages: - python-setuptools - python-virtualenv - rabbitmq-server + - rustc # for building cryptograhpy gitlab_host_key: 'git.fudiggity.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNmvcxza79T7JZMkifmquwXH/kMUqDnKs9Oob+JrRvn' gitlab_domain: 'git.fudiggity.nl' From 2b77c15ce499a23f2ebb8d50532ee9f3b170fa33 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 23 Apr 2021 22:56:46 +0200 Subject: [PATCH 2/4] Add email settings --- templates/env.j2 | 8 ++++++++ vars/email.yml | 14 ++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 vars/email.yml diff --git a/templates/env.j2 b/templates/env.j2 index 3996d5b..cbb0a1b 100644 --- a/templates/env.j2 +++ b/templates/env.j2 @@ -7,6 +7,14 @@ POSTGRES_PASSWORD="{{ pgbouncer_password }}" DJANGO_SETTINGS_MODULE="{{ django_settings_module }}" DJANGO_SECRET_KEY="{{ django_secret_key }}" +EMAIL_HOST="{{ email_host }}" +EMAIL_PORT="{{ email_port }}" +EMAIL_HOST_USER="{{ email_user }}" +EMAIL_HOST_PASSWORD="{{ email_password }}" +EMAIL_USE_TLS={{ email_tls }} +EMAIL_USE_SSL={{ email_ssl }} +EMAIL_DEFAULT_FROM="{{ email_user }}" + REDDIT_CLIENT_ID="{{ reddit_client_id }}" REDDIT_CLIENT_SECRET="{{ reddit_client_secret }}" REDDIT_CALLBACK_URL="{{ reddit_callback_url }}" diff --git a/vars/email.yml b/vars/email.yml new file mode 100644 index 0000000..2b57e59 --- /dev/null +++ b/vars/email.yml @@ -0,0 +1,14 @@ +email_host: 'smtp.transip.email' +email_port: 465 +email_user: 'services@fudiggity.nl' +email_password: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 37316661346236386438646338633536623266323432386330383037353932366531643736333462 + 3264326231626231663233333731636134653135343730650a393666333766353261653661323436 + 66393963646435626163626464383136373239373235653065383265306264393961616230366632 + 3734386465653235340a656538313935316565623263363764383536326363313361626665313365 + 37653136393464636433303866326564336365356538613036656338343938373535346437613233 + 32656531366135636634633939346364373331646532616139663165636637333333393639613033 + 636565306164653538653330613432323136 +email_tls: false +email_ssl: true From dcb8efd539e6d937328dfe51ebc55d13da1be66e Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 23 Apr 2021 23:12:51 +0200 Subject: [PATCH 3/4] Include missing var file --- playbook.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbook.yml b/playbook.yml index 9b0172c..7c591dc 100644 --- a/playbook.yml +++ b/playbook.yml @@ -36,6 +36,7 @@ - import_tasks: 'handlers.yml' vars_files: - 'vars/app.yml' + - 'vars/email.yml' - 'vars/main.yml' - 'vars/network.yml' - 'vars/postgres.yml' From 2e226ebdf4cd2325cef722caf7d7f645c0ba42a6 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sat, 24 Apr 2021 13:29:03 +0200 Subject: [PATCH 4/4] Re-run formatting --- vars/email.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vars/email.yml b/vars/email.yml index 2b57e59..63ac2ac 100644 --- a/vars/email.yml +++ b/vars/email.yml @@ -2,13 +2,13 @@ email_host: 'smtp.transip.email' email_port: 465 email_user: 'services@fudiggity.nl' email_password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 37316661346236386438646338633536623266323432386330383037353932366531643736333462 - 3264326231626231663233333731636134653135343730650a393666333766353261653661323436 - 66393963646435626163626464383136373239373235653065383265306264393961616230366632 - 3734386465653235340a656538313935316565623263363764383536326363313361626665313365 - 37653136393464636433303866326564336365356538613036656338343938373535346437613233 - 32656531366135636634633939346364373331646532616139663165636637333333393639613033 - 636565306164653538653330613432323136 -email_tls: false -email_ssl: true + $ANSIBLE_VAULT;1.1;AES256 + 37316661346236386438646338633536623266323432386330383037353932366531643736333462 + 3264326231626231663233333731636134653135343730650a393666333766353261653661323436 + 66393963646435626163626464383136373239373235653065383265306264393961616230366632 + 3734386465653235340a656538313935316565623263363764383536326363313361626665313365 + 37653136393464636433303866326564336365356538613036656338343938373535346437613233 + 32656531366135636634633939346364373331646532616139663165636637333333393639613033 + 636565306164653538653330613432323136 +email_tls: '' +email_ssl: 'true'