From 409b8d642da8775e51d66550ab5c2b3f451a1914 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 18 Jan 2020 14:59:10 +0100 Subject: [PATCH] add missing sslrootcert to pg connection url --- defaults/main.yml | 1 - templates/services/compose.yml.j2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5455779..7dff108 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -82,7 +82,6 @@ bitwardenrs_db_port: 5432 bitwardenrs_db_name: bitwardenrs bitwardenrs_db_user: pgbitwardenrs bitwardenrs_db_password: secure - bitwardenrs_db_ssl_mode: disable bitwardenrs_db_ssl_rootcert: /etc/ssl/certs/ca-certificates.crt diff --git a/templates/services/compose.yml.j2 b/templates/services/compose.yml.j2 index a17961f..58d53ac 100644 --- a/templates/services/compose.yml.j2 +++ b/templates/services/compose.yml.j2 @@ -19,7 +19,7 @@ services: {% endif %} environment: - BITWARDENRS_DOMAIN={{ bitwardenrs_base_url }} - - BITWARDENRS_DATABASE_URL=postgresql://{{ bitwardenrs_db_user }}:{{ bitwardenrs_db_password }}@{{ bitwardenrs_db_server }}:{{ bitwardenrs_db_port }}/{{ bitwardenrs_db_name }}?sslmode={{ bitwardenrs_db_ssl_mode }} + - BITWARDENRS_DATABASE_URL=postgresql://{{ bitwardenrs_db_user }}:{{ bitwardenrs_db_password }}@{{ bitwardenrs_db_server }}:{{ bitwardenrs_db_port }}/{{ bitwardenrs_db_name }}?sslmode={{ bitwardenrs_db_ssl_mode }}&sslrootcert={{ bitwardenrs_db_ssl_rootcert }} {% if bitwardenrs_templates_folder is defined and bitwardenrs_templates_folder %} - BITWARDENRS_TEMPLATES_FOLDER={{ bitwardenrs_templates_folder }} {% endif %}