From 2579abb6735ff5e5a7c0a859032b830dab1a318c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 14 May 2013 17:03:16 +0200
Subject: [PATCH] 1.7.9 compat

---
 root/etc/e-smith/templates/usr/share/tt-rss/config.php/25auth    | 7 +++++++
 root/etc/e-smith/templates/usr/share/tt-rss/config.php/35digest  | 6 +++---
 root/etc/e-smith/templates/usr/share/tt-rss/config.php/45sphinx  | 2 ++
 root/etc/e-smith/templates/usr/share/tt-rss/config.php/55various | 6 ++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/25auth b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/25auth
index 58d0f4d..0fab2fe 100644
--- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/25auth
+++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/25auth
@@ -50,3 +50,10 @@ HERE
         // Hard expiration limit for sessions. Should be
         // greater or equal to SESSION_COOKIE_LIFETIME
 
+	define('FEED_CRYPT_KEY', '');
+	// Key used for encryption of passwords for password-protected feeds
+	// in the database. A string of 24 random characters. If left blank, encryption
+	// is not used. Requires mcrypt functions.
+	// Warning: changing this key will make your stored feed passwords impossible
+	// to decrypt.
+
diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/35digest b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/35digest
index 428510a..7183b8d 100644
--- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/35digest
+++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/35digest
@@ -11,9 +11,9 @@
         define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
         // Subject line for email digests
 
-        define('SMTP_HOST', 'localhost');
-        define('SMTP_PORT', '25');
-        // SMTP Host to send outgoing mail. Blank - use system MTA.
+	define('SMTP_SERVER', '');
+	// Hostname:port combination to send outgoing mail (i.e. localhost:25). 
+	// Blank - use system MTA.
 
         define('SMTP_LOGIN', '');
         define('SMTP_PASSWORD', '');
diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/45sphinx b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/45sphinx
index ea0b88e..af0422f 100644
--- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/45sphinx
+++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/45sphinx
@@ -6,3 +6,5 @@
         define('SPHINX_INDEX', 'ttrss');
         // Index name in Sphinx configuration
 
+	define('SPHINX_SERVER', 'localhost:9312');
+	// Hostname:port combination for the Sphinx server.
diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/55various b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/55various
index 91ca7af..a23bc8b 100644
--- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/55various
+++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/55various
@@ -25,3 +25,9 @@
         define('PUBSUBHUBBUB_ENABLED', false);
         // Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
         // won't try to subscribe to PUSH feed updates.
+
+	define('LOG_DESTINATION', '');
+	// 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 
+	// error.log).