Bug-fix release 20180422.a-2.1-2

Fixes:  
#1  
#2  
#3  
#4

See merge request !7

.gitlab-ci.yml

@@ -10,7 +10,7 @@ before_script:
 build-stable:
   stage: build
   script:
-    - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:20180422 --destination $CI_REGISTRY_IMAGE:20180422-1
+    - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:20180422 --destination $CI_REGISTRY_IMAGE:20180422-2
   only:
     - stable
 

Dockerfile

@@ -6,7 +6,7 @@ RUN printf "Running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATF
 # Basic info
 ARG NAME
 ARG BUILD_DATE
-ARG VERSION=20180422.a-2.1
+ARG VERSION=20180422.a-2.1-2
 ARG VCS_REF
 ARG VCS_URL
 
@@ -67,7 +67,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 	&& a2enmod setenvif \
 	&& usermod -aG tty www-data \
 	&& chmod o+w /dev/std* \
-	&& mv /etc/dokuwiki /etc/dokuwiki.dist \
+	&& mv -n /etc/dokuwiki /etc/dokuwiki.dist \
 	&& mv /etc/shibboleth /etc/shibboleth.dist \
 	&& mv /var/lib/dokuwiki /var/lib/dokuwiki.dist \
 	&& mkdir -p /run/shibboleth && chown _shibd /run/shibboleth \

content/etc/apache2/sites-available/000-default.conf

+<VirtualHost *:80>
+	DocumentRoot /var/www/html
+
+	ErrorLog /dev/stderr
+	CustomLog /dev/stdout combined
+
+	IncludeOptional /etc/apache2/conf-available/fqdn.conf
+	IncludeOptional /etc/apache2/conf-available/dokuwiki_csp.conf
+</VirtualHost>

content/etc/shibboleth.dist/shibd.logger

+# set overall behavior
+log4j.rootCategory=INFO, console
+
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
+log4j.category.XMLTooling.XMLObjectBuilder=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=INFO
+
+# useful categories to tune independently:
+#
+# tracing of SAML messages and security policies
+#log4j.category.OpenSAML.MessageDecoder=DEBUG
+#log4j.category.OpenSAML.MessageEncoder=DEBUG
+#log4j.category.OpenSAML.SecurityPolicyRule=DEBUG
+#log4j.category.XMLTooling.SOAPClient=DEBUG
+# interprocess message remoting
+#log4j.category.Shibboleth.Listener=DEBUG
+# mapping of requests to applicationId
+#log4j.category.Shibboleth.RequestMapper=DEBUG
+# high level session cache operations
+#log4j.category.Shibboleth.SessionCache=DEBUG
+# persistent storage and caching
+#log4j.category.XMLTooling.StorageService=DEBUG
+
+# logs XML being signed or verified if set to DEBUG
+log4j.category.XMLTooling.Signature.Debugger=INFO, sig_log
+log4j.additivity.XMLTooling.Signature.Debugger=false
+log4j.ownAppenders.XMLTooling.Signature.Debugger=true
+
+# the tran log blocks the "default" appender(s) at runtime
+# Level should be left at INFO for this category
+log4j.category.Shibboleth-TRANSACTION=INFO, tran_log
+log4j.additivity.Shibboleth-TRANSACTION=false
+log4j.ownAppenders.Shibboleth-TRANSACTION=true
+
+# uncomment to suppress particular event types
+#log4j.category.Shibboleth-TRANSACTION.AuthnRequest=WARN
+#log4j.category.Shibboleth-TRANSACTION.Login=WARN
+#log4j.category.Shibboleth-TRANSACTION.Logout=WARN
+
+# define the appenders
+
+#log4j.appender.shibd_log=org.apache.log4j.RollingFileAppender
+#log4j.appender.shibd_log.fileName=/var/log/shibboleth/shibd.log
+#log4j.appender.shibd_log.maxFileSize=1000000
+#log4j.appender.shibd_log.maxBackupIndex=10
+#log4j.appender.shibd_log.layout=org.apache.log4j.PatternLayout
+#log4j.appender.shibd_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=/var/log/shibboleth/shibd_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.tran_log=org.apache.log4j.RollingFileAppender
+#log4j.appender.tran_log.fileName=/var/log/shibboleth/transaction.log
+#log4j.appender.tran_log.maxFileSize=1000000
+#log4j.appender.tran_log.maxBackupIndex=20
+#log4j.appender.tran_log.layout=org.apache.log4j.PatternLayout
+#log4j.appender.tran_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S}|%c|%m%n
+#
+#log4j.appender.sig_log=org.apache.log4j.FileAppender
+#log4j.appender.sig_log.fileName=/var/log/shibboleth/signature.log
+#log4j.appender.sig_log.layout=org.apache.log4j.PatternLayout
+#log4j.appender.sig_log.layout.ConversionPattern=%m
+
+
+log4j.rootCategory=WARN, console
+
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
+log4j.category.XMLTooling.XMLObjectBuilder=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=INFO
+
+# useful categories to tune independently:
+#
+# tracing of SAML messages and security policies
+#log4j.category.OpenSAML.MessageDecoder=DEBUG
+#log4j.category.OpenSAML.MessageEncoder=DEBUG
+#log4j.category.OpenSAML.SecurityPolicyRule=DEBUG
+# interprocess message remoting
+#log4j.category.Shibboleth.Listener=DEBUG
+# mapping of requests to applicationId
+#log4j.category.Shibboleth.RequestMapper=DEBUG
+# high level session cache operations
+#log4j.category.Shibboleth.SessionCache=DEBUG
+# persistent storage and caching
+#log4j.category.XMLTooling.StorageService=DEBUG
+
+# define the appender
+
+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=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n

content/etc/supervisor/conf.d/php-fpm.conf

 [program:php-fpm]
-command      = /usr/sbin/php-fpm7.4 -F
+command      = /usr/sbin/php-fpm7.4 -F -O
 user         = www-data
 autorestart  = true
 startretries = 3

content/opt/dokuwiki-entrypoint.sh

@@ -53,7 +53,7 @@ if [ -f /etc/apache2/ssl/dokuwiki.crt ] && [ -f /etc/apache2/ssl/dokuwiki.key ];
 		if [ ! -f /etc/apache2/ssl/dokuwiki.chain ]; then
 		echo > /etc/apache2/ssl/dokuwiki.chain
 	fi
-	a2enmod -q ssl >/dev/null 2>&1
+	a2enmod -q ssl headers >/dev/null 2>&1
 	a2ensite -q dokuwiki-ssl >/dev/null 2>&1
 	chown www-data:www-data /etc/apache2/ssl/dokuwiki.{crt,key} || true
 

docker-compose.yml

@@ -16,7 +16,6 @@ networks:
       driver: default
       config:
       - subnet: fd00:dead:beef::/48
-        gateway: fd00:dead:beef::1
 
 services:
   dokuwiki: