Skip to content

perl dependencies and debian support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agoddard wants to merge 7 commits into
base: master
Choose a base branch
from
Open

perl dependencies and debian support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76dca2e
added missing perl dependencies
agoddard Apr 30, 2011
e551e78
debian support
agoddard Apr 30, 2011
43494a2
added debian support in metadata
agoddard Apr 30, 2011
3beef4b
removed undefined blank? method, replaced with equivalent logic
May 2, 2011
56b7588
fixed node search for chef 0.10.0
May 2, 2011
babf9f9
correct .blank? replacement logic
May 5, 2011
137e259
version bump
agoddard Aug 16, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion collectd/definitions/collectd_plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
owner "root"
group "root"
mode "644"
if params[:template].blank?
if params[:template].nil? || params[:template].empty?
source "plugin.conf.erb"
cookbook params[:cookbook] || "collectd"
else
Expand Down
7 changes: 5 additions & 2 deletions collectd/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
license "Apache 2.0"
description "Install and configure the collectd monitoring daemon"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
version "1.0.0"
supports "ubuntu"
version "1.0.1"

%w{debian ubuntu}.each do |os|
supports os
end
2 changes: 1 addition & 1 deletion collectd/recipes/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
include_recipe "collectd"

servers = []
search(:node, 'recipes:"collectd::server"') do |n|
search(:node, 'recipes:"collectd\:\:server"') do |n|
servers << n['fqdn']
end

Expand Down
6 changes: 6 additions & 0 deletions collectd/recipes/collectd_web.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
include_recipe "collectd"
include_recipe "apache2"

%w{libjson-perl libhtml-entities-numbered-perl libhtml-parser-perl librrds-perl}.each do |pkg|
package pkg do
action :install
end
end

directory node[:collectd][:collectd_web][:path] do
owner "root"
group "root"
Expand Down
7 changes: 6 additions & 1 deletion collectd/recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
#

package "collectd" do
package_name "collectd-core"
case node[:platform]
when "ubuntu"
package_name "collectd-core"
when "debian"
package_name "collectd"
end
end

service "collectd" do
Expand Down