Merge pull request #946 from trenta/master

Allow allowkey and denykey on agent2

Author: Valantin

spec/classes/agent_spec.rb

@@ -462,7 +462,7 @@
         it do
           is_expected.not_to contain_file(config_path).with_content(
             %r{^(LogRemoteCommands|StartAgents|MaxLinesPerSecond
-                 |AllowRoot|User|LoadModulePath|AllowKey|DenyKey|
+                 |AllowRoot|User|LoadModulePath|
                  EnableRemoteCommands|LogRemoteCommands)}
           )
         end

templates/zabbix_agentd.conf.erb

@@ -48,7 +48,6 @@ DebugLevel=<%= @debuglevel %>
 #
 <% if @sourceip %>SourceIP=<%= @sourceip %><% end %>
 
-<% unless @agent2 %>
 <%  if @zabbix_version.to_f >= 5.0 %>
 ### Option: AllowKey
 #       Allow execution of item keys matching pattern.
@@ -74,6 +73,7 @@ DebugLevel=<%= @debuglevel %>
 # Default:
 <%    if @denykey %>DenyKey=<%= @denykey -%><% end %>
 <%  end %>
+<% unless @agent2 %>
 
 ### Option: EnableRemoteCommands
 #	Whether remote commands from Zabbix server are allowed.