zabbix_agentd: Configfile reorganization

[people/pmueller/ipfire-2.x.git] / lfs / zabbix_agentd

diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index dbf6f2d779e6ba4ab13f2423fe3698534b7613f7..025a0f0dbc311e0cb3db606e7d0b2d5b14158e0a 100644 (file)
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Zabbix Agent
 
-VER        = 4.2.6
+VER        = 6.0.6
 
 THISAPP    = zabbix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = zabbix_agentd
-PAK_VER    = 4
+PAK_VER    = 5
 DEPS       =
 
 SERVICES   = zabbix_agentd
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6cd55cd743d416d9ffbf2e6fdee680ee
+$(DL_FILE)_BLAKE2 = f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17
 
 install : $(TARGET)
 
@@ -55,13 +55,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist:
        @$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -70,8 +70,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -84,7 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --prefix=/usr \
                --enable-agent \
                --sysconfdir=/etc/zabbix_agentd \
-               --with-openssl
+               --with-openssl \
+               --with-libcurl
 
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
@@ -93,10 +94,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -rmdir /etc/zabbix_agentd/zabbix_agentd.conf.d
        -mkdir -pv /etc/zabbix_agentd/zabbix_agentd.d
        -mkdir -pv /etc/zabbix_agentd/scripts
+       # Move upstream supplied config out of the way for reference
+       # and install our own version of the config.
+       -mv /etc/zabbix_agentd/zabbix_agentd.conf \
+               /etc/zabbix_agentd/zabbix_agentd.conf.example
        install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/zabbix_agentd.conf \
                /etc/zabbix_agentd/zabbix_agentd.conf
+
+       # Install IPFire-specific Zabbix Agent config
+       -mkdir -pv /var/ipfire/zabbix_agentd/userparameters
+       install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf \
+               /var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf
        install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_pakfire.conf \
-               /etc/zabbix_agentd/zabbix_agentd.d/userparameter_pakfire.conf
+               /var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf
 
        # Create directory for additional agent modules
        -mkdir -pv /usr/lib/zabbix
@@ -113,7 +123,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(call INSTALL_INITSCRIPTS,$(SERVICES))
 
        # Install sudoers include file
-       install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \
+       install -v -m 640 $(DIR_SRC)/config/zabbix_agentd/sudoers \
                /etc/sudoers.d/zabbix
 
        # Install include file for backup