mirror of
https://github.com/netdata/netdata.git
synced 2025-05-05 01:30:32 +00:00
prefer cap over setuid for sysetmd-journal in installer (#15741)
This commit is contained in:
parent
326e3e4687
commit
4611cbbcb3
1 changed files with 15 additions and 4 deletions
|
@ -1239,6 +1239,21 @@ if [ "$(id -u)" -eq 0 ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -f "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin" ]; then
|
||||||
|
run chown "root:${NETDATA_GROUP}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"
|
||||||
|
capabilities=0
|
||||||
|
if ! iscontainer && command -v setcap 1> /dev/null 2>&1; then
|
||||||
|
run chmod 0750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"
|
||||||
|
if run setcap cap_dac_read_search+ep "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"; then
|
||||||
|
capabilities=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $capabilities -eq 0 ]; then
|
||||||
|
run chmod 4750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -f "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/freeipmi.plugin" ]; then
|
if [ -f "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/freeipmi.plugin" ]; then
|
||||||
run chown "root:${NETDATA_GROUP}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/freeipmi.plugin"
|
run chown "root:${NETDATA_GROUP}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/freeipmi.plugin"
|
||||||
run chmod 4750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/freeipmi.plugin"
|
run chmod 4750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/freeipmi.plugin"
|
||||||
|
@ -1291,10 +1306,6 @@ if [ "$(id -u)" -eq 0 ]; then
|
||||||
run chmod 4750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/local-listeners"
|
run chmod 4750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/local-listeners"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin" ]; then
|
|
||||||
run chown "root:${NETDATA_GROUP}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"
|
|
||||||
run chmod 4750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
# non-privileged user installation
|
# non-privileged user installation
|
||||||
run chown "${NETDATA_USER}:${NETDATA_GROUP}" "${NETDATA_LOG_DIR}"
|
run chown "${NETDATA_USER}:${NETDATA_GROUP}" "${NETDATA_LOG_DIR}"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue