Attachment 1305 Details for Bug 3931 – sphinx-mga_conf.diff

[patch] sphinx-mga_conf.diff

sphinx-mga_conf.diff (text/plain), 3.21 KB, created by Sam Bailey on 2011-12-29 23:50:13 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Bailey

Created: 2011-12-29 23:50:13 CET

Size: 3.21 KB

patch

obsolete

>--- sphinx.conf.in	2011-04-19 00:39:40.000000000 +1000
>+++ sphinx.conf.in.new	2011-12-30 09:12:33.961068418 +1100
>@@ -270,7 +270,7 @@
> 	# shell command to invoke xmlpipe stream producer
> 	# mandatory
> 	#
>-	# xmlpipe_command		= cat @CONFDIR@/test.xml
>+	# xmlpipe_command		= cat /var/lib/sphinx/test.xml
> 
> 	# xmlpipe2 field declaration
> 	# multi-value, optional, default is empty
>@@ -328,7 +328,7 @@
> 
> 	# index files path and file name, without extension
> 	# mandatory, path must be writable, extensions will be auto-appended
>-	path			= @CONFDIR@/data/test1
>+	path			= /var/lib/sphinx/data/test1
> 
> 	# document attribute values (docinfo) storage mode
> 	# optional, default is 'extern'
>@@ -363,13 +363,13 @@
> 	# optional, default is empty
> 	# contents are plain text, charset_table and stemming are both applied
> 	#
>-	# stopwords		= @CONFDIR@/data/stopwords.txt
>+	# stopwords		= /var/lib/sphinx/data/stopwords.txt
> 
> 
> 	# wordforms file, in "mapfrom > mapto" plain text format
> 	# optional, default is empty
> 	#
>-	# wordforms		= @CONFDIR@/data/wordforms.txt
>+	# wordforms		= /var/lib/sphinx/data/wordforms.txt
> 
> 
> 	# tokenizing exceptions file
>@@ -378,7 +378,7 @@
> 	# plain text, case sensitive, space insensitive in map-from part
> 	# one "Map Several Words => ToASingleOne" entry per line
> 	#
>-	# exceptions		= @CONFDIR@/data/exceptions.txt
>+	# exceptions		= /var/lib/sphinx/data/exceptions.txt
> 
> 
> 	# minimum indexed word length
>@@ -577,7 +577,7 @@
> # and may then be overridden in this index definition
> index test1stemmed : test1
> {
>-	path			= @CONFDIR@/data/test1stemmed
>+	path			= /var/lib/sphinx/data/test1stemmed
> 	morphology		= stem_en
> }
> 
>@@ -631,7 +631,7 @@
> 
> 	# index files path and file name, without extension
> 	# mandatory, path must be writable, extensions will be auto-appended
>-	path			= @CONFDIR@/data/rt
>+	path			= /var/lib/sphinx/data/rt
> 
> 	# RAM chunk size limit
> 	# RT index will keep at most this much data in RAM, then flush to disk
>@@ -721,11 +721,11 @@
> 
> 	# log file, searchd run info is logged here
> 	# optional, default is 'searchd.log'
>-	log			= @CONFDIR@/log/searchd.log
>+	log			= /var/log/sphinx/searchd.log
> 
> 	# query log file, all search queries are logged here
> 	# optional, default is empty (do not log queries)
>-	query_log		= @CONFDIR@/log/query.log
>+	query_log		= /var/log/sphinx/query.log
> 
> 	# client read timeout, seconds
> 	# optional, default is 5
>@@ -741,7 +741,7 @@
> 
> 	# PID file, searchd process ID file name
> 	# mandatory
>-	pid_file		= @CONFDIR@/log/searchd.pid
>+	pid_file		= /var/log/sphinx/searchd.pid
> 
> 	# max amount of matches the daemon ever keeps in RAM, per-index
> 	# WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL
>@@ -787,7 +787,7 @@
> 	# searchd will (try to) log crashed query to 'crash_log_path.PID' file
> 	# optional, default is empty (do not create crash logs)
> 	#
>-	# crash_log_path		= @CONFDIR@/log/crash
>+	# crash_log_path		= /var/log/sphinx/crash
> 
> 
> 	# max allowed per-query filter count
>@@ -852,7 +852,7 @@
> 	# optional, default is build-time configured data directory
> 	#
> 	# binlog_path		= # disable logging
>-	# binlog_path		= @CONFDIR@/data # binlog.001 etc will be created there
>+	# binlog_path		= /var/lib/sphinx/data # binlog.001 etc will be created there
> 
> 
> 	# binlog flush/sync mode

--- sphinx.conf.in	2011-04-19 00:39:40.000000000 +1000
+++ sphinx.conf.in.new	2011-12-30 09:12:33.961068418 +1100
@@ -270,7 +270,7 @@
 	# shell command to invoke xmlpipe stream producer
 	# mandatory
 	#
-	# xmlpipe_command		= cat @CONFDIR@/test.xml
+	# xmlpipe_command		= cat /var/lib/sphinx/test.xml
 
 	# xmlpipe2 field declaration
 	# multi-value, optional, default is empty
@@ -328,7 +328,7 @@
 
 	# index files path and file name, without extension
 	# mandatory, path must be writable, extensions will be auto-appended
-	path			= @CONFDIR@/data/test1
+	path			= /var/lib/sphinx/data/test1
 
 	# document attribute values (docinfo) storage mode
 	# optional, default is 'extern'
@@ -363,13 +363,13 @@
 	# optional, default is empty
 	# contents are plain text, charset_table and stemming are both applied
 	#
-	# stopwords		= @CONFDIR@/data/stopwords.txt
+	# stopwords		= /var/lib/sphinx/data/stopwords.txt
 
 
 	# wordforms file, in "mapfrom > mapto" plain text format
 	# optional, default is empty
 	#
-	# wordforms		= @CONFDIR@/data/wordforms.txt
+	# wordforms		= /var/lib/sphinx/data/wordforms.txt
 
 
 	# tokenizing exceptions file
@@ -378,7 +378,7 @@
 	# plain text, case sensitive, space insensitive in map-from part
 	# one "Map Several Words => ToASingleOne" entry per line
 	#
-	# exceptions		= @CONFDIR@/data/exceptions.txt
+	# exceptions		= /var/lib/sphinx/data/exceptions.txt
 
 
 	# minimum indexed word length
@@ -577,7 +577,7 @@
 # and may then be overridden in this index definition
 index test1stemmed : test1
 {
-	path			= @CONFDIR@/data/test1stemmed
+	path			= /var/lib/sphinx/data/test1stemmed
 	morphology		= stem_en
 }
 
@@ -631,7 +631,7 @@
 
 	# index files path and file name, without extension
 	# mandatory, path must be writable, extensions will be auto-appended
-	path			= @CONFDIR@/data/rt
+	path			= /var/lib/sphinx/data/rt
 
 	# RAM chunk size limit
 	# RT index will keep at most this much data in RAM, then flush to disk
@@ -721,11 +721,11 @@
 
 	# log file, searchd run info is logged here
 	# optional, default is 'searchd.log'
-	log			= @CONFDIR@/log/searchd.log
+	log			= /var/log/sphinx/searchd.log
 
 	# query log file, all search queries are logged here
 	# optional, default is empty (do not log queries)
-	query_log		= @CONFDIR@/log/query.log
+	query_log		= /var/log/sphinx/query.log
 
 	# client read timeout, seconds
 	# optional, default is 5
@@ -741,7 +741,7 @@
 
 	# PID file, searchd process ID file name
 	# mandatory
-	pid_file		= @CONFDIR@/log/searchd.pid
+	pid_file		= /var/log/sphinx/searchd.pid
 
 	# max amount of matches the daemon ever keeps in RAM, per-index
 	# WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL
@@ -787,7 +787,7 @@
 	# searchd will (try to) log crashed query to 'crash_log_path.PID' file
 	# optional, default is empty (do not create crash logs)
 	#
-	# crash_log_path		= @CONFDIR@/log/crash
+	# crash_log_path		= /var/log/sphinx/crash
 
 
 	# max allowed per-query filter count
@@ -852,7 +852,7 @@
 	# optional, default is build-time configured data directory
 	#
 	# binlog_path		= # disable logging
-	# binlog_path		= @CONFDIR@/data # binlog.001 etc will be created there
+	# binlog_path		= /var/lib/sphinx/data # binlog.001 etc will be created there
 
 
 	# binlog flush/sync mode

Actions: View | Diff

Attachments on bug 3931: 1305 | 1306