Permalink
Browse files

Merge branch 'release/1.1.9'

  • Loading branch information...
hectcastro committed Jun 4, 2014
2 parents 7134a0e + ad2e5dc commit 464fbff900fb0ac51191df9426d710f66b7d2b67
Showing with 14 additions and 4 deletions.
  1. +4 −0 CHANGELOG.md
  2. +1 −0 CONTRIBUTORS
  3. +3 −1 README.md
  4. +3 −0 attributes/default.rb
  5. +1 −1 metadata.rb
  6. +1 −1 recipes/default.rb
  7. +1 −1 templates/default/sv-statsd-run.erb
View
@@ -1,3 +1,7 @@
+## v1.1.9
+
+* Add `nodejs_bin` attribute to explicitly point to a Node.js binary.
+
## v1.1.8
* Ensure `globalSuffix` is `undefined` when not used.
View
@@ -13,3 +13,4 @@ Peter Schultz (@pschultz)
Ralph Meijer (@ralphm)
Russell Cardullo (@russellcardullo)
Sergey Khaladzinski (@gansbrest)
+Jameson Lee (@jamesonjlee)
View
@@ -45,7 +45,7 @@ Installs and configures StatsD.
* `node["statsd"]["delete_counters"]` - Don't send values to graphite for
inactive counters (default: `false`).
* `node["statsd"]["username"]` - Will be used for process supervision
- (default: `stasd` )
+ (default: `stasd`).
* `node["statsd"]["dump_messages"]` - Print debugging information on incoming
messages (default: `false`).
* `node["statsd"]["graphite"]["legacy_namespace"]` - Flag to use legacy
@@ -62,6 +62,8 @@ Installs and configures StatsD.
metrics (default: `gauges`).
* `node["statsd"]["graphite"]["prefix_set"]` - Graphite prefix for set
metrics (default: `sets`).
+* `node["statsd"]["nodejs_bin"]` - Specify a direct path to the Node.js binary
+ (default: `#{node["nodejs"]["dir"]}/bin/node`).
## Recipes
View
@@ -26,3 +26,6 @@
default["statsd"]["graphite"]["prefix_timer"] = "timers"
default["statsd"]["graphite"]["prefix_gauge"] = "gauges"
default["statsd"]["graphite"]["prefix_set"] = "sets"
+
+# nodejs
+default["statsd"]["nodejs_bin"] = "#{node["nodejs"]["dir"]}/bin/node"
View
@@ -2,7 +2,7 @@
maintainer_email "hectcastro@gmail.com"
license "Apache 2.0"
description "Installs and configures StatsD."
-version "1.1.8"
+version "1.1.9"
recipe "statsd", "Installs and configures StatsD"
name "statsd"
View
@@ -62,6 +62,6 @@
:user => node['statsd']['username'],
:statsd_dir => node['statsd']['dir'],
:conf_dir => node['statsd']['conf_dir'],
- :nodejs_dir => node['nodejs']['dir']
+ :nodejs_bin => node['statsd']['nodejs_bin']
})
end
@@ -1,4 +1,4 @@
#!/bin/sh
exec 2>&1
-exec chpst -u <%= @options[:user] %> <%= @options[:nodejs_dir] %>/bin/node <%= @options[:statsd_dir] %>/stats.js <%= @options[:conf_dir] %>/config.js
+exec chpst -u <%= @options[:user] %> <%= @options[:nodejs_bin] %> <%= @options[:statsd_dir] %>/stats.js <%= @options[:conf_dir] %>/config.js

0 comments on commit 464fbff

Please sign in to comment.