diff --git a/defaults/main.yml b/defaults/main.yml index 1d04566..bca4129 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -85,3 +85,5 @@ freshrss_db_password: secure freshrss_db_ssl_mode: disable # @var freshrss_db_ssl_mode:description: This variable is only supported for `pgsql` DB type. freshrss_db_ssl_rootcert: /etc/ssl/certs/ca-certificates.crt + +freshrss_docker_compose_bin: /usr/local/bin/docker-compose diff --git a/tasks/setup.yml b/tasks/setup.yml index e595641..86b2c83 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -7,7 +7,7 @@ owner: root group: root mode: 0644 - validate: /bin/docker-compose -f %s config -q + validate: "{{ freshrss_docker_compose_bin }} -f %s config -q" notify: __freshrss_restart - name: Create systemd unit files diff --git a/templates/etc/systemd/system/freshrss.service.j2 b/templates/etc/systemd/system/freshrss.service.j2 index 04adfd2..8698812 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=/bin/docker-compose pull --quiet --ignore-pull-failures -ExecStart=/usr/bin/docker-compose up --remove-orphans +ExecStartPre={{ ttrss_docker_compose_bin }} pull --quiet --ignore-pull-failures +ExecStart={{ ttrss_docker_compose_bin }} up --remove-orphans -ExecStop=/usr/bin/docker-compose down --remove-orphans +ExecStop={{ ttrss_docker_compose_bin }} down --remove-orphans -ExecReload=/usr/bin/docker-compose pull --quiet --ignore-pull-failures +ExecReload={{ ttrss_docker_compose_bin }} pull --quiet --ignore-pull-failures [Install] WantedBy=multi-user.target