]> TLD Linux GIT Repositories - packages/syslog-ng.git/blob - syslog-ng-datadir.patch
- more upstart cleanups
[packages/syslog-ng.git] / syslog-ng-datadir.patch
1 diff -urNp syslog-ng-3.6.2.orig/lib/syslog-ng.h syslog-ng-3.6.2/lib/syslog-ng.h
2 --- syslog-ng-3.6.2.orig/lib/syslog-ng.h        2014-12-15 14:48:45.000000000 +0000
3 +++ syslog-ng-3.6.2/lib/syslog-ng.h     2015-01-28 21:25:42.469000000 +0000
4 @@ -42,7 +42,7 @@
5  #if ENABLE_ENV_WRAPPER
6  #define PATH_SYSLOGNG           PATH_LIBEXECDIR "/syslog-ng"
7  #endif
8 -#define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
9 +#define PATH_PERSIST_CONFIG     "/var/lib/syslog-ng/syslog-ng.persist"
10  
11  #define SAFE_STRING(x) ((x) ? (x) : "NULL")
12  
13 diff -urNp syslog-ng-3.6.2.orig/modules/dbparser/dbparser.h syslog-ng-3.6.2/modules/dbparser/dbparser.h
14 --- syslog-ng-3.6.2.orig/modules/dbparser/dbparser.h    2014-12-15 14:48:45.000000000 +0000
15 +++ syslog-ng-3.6.2/modules/dbparser/dbparser.h 2015-01-28 21:26:58.719000000 +0000
16 @@ -27,8 +27,8 @@
17  #include "parser/parser-expr.h"
18  #include "patterndb.h"
19  
20 -#define PATH_PATTERNDB_FILE     PATH_LOCALSTATEDIR "/patterndb.xml"
21 -#define PATH_XSDDIR             PATH_DATADIR "/xsd"
22 +#define PATH_PATTERNDB_FILE     "/var/lib/syslog-ng/patterndb.xml"
23 +#define PATH_XSDDIR             "/var/lib/syslog-ng/xsd"
24  
25  typedef struct _LogDBParser LogDBParser;
26  
27 diff -urNp syslog-ng-3.6.2.orig/scripts/update-patterndb.in syslog-ng-3.6.2/scripts/update-patterndb.in
28 --- syslog-ng-3.6.2.orig/scripts/update-patterndb.in    2014-12-15 14:48:45.000000000 +0000
29 +++ syslog-ng-3.6.2/scripts/update-patterndb.in 2015-01-28 21:24:20.398000000 +0000
30 @@ -3,6 +3,6 @@ prefix=@prefix@
31  exec_prefix=@exec_prefix@
32  bindir=@bindir@
33  sysconfdir=@sysconfdir@
34 -localstatedir=@localstatedir@
35 +localstatedir=/var/lib/syslog-ng
36  
37  ${bindir}/pdbtool merge -r --glob \*.pdb -D ${sysconfdir}/patterndb.d -p ${localstatedir}/patterndb.xml