Only set default_qdisc in base role to prevent yoyo

[chef.git] / cookbooks / overpass / recipes / default.rb

diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index c53153339c47c0a1730dd6a0b3811380d765486e..be930135fc24ad9a3470d5118925b8b70d2e19ba 100644 (file)
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -18,8 +18,9 @@
 #
 
 include_recipe "accounts"
 #
 
 include_recipe "accounts"

-include_recipe "munin"

 include_recipe "apache"
 include_recipe "apache"

+include_recipe "munin"
+include_recipe "ruby"

 
 username = "overpass"
 basedir = data_bag_item("accounts", username)["home"]
 
 username = "overpass"
 basedir = data_bag_item("accounts", username)["home"]


@@ -36,7 +37,7 @@ end
 
 ## Install overpass from source
 
 
 ## Install overpass from source
 

-srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:version]}"
+srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:full_version]}"

 
 package %w[
   build-essential
 
 package %w[
   build-essential


@@ -72,7 +73,9 @@ end
 
 ## Setup Apache
 
 
 ## Setup Apache
 

-gem_package "rotp"
+gem_package "rotp" do
+  gem_binary node[:ruby][:gem]
+end

 
 directory "#{basedir}/apache" do
   owner "root"
 
 directory "#{basedir}/apache" do
   owner "root"