X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=config.php-dist;h=2c92429ec07cdd2f3eb6a8089a1d4584aae8293e;hb=c29324c7a4d35c6feac3ff7d2557a265e0c4cc35;hp=ecacf202879a6b8199d4a922b7cf92426bc3491c;hpb=bc0f07856012aa94eaea7c409e720d73f2fba0c3;p=tt-rss.git

diff --git a/config.php-dist b/config.php-dist
index ecacf202..2c92429e 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -34,30 +34,6 @@
 	define('SINGLE_USER_MODE', true);
 	// Operate in single user mode, disables all functionality related to
 	// multiple users.
-
-	define('DAEMON_REFRESH_ONLY', false);
-	// updates to all feeds will only run when the backend script is
-	// invoked with a "daemon" option on the URI stem. This is useful when you
-	// are hosting multi-user system and want to control how often 
-	// feeds are being updated.
-	
-	// An example wget command line below will invoke an update every 30 
-	// minutes, with output being sent to /dev/null and the timeout set to 
-	// 10 minutes so that wget does not time out. Substitute your site name
-	// and tt-rss path as necessary.
-	//
-	// */30 * * * * /usr/bin/wget -O /dev/null -T 600 "http://www.your-site.xxx/tt-rss/backend.php?op=globalUpdateFeeds&daemon=1"
-	//
-
-	// The alternative approach is to run update_feeds.php from your crontab
-	// with command line PHP interpreter. Don't forget to chdir() into TT-RSS
-	// directory or it won't be able to find includes. E.g.
-	//
-	// */30 * * * * cd $TTRSS_DIRECTORY && ./update_feeds.php >/dev/null 2>&1
-
-	// Another alternative approach is to run update_daemon.php in the background
-	// on the server, which allows user-scheduled updates and continous
-	// feed updating in the background. This is the recommended way at the moment.
 	
 	define('SMART_RPC_COUNTERS', false);
 	// If enabled, stores feed counter information on the server side and sends
@@ -73,9 +49,6 @@
 	define('MAIL_RESET_PASS', true);
 	// Send mail to user on password reset
 	
-	define('MAIL_FROM', 'TT-RSS Daemon <noreply@some.ttrss.host.dom>');
-	// Pretty obvious, I suppose. Used for email digests & password notifications.
-
 	define('ENABLE_FEED_BROWSER', true);
 	// Enable or disable local feed browser
 
@@ -132,9 +105,6 @@
 	define('DIGEST_ENABLE', true);
 	// Global option to enable daily digests
 
-	define('DIGEST_HOSTNAME', 'some.ttrss.host.dom');
-	// Hostname for email digest signature
-
 	define('DIGEST_EMAIL_LIMIT', 10);
 	// The maximum amount of emails sent in one digest batch
 
@@ -177,7 +147,34 @@
 	// parameter to speed up tt-rss when having a huge number of articles
 	// in the database (better yet, enable purging!)
 
-	define('CONFIG_VERSION', 9);
+	define('DIGEST_FROM_NAME', 'Tiny Tiny RSS');
+	define('DIGEST_FROM_ADDRESS', 'noreply@your.domain.dom');
+	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
+	// Name, address and subject for sending email digests from.
+
+	define('DIGEST_SMTP_HOST', '');
+	// SMTP Host to send digests. When blank tt-rss uses
+	// PHP's default mail() function.
+
+	define('DIGEST_SMTP_LOGIN', '');
+	define('DIGEST_SMTP_PASSWORD', '');
+	// These two options enable SMTP authentication when sending
+	// digests. Require DIGEST_SMTP_HOST.
+
+	define('DAEMON_FEED_LIMIT', 100);
+	// Limits the amount of feeds daemon updates on one run
+
+	define('ALLOW_REMOTE_USER_AUTH', false);
+   // 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('LOCK_DIRECTORY', '.');
+	// Directory for lockfiles, must be writable to the user you run
+	// daemon process or cronjobs under.
+
+	define('CONFIG_VERSION', 14);
 	// Expected config version. Please update this option in config.php
 	// if necessary (after migrating all new options from this file).