[cpp-sp] 10/37: Reset native.logger (Apache module logs) to upstream behavior

Scott Cantor cantor.2 at osu.edu
Thu Dec 20 19:47:36 EST 2018 

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.5.5+dfsg1-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=a6ccea4dd89b3ee14e05b61c06c270646f94aef3

commit a6ccea4dd89b3ee14e05b61c06c270646f94aef3
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Wed Jan 20 17:43:36 2016 +0100

    Reset native.logger (Apache module logs) to upstream behavior
    
    Before 2.5.4 the upstream default was writing them into the Apache log
    directory.  As Apache couldn't create files there after dropping privileges,
    the internal log rotation did not work, thus we diverted those to syslog.
    
    Upstream recognized the problem and switched to using a separate package
    specific directory.  We've got no reason to deviate anymore.
    
    See also https://issues.shibboleth.net/jira/browse/SSPCPP-646.
---
 debian/libapache2-mod-shib2.NEWS                   |  8 +++
 debian/libapache2-mod-shib2.README.Debian          |  5 --
 debian/libapache2-mod-shib2.install                |  1 +
 debian/libapache2-mod-shib2.postrm                 |  9 +++
 .../patches/Default-native-logger-to-syslog.patch  | 69 ----------------------
 debian/patches/Shire-log-path-for-Debian.patch     | 23 --------
 debian/patches/series                              |  2 -
 debian/rules                                       |  4 ++
 8 files changed, 22 insertions(+), 99 deletions(-)

diff --git a/debian/libapache2-mod-shib2.NEWS b/debian/libapache2-mod-shib2.NEWS
index cea6b95..bef46ee 100644
--- a/debian/libapache2-mod-shib2.NEWS
+++ b/debian/libapache2-mod-shib2.NEWS
@@ -1,3 +1,11 @@
+shibboleth-sp2 (2.5.5+dfsg1-1) unstable; urgency=medium
+
+  The Debian specific redirection of logs from the Apache module (native
+  logs) is dropped in this version.  The new upstream location for these
+  logs is /var/log/shibboleth-www.
+
+ -- Ferenc Wágner <wferi at niif.hu>  Thu, 21 Jan 2016 01:13:27 +0100
+
 shibboleth-sp2 (2.5.2+dfsg-1) experimental; urgency=low
 
   Shibboleth has added new Require shib-session and Require shib-user
diff --git a/debian/libapache2-mod-shib2.README.Debian b/debian/libapache2-mod-shib2.README.Debian
index 982a736..9cc2fcb 100644
--- a/debian/libapache2-mod-shib2.README.Debian
+++ b/debian/libapache2-mod-shib2.README.Debian
@@ -75,11 +75,6 @@ Installation and Configuration
 
 Changes in Debian Package
 
-  The logging configuration for the native.log file has been changed to
-  use syslog.  See /etc/shibboleth/native.logger for more details.  If you
-  want the other parts of Shibboleth to also log to syslog, change the
-  other /etc/shibboleth/*.logger files similarly.
-
   The WS-Trust.xsd schema, which is needed if you use the ADFS support
   and turn on schema validation, was removed from the Debian package for
   license reasons.  To enable it again, do the following:
diff --git a/debian/libapache2-mod-shib2.install b/debian/libapache2-mod-shib2.install
index c326239..7d581cb 100644
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -1 +1,2 @@
 usr/share/shibboleth
+var/log/shibboleth-www
diff --git a/debian/libapache2-mod-shib2.postrm b/debian/libapache2-mod-shib2.postrm
new file mode 100755
index 0000000..047cd3b
--- /dev/null
+++ b/debian/libapache2-mod-shib2.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = purge ]; then
+    rm -rf /var/log/shibboleth-www
+fi
+
+#DEBHELPER#
diff --git a/debian/patches/Default-native-logger-to-syslog.patch b/debian/patches/Default-native-logger-to-syslog.patch
deleted file mode 100644
index 7c2fd4e..0000000
--- a/debian/patches/Default-native-logger-to-syslog.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Russ Allbery <rra at debian.org>
-Date: Sun, 16 Mar 2014 16:35:39 -0700
-Subject: Default native logger to syslog
-
-Rather than generating a separate log in /var/log/apache2 by
-default, which needs permissions and rotation management, default
-the native.logger configuration to using syslog.
----
- configs/native.logger.in |   44 ++++++++++++++++++++++++++++++--------------
- 1 file changed, 30 insertions(+), 14 deletions(-)
-
-diff --git a/configs/native.logger.in b/configs/native.logger.in
-index 52a90ae..5785d7e 100644
---- a/configs/native.logger.in
-+++ b/configs/native.logger.in
-@@ -1,5 +1,9 @@
- # set overall behavior
--log4j.rootCategory=INFO, native_log, warn_log
-+#
-+# Debian: remove warn_log.  All logs go to syslog, so there's no need to
-+# have multiple log destinations differentiated only by log threshold.
-+#log4j.rootCategory=INFO, native_log, warn_log
-+log4j.rootCategory=INFO, native_log
- 
- # fairly verbose for DEBUG, so generally leave at INFO
- log4j.category.XMLTooling.XMLObject=INFO
-@@ -27,17 +31,29 @@ log4j.category.XMLTooling.libcurl=INFO
- 
- # define the appender
- 
--log4j.appender.native_log=org.apache.log4j.RollingFileAppender
--log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
--log4j.appender.native_log.maxFileSize=1000000
--log4j.appender.native_log.maxBackupIndex=10
--log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
--log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
-+# This is the default, but it's essentially useless under normal
-+# circumstances since Apache doesn't have access to write to that
-+# directory.
-+#log4j.appender.native_log=org.apache.log4j.RollingFileAppender
-+#log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
-+#log4j.appender.native_log.maxFileSize=1000000
-+#log4j.appender.native_log.maxBackupIndex=10
-+#log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
-+#log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
-+#log4j.appender.warn_log=org.apache.log4j.RollingFileAppender
-+#log4j.appender.warn_log.fileName=@-SHIRELOGDIR-@/native_warn.log
-+#log4j.appender.warn_log.maxFileSize=1000000
-+#log4j.appender.warn_log.maxBackupIndex=10
-+#log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
-+#log4j.appender.warn_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
-+#log4j.appender.warn_log.threshold=WARN
- 
--log4j.appender.warn_log=org.apache.log4j.RollingFileAppender
--log4j.appender.warn_log.fileName=@-SHIRELOGDIR-@/native_warn.log
--log4j.appender.warn_log.maxFileSize=1000000
--log4j.appender.warn_log.maxBackupIndex=10
--log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
--log4j.appender.warn_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
--log4j.appender.warn_log.threshold=WARN
-+# Use syslog instead, since then at least the messages will go somewhere.
-+# That facility is LOG_DAEMON, since log4cpp apparently doesn't recognize
-+# symbolic log facilities.
-+#
-+# This is a Debian-specific change.
-+log4j.appender.native_log=org.apache.log4j.LocalSyslogAppender
-+log4j.appender.native_log.syslogName=shibboleth-sp
-+log4j.appender.native_log.facility=3
-+log4j.appender.native_log.layout=org.apache.log4j.BasicLayout
diff --git a/debian/patches/Shire-log-path-for-Debian.patch b/debian/patches/Shire-log-path-for-Debian.patch
deleted file mode 100644
index 816d4b3..0000000
--- a/debian/patches/Shire-log-path-for-Debian.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Russ Allbery <rra at debian.org>
-Date: Sun, 16 Mar 2014 16:34:45 -0700
-Subject: Shire log path for Debian
-
-Change the Apache module log path to /var/log/apache2, used on
-Debian, from the Red Hat /var/log/httpd.
----
- configs/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configs/Makefile.am b/configs/Makefile.am
-index 19826d7..c3a6858 100644
---- a/configs/Makefile.am
-+++ b/configs/Makefile.am
-@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
- 
- pkglibdir = ${libdir}/@PACKAGE_NAME@
- pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
--shirelogdir = ${localstatedir}/log/@PACKAGE_NAME at -www
-+shirelogdir = ${localstatedir}/log/apache2
- pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
- pkgwebdir = $(datadir)/@PACKAGE_NAME@
- pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
diff --git a/debian/patches/series b/debian/patches/series
index 4117494..aafe62f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 Improve-shibd-init-script.patch
 keygen-improvements-for-Debian.patch
 Avoid-libtool-silent-flag.patch
-Shire-log-path-for-Debian.patch
-Default-native-logger-to-syslog.patch
 Remove-WSTrust-schema-references.patch
diff --git a/debian/rules b/debian/rules
index 31799cf..1a89317 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,5 +100,9 @@ override_dh_installdocs:
 override_dh_installinit:
 	dh_installinit --name=shibd
 
+override_dh_fixperms:
+	dh_fixperms
+	chown www-data debian/libapache2-mod-shib2/var/log/shibboleth-www
+
 override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/shibboleth

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list