[v4,2/6] zabbix_agentd: Fix agent modules dir and few minor bugs
Commit Message
- Add agent modules-dir to backup
- Remove original, not used agent modules dir from rootfile
- Create modules-dir during install if it not already exists
- bugfix: Add existence check before creating log-dir, avoiding error
messages if it already exists from a previous install
- bugfix: add extract_backup_includes to update.sh script to make
sure backup includes exist when backup is taken.
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
---
config/backup/includes/zabbix_agentd | 3 ++-
config/rootfiles/packages/zabbix_agentd | 2 +-
src/paks/zabbix_agentd/install.sh | 4 ++--
src/paks/zabbix_agentd/update.sh | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
@@ -1,2 +1,3 @@
/etc/sudoers.d/zabbix
-/etc/zabbix_agentd/*
+/etc/zabbix_agentd/
+/usr/lib/zabbix/
@@ -8,7 +8,7 @@ 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/modules
usr/lib/zabbix
usr/sbin/zabbix_agentd
#usr/share/man/man1/zabbix_get.1
@@ -39,8 +39,8 @@ ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc0.d/K02zabbix_agentd
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
+[ -d /var/log/zabbix ] || ( mkdir -pv /var/log/zabbix && chown zabbix.zabbix /var/log/zabbix )
+[ -d /usr/lib/zabbix ] || ( mkdir -pv /usr/lib/zabbix && chown zabbix.zabbix /usr/lib/zabbix )
restore_backup ${NAME}
start_service --background ${NAME}
@@ -22,6 +22,7 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh