From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robin Roevens <robin.roevens@disroot.org>
To: development@lists.ipfire.org
Subject:
 [PATCH v4 2/6] zabbix_agentd: Fix agent modules dir and few minor bugs
Date: Thu, 03 Mar 2022 22:02:50 +0100
Message-ID: <20220303210254.3116-3-robin.roevens@disroot.org>
In-Reply-To: <20220303210254.3116-1-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7405221776232646720=="
List-Id: <development.lists.ipfire.org>

--===============7405221776232646720==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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(a)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(-)

diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/za=
bbix_agentd
index cba18d772..d3305cb96 100644
--- a/config/backup/includes/zabbix_agentd
+++ b/config/backup/includes/zabbix_agentd
@@ -1,2 +1,3 @@
 /etc/sudoers.d/zabbix
-/etc/zabbix_agentd/*
+/etc/zabbix_agentd/
+/usr/lib/zabbix/
diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packa=
ges/zabbix_agentd
index 4420bda05..d9bbc3ccf 100644
--- a/config/rootfiles/packages/zabbix_agentd
+++ b/config/rootfiles/packages/zabbix_agentd
@@ -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
diff --git a/src/paks/zabbix_agentd/install.sh b/src/paks/zabbix_agentd/insta=
ll.sh
index e1450a1d8..cf435918d 100644
--- a/src/paks/zabbix_agentd/install.sh
+++ b/src/paks/zabbix_agentd/install.sh
@@ -39,8 +39,8 @@ ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc0.d/K02zabbix_ag=
entd
 ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc6.d/K02zabbix_agentd
=20
 # 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 )
=20
 restore_backup ${NAME}
 start_service --background ${NAME}
diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update=
.sh
index 7fc1c96fb..68bba4f80 100644
--- a/src/paks/zabbix_agentd/update.sh
+++ b/src/paks/zabbix_agentd/update.sh
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 ./uninstall.sh
 ./install.sh
=20
--=20
2.34.1


--=20
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.


--===============7405221776232646720==--