merge patched-debian into debian
[shibboleth/sp.git] / debian / patches / 0004-Send-the-native-log-to-syslog.patch
1 From 2549bf970b43c7a1f03048789f1c9d48cf24d528 Mon Sep 17 00:00:00 2001
2 From: Russ Allbery <rra@debian.org>
3 Date: Wed, 25 Jun 2008 17:18:03 -0700
4 Subject: Send the native log to syslog
5
6 The default native log appender tries to write to native.log in the
7 Apache log directory, but since that directory is not writable by the
8 Apache web user (regular Apache logs are handled by the root process),
9 the logs normally go nowhere.  Change the default to log to syslog so
10 the logs at least go somewhere.
11 ---
12  configs/native.logger.in |   24 ++++++++++++++++++------
13  1 files changed, 18 insertions(+), 6 deletions(-)
14
15 diff --git a/configs/native.logger.in b/configs/native.logger.in
16 index 8c17632..7d2cff2 100644
17 --- a/configs/native.logger.in
18 +++ b/configs/native.logger.in
19 @@ -26,12 +26,15 @@ log4j.category.XMLTooling.libcurl=INFO
20  
21  # define the appender
22  
23 -log4j.appender.native_log=org.apache.log4j.RollingFileAppender
24 -log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
25 -log4j.appender.native_log.maxFileSize=1000000
26 -log4j.appender.native_log.maxBackupIndex=10
27 -log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
28 -log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
29 +# This is the default, but it's essentially useless under normal
30 +# circumstances since Apache doesn't have access to write to that
31 +# directory.
32 +#log4j.appender.native_log=org.apache.log4j.RollingFileAppender
33 +#log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
34 +#log4j.appender.native_log.maxFileSize=1000000
35 +#log4j.appender.native_log.maxBackupIndex=10
36 +#log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
37 +#log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
38  
39  log4j.appender.warn_log=org.apache.log4j.RollingFileAppender
40  log4j.appender.warn_log.fileName=@-SHIRELOGDIR-@/native_warn.log
41 @@ -40,3 +43,12 @@ log4j.appender.warn_log.maxBackupIndex=10
42  log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
43  log4j.appender.warn_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
44  log4j.appender.warn_log.threshold=WARN
45 +# Use syslog instead, since then at least the messages will go somewhere.
46 +# That facility is (3 << 3) or LOG_DAEMON, since log4cpp apparently
47 +# doesn't recognize symbolic log facilities.
48 +#
49 +# This is a Debian-specific change.
50 +log4j.appender.native_log=org.apache.log4j.LocalSyslogAppender
51 +log4j.appender.native_log.syslogName=shibboleth-sp
52 +log4j.appender.native_log.facility=24
53 +log4j.appender.native_log.layout=org.apache.log4j.BasicLayout
54 -- 
55 1.7.1
56