From b996d72872af9320b016e7d0ad52e0197a315bcf Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 14 Nov 2012 21:48:06 +0100 Subject: [PATCH] More config change for v 1.6 --- .../usr/share/tt-rss/config.php/15directories | 22 ----------------- .../templates/usr/share/tt-rss/config.php/35digest | 28 ++++++++-------------- .../usr/share/tt-rss/config.php/55various | 21 +++++++++++----- 3 files changed, 25 insertions(+), 46 deletions(-) diff --git a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/15directories b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/15directories index ae40421..d9cdc82 100644 --- a/root/etc/e-smith/templates/usr/share/tt-rss/config.php/15directories +++ b/root/etc/e-smith/templates/usr/share/tt-rss/config.php/15directories @@ -4,22 +4,9 @@ // You need to set this option correctly otherwise several features // including PUSH, bookmarklets and browser integration will not work properly. - define('MAGPIE_FETCH_TIME_OUT', 60); - // Magpie's default timeout is 5 seconds. Some RSS feeds, - // such as from large Trac installs, can take significantly - // longer than 5 seconds to generate. To prevent failed - // updates, increase this. - define('CACHE_DIR', '/var/cache/tt-rss/'); // Local cache directory for RSS feed content. - define('MAGPIE_CACHE_DIR', '/var/cache/tt-rss/magpie'); - // Local cache directory for RSS feeds - - define('MAGPIE_CACHE_AGE', 60*30); - // How long to store cached RSS objects? In seconds. - // Defaults to 30 minutes - define('ICONS_DIR', "rssicons"); define('ICONS_URL', "rssicons"); // Local and URL path to the directory, where feed favicons are stored. @@ -29,15 +16,6 @@ define('TMP_DIRECTORY', '/tmp'); // Directory for temporary files - define('SIMPLEPIE_CACHE_DIR', '/var/cache/tt-rss/simplepie'); - // Cache directory for RSS feeds when using SimplePie - - define('SIMPLEPIE_CACHE_IMAGES', true); - // Allow caching feed images when using SimplePie, to bypass hotlink - // prevention and such at expense of local disk space and bandwidth. - // Note that you (or your users) also have to enable image caching - // in feed editor. - define('PHP_EXECUTABLE', '/usr/bin/php'); // Path to PHP executable 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 7049ffe..fd51a2a 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 @@ -1,29 +1,21 @@ - define('DIGEST_ENABLE', true); - // Global option to enable daily digests. Also toggles the ability of users - // to forward articles by email. + // ********************************* + // *** Email and digest settings *** + // ********************************* - define('DIGEST_EMAIL_LIMIT', 10); - // The maximum amount of emails sent in one digest batch - - define('DAEMON_SENDS_DIGESTS', true); - // If update daemon and update_feeds should send digests - // Disable if you prefer querying special URL (see wiki) - - define('DIGEST_FROM_NAME', 'Tiny Tiny RSS'); - define('DIGEST_FROM_ADDRESS', 'noreply@{$DomainName}'); + define('SMTP_FROM_NAME', 'Tiny Tiny RSS'); + define('SMTP_FROM_ADDRESS', 'noreply@{$DomainName}'); // Name, address and subject for sending outgoing mail. This applies // to password reset notifications, digest emails and any other mail. define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours'); - // Subject line for email digests + // Subject line for email digests - define('DIGEST_SMTP_HOST', 'localhost'); + define('SMTP_HOST', 'localhost'); // SMTP Host to send outgoing mail. Blank - use system MTA. - define('DIGEST_SMTP_LOGIN', ''); - define('DIGEST_SMTP_PASSWORD', ''); + define('SMTP_LOGIN', ''); + define('SMTP_PASSWORD', ''); // These two options enable SMTP authentication when sending - // outgoing mail. Require DIGEST_SMTP_HOST. - + // outgoing mail. Only used with SMTP_HOST 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 b65a4c2..91ca7af 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 @@ -3,16 +3,25 @@ // Selectively gzip output to improve wire performance. This requires // PHP Zlib extension on the server. - define('ENABLE_TRANSLATIONS', true); - // Enable support for interface translations - define('FEEDBACK_URL', ''); // Displays an URL for users to provide feedback or comments regarding // this instance of tt-rss. Can lead to a forum, contact email, etc. - define('USE_CURL', false); - // Use CURL to fetch remote data instead of PHP built-in fopen() - define('CHECK_FOR_NEW_VERSION', false); // Check for new versions of tt-rss automatically. + define('ARTICLE_BUTTON_PLUGINS', 'note,tweet,share,mail'); + // Comma-separated list of additional article action button plugins + // to enable, like tweet button, etc. + // The following plugins are available: note, tweet, share, mail + // More plugins: http://tt-rss.org/wiki/Plugins + + // *** PubSubHubbub settings *** + + define('PUBSUBHUBBUB_HUB', ''); + // URL to a PubSubHubbub-compatible hub server. If defined, "Published + // articles" generated feed would automatically become PUSH-enabled. + + define('PUBSUBHUBBUB_ENABLED', false); + // Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss + // won't try to subscribe to PUSH feed updates.