From e28c60675109000e45b0650cb47fb91de8a5792b Mon Sep 17 00:00:00 2001
From: Gardais Jeremy <jeremy.gardais@univ-rennes1.fr>
Date: Tue, 30 Jan 2018 16:59:36 +0100
Subject: [PATCH] Ensure to copy all rsyslogd configuration files.

---
 scripts/latecommand/post.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/latecommand/post.sh b/scripts/latecommand/post.sh
index de6343e..0001eb9 100755
--- a/scripts/latecommand/post.sh
+++ b/scripts/latecommand/post.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-RSYSLOGD_CONF="$(dirname $0)/stretch/etc/rsyslog.conf"
-RSYSLOGD_FILE="/etc/rsyslog.conf"
-RSYSLOGD_SYSLOG_CONF="$(dirname $0)/stretch/etc/rsyslog.d/99syslog.conf"
-RSYSLOGD_SYSLOG_FILE="/etc/rsyslog.d/99syslog.conf"
+RSYSLOGD_CONF_SRC="$(dirname $0)/stretch/etc/rsyslog.conf"
+RSYSLOGD_CONF_PATH="/etc/rsyslog.conf"
+RSYSLOGD_INCLUDE_SRC="$(dirname $0)/stretch/etc/rsyslog.d/*"
+RSYSLOGD_INCLUDE_PATH="/etc/rsyslog.d/"
 
 LOGROTATE_CONF="$(dirname $0)/stretch/etc/logrotate.conf"
 LOGROTATE_FILE="/etc/logrotate.conf"
@@ -70,10 +70,10 @@ fi
 ### Rsyslog {{{
 
 # Install new Rsyslog configuration
-if [ -f "${RSYSLOGD_FILE}" ]; then
-  cp "${RSYSLOGD_CONF}" "${RSYSLOGD_FILE}"
+if [ -f "${RSYSLOGD_CONF_PATH}" ]; then
+  cp "${RSYSLOGD_CONF_SRC}" "${RSYSLOGD_CONF_PATH}"
 fi
-cp "${RSYSLOGD_SYSLOG_CONF}" "${RSYSLOGD_SYSLOG_FILE}"
+cp -- "${RSYSLOGD_INCLUDE_SRC}" "${RSYSLOGD_INCLUDE_PATH}"
 
 # Restart Rsyslog service
 systemctl restart rsyslog