[tt-rss.git] / debian / config.php-dist-tt-rss-mysql.diff

--- config.php-dist	2011-11-10 21:25:19.909372305 +0400
+++ config.php-dist.mysql	2011-11-10 23:33:33.049370586 +0400
@@ -1,10 +1,12 @@
 <?php
 	// Database server configuration
-	define('DB_TYPE', "pgsql"); // or mysql
-	define('DB_HOST', "localhost");
-	define('DB_USER', "fox");
-	define('DB_NAME', "fox");
-	define('DB_PASS', "XXXXXX");
+	// dbconfig-common
+	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('DB_PORT', '5432'); // when neeeded, PG-only
 
 	define('SELF_URL_PATH', 'http://yourserver/tt-rss/');
@@ -17,7 +19,7 @@
 	// Operate in single user mode, disables all functionality related to
 	// multiple users.
 	
-	define('CACHE_DIR', 'cache');
+	define('CACHE_DIR', '/var/cache/tt-rss');
 	// Local cache directory for RSS feed content.
 
 	define('SIMPLEPIE_CACHE_IMAGES', false);
@@ -130,7 +132,7 @@
 	// You want new users to be automaticaly created in tt-rss database
 	// on first login
 
-	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.
Commit	Line	Data
d0cafcf4 AD	1	--- config.php-dist 2011-11-10 21:25:19.909372305 +0400
	2	+++ config.php-dist.mysql 2011-11-10 23:33:33.049370586 +0400
	3	@@ -1,10 +1,12 @@
	4	<?php
	5	// Database server configuration
	6	- define('DB_TYPE', "pgsql"); // or mysql
	7	- define('DB_HOST', "localhost");
	8	- define('DB_USER', "fox");
	9	- define('DB_NAME', "fox");
	10	- define('DB_PASS', "XXXXXX");
	11	+ // dbconfig-common
	12	+ include_once('/etc/tt-rss-mysql/database.php');
	13	+ define('DB_TYPE', $dbtype);
	14	+ define('DB_HOST', $dbserver);
	15	+ define('DB_USER', $dbuser);
	16	+ define('DB_NAME', $dbname);
	17	+ define('DB_PASS', $dbpass);
	18	//define('DB_PORT', '5432'); // when neeeded, PG-only
	19
	20	define('SELF_URL_PATH', 'http://yourserver/tt-rss/');
	21	@@ -17,7 +19,7 @@
	22	// Operate in single user mode, disables all functionality related to
	23	// multiple users.
	24
	25	- define('CACHE_DIR', 'cache');
	26	+ define('CACHE_DIR', '/var/cache/tt-rss');
	27	// Local cache directory for RSS feed content.
	28
	29	define('SIMPLEPIE_CACHE_IMAGES', false);
	30	@@ -130,7 +132,7 @@
	31	// You want new users to be automaticaly created in tt-rss database
	32	// on first login
	33
	34	- define('LOCK_DIRECTORY', 'lock');
	35	+ define('LOCK_DIRECTORY', '/var/lock/tt-rss');
	36	// Directory for lockfiles, must be writable to the user you run
	37	// daemon process or cronjobs under.
	38