From ad4f6259926682afe64ddf6316d2d9ed584bf8d7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 3 Feb 2021 20:19:38 +0100 Subject: [PATCH] [mailman] Setup database host Signed-off-by: Yohann D'ANELLO --- plays/mailman.yml | 14 +++++++++----- roles/mailman3/templates/mailman3/mailman.cfg.j2 | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plays/mailman.yml b/plays/mailman.yml index ac7afd00..4f05430a 100755 --- a/plays/mailman.yml +++ b/plays/mailman.yml @@ -25,11 +25,15 @@ vars: mailman3: site_owner: root@crans.org - database_pass: "{{ vault.mailman3_database_pass }}" - restadmin_pass: "{{ vault.mailman3_restadmin_pass }}" - archiver_key: "{{ vault.mailman3_archiver_key }}" - web_secret_key: "{{ vault.mailman3_web_secret_key }}" - web_database_pass: "{{ vault.mailman3_web_database_pass }}" + database_user: "mailman3" + database_pass: "{{ vault_mailman3_database_pass }}" + database_host: "172.16.10.1" + database_port: 5432 + database_name: "mailman3" + restadmin_pass: "{{ vault_mailman3_restadmin_pass }}" + archiver_key: "{{ vault_mailman3_archiver_key }}" + web_secret_key: "{{ vault_mailman3_web_secret_key }}" + web_database_pass: "{{ vault_mailman3_web_database_pass }}" web_domain: "mailman.crans.org" roles: - mailman3 diff --git a/roles/mailman3/templates/mailman3/mailman.cfg.j2 b/roles/mailman3/templates/mailman3/mailman.cfg.j2 index 4dbccacc..00f723ef 100644 --- a/roles/mailman3/templates/mailman3/mailman.cfg.j2 +++ b/roles/mailman3/templates/mailman3/mailman.cfg.j2 @@ -172,7 +172,7 @@ class: mailman.database.postgresql.PostgreSQLDatabase # 'configuration' substitutions. #url: sqlite:///$DATA_DIR/mailman.db #url: mysql+pymysql://mailman3:mmpass@localhost/mailman3?charset=utf8&use_unicode=1 -url: postgres://mailman3:{{ mailman3.database_pass }}@localhost/mailman3 +url: postgres://{{ mailman3.database_user }}:{{ mailman3.database_pass }}@{{ mailman3.database_host }}:{{ mailman3.database_port }}/{{ mailman3.database_name }} debug: no