Refactor Shibboleth SP logging configuration

Refactor the Shibboleth SP logging configuration so that default
shibd.logger, native.logger, and console.logger with details appropriate
for Docker images are in the base and can be easily copied into images.
Remove shibd.logger and native.logger from the COmanage Registry and
Mailman images as a result.

comanage-registry-mailman/apache-shib/Dockerfile

@@ -52,9 +52,6 @@ RUN /usr/sbin/useradd --system _shibd \
       && rm -rf shibboleth \
       && ln -s /etc/shibboleth shibboleth
 
-COPY --chown=_shibd:_shibd shibd.logger /etc/shibboleth/shibd.logger
-COPY --chown=_shibd:_shibd native.logger /etc/shibboleth/native.logger
-
 COPY --from=comanage-registry-base /usr/local/lib/comanage_shibboleth_sp_utils.sh /usr/local/lib/comanage_shibboleth_sp_utils.sh
 
 COPY supervisord.conf /usr/local/etc/supervisord.conf

comanage-registry-shibboleth-sp-base/Dockerfile

@@ -139,6 +139,9 @@ RUN wget -O shibboleth-sp.tar.gz "${SHIBBOLETH_SP_URL}" \
 
 COPY shib2.load /opt/shibboleth-sp/etc/shibboleth/shib2.load
 COPY shibboleth2.xml.template /opt/shibboleth-sp/etc/shibboleth/shibboleth2.xml.template
+COPY shibd.logger /opt/shibboleth-sp/etc/shibboleth/shibd.logger
+COPY native.logger /opt/shibboleth-sp/etc/shibboleth/native.logger
+COPY console.logger /opt/shibboleth-sp/etc/shibboleth/console.logger
 
 RUN apt-get update && apt-get install -y \
       && apt-get purge -y \

comanage-registry-shibboleth-sp/native.logger → comanage-registry-shibboleth-sp-base/console.logger

@@ -1,14 +1,13 @@
-# set overall behavior
-log4j.rootCategory=INFO, native_log
+log4j.rootCategory=WARN, console
 
-# fairly verbose for DEBUG, so generally leave at WARN/INFO
-log4j.category.XMLTooling.XMLObject=WARN
-log4j.category.XMLTooling.KeyInfoResolver=WARN
-log4j.category.Shibboleth.IPRange=WARN
-log4j.category.Shibboleth.PropertySet=WARN
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
+log4j.category.XMLTooling.KeyInfoResolver=INFO
+log4j.category.Shibboleth.IPRange=INFO
+log4j.category.Shibboleth.PropertySet=INFO
 
 # raise for low-level tracing of SOAP client HTTP/SSL behavior
-log4j.category.XMLTooling.libcurl=WARN
+log4j.category.XMLTooling.libcurl=INFO
 
 # useful categories to tune independently:
 #
@@ -27,6 +26,7 @@ log4j.category.XMLTooling.libcurl=WARN
 
 # define the appender
 
-log4j.appender.native_log=org.apache.log4j.ConsoleAppender
-log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
-log4j.appender.native_log.layout.ConversionPattern=native_log %p %c %x: %m%n
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+#log4j.appender.console.layout=org.apache.log4j.BasicLayout
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=console_log %d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n

comanage-registry-mailman/apache-shib/native.logger → comanage-registry-shibboleth-sp-base/native.logger

@@ -26,7 +26,6 @@ log4j.category.XMLTooling.libcurl=WARN
 #log4j.category.XMLTooling.StorageService=DEBUG
 
 # define the appender
-
 log4j.appender.native_log=org.apache.log4j.ConsoleAppender
 log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
 log4j.appender.native_log.layout.ConversionPattern=native_log %p %c %x: %m%n

comanage-registry-mailman/apache-shib/shibd.logger → comanage-registry-shibboleth-sp-base/shibd.logger

@@ -43,7 +43,6 @@ log4j.ownAppenders.Shibboleth-TRANSACTION=true
 #log4j.category.Shibboleth-TRANSACTION.Logout=WARN
 
 # define the appenders
-
 log4j.appender.shibd_log=org.apache.log4j.ConsoleAppender
 log4j.appender.shibd_log.layout=org.apache.log4j.PatternLayout
 log4j.appender.shibd_log.layout.ConversionPattern=shibd_log %d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n

comanage-registry-shibboleth-sp/Dockerfile

@@ -58,9 +58,6 @@ RUN /usr/sbin/useradd --system _shibd \
       && ln -s /etc/shibboleth shibboleth \
       && a2enmod shib2
 
-COPY --chown=_shibd:_shibd shibd.logger /etc/shibboleth/shibd.logger
-COPY --chown=_shibd:_shibd native.logger /etc/shibboleth/native.logger
-
 COPY supervisord.conf /usr/local/etc/supervisord.conf
 
 COPY 000-comanage.conf /etc/apache2/sites-available/