From 9d60fb8cc0c3db58dd1df54bb5a9fb4ce6115180 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 14 Nov 2012 19:23:27 +0100
Subject: [PATCH] Update auth config for ttrss 1.6

---
 .../e-smith/templates/usr/share/tt-rss/config.php/25auth  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 8647621..8493a0e 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,7 @@
 {
 
 my $auth = ${'tt-rss'}{'Authentication'} || 'http';
-my $remote = ($auth eq 'internal') ? 'false':'true';
+my $authModule = ($auth eq 'internal') ? 'internal':'remote';
 my $multi = ((${'tt-rss'}{'MultiUser'} || 'enabled') eq 'enabled') ? 'false':'true';
 
 $OUT .=<<"HERE";
@@ -10,7 +10,7 @@ $OUT .=<<"HERE";
         // Operate in single user mode, disables all functionality related to
         // multiple users.
 
-        define('ALLOW_REMOTE_USER_AUTH',$remote);
+        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
@@ -19,12 +19,12 @@ $OUT .=<<"HERE";
 HERE
 }
 
-        define('AUTO_CREATE_USER',true);
+        define('AUTH_AUTO_CREATE',true);
         // If users are authenticated by your web server, set this to true if
         // You want new users to be automaticaly created in tt-rss database
         // on first login
 
-        define('AUTO_LOGIN',true);
+        define('AUTH_AUTO_LOGIN',true);
         // Set this to true if you use ALLOW_REMOTE_USER_AUTH and you want
         // to skip the login form. If set to true, users won't be able to select
         // profile