From 3eb286c9bd9143a70435ba5d30ebab99a465a5b3 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 6 Mar 2021 12:10:56 +0000
Subject: [PATCH] Move envrironment variables to docker

Using the `TTRSS_` prefix to follow upstream standard rather than container's

https://github.com/lunik1/docker-tt-rss/issues/3
---
 ansible/roles/pve_docker/files/tt-rss/config.php      | 11 -----------
 .../roles/pve_docker/files/tt-rss/docker-compose.yml  |  9 ++++++++-
 ansible/roles/pve_docker/tasks/tt-rss.yml             |  9 ---------
 3 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 ansible/roles/pve_docker/files/tt-rss/config.php

diff --git a/ansible/roles/pve_docker/files/tt-rss/config.php b/ansible/roles/pve_docker/files/tt-rss/config.php
deleted file mode 100644
index 15ebcc4..0000000
--- a/ansible/roles/pve_docker/files/tt-rss/config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-  putenv('TTRSS_DB_USER=tt-rss');
-  putenv('TTRSS_DB_NAME=tt-rss');
-  putenv('TTRSS_DB_PASS=tt-rss');
-
-  putenv('TTRSS_SELF_URL_PATH=https://tt-rss.jakehoward.tech/');
-
-  putenv('TTRSS_ENABLE_REGISTRATION=false');
-
-  putenv('TTRSS_CHECK_FOR_UPDATES=false');
-  putenv('TTRSS_ENABLE_GZIP_OUTPUT=true');
diff --git a/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml b/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
index 656153a..86308ab 100644
--- a/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
+++ b/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
@@ -7,8 +7,15 @@ services:
       - PUID={{ docker_user.id }}
       - PGID={{ docker_user.id }}
       - TZ={{ TZ }}
+
+      - TTRSS_DB_USER=tt-rss
+      - TTRSS_DB_NAME=tt-rss
+      - TTRSS_DB_PASS=tt-rss
+      - TTRSS_SELF_URL_PATH=https://tt-rss.jakehoward.tech/
+      - TTRSS_ENABLE_REGISTRATION=false
+      - TTRSS_CHECK_FOR_UPDATES=false
+      - TTRSS_ENABLE_GZIP_OUTPUT=true
     volumes:
-      - "{{ app_data_dir }}/tt-rss/config.php:/config/config.php:ro"
       - "{{ app_data_dir }}/tt-rss/feed-icons:/config/feed-icons"
       - ./plugins:/config/plugins.local
     restart: unless-stopped
diff --git a/ansible/roles/pve_docker/tasks/tt-rss.yml b/ansible/roles/pve_docker/tasks/tt-rss.yml
index ad8485d..6788ffc 100644
--- a/ansible/roles/pve_docker/tasks/tt-rss.yml
+++ b/ansible/roles/pve_docker/tasks/tt-rss.yml
@@ -25,15 +25,6 @@
   register: compose_file
   become: true
 
-- name: Install tt-rss config
-  template:
-    src: files/tt-rss/config.php
-    dest: "{{ app_data_dir }}/tt-rss/config.php"
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ docker_user.name }}"
-  register: config_file
-  become: true
-
 - name: Install fever plugin
   git:
     repo: https://github.com/DigitalDJ/tinytinyrss-fever-plugin