diff --git a/attributes/default.rb b/attributes/default.rb index d1b3014..a000de8 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -14,7 +14,7 @@ default[:sphinx][:source][:base_url] = "http://sphinxsearch.com/files" default[:sphinx][:source][:stemmer_url] = "http://snowball.tartarus.org/dist/libstemmer_c.tgz" default[:sphinx][:source][:install_path] = "/usr/local" -default[:sphinx][:source][:binary_path] = "#{sphinx[:source][:install_path]}/bin" +default[:sphinx][:source][:binary_path] = "#{node[:sphinx][:source][:install_path]}/bin" default[:sphinx][:source][:configure_flags] = [] default[:sphinx][:source][:extra_configure_flags] = [] default[:sphinx][:source][:branch] = 'trunk' diff --git a/metadata.rb b/metadata.rb index dc4b038..4d36d85 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer_email "jesse@techno-geeks.org" license "Apache 2.0" description "Installs/Configures sphinx search engine." -version "1.1.0" +version "1.1.1" recipe "sphinx", "Installs sphinx" recipe "sphinx::package", "Installs sphinx from a package" @@ -16,7 +16,7 @@ provides "sphinx::rpm" depends "build-essential", ">= 1.1.2" -depends "mysql" +depends "mysql", ">= 6.0.0" depends "percona" depends "postgresql", ">= 1.0.0" depends "yum" diff --git a/recipes/default.rb b/recipes/default.rb index 51a0a8f..e6d1304 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,4 +1,4 @@ +mysql_client "default" if node[:sphinx][:use_mysql] include_recipe "percona::client" if node[:sphinx][:use_percona] -include_recipe "mysql::client" if node[:sphinx][:use_mysql] include_recipe "postgresql::client" if node[:sphinx][:use_postgres] include_recipe "sphinx::#{node[:sphinx][:install_method]}" diff --git a/resources/index.rb b/resources/index.rb index 9587787..9e5c20b 100644 --- a/resources/index.rb +++ b/resources/index.rb @@ -4,6 +4,6 @@ attribute :name, :kind_of => String, :name_attribute => true, :required => true attribute :source, :kind_of => String -attribute :params, :kind_of => Hash, :required => true, :default => {} +attribute :attrs, :kind_of => Hash, :required => true, :default => {} attribute :rotate, :kind_of => [TrueClass, FalseClass], :default => false diff --git a/resources/source.rb b/resources/source.rb index 1b366ad..3646946 100644 --- a/resources/source.rb +++ b/resources/source.rb @@ -4,4 +4,4 @@ attribute :name, :kind_of => String, :name_attribute => true, :required => true attribute :type, :kind_of => String, :required => true -attribute :params, :kind_of => Hash, :required => true, :default => {} +attribute :attrs, :kind_of => Hash, :required => true, :default => {} diff --git a/templates/default/index.erb b/templates/default/index.erb index 9baa3ea..4c6baca 100644 --- a/templates/default/index.erb +++ b/templates/default/index.erb @@ -1,7 +1,7 @@ index <%= @new_resource.name %> { source = <%= @new_resource.source %> path = <%= @data_path %> -<% @new_resource.params.each do |k, v| %> +<% @new_resource.attrs.each do |k, v| %> <%= k %> = <%= v %> <% end %> } diff --git a/templates/default/source.erb b/templates/default/source.erb index 8e103ad..3924b00 100644 --- a/templates/default/source.erb +++ b/templates/default/source.erb @@ -1,6 +1,6 @@ source <%= @new_resource.name %> { type = <%= @new_resource.type %> -<% @new_resource.params.each do |k, v| %> +<% @new_resource.attrs.each do |k, v| %> <% if v.respond_to?("each") %> <% v.each do |sub_v| %> <%= k %> = <%= sub_v %>