From 18bc306c07fe7f25bc557fcb08b86ff6b993b843 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Thu, 11 Jul 2019 16:12:37 +0200
Subject: [PATCH] small fixes

---
 Dockerfile.linux.amd64                |  3 +--
 README.md                             | 14 ++++++++------
 overlay/etc/templates/config.php.tmpl | 12 ++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.linux.amd64 b/Dockerfile.linux.amd64
index 6b08613..9c9d6fc 100644
--- a/Dockerfile.linux.amd64
+++ b/Dockerfile.linux.amd64
@@ -27,8 +27,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
 
 ADD overlay/ /
 
-VOLUME /var/www/app/lock
-VOLUME /var/www/app/cache
+VOLUME /var/www/app/plugins.local
 VOLUME /var/www/app/feed-icons
 
 EXPOSE 80
diff --git a/README.md b/README.md
index ae64fe3..6c41baf 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,9 @@ services:
       - "80:80"
     depends_on:
       - db
+    volumes:
+      - plugins:/var/www/app/plugins.local
+      - icons:/var/www/app/feed-icons
 
   db:
     image: postgres
@@ -48,6 +51,10 @@ services:
 volumes:
   postgres_data:
     driver: local
+  plugins:
+    driver: local
+  icons:
+    driver: local
 ```
 
 ## Environment variables
@@ -64,7 +71,6 @@ TTRSS_DB_PORT=5432
 TTRSS_SELF_URL_PATH=http://localhost/
 TTRSS_SINGLE_USER_MODE=false
 TTRSS_SIMPLE_UPDATE_MODE=false
-TTRSS_PHP_EXECUTABLE=/usr/bin/php
 TTRSS_AUTH_AUTO_CREATE=true
 TTRSS_AUTH_AUTO_LOGIN=true
 TTRSS_FORCE_ARTICLE_PURGE=0
@@ -75,13 +81,9 @@ TTRSS_REG_NOTIFY_ADDRESS=
 TTRSS_REG_MAX_USERS=10;
 TTRSS_SESSION_COOKIE_LIFETIME=86400
 TTRSS_SMTP_FROM_NAME=Tiny Tiny RSS
-TTRSS_SMTP_FROM_NAME=
+TTRSS_SMTP_FROM_ADDRESS=
 TTRSS_DIGEST_SUBJECT=[tt-rss] New headlines for last 24 hours
-TTRSS_CHECK_FOR_UPDATES=true
-TTRSS_ENABLE_GZIP_OUTPUT=false
 TTRSS_PLUGINS=auth_internal, note
-TTRSS_LOG_DESTINATION=sql
-TTRSS_CONFIG_VERSION=26
 ```
 
 ### PHP
diff --git a/overlay/etc/templates/config.php.tmpl b/overlay/etc/templates/config.php.tmpl
index c79cc94..4601ca7 100644
--- a/overlay/etc/templates/config.php.tmpl
+++ b/overlay/etc/templates/config.php.tmpl
@@ -44,7 +44,7 @@
 	// *** Files and directories ***
 	// *****************************
 
-	define('PHP_EXECUTABLE', '{{ getenv "TTRSS_PHP_EXECUTABLE" "/usr/bin/php" }}');
+	define('PHP_EXECUTABLE', '/usr/bin/php');
 	// Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss
 	// programs and update daemon. Do not try to use CGI binary here, it won't work.
 	// If you see HTTP headers being displayed while running tt-rss scripts,
@@ -137,7 +137,7 @@
 	// https://git.tt-rss.org/fox/ttrss-mailer-smtp
 
 	define('SMTP_FROM_NAME', '{{ getenv "TTRSS_SMTP_FROM_NAME" "Tiny Tiny RSS" }}');
-	define('SMTP_FROM_ADDRESS', '{{ getenv "TTRSS_SMTP_FROM_NAME" }}');
+	define('SMTP_FROM_ADDRESS', '{{ getenv "TTRSS_SMTP_FROM_ADDRESS" }}');
 	// Name, address and subject for sending outgoing mail. This applies
 	// to password reset notifications, digest emails and any other mail.
 
@@ -148,10 +148,10 @@
 	// *** Other settings (less important) ***
 	// ***************************************
 
-	define('CHECK_FOR_UPDATES', {{ getenv "TTRSS_CHECK_FOR_UPDATES" "true" }});
+	define('CHECK_FOR_UPDATES', false);
 	// Check for updates automatically if running Git version
 
-	define('ENABLE_GZIP_OUTPUT', {{ getenv "TTRSS_ENABLE_GZIP_OUTPUT" "false" }});
+	define('ENABLE_GZIP_OUTPUT', false);
 	// Selectively gzip output to improve wire performance. This requires
 	// PHP Zlib extension on the server.
 	// Enabling this can break tt-rss in several httpd/php configurations,
@@ -167,7 +167,7 @@
 	// Disabling auth_internal in this list would automatically disable
 	// reset password link on the login form.
 
-	define('LOG_DESTINATION', '{{ getenv "TTRSS_LOG_DESTINATION" "sql" }}');
+	define('LOG_DESTINATION', 'sql');
 	// Error log destination to use. Possible values: sql (uses internal logging
 	// you can read in Preferences -> System), syslog - logs to system log.
 	// Setting this to blank uses PHP logging (usually to http server
@@ -175,6 +175,6 @@
 	// Note that feed updating daemons don't use this logging facility
 	// for normal output.
 
-	define('CONFIG_VERSION', {{ getenv "TTRSS_CONFIG_VERSION" "26" }});
+	define('CONFIG_VERSION', 26);
 	// Expected config version. Please update this option in config.php
 	// if necessary (after migrating all new options from this file).