From cffa0fc411f8312c96d487564db466ea0187c15c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 8 Nov 2023 08:48:34 +0100 Subject: [PATCH 1/2] drop last bits of Fedora support Fixes: cbf95846e294aca51a3b179994d8c9ae801bd500 --- manifests/params.pp | 19 ------------------- spec/classes/agent_spec.rb | 2 -- 2 files changed, 21 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index c0c9aacb2..dd1f4eaab 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -52,25 +52,6 @@ $zabbix_package_provider = undef $agent_loadmodulepath = '/usr/lib/modules' } - 'Fedora': { - $server_fpinglocation = '/usr/sbin/fping' - $server_fping6location = '/usr/sbin/fping6' - $proxy_fpinglocation = '/usr/sbin/fping' - $proxy_fping6location = '/usr/sbin/fping6' - $manage_repo = false - $manage_choco = false - $zabbix_package_agent = 'zabbix-agent' - $agent_configfile_path = '/etc/zabbix_agentd.conf' - $agent_config_owner = 'zabbix' - $agent_zabbix_user = 'zabbix' - $agent_config_group = 'zabbix' - $agent_pidfile = '/var/run/zabbix/zabbix_agentd.pid' - $agent_servicename = 'zabbix-agent' - $agent_include = '/etc/zabbix/zabbix_agentd.d' - $server_zabbix_user = 'zabbix' - $zabbix_package_provider = undef - $agent_loadmodulepath = '/usr/lib/modules' - } 'FreeBSD': { $manage_repo = false $manage_choco = false diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb index e440417db..7c981ffd7 100644 --- a/spec/classes/agent_spec.rb +++ b/spec/classes/agent_spec.rb @@ -17,8 +17,6 @@ on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os}" do config_path = case facts[:os]['name'] - when 'Fedora' - '/etc/zabbix_agentd.conf' when 'windows' 'C:/ProgramData/zabbix/zabbix_agentd.conf' else From fbeb712fcb1bf7ffe35d55a51f17d4444ee4b7d8 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 8 Nov 2023 08:58:54 +0100 Subject: [PATCH 2/2] use os.family fact to detect params --- manifests/params.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index dd1f4eaab..a52a7af42 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,8 +1,8 @@ # @summary This class manages zabbix server parameters class zabbix::params { # It seems that ubuntu has an different fping path... - case $facts['os']['name'] { - 'Ubuntu', 'Debian' : { + case $facts['os']['family'] { + 'Debian' : { $server_fpinglocation = '/usr/bin/fping' $server_fping6location = '/usr/bin/fping6' $proxy_fpinglocation = '/usr/bin/fping'