From 2d842f0394adb7484b87f03856d7538ca145fb18 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 3 Oct 2019 14:05:49 +0200 Subject: [PATCH] fix postgres port and root ca handling --- defaults/main.yml | 1 - templates/services/freshrss-compose.yml.j2 | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f192bfe..2abd930 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -65,7 +65,6 @@ freshrss_extensions_enabled: - "Tumblr-GDPR" freshrss_postgres_ssl_mode: disable -freshrss_postgres_ssl_rootcert: /etc/ssl/certs/ca-certificates.crt freshrss_postgres_server: "{{ inventory_hostname }}" freshrss_postgres_port: 5432 freshrss_postgres_superuser: postgres diff --git a/templates/services/freshrss-compose.yml.j2 b/templates/services/freshrss-compose.yml.j2 index ba4b059..78faa8f 100644 --- a/templates/services/freshrss-compose.yml.j2 +++ b/templates/services/freshrss-compose.yml.j2 @@ -69,7 +69,8 @@ services: - FRESHRSS_CURLOPT_PROXYUSERPWD={{ freshrss_curlopt_proxyuserpwd }} {% endif %} - FRESHRSS_DB_TYPE=pgsql - - FRESHRSS_DB_HOST={{ freshrss_postgres_server }}:{{ freshrss_postgres_port }};sslmode={{ freshrss_postgres_ssl_mode }};sslrootcert={{ freshrss_postgres_ssl_rootcert }} + - FRESHRSS_DB_HOST={{ freshrss_postgres_server }};sslmode={{ freshrss_postgres_ssl_mode }};sslrootcert=ca-certificates.crt + - FRESHRSS_DB_PORT={{ freshrss_postgres_port }} - FRESHRSS_DB_USER={{ freshrss_postgres_user.name }} - FRESHRSS_DB_PASSWORD={{ freshrss_postgres_user.password }} - FRESHRSS_DB_BASE={{ freshrss_postgres_db.name }}