Permalink
Browse files

[rhel] run completes

  • Loading branch information...
1 parent c988f7f commit 3b739eb77b34e52f9e234f99a18ccf89328c2b0d Chris Lundquist committed Feb 6, 2013
Showing with 25 additions and 10 deletions.
  1. +12 −8 .jamie.yml
  2. +1 −0 Berksfile
  3. +4 −0 recipes/carbon_init.rb
  4. +8 −2 recipes/web.rb
  5. 0 templates/default/carbon.init.erb
View
@@ -7,18 +7,22 @@ platforms:
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box
run_list:
- recipe[apt]
+- name: ubuntu-12.04-runit-twistd
+ driver_config:
+ box: opscode-ubuntu-12.04
+ box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box
+ run_list:
+ - recipe[apt]
+ - recipe[graphite::carbon_runit_twistd]
- name: centos-6.3
driver_config:
box: opscode-centos-6.3
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box
+ run_list:
+ - recipe[yum::epel]
suites:
-- name: carbon
- run_list:
- - recipe[graphite::carbon]
-- name: carbon_runit
+- name: default
run_list:
- - recipe[graphite::carbon_runit]
-- name: carbon_runit_twistd
- run_list:
- - recipe[graphite::carbon_runit_twistd]
+ - recipe[apache2]
+ - recipe[graphite]
View
@@ -1,4 +1,5 @@
cookbook 'apt'
+cookbook 'yum'
cookbook 'graphite', path: "."
group :test do
View
@@ -1,2 +1,6 @@
+template "/etc/init.d/carbon" do
+ source "carbon.init.erb"
+end
+
service "carbon-cache" do
end
View
@@ -35,7 +35,13 @@
Chef::Log.warn "This recipe uses encrypted data bags for graphite password but no encrypted data bag name is specified - fallback to node attribute."
end
-%w{ python-cairo-dev python-django python-django-tagging python-memcache python-rrdtool }.each do |pkg|
+dep_packages = case node['platform_family']
+ when "debian"
+ %w{ python-cairo-dev python-django python-django-tagging python-memcache python-rrdtool }
+ when "rhel", "fedora"
+ %w{ bitmap bitmap-fonts Django pycairo-devel python-devel python-memcached mod_wsgi python-sqlite2 python-zope-interface }
+ end
+dep_packages.each do |pkg|
package pkg do
action :install
end
@@ -58,7 +64,7 @@
cwd "#{Chef::Config[:file_cache_path]}/graphite-web-#{version}"
end
-template "/etc/apache2/sites-available/graphite" do
+template "#{node['apache']['dir']}/sites-available/graphite" do
source "graphite-vhost.conf.erb"
end
No changes.

0 comments on commit 3b739eb

Please sign in to comment.