Skip to content
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

Jump to bottom

Renamed install_plugin definition to prevent conflict #2

Merged
merged 1 commit into from
Nov 3, 2014
Merged

Renamed install_plugin definition to prevent conflict #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions definitions/install_plugin.rb → definitions/newrelic_plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define :install_plugin do
define :newrelic_plugin do

tar_file = File.join(params[:install_path], "#{params[:name]}-#{params[:plugin_version]}.tar.gz")

Expand Down Expand Up @@ -38,4 +38,4 @@
only_if { File.directory?(params[:plugin_path]) && Dir.entries(params[:plugin_path]).sort == %w(. ..) }
end

end
end
2 changes: 1 addition & 1 deletion recipes/aws_cloudwatch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
package 'libxslt-devel'
end

install_plugin 'newrelic_aws_cloudwatch_plugin' do
newrelic_plugin 'newrelic_aws_cloudwatch_plugin' do
plugin_version node[:newrelic][:aws_cloudwatch][:version]
install_path node[:newrelic][:aws_cloudwatch][:install_path]
plugin_path node[:newrelic][:aws_cloudwatch][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/example.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

verify_license_key node[:newrelic][:license_key]

install_plugin 'newrelic_example_plugin' do
newrelic_plugin 'newrelic_example_plugin' do
plugin_version node[:newrelic][:example][:version]
install_path node[:newrelic][:example][:install_path]
plugin_path node[:newrelic][:example][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/memcached_java.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

verify_license_key node[:newrelic][:license_key]

install_plugin 'newrelic_memcached_java_plugin' do
newrelic_plugin 'newrelic_memcached_java_plugin' do
plugin_version node[:newrelic][:memcached_java][:version]
install_path node[:newrelic][:memcached_java][:install_path]
plugin_path node[:newrelic][:memcached_java][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/memcached_ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

verify_license_key node[:newrelic][:license_key]

install_plugin 'newrelic_memcached_ruby_plugin' do
newrelic_plugin 'newrelic_memcached_ruby_plugin' do
plugin_version node[:newrelic][:memcached_ruby][:version]
install_path node[:newrelic][:memcached_ruby][:install_path]
plugin_path node[:newrelic][:memcached_ruby][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/mysql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

verify_license_key node[:newrelic][:license_key]

install_plugin 'newrelic_mysql_plugin' do
newrelic_plugin 'newrelic_mysql_plugin' do
plugin_version node[:newrelic][:mysql][:version]
install_path node[:newrelic][:mysql][:install_path]
plugin_path node[:newrelic][:mysql][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/rackspace_load_balancers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
package 'libxslt-devel'
end

install_plugin 'newrelic_rackspace_load_balancers_plugin' do
newrelic_plugin 'newrelic_rackspace_load_balancers_plugin' do
plugin_version node[:newrelic][:rackspace_load_balancers][:version]
install_path node[:newrelic][:rackspace_load_balancers][:install_path]
plugin_path node[:newrelic][:rackspace_load_balancers][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/wikipedia_example_java.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

verify_license_key node[:newrelic][:license_key]

install_plugin 'newrelic_wikipedia_example_java_plugin' do
newrelic_plugin 'newrelic_wikipedia_example_java_plugin' do
plugin_version node[:newrelic][:wikipedia_example_java][:version]
install_path node[:newrelic][:wikipedia_example_java][:install_path]
plugin_path node[:newrelic][:wikipedia_example_java][:plugin_path]
Expand Down
2 changes: 1 addition & 1 deletion recipes/wikipedia_example_ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

verify_license_key node[:newrelic][:license_key]

install_plugin 'newrelic_wikipedia_example_ruby_plugin' do
newrelic_plugin 'newrelic_wikipedia_example_ruby_plugin' do
plugin_version node[:newrelic][:wikipedia_example_ruby][:version]
install_path node[:newrelic][:wikipedia_example_ruby][:install_path]
plugin_path node[:newrelic][:wikipedia_example_ruby][:plugin_path]
Expand Down