summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-07-27 00:51:00 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-07-27 00:51:52 +0000
commitd3863ebc938d5db915283fe815f6a141e15e1ca7 (patch)
tree508a791beda2561ba5ead4f44c28ede71327d0fe /bin
parentHardening quoting in container main program. (diff)
downloadcompute-tools-d3863ebc938d5db915283fe815f6a141e15e1ca7.tar.xz
compute-tools-d3863ebc938d5db915283fe815f6a141e15e1ca7.zip
Supporting /etc/compute-tools/container.conf.d.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/container10
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/container b/bin/container
index 1ec73ef..172caec 100755
--- a/bin/container
+++ b/bin/container
@@ -80,9 +80,15 @@ do
echo "${DATE} ${HOST} ${CONTAINER_USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
# irc
- if [ -e /usr/bin/irk ] && [ -e "/etc/${SOFTWARE}.conf" ]
+ if [ -e /usr/bin/irk ]
then
- . "/etc/${SOFTWARE}.conf"
+ for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
+ do
+ if [ -e "${FILE}" ]
+ then
+ . "${FILE}"
+ fi
+ done
if [ -n "${IRK_TARGETS}" ]
then