Linux-Help/cookbook-ossec-ng
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bugfix-node-attribute' of Linux-Help/cookbook-ossec-ng into develop

Browse source
This commit is contained in:
Eric Renfro 2017-01-28 11:28:15 -05:00 committed by Gogs
commit d7e73af7cf
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Berksfile
View file

@ -2,7 +2,7 @@ source "https://supermarket.chef.io"
metadata metadata
cookbook "selinux_policy", "~> 0.9.5" cookbook "selinux_policy", "~> 1.1.1"
cookbook "yum-atomic", "~> 0.1.2" cookbook "yum-atomic", "~> 0.1.2"
cookbook "yum-epel" cookbook "yum-epel", "~> 2.1.1"
cookbook "apt-atomic", "~> 0.1.2" cookbook "apt-atomic", "~> 0.1.2"

2
metadata.rb
View file

@ -4,7 +4,7 @@ maintainer_email "psi-jack@linux-help.org"
license "GPLv2" license "GPLv2"
description "Installs/Configures ossec" description "Installs/Configures ossec"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "1.2.2" version "1.2.3"
issues_url "http://git.linux-help.org/Linux-Help/ossec-ng/issues" issues_url "http://git.linux-help.org/Linux-Help/ossec-ng/issues"
source_url "http://git.linux-help.org/Linux-Help/ossec-ng" source_url "http://git.linux-help.org/Linux-Help/ossec-ng"

2
recipes/server.rb
View file

@ -132,7 +132,7 @@ else
end end
if ossec_agent_should_be_removed?(agent_id) if ossec_agent_should_be_removed?(agent_id)
Chef::Log.info("OSSEC: Removing old agent '#{agent_id}' - '#{params[:name]}'") Chef::Log.info("OSSEC: Removing old agent '#{agent_id}' - '#{params[:name]}'")
node["ossec"]["agents"].delete(agent_id) node.normal["ossec"]["agents"].delete(agent_id)
else else
Chef::Log.info("OSSEC: agent '#{agent_id}' - '#{params[:name]}' is candidate for removal") Chef::Log.info("OSSEC: agent '#{agent_id}' - '#{params[:name]}' is candidate for removal")
node.normal["ossec"]["agents"][agent_id]["status"] = 'candidate_for_removal' node.normal["ossec"]["agents"][agent_id]["status"] = 'candidate_for_removal'