summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-04-11 12:41:32 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-04-11 12:46:00 +0000
commit0ddd4177d44497b25ef3baa85a4187aafa0faf96 (patch)
tree56b10bc2959228aaf3411172f113e42544cd4dba
parentUsing /usr/share/compute-tools instead of /usr/share/open-infrastructure/cont... (diff)
downloadcompute-tools-0ddd4177d44497b25ef3baa85a4187aafa0faf96.tar.xz
compute-tools-0ddd4177d44497b25ef3baa85a4187aafa0faf96.zip
Using /var/log/compute-tools instead of /var/log/open-infrastructure.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rw-r--r--Makefile4
-rwxr-xr-xbin/container2
-rwxr-xr-xlibexec/container/log2
-rw-r--r--share/bash-completion/container16
-rw-r--r--share/logrotate/container2
-rw-r--r--share/man/container.1.txt2
6 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index b7b0b28..40f9ec5 100644
--- a/Makefile
+++ b/Makefile
@@ -123,10 +123,10 @@ install: build
mkdir -p $(DESTDIR)/lib/systemd/system
cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
- mkdir -p $(DESTDIR)/var/log/$(PROJECT)
+ mkdir -p $(DESTDIR)/var/log/$(SOFTWARE)
uninstall:
- rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/var/log/$(PROJECT) || true
+ rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/var/log/$(SOFTWARE) || true
for FILE in share/systemd/*; \
do \
diff --git a/bin/container b/bin/container
index d99916a..6106578 100755
--- a/bin/container
+++ b/bin/container
@@ -71,7 +71,7 @@ do
HOST="$(hostname -f 2> /dev/null || hostname)"
# logfile
- echo "${DATE} ${HOST} ${USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${PROJECT}/${PROGRAM}.log"
+ echo "${DATE} ${HOST} ${USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
# irc
if [ -e /usr/bin/irk ] && [ -e "/etc/${SOFTWARE}.conf" ]
diff --git a/libexec/container/log b/libexec/container/log
index 6674e13..2378eb4 100755
--- a/libexec/container/log
+++ b/libexec/container/log
@@ -24,7 +24,7 @@ SOFTWARE="compute-tools"
PROGRAM="container"
COMMAND="$(basename ${0})"
-LOG="/var/log/${PROJECT}/${PROGRAM}.log"
+LOG="/var/log/${SOFTWARE}/${PROGRAM}.log"
Parameters ()
{
diff --git a/share/bash-completion/container b/share/bash-completion/container
index 810d1c2..4e123ed 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -145,13 +145,13 @@ _container()
log)
case "${prev}" in
-d|--date)
- opts="$(if ls /var/log/open-infrastructure/container.log-*.gz > /dev/null 2>&1;
+ opts="$(if ls /var/log/compute-tools/container.log-*.gz > /dev/null 2>&1;
then \
- zcat /var/log/open-infrastructure/container.log-*.gz | awk '{ print $1 }' | sort -u; \
+ zcat /var/log/compute-tools/container.log-*.gz | awk '{ print $1 }' | sort -u; \
fi; \
- if [ -e /var/log/open-infrastructure/container.log ]; \
+ if [ -e /var/log/compute-tools/container.log ]; \
then \
- awk '{ print $1 }' /var/log/open-infrastructure/container.log | sort -u; \
+ awk '{ print $1 }' /var/log/compute-tools/container.log | sort -u; \
fi) \
today yesterday"
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
@@ -159,13 +159,13 @@ _container()
;;
-n|--name)
- opts="$(if ls /var/log/open-infrastructure/container.log-*.gz > /dev/null 2>&1;
+ opts="$(if ls /var/log/compute-tools/container.log-*.gz > /dev/null 2>&1;
then \
- zgrep -E '(\-n|\-\-name) ' /var/log/open-infrastructure/container.log-*.gz | sed -e 's|.*-n ||' -e 's|.*--name ||' -e 's| .*$||' | sort -u; \
+ zgrep -E '(\-n|\-\-name) ' /var/log/compute-tools/container.log-*.gz | sed -e 's|.*-n ||' -e 's|.*--name ||' -e 's| .*$||' | sort -u; \
fi; \
- if [ -e /var/log/open-infrastructure/container.log ]; \
+ if [ -e /var/log/compute-tools/container.log ]; \
then \
- grep -E '(\-n|\-\-name) ' /var/log/open-infrastructure/container.log | sed -e 's|.*-n ||' -e 's|.*--name ||' -e 's| .*$||' | sort -u; \
+ grep -E '(\-n|\-\-name) ' /var/log/compute-tools/container.log | sed -e 's|.*-n ||' -e 's|.*--name ||' -e 's| .*$||' | sort -u; \
fi)"
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
return 0
diff --git a/share/logrotate/container b/share/logrotate/container
index 14599be..0722aa5 100644
--- a/share/logrotate/container
+++ b/share/logrotate/container
@@ -1,4 +1,4 @@
-/var/log/open-infrastructure/container.log {
+/var/log/compute-tools/container.log {
compress
create 0640 root adm
dateext
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index fd5f354..c3bcdfb 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -128,7 +128,7 @@ The following files are used:
*/var/lib/machines*::
Container root directory.
-*/var/log/open-infrastructure*::
+*/var/log/compute-tools*::
Container log files.