Merge pull request #291 from shaunrampersad/fix_264

Fixes for #264
voxpupuli · Oct 11, 2016 · b02f3eb · b02f3eb
2 parents 66b5919 + 26126fe
commit b02f3eb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/spec/defines/startup_spec.rb b/spec/defines/startup_spec.rb
@@ -31,7 +31,7 @@
               it do
                 should contain_file('/etc/init.d/zabbix-agent').with(
                   ensure: 'file',
-                  content: %r{OPTS="-c /something"}
+                  content: %r{OPTS="/something"}
                 )
               end
             else
@@ -122,7 +122,7 @@
               it do
                 should contain_file('/etc/init.d/zabbix-server').with(
                   ensure: 'file',
-                  content: %r{OPTS="-c /something"}
+                  content: %r{OPTS="/something"}
                 )
               end
             else

diff --git a/templates/zabbix-agent-redhat.init.erb b/templates/zabbix-agent-redhat.init.erb
@@ -18,8 +18,8 @@
 
 RETVAL=0
 prog="Zabbix Agent"
-ZABBIX_BIN="/usr/local/sbin/zabbix_agentd"
-OPTS="-c <%= @agent_configfile_path %>"
+ZABBIX_BIN="$(type -P zabbix_agentd)"
+OPTS="<%= @agent_configfile_path %>"
 
 if [ ! -x ${ZABBIX_BIN} ] ; then
         echo -n "${ZABBIX_BIN} not installed! "

diff --git a/templates/zabbix-server-redhat.init.erb b/templates/zabbix-server-redhat.init.erb
@@ -18,8 +18,8 @@
 
 RETVAL=0
 prog="Zabbix Server"
-ZABBIX_BIN="/usr/local/sbin/zabbix_server"
-OPTS="-c <%= @server_configfile_path %>"
+ZABBIX_BIN="$(type -P zabbix_server)"
+OPTS="<%= @server_configfile_path %>"
 
 if [ ! -x ${ZABBIX_BIN} ] ; then
         echo -n "${ZABBIX_BIN} not installed! "