diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-07-27 00:51:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-07-27 00:51:52 +0000 |
| commit | d3863ebc938d5db915283fe815f6a141e15e1ca7 (patch) | |
| tree | 508a791beda2561ba5ead4f44c28ede71327d0fe | |
| parent | Hardening quoting in container main program. (diff) | |
| download | compute-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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | bin/container | 10 | ||||
| -rwxr-xr-x | share/hooks/pre-build.git-pull.sh | 11 | ||||
| -rwxr-xr-x | share/hooks/pre-get.git-pull.sh | 11 | ||||
| -rw-r--r-- | share/man/container.1.rst | 2 |
5 files changed, 25 insertions, 11 deletions
@@ -73,6 +73,7 @@ install: build mkdir -p $(DESTDIR)/etc/$(SOFTWARE)/debconf mkdir -p $(DESTDIR)/etc/$(SOFTWARE)/hooks mkdir -p $(DESTDIR)/etc/$(SOFTWARE)/keys + mkdir -p $(DESTDIR)/etc/${SOFTWARE}/container.conf.d mkdir -p $(DESTDIR)/usr/bin cp -r bin/* $(DESTDIR)/usr/bin @@ -205,6 +206,7 @@ uninstall: rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/debconf || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/hooks || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/keys || true + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/container.conf.d || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE) || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc || true 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 diff --git a/share/hooks/pre-build.git-pull.sh b/share/hooks/pre-build.git-pull.sh index 744f955..d2cc152 100755 --- a/share/hooks/pre-build.git-pull.sh +++ b/share/hooks/pre-build.git-pull.sh @@ -31,10 +31,13 @@ do then echo "Updating ${DIRECTORY}..." - if [ -e "/etc/${SOFTWARE}.conf" ] - then - . "/etc/${SOFTWARE}.conf" - fi + for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf + do + if [ -e "${FILE}" ] + then + . "${FILE}" + fi + done DEBCONF_ID="${DEBCONF_ID:-HEAD}" diff --git a/share/hooks/pre-get.git-pull.sh b/share/hooks/pre-get.git-pull.sh index 744f955..d2cc152 100755 --- a/share/hooks/pre-get.git-pull.sh +++ b/share/hooks/pre-get.git-pull.sh @@ -31,10 +31,13 @@ do then echo "Updating ${DIRECTORY}..." - if [ -e "/etc/${SOFTWARE}.conf" ] - then - . "/etc/${SOFTWARE}.conf" - fi + for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf + do + if [ -e "${FILE}" ] + then + . "${FILE}" + fi + done DEBCONF_ID="${DEBCONF_ID:-HEAD}" diff --git a/share/man/container.1.rst b/share/man/container.1.rst index 05139f5..3fff87b 100644 --- a/share/man/container.1.rst +++ b/share/man/container.1.rst @@ -112,7 +112,7 @@ Files The following files are used: -/etc/compute-tools/container: +/etc/compute-tools/container.conf, /etc/compute-tools/container.conf.d/\*.conf: Container configuration files. /usr/bin/container, /usr/bin/cnt: |