36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
--- config.php-dist 2011-12-13 19:22:16.820796058 +0400
|
|
+++ config.php-dist.mysql 2011-12-14 12:08:35.747296079 +0400
|
|
@@ -3,12 +3,12 @@
|
|
// *** Database configuration (important!) ***
|
|
// *******************************************
|
|
|
|
- define('DB_TYPE', "pgsql"); // or mysql
|
|
- define('DB_HOST', "localhost");
|
|
- define('DB_USER', "fox");
|
|
- define('DB_NAME', "fox");
|
|
- define('DB_PASS', "XXXXXX");
|
|
- //define('DB_PORT', '5432'); // when neeeded, PG-only
|
|
+ include_once('/etc/tt-rss-mysql/database.php');
|
|
+ define('DB_TYPE', $dbtype);
|
|
+ define('DB_HOST', $dbserver);
|
|
+ define('DB_USER', $dbuser);
|
|
+ define('DB_NAME', $dbname);
|
|
+ define('DB_PASS', $dbpass);
|
|
|
|
define('MYSQL_CHARSET', 'UTF8');
|
|
// Connection charset for MySQL. If you have a legacy database and/or experience
|
|
@@ -35,11 +35,11 @@
|
|
define('PHP_EXECUTABLE', '/usr/bin/php');
|
|
// Path to PHP executable, used for various command-line tt-rss programs
|
|
|
|
- define('LOCK_DIRECTORY', 'lock');
|
|
+ define('LOCK_DIRECTORY', '/var/lock/tt-rss');
|
|
// Directory for lockfiles, must be writable to the user you run
|
|
// daemon process or cronjobs under.
|
|
|
|
- define('CACHE_DIR', 'cache');
|
|
+ define('CACHE_DIR', '/var/cache/tt-rss');
|
|
// Local cache directory for RSS feed content.
|
|
|
|
define('TMP_DIRECTORY', '/tmp');
|