From e5797340575e3d2a544e4407350c94c2678ffcb2 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 7 Feb 2020 20:28:33 +0100 Subject: [PATCH] urlencode db password --- defaults/main.yml | 2 +- templates/services/compose.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5c5aac7..fccbba1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,7 +27,7 @@ bitwardenrs_security_opt: [] # @var bitwardenrs_pids_limit: $ "_unset_" bitwardenrs_healthcheck: - test: '["CMD", "/usr/local/bin/healthcheck.sh"]' + test: '["CMD", "/usr/local/bin/healthcheck"]' interval: 10s timeout: 3s retries: 3 diff --git a/templates/services/compose.yml.j2 b/templates/services/compose.yml.j2 index b08b9c8..695c273 100644 --- a/templates/services/compose.yml.j2 +++ b/templates/services/compose.yml.j2 @@ -25,7 +25,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 }}&sslrootcert={{ bitwardenrs_db_ssl_rootcert }} + - BITWARDENRS_DATABASE_URL=postgresql://{{ bitwardenrs_db_user }}:{{ bitwardenrs_db_password | urlencode }}@{{ bitwardenrs_db_server }}:{{ bitwardenrs_db_port }}/{{ bitwardenrs_db_name }}?sslmode={{ bitwardenrs_db_ssl_mode }}&sslrootcert={{ bitwardenrs_db_ssl_rootcert }} - BITWARDENRS_WEBSOCKET_ENABLED={{ bitwardenrs_websocket_enabled }} {% if bitwardenrs_templates_folder is defined and bitwardenrs_templates_folder %} - BITWARDENRS_TEMPLATES_FOLDER={{ bitwardenrs_templates_folder }}