From 6dc2a86c07ba6956a94b42e4621b4d73360505d5 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 24 Nov 2019 23:31:47 +0100 Subject: [PATCH] fix typo --- defaults/main.yml | 2 +- templates/etc/systemd/system/freshrss.service.j2 | 8 ++++---- templates/services/freshrss-compose.yml.j2 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index bca4129..4582bcf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -74,7 +74,7 @@ freshrss_limits_max_registrations: "1" freshrss_extensions_enabled: - "Tumblr-GDPR" -ttrss_db_type: pgsql +freshrss_db_type: pgsql freshrss_db_server: localhost freshrss_db_port: 5432 freshrss_db_name: freshrss diff --git a/templates/etc/systemd/system/freshrss.service.j2 b/templates/etc/systemd/system/freshrss.service.j2 index 8698812..e532cb7 100644 --- a/templates/etc/systemd/system/freshrss.service.j2 +++ b/templates/etc/systemd/system/freshrss.service.j2 @@ -11,12 +11,12 @@ Type=simple TimeoutStartSec=15min Restart={{ freshrss_restart_policy }} -ExecStartPre={{ ttrss_docker_compose_bin }} pull --quiet --ignore-pull-failures -ExecStart={{ ttrss_docker_compose_bin }} up --remove-orphans +ExecStartPre={{ freshrss_docker_compose_bin }} pull --quiet --ignore-pull-failures +ExecStart={{ freshrss_docker_compose_bin }} up --remove-orphans -ExecStop={{ ttrss_docker_compose_bin }} down --remove-orphans +ExecStop={{ freshrss_docker_compose_bin }} down --remove-orphans -ExecReload={{ ttrss_docker_compose_bin }} pull --quiet --ignore-pull-failures +ExecReload={{ freshrss_docker_compose_bin }} pull --quiet --ignore-pull-failures [Install] WantedBy=multi-user.target diff --git a/templates/services/freshrss-compose.yml.j2 b/templates/services/freshrss-compose.yml.j2 index ff718bc..306824a 100644 --- a/templates/services/freshrss-compose.yml.j2 +++ b/templates/services/freshrss-compose.yml.j2 @@ -69,7 +69,7 @@ services: - FRESHRSS_CURLOPT_PROXYUSERPWD={{ freshrss_curlopt_proxyuserpwd }} {% endif %} - FRESHRSS_DB_TYPE=pgsql - {% if ttrss_db_type == "pgsql" %} + {% if freshrss_db_type == "pgsql" %} - FRESHRSS_DB_HOST={{ freshrss_db_server }};sslmode={{ freshrss_db_ssl_mode }} {% else %} - FRESHRSS_DB_HOST={{ freshrss_db_server }}