~ubuntu-branches/ubuntu/vivid/sphinxsearch/vivid

« back to all changes in this revision

Viewing changes to debian/patches/02_sphinx.conf.patch

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-04-05 09:25:55 UTC
  • mfrom: (1.2.1) (7.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20120405092555-65tc91rowhls3kob
Tags: 2.0.4-0ubuntu1
* New upstream release (LP: #930747)
* Remove explicit depends on libmysqlcient16 (LP: #974427)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Author: <monty@inaugust.com>, modified by Radu Spineanu
 
2
Description: Changed default locations to match debian locations.
 
3
--- a/sphinx.conf.in
 
4
+++ b/sphinx.conf.in
 
5
@@ -270,7 +270,7 @@
 
6
        # shell command to invoke xmlpipe stream producer
 
7
        # mandatory
 
8
        #
 
9
-       # xmlpipe_command               = cat @CONFDIR@/test.xml
 
10
+       # xmlpipe_command               = cat @localstatedir@/test.xml 
 
11
 
 
12
        # xmlpipe2 field declaration
 
13
        # multi-value, optional, default is empty
 
14
@@ -328,7 +328,7 @@
 
15
 
 
16
        # index files path and file name, without extension
 
17
        # mandatory, path must be writable, extensions will be auto-appended
 
18
-       path                    = @CONFDIR@/data/test1
 
19
+       path                    = @localstatedir@/data/test1
 
20
 
 
21
        # document attribute values (docinfo) storage mode
 
22
        # optional, default is 'extern'
 
23
@@ -363,13 +363,13 @@
 
24
        # optional, default is empty
 
25
        # contents are plain text, charset_table and stemming are both applied
 
26
        #
 
27
-       # stopwords             = @CONFDIR@/data/stopwords.txt
 
28
+       # stopwords             = @localstatedir@/data/stopwords.txt
 
29
 
 
30
 
 
31
        # wordforms file, in "mapfrom > mapto" plain text format
 
32
        # optional, default is empty
 
33
        #
 
34
-       # wordforms             = @CONFDIR@/data/wordforms.txt
 
35
+       # wordforms             = @localstatedir@/data/wordforms.txt
 
36
 
 
37
 
 
38
        # tokenizing exceptions file
 
39
@@ -378,7 +378,7 @@
 
40
        # plain text, case sensitive, space insensitive in map-from part
 
41
        # one "Map Several Words => ToASingleOne" entry per line
 
42
        #
 
43
-       # exceptions            = @CONFDIR@/data/exceptions.txt
 
44
+       # exceptions            = @localstatedir@/data/exceptions.txt
 
45
 
 
46
 
 
47
        # minimum indexed word length
 
48
@@ -577,7 +577,7 @@
 
49
 # and may then be overridden in this index definition
 
50
 index test1stemmed : test1
 
51
 {
 
52
-       path                    = @CONFDIR@/data/test1stemmed
 
53
+       path                    = @localstatedir@/data/test1stemmed
 
54
        morphology              = stem_en
 
55
 }
 
56
 
 
57
@@ -631,7 +631,7 @@
 
58
 
 
59
        # index files path and file name, without extension
 
60
        # mandatory, path must be writable, extensions will be auto-appended
 
61
-       path                    = @CONFDIR@/data/rt
 
62
+       path                    = @localstatedir@/data/rt
 
63
 
 
64
        # RAM chunk size limit
 
65
        # RT index will keep at most this much data in RAM, then flush to disk
 
66
@@ -721,11 +721,11 @@
 
67
 
 
68
        # log file, searchd run info is logged here
 
69
        # optional, default is 'searchd.log'
 
70
-       log                     = @CONFDIR@/log/searchd.log
 
71
+       log                     = /var/log/sphinxsearch/searchd.log
 
72
 
 
73
        # query log file, all search queries are logged here
 
74
        # optional, default is empty (do not log queries)
 
75
-       query_log               = @CONFDIR@/log/query.log
 
76
+       query_log               = /var/log/sphinxsearch/query.log
 
77
 
 
78
        # client read timeout, seconds
 
79
        # optional, default is 5
 
80
@@ -741,7 +741,7 @@
 
81
 
 
82
        # PID file, searchd process ID file name
 
83
        # mandatory
 
84
-       pid_file                = @CONFDIR@/log/searchd.pid
 
85
+       pid_file                = /var/run/sphinxsearch/searchd.pid
 
86
 
 
87
        # max amount of matches the daemon ever keeps in RAM, per-index
 
88
        # WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL
 
89
@@ -787,7 +787,7 @@
 
90
        # searchd will (try to) log crashed query to 'crash_log_path.PID' file
 
91
        # optional, default is empty (do not create crash logs)
 
92
        #
 
93
-       # crash_log_path                = @CONFDIR@/log/crash
 
94
+       # crash_log_path                = /var/log/sphinxsearch/crash
 
95
 
 
96
 
 
97
        # max allowed per-query filter count
 
98
@@ -852,7 +852,7 @@
 
99
        # optional, default is build-time configured data directory
 
100
        #
 
101
        # binlog_path           = # disable logging
 
102
-       # binlog_path           = @CONFDIR@/data # binlog.001 etc will be created there
 
103
+       # binlog_path           = @localstatedir@/data # binlog.001 etc will be created there
 
104
 
 
105
 
 
106
        # binlog flush/sync mode
 
107
--- a/sphinx-min.conf.in
 
108
+++ b/sphinx-min.conf.in
 
109
@@ -26,7 +26,7 @@
 
110
 index test1
 
111
 {
 
112
        source                  = src1
 
113
-       path                    = @CONFDIR@/data/test1
 
114
+       path                    = @localstatedir@/data/test1
 
115
        docinfo                 = extern
 
116
        charset_type            = sbcs
 
117
 }
 
118
@@ -37,7 +37,7 @@
 
119
        type                    = rt
 
120
        rt_mem_limit            = 32M
 
121
 
 
122
-       path                    = @CONFDIR@/data/testrt
 
123
+       path                    = @localstatedir@/data/testrt
 
124
        charset_type            = utf-8
 
125
 
 
126
        rt_field                = title
 
127
@@ -56,11 +56,11 @@
 
128
 {
 
129
        listen                  = 9312
 
130
        listen                  = 9306:mysql41
 
131
-       log                     = @CONFDIR@/log/searchd.log
 
132
-       query_log               = @CONFDIR@/log/query.log
 
133
+       log                     = /var/log/sphinxsearch/searchd.log
 
134
+       query_log               = /var/log/sphinxsearch/query.log
 
135
        read_timeout            = 5
 
136
        max_children            = 30
 
137
-       pid_file                = @CONFDIR@/log/searchd.pid
 
138
+       pid_file                = /var/run/sphinxsearch/searchd.pid
 
139
        max_matches             = 1000
 
140
        seamless_rotate         = 1
 
141
        preopen_indexes         = 1