From 9f1624dfdd7da29508496cd4716c1610467e8735 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 5 Mar 2013 09:23:33 +0100
Subject: [PATCH] update config templates for tt-rss 1.7.x

---
 .../templates/usr/share/tt-rss/config.php/25auth  | 15 ++++++++-------
 .../usr/share/tt-rss/config.php/30update          | 15 ++++++++-------
 .../usr/share/tt-rss/config.php/60version         |  2 +-
 3 files changed, 17 insertions(+), 15 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 8493a0e..58d0f4d 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
@@ -1,7 +1,8 @@
 {
 
 my $auth = ${'tt-rss'}{'Authentication'} || 'http';
-my $authModule = ($auth eq 'internal') ? 'internal':'remote';
+my $plugins = ($auth eq 'internal') ? 'auth_internal':'auth_remote';
+$plugin .= ',note';
 my $multi = ((${'tt-rss'}{'MultiUser'} || 'enabled') eq 'enabled') ? 'false':'true';
 
 $OUT .=<<"HERE";
@@ -10,12 +11,12 @@ $OUT .=<<"HERE";
         // Operate in single user mode, disables all functionality related to
         // multiple users.
 
-        define('AUTH_MODULES',$authModule);
-        // Set to 'true' if you trust your web server's REMOTE_USER
-        // environment variable to validate that the user is logged in. This
-        // option can be used to integrate tt-rss with Apache's external
-        // authentication modules.
-
+        define('PLUGINS','$plugins');
+        // Comma-separated list of plugins to load automatically for all users.
+        // System plugins have to be specified here. Please enable at least one
+        // authentication plugin here (auth_*).
+        // Users may enable other user plugins from Preferences/Plugins but may not
+        // disable plugins specified in this list.
 HERE
 }
 
diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/30update b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/30update
index 3caad58..68649a5 100644
--- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/30update
+++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/30update
@@ -12,12 +12,6 @@
         // Stop updating feeds of user who haven't logged in specified 
         // amount of days. 0 disables.
 
-       define('DEFAULT_UPDATE_METHOD', 0);
-        // Which feed parsing library to use as default:
-        // 0 - Magpie
-        // 1 - SimplePie
-
-
         define('DAEMON_FEED_LIMIT', 60);
         // Limits the amount of feeds daemon (or a cronjob) updates on one run
 
@@ -31,4 +25,11 @@
         // parameter to speed up tt-rss when having a huge number of articles
         // in the database (better yet, enable purging!)
 
-
+        define('SIMPLE_UPDATE_MODE', false);
+        // Enables fallback update mode where tt-rss tries to update feeds in
+        // background while tt-rss is open in your browser. 
+        // If you don't have a lot of feeds and don't want to or can't run 
+        // background processes while not running tt-rss, this method is generally 
+        // viable to keep your feeds up to date.
+        // Still, there are more robust (and recommended) updating methods 
+        // available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds
diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/60version b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/60version
index 9ead6a0..599ec0f 100644
--- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/60version
+++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/60version
@@ -1,4 +1,4 @@
-        define('CONFIG_VERSION', 23);
+        define('CONFIG_VERSION', 26);
         // Expected config version. Please update this option in config.php
         // if necessary (after migrating all new options from this file).