[2/4] zabbix_agentd: Fix agent modules directory
Commit Message
- Add agent modules-dir to backup
- Remove original, not used agent modules dir from rootfile
- Delete agent modules dir only when empty on uninstall thus keeping
possible user deployed custom module files but removing it if unused.
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
---
config/backup/includes/zabbix_agentd | 3 ++-
config/rootfiles/packages/zabbix_agentd | 4 ++--
src/paks/zabbix_agentd/install.sh | 2 ++
src/paks/zabbix_agentd/uninstall.sh | 5 +++++
src/paks/zabbix_agentd/update.sh | 1 +
5 files changed, 12 insertions(+), 3 deletions(-)
@@ -1,2 +1,3 @@
/etc/sudoers.d/zabbix
-/etc/zabbix_agentd/*
+/etc/zabbix_agentd/
+/usr/lib/zabbix/
@@ -8,8 +8,8 @@ etc/zabbix_agentd/zabbix_agentd.d
etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf
usr/bin/zabbix_get
usr/bin/zabbix_sender
-usr/lib/modules
-usr/lib/zabbix
+#usr/lib/modules
+#usr/lib/zabbix
usr/sbin/zabbix_agentd
#usr/share/man/man1/zabbix_get.1
#usr/share/man/man1/zabbix_sender.1
@@ -41,6 +41,8 @@ ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc6.d/K02zabbix_agentd
# Create additonal directories and set permissions
mkdir -pv /var/log/zabbix
chown zabbix.zabbix /var/log/zabbix
+mkdir -pv /usr/lib/zabbix
+chown zabbix.zabbix /usr/lib/zabbix
restore_backup ${NAME}
start_service --background ${NAME}
@@ -26,5 +26,10 @@ stop_service ${NAME}
make_backup ${NAME}
remove_files
+# Remove agent modules dir if empty
+if [ -z "$(ls -A /usr/lib/zabbix/)" ]; then
+ rmdir /usr/lib/zabbix
+fi
+
# Remove init-scripts and symlinks
rm -rfv /etc/rc.d/rc*.d/*zabbix_agentd
@@ -22,6 +22,7 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh