From c80d4b7e0467a45f87ecebe9c694525a84160c6f Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 2 Jul 2020 18:24:26 +0100 Subject: [PATCH] Move tt-rss config out of config directory --- .../intersect-docker/files/tt-rss/docker-compose.yml | 5 ++++- ansible/roles/intersect-docker/tasks/tt-rss.yml | 9 +-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml b/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml index bc0fd52..ecae617 100644 --- a/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml @@ -8,7 +8,8 @@ services: - PGID={{ docker_user.id }} - TZ=Europe/London volumes: - - ./config:/config + - ./config.php:/config/config.php:ro + - ./feed-icons:/config/feed-icons restart: unless-stopped labels: - traefik.enable=true @@ -16,6 +17,8 @@ services: - traefik.http.routers.tt-rss.tls.certresolver=le depends_on: - db + tmpfs: + - /config/log db: image: postgres:12-alpine diff --git a/ansible/roles/intersect-docker/tasks/tt-rss.yml b/ansible/roles/intersect-docker/tasks/tt-rss.yml index ec51c0d..a0ea058 100644 --- a/ansible/roles/intersect-docker/tasks/tt-rss.yml +++ b/ansible/roles/intersect-docker/tasks/tt-rss.yml @@ -16,17 +16,10 @@ register: compose_file become: true -- name: Create tt-rss config directory - file: - path: /opt/tt-rss/config - state: directory - mode: "{{ docker_compose_directory_mask }}" - become: true - - name: Install tt-rss config template: src: files/tt-rss/config.php - dest: /opt/tt-rss/config/config.php + dest: /opt/tt-rss/config.php mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" register: config_file