Skip to content

Commit 9a31243

Browse files
wdberrywdberry
committed
Change default value of socketdir to undef from explicit default.
I realized, after the fact, that the better code pattern rather than explicitly configuring the default value to the implied default is to omit it from the configuration file by the default by using a default of undef and conditional statements.
1 parent b003d5a commit 9a31243

File tree

6 files changed

+98
-98
lines changed

6 files changed

+98
-98
lines changed

‎manifests/init.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
$include_dir = $zabbix::params::server_include,
177177
$loadmodulepath = $zabbix::params::server_loadmodulepath,
178178
$loadmodule = $zabbix::params::server_loadmodule,
179-
Stdlib::Absolutepath $socketdir = $zabbix::params::server_socketdir,
179+
Optional[Stdlib::Absolutepath] $socketdir = $zabbix::params::server_socketdir,
180180
Boolean $manage_selinux = $zabbix::params::manage_selinux,
181181
String $additional_service_params = $zabbix::params::additional_service_params,
182182
Optional[String[1]] $zabbix_user = $zabbix::params::server_zabbix_user,

‎manifests/params.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
$server_vmwarecachesize = '8M'
285285
$server_vmwarefrequency = '60'
286286
$server_vmwaretimeout = undef
287-
$server_socketdir = '/tmp'
287+
$server_socketdir = undef
288288

289289
# Agent specific params
290290
$agent_allowroot = '0'
@@ -427,7 +427,7 @@
427427
$proxy_zabbix_server_port = '10051'
428428
$proxy_zbx_templates = ['Template App Zabbix Proxy']
429429
$proxy_socketdir = versioncmp($zabbix_version, '5.0') ? {
430-
-1 => '/tmp',
430+
-1 => undef,
431431
default => '/var/run/zabbix',
432432
}
433433

‎manifests/proxy.pp‎

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -336,98 +336,98 @@
336336
# Copyright 2014 Werner Dijkerman
337337
#
338338
class zabbix::proxy (
339-
Zabbix::Databases $database_type = $zabbix::params::database_type,
340-
$database_path = $zabbix::params::database_path,
341-
$zabbix_version = $zabbix::params::zabbix_version,
342-
$zabbix_package_state = $zabbix::params::zabbix_package_state,
343-
Boolean $manage_database = $zabbix::params::manage_database,
344-
Boolean $manage_firewall = $zabbix::params::manage_firewall,
345-
Boolean $manage_repo = $zabbix::params::manage_repo,
346-
Boolean $manage_resources = $zabbix::params::manage_resources,
347-
Boolean $manage_service = $zabbix::params::manage_service,
348-
$zabbix_proxy = $zabbix::params::zabbix_proxy,
349-
$zabbix_proxy_ip = $zabbix::params::zabbix_proxy_ip,
350-
$use_ip = $zabbix::params::proxy_use_ip,
351-
$zbx_templates = $zabbix::params::proxy_zbx_templates,
352-
$proxy_configfile_path = $zabbix::params::proxy_configfile_path,
353-
$proxy_service_name = $zabbix::params::proxy_service_name,
354-
$mode = $zabbix::params::proxy_mode,
355-
$zabbix_server_host = $zabbix::params::proxy_zabbix_server_host,
356-
$zabbix_server_port = $zabbix::params::proxy_zabbix_server_port,
357-
$hostname = $zabbix::params::proxy_hostname,
358-
$listenport = $zabbix::params::proxy_listenport,
359-
$sourceip = $zabbix::params::proxy_sourceip,
360-
Integer[0] $enableremotecommands = $zabbix::params::proxy_enableremotecommands,
361-
Integer[0] $logremotecommands = $zabbix::params::proxy_logremotecommands,
362-
$logfile = $zabbix::params::proxy_logfile,
363-
$logfilesize = $zabbix::params::proxy_logfilesize,
364-
$debuglevel = $zabbix::params::proxy_debuglevel,
365-
$pidfile = $zabbix::params::proxy_pidfile,
366-
$database_schema_path = $zabbix::params::database_schema_path,
367-
$database_host = $zabbix::params::proxy_database_host,
368-
$database_name = $zabbix::params::proxy_database_name,
369-
$database_schema = $zabbix::params::proxy_database_schema,
370-
$database_user = $zabbix::params::proxy_database_user,
371-
$database_password = $zabbix::params::proxy_database_password,
372-
$database_socket = $zabbix::params::proxy_database_socket,
373-
$database_port = $zabbix::params::proxy_database_port,
374-
$localbuffer = $zabbix::params::proxy_localbuffer,
375-
$offlinebuffer = $zabbix::params::proxy_offlinebuffer,
376-
$heartbeatfrequency = $zabbix::params::proxy_heartbeatfrequency,
377-
$configfrequency = $zabbix::params::proxy_configfrequency,
378-
$datasenderfrequency = $zabbix::params::proxy_datasenderfrequency,
379-
$startpollers = $zabbix::params::proxy_startpollers,
380-
$startipmipollers = $zabbix::params::proxy_startipmipollers,
381-
$startpollersunreachable = $zabbix::params::proxy_startpollersunreachable,
382-
$starttrappers = $zabbix::params::proxy_starttrappers,
383-
$startpingers = $zabbix::params::proxy_startpingers,
384-
$startdiscoverers = $zabbix::params::proxy_startdiscoverers,
385-
$starthttppollers = $zabbix::params::proxy_starthttppollers,
386-
$javagateway = $zabbix::params::proxy_javagateway,
387-
$javagatewayport = $zabbix::params::proxy_javagatewayport,
388-
$startjavapollers = $zabbix::params::proxy_startjavapollers,
389-
$startvmwarecollectors = $zabbix::params::proxy_startvmwarecollectors,
390-
$vmwarefrequency = $zabbix::params::proxy_vmwarefrequency,
391-
$vmwareperffrequency = $zabbix::params::proxy_vmwareperffrequency,
392-
$vmwarecachesize = $zabbix::params::proxy_vmwarecachesize,
393-
$vmwaretimeout = $zabbix::params::proxy_vmwaretimeout,
394-
$enablesnmpbulkrequests = $zabbix::params::proxy_enablesnmpbulkrequests,
395-
$snmptrapperfile = $zabbix::params::proxy_snmptrapperfile,
396-
$snmptrapper = $zabbix::params::proxy_snmptrapper,
397-
$listenip = $zabbix::params::proxy_listenip,
398-
$housekeepingfrequency = $zabbix::params::proxy_housekeepingfrequency,
399-
$cachesize = $zabbix::params::proxy_cachesize,
400-
$startdbsyncers = $zabbix::params::proxy_startdbsyncers,
401-
$historycachesize = $zabbix::params::proxy_historycachesize,
402-
$historyindexcachesize = $zabbix::params::proxy_historyindexcachesize,
403-
$historytextcachesize = $zabbix::params::proxy_historytextcachesize,
404-
$timeout = $zabbix::params::proxy_timeout,
405-
$tlsaccept = $zabbix::params::proxy_tlsaccept,
406-
$tlscafile = $zabbix::params::proxy_tlscafile,
407-
$tlscertfile = $zabbix::params::proxy_tlscertfile,
408-
$tlsconnect = $zabbix::params::proxy_tlsconnect,
409-
$tlscrlfile = $zabbix::params::proxy_tlscrlfile,
410-
$tlskeyfile = $zabbix::params::proxy_tlskeyfile,
411-
$tlspskfile = $zabbix::params::proxy_tlspskfile,
412-
$tlspskidentity = $zabbix::params::proxy_tlspskidentity,
413-
$tlsservercertissuer = $zabbix::params::proxy_tlsservercertissuer,
414-
$tlsservercertsubject = $zabbix::params::proxy_tlsservercertsubject,
415-
$trappertimeout = $zabbix::params::proxy_trappertimeout,
416-
$unreachableperiod = $zabbix::params::proxy_unreachableperiod,
417-
$unavaliabledelay = $zabbix::params::proxy_unavaliabledelay,
418-
$unreachabedelay = $zabbix::params::proxy_unreachabedelay,
419-
$externalscripts = $zabbix::params::proxy_externalscripts,
420-
$fpinglocation = $zabbix::params::proxy_fpinglocation,
421-
$fping6location = $zabbix::params::proxy_fping6location,
422-
$sshkeylocation = $zabbix::params::proxy_sshkeylocation,
423-
$logslowqueries = $zabbix::params::proxy_logslowqueries,
424-
$tmpdir = $zabbix::params::proxy_tmpdir,
425-
$allowroot = $zabbix::params::proxy_allowroot,
426-
$include_dir = $zabbix::params::proxy_include,
427-
$loadmodulepath = $zabbix::params::proxy_loadmodulepath,
428-
$loadmodule = $zabbix::params::proxy_loadmodule,
429-
Boolean $manage_selinux = $zabbix::params::manage_selinux,
430-
Stdlib::Absolutepath $socketdir = $zabbix::params::proxy_socketdir,
339+
Zabbix::Databases $database_type = $zabbix::params::database_type,
340+
$database_path = $zabbix::params::database_path,
341+
$zabbix_version = $zabbix::params::zabbix_version,
342+
$zabbix_package_state = $zabbix::params::zabbix_package_state,
343+
Boolean $manage_database = $zabbix::params::manage_database,
344+
Boolean $manage_firewall = $zabbix::params::manage_firewall,
345+
Boolean $manage_repo = $zabbix::params::manage_repo,
346+
Boolean $manage_resources = $zabbix::params::manage_resources,
347+
Boolean $manage_service = $zabbix::params::manage_service,
348+
$zabbix_proxy = $zabbix::params::zabbix_proxy,
349+
$zabbix_proxy_ip = $zabbix::params::zabbix_proxy_ip,
350+
$use_ip = $zabbix::params::proxy_use_ip,
351+
$zbx_templates = $zabbix::params::proxy_zbx_templates,
352+
$proxy_configfile_path = $zabbix::params::proxy_configfile_path,
353+
$proxy_service_name = $zabbix::params::proxy_service_name,
354+
$mode = $zabbix::params::proxy_mode,
355+
$zabbix_server_host = $zabbix::params::proxy_zabbix_server_host,
356+
$zabbix_server_port = $zabbix::params::proxy_zabbix_server_port,
357+
$hostname = $zabbix::params::proxy_hostname,
358+
$listenport = $zabbix::params::proxy_listenport,
359+
$sourceip = $zabbix::params::proxy_sourceip,
360+
Integer[0] $enableremotecommands = $zabbix::params::proxy_enableremotecommands,
361+
Integer[0] $logremotecommands = $zabbix::params::proxy_logremotecommands,
362+
$logfile = $zabbix::params::proxy_logfile,
363+
$logfilesize = $zabbix::params::proxy_logfilesize,
364+
$debuglevel = $zabbix::params::proxy_debuglevel,
365+
$pidfile = $zabbix::params::proxy_pidfile,
366+
$database_schema_path = $zabbix::params::database_schema_path,
367+
$database_host = $zabbix::params::proxy_database_host,
368+
$database_name = $zabbix::params::proxy_database_name,
369+
$database_schema = $zabbix::params::proxy_database_schema,
370+
$database_user = $zabbix::params::proxy_database_user,
371+
$database_password = $zabbix::params::proxy_database_password,
372+
$database_socket = $zabbix::params::proxy_database_socket,
373+
$database_port = $zabbix::params::proxy_database_port,
374+
$localbuffer = $zabbix::params::proxy_localbuffer,
375+
$offlinebuffer = $zabbix::params::proxy_offlinebuffer,
376+
$heartbeatfrequency = $zabbix::params::proxy_heartbeatfrequency,
377+
$configfrequency = $zabbix::params::proxy_configfrequency,
378+
$datasenderfrequency = $zabbix::params::proxy_datasenderfrequency,
379+
$startpollers = $zabbix::params::proxy_startpollers,
380+
$startipmipollers = $zabbix::params::proxy_startipmipollers,
381+
$startpollersunreachable = $zabbix::params::proxy_startpollersunreachable,
382+
$starttrappers = $zabbix::params::proxy_starttrappers,
383+
$startpingers = $zabbix::params::proxy_startpingers,
384+
$startdiscoverers = $zabbix::params::proxy_startdiscoverers,
385+
$starthttppollers = $zabbix::params::proxy_starthttppollers,
386+
$javagateway = $zabbix::params::proxy_javagateway,
387+
$javagatewayport = $zabbix::params::proxy_javagatewayport,
388+
$startjavapollers = $zabbix::params::proxy_startjavapollers,
389+
$startvmwarecollectors = $zabbix::params::proxy_startvmwarecollectors,
390+
$vmwarefrequency = $zabbix::params::proxy_vmwarefrequency,
391+
$vmwareperffrequency = $zabbix::params::proxy_vmwareperffrequency,
392+
$vmwarecachesize = $zabbix::params::proxy_vmwarecachesize,
393+
$vmwaretimeout = $zabbix::params::proxy_vmwaretimeout,
394+
$enablesnmpbulkrequests = $zabbix::params::proxy_enablesnmpbulkrequests,
395+
$snmptrapperfile = $zabbix::params::proxy_snmptrapperfile,
396+
$snmptrapper = $zabbix::params::proxy_snmptrapper,
397+
$listenip = $zabbix::params::proxy_listenip,
398+
$housekeepingfrequency = $zabbix::params::proxy_housekeepingfrequency,
399+
$cachesize = $zabbix::params::proxy_cachesize,
400+
$startdbsyncers = $zabbix::params::proxy_startdbsyncers,
401+
$historycachesize = $zabbix::params::proxy_historycachesize,
402+
$historyindexcachesize = $zabbix::params::proxy_historyindexcachesize,
403+
$historytextcachesize = $zabbix::params::proxy_historytextcachesize,
404+
$timeout = $zabbix::params::proxy_timeout,
405+
$tlsaccept = $zabbix::params::proxy_tlsaccept,
406+
$tlscafile = $zabbix::params::proxy_tlscafile,
407+
$tlscertfile = $zabbix::params::proxy_tlscertfile,
408+
$tlsconnect = $zabbix::params::proxy_tlsconnect,
409+
$tlscrlfile = $zabbix::params::proxy_tlscrlfile,
410+
$tlskeyfile = $zabbix::params::proxy_tlskeyfile,
411+
$tlspskfile = $zabbix::params::proxy_tlspskfile,
412+
$tlspskidentity = $zabbix::params::proxy_tlspskidentity,
413+
$tlsservercertissuer = $zabbix::params::proxy_tlsservercertissuer,
414+
$tlsservercertsubject = $zabbix::params::proxy_tlsservercertsubject,
415+
$trappertimeout = $zabbix::params::proxy_trappertimeout,
416+
$unreachableperiod = $zabbix::params::proxy_unreachableperiod,
417+
$unavaliabledelay = $zabbix::params::proxy_unavaliabledelay,
418+
$unreachabedelay = $zabbix::params::proxy_unreachabedelay,
419+
$externalscripts = $zabbix::params::proxy_externalscripts,
420+
$fpinglocation = $zabbix::params::proxy_fpinglocation,
421+
$fping6location = $zabbix::params::proxy_fping6location,
422+
$sshkeylocation = $zabbix::params::proxy_sshkeylocation,
423+
$logslowqueries = $zabbix::params::proxy_logslowqueries,
424+
$tmpdir = $zabbix::params::proxy_tmpdir,
425+
$allowroot = $zabbix::params::proxy_allowroot,
426+
$include_dir = $zabbix::params::proxy_include,
427+
$loadmodulepath = $zabbix::params::proxy_loadmodulepath,
428+
$loadmodule = $zabbix::params::proxy_loadmodule,
429+
Boolean $manage_selinux = $zabbix::params::manage_selinux,
430+
Optional[Stdlib::Absolutepath] $socketdir = $zabbix::params::proxy_socketdir,
431431
) inherits zabbix::params {
432432
# check osfamily, Arch is currently not supported for web
433433
if $facts['os']['family'] == 'Archlinux' {

‎manifests/server.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
String $additional_service_params = $zabbix::params::additional_service_params,
388388
Optional[String[1]] $zabbix_user = $zabbix::params::server_zabbix_user,
389389
Boolean $manage_startup_script = $zabbix::params::manage_startup_script,
390-
Stdlib::Absolutepath $socketdir = $zabbix::params::server_socketdir,
390+
Optional[Stdlib::Absolutepath] $socketdir = $zabbix::params::server_socketdir,
391391
) inherits zabbix::params {
392392
# the following codeblock is a bit blargh. The correct default value for
393393
# $real_additional_service_params changes based on the value of $zabbix_version

‎templates/zabbix_proxy.conf.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ PidFile=<%= @pidfile %>
103103
# Mandatory: no
104104
# Default:
105105

106-
SocketDir=<%= @socketdir %>
106+
<% if @socketdir %>SocketDir=<%= @socketdir %><% end %>
107107
<% end %>
108108

109109
### Option: DBHost

‎templates/zabbix_server.conf.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ PidFile=<%= @pidfile %>
8585
# Mandatory: no
8686
# Default:
8787

88-
SocketDir=<%= @socketdir %>
88+
<% if @socketdir %>SocketDir=<%= @socketdir %><% end %>
8989
<% end %>
9090

9191
### Option: DBHost

0 commit comments

Comments
 (0)