From b003d5a8cc0fd8777811655e5125727018610be5 Mon Sep 17 00:00:00 2001 From: Will Berry <73126355+wdberry@users.noreply.github.com> Date: Mon, 26 Oct 2020 09:47:48 -0400 Subject: [PATCH] Correct variable names in templates Removes extra newline at end of zabbix_proxy.conf and zabbix_server.conf --- templates/zabbix_proxy.conf.erb | 3 +-- templates/zabbix_server.conf.erb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/zabbix_proxy.conf.erb b/templates/zabbix_proxy.conf.erb index c2cb73557..c6ed2d222 100644 --- a/templates/zabbix_proxy.conf.erb +++ b/templates/zabbix_proxy.conf.erb @@ -103,7 +103,7 @@ PidFile=<%= @pidfile %> # Mandatory: no # Default: -SocketDir=<%= @socket_dir %> +SocketDir=<%= @socketdir %> <% end %> ### Option: DBHost @@ -545,4 +545,3 @@ LoadModulePath=<%= @loadmodulepath %> <% if @tlspskfile %>TLSPSKFile=<%= @tlspskfile %><% end %> <% end %> - diff --git a/templates/zabbix_server.conf.erb b/templates/zabbix_server.conf.erb index fed2da32b..f159363e2 100644 --- a/templates/zabbix_server.conf.erb +++ b/templates/zabbix_server.conf.erb @@ -85,7 +85,7 @@ PidFile=<%= @pidfile %> # Mandatory: no # Default: -SocketDir=<%= @socket_dir %> +SocketDir=<%= @socketdir %> <% end %> ### Option: DBHost @@ -527,4 +527,3 @@ LoadModulePath=<%= @loadmodulepath %> <% if @tlskeyfile %>TLSKeyFile=<%= @tlskeyfile %><% end %> <% end %> -