zabbix_agentd: Bugfix for /etc/sudoers.d/zabbix.user

Files containing an '~' or '.' are ignored by sudo when placed in the includedir /etc/sudoers.d This makes the file useless. The file is renamed to "zabbix" instead of "zabbix.user" to fix this.

See: https://www.sudo.ws/man/1.8.13/sudoers.man.html#Including_other_files_from_within_sudoers

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/zabbix_agentd
index b410dbe16b8ee45f17169016c61334a669fc125b..cba18d7721771443bbee6a98ad3ad03b9bde5745 100644 (file)
--- a/config/backup/includes/zabbix_agentd
+++ b/config/backup/includes/zabbix_agentd
@@ -1,2 +1,2 @@
-/etc/sudoers.d/zabbix.user
+/etc/sudoers.d/zabbix
 /etc/zabbix_agentd/*

diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd
index db852381e1bdca48329bc329014a1f0cb68b5ebe..eaecf26445ae2e62fd7935795b34b75453104be3 100644 (file)
--- a/config/rootfiles/packages/zabbix_agentd
+++ b/config/rootfiles/packages/zabbix_agentd
@@ -1,6 +1,6 @@
 etc/logrotate.d/zabbix_agentd
 etc/rc.d/init.d/zabbix_agentd
-etc/sudoers.d/zabbix.user
+etc/sudoers.d/zabbix
 etc/zabbix_agentd
 etc/zabbix_agentd/scripts
 etc/zabbix_agentd/zabbix_agentd.conf

diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index d7f7fc31ec7ba97755cb7dfe8148f726093e667f..5e50235981fa6d0a7567cea25038afcb32ea1efc 100644 (file)
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -108,7 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Install sudoers include file
        install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \
-               /etc/sudoers.d/zabbix.user
+               /etc/sudoers.d/zabbix
 
        # Install include file for backup
        install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \

diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..7fc1c96fbdf6199408507ab9e1a110c9800e9eff 100644 (file)
--- a/src/paks/zabbix_agentd/update.sh
+++ b/src/paks/zabbix_agentd/update.sh
@@ -24,3 +24,8 @@
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
 ./install.sh
+
+# Ensure /etc/sudoers.d/zabbix.user is renamed to /etc/sudoers.d/zabbix
+if [ -e /etc/sudoers.d/zabbix.user ]; then
+       mv -v /etc/sudoers.d/zabbix.user /etc/sudoers.d/zabbix
+fi