From 304c84e2e7a7c2dd61fb190703eb6cd34d3a5e82 Mon Sep 17 00:00:00 2001
From: Justin Downing <justin@downing.us>
Date: Sat, 14 Mar 2015 16:20:53 -0400
Subject: [PATCH] Release 2.4.0

---
 .travis.yml         |  2 +-
 CHANGELOG           | 49 +++++++++++++++++++++++++++++++++++++++++++++
 manifests/config.pp |  8 ++++----
 manifests/init.pp   |  2 +-
 manifests/params.pp |  2 +-
 metadata.json       |  2 +-
 6 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c29ca7..766e81a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
   - PUPPET_VERSION="3.4.3"
   - PUPPET_VERSION="3.5.1"
   - PUPPET_VERSION="3.6.2"
-  - PUPPET_VERSION="3.7.3"
+  - PUPPET_VERSION="3.7.4"
 sudo: false
 bundler_args: --without development
 script: bundle exec rake spec SPEC_OPTS='--format documentation'
diff --git a/CHANGELOG b/CHANGELOG
index 0a821ef..91a03fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,55 @@
 CHANGELOG
 =========
 
+2.4.0
+-----
+
+* add $manage_backends parameter
+* fixed erb for librato_source
+* use selective file permissions
+* update File ~> Service dependency
+
+2.3.1
+-----
+
+* fix linting errors
+
+2.3.0
+-----
+
+* Update specs for better coverage
+* Parameterize service (disable, enable, ensure)
+* Paramterize logfile location
+* Update Vagrant config for Ubuntu
+* Update Librato backend configuration with new params
+* fix librato_snapTime to default to 10s
+
+2.2.1
+-----
+
+* add rspec-puppet and code coverage to spec tests
+* fix linting warnings on backends.pp
+
+2.2.0
+-----
+
+* add stahnma-epel dependency
+* use nobody:nogroup permissions for Ubuntu upstart script
+* parameterize $statsd::config::configfile
+* update Travis CI config
+* fix linting, style warnings
+* update Gemfile, Puppetfile, License, Readme, Rakefile
+* split Vagrant config for CentOS and Ubuntu -- use latest Puppet Labs boxes for both
+
+2.1.0
+-----
+
+* fix bug with service provider parameter
+* add $nodejs_bin parameter for custom nodejs binary path (default: /usr/bin/node)
+* add $configfile parameter for custom statsd config path (default: /etc/statsd/localConfig.js)
+* add $package_name parameter for custom statsd package name (default: statsd)
+* add $package_provider parameter for custom statsd package provider (default: npm)
+
 2.0.1
 -----
 
diff --git a/manifests/config.pp b/manifests/config.pp
index 47fb241..d342502 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -15,8 +15,8 @@
   file { $configfile:
     content => template('statsd/localConfig.js.erb'),
     mode    => '0644',
-    owner  => 'root',
-    group  => 'root',
+    owner   => 'root',
+    group   => 'root',
   }
 
   file { $statsd::init_location:
@@ -28,8 +28,8 @@
 
   file {  '/etc/default/statsd':
     content => template('statsd/statsd-defaults.erb'),
-    owner  => 'root',
-    group  => 'root',
+    owner   => 'root',
+    group   => 'root',
     mode    => '0755',
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 28ef906..3dcf65b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,6 +13,7 @@
   $service_ensure                    = $statsd::params::service_ensure,
   $service_enable                    = $statsd::params::service_enable,
 
+  $manage_backends                   = $statsd::params::manage_backends,
   $backends                          = $statsd::params::backends,
   $debug                             = $statsd::params::debug,
   $mgmt_address                      = $statsd::params::mgmt_address,
@@ -74,7 +75,6 @@
   $package_provider                  = $statsd::params::package_provider,
 
   $dependencies                      = $statsd::params::dependencies,
-  $manage_backends                   = $statsd::params::manage_backends,
 ) inherits statsd::params {
 
   if $dependencies {
diff --git a/manifests/params.pp b/manifests/params.pp
index df5e5f1..1cd27cf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,6 +13,7 @@
   $service_ensure                    = 'running'
   $service_enable                    = true
 
+  $manage_backends                   = true
   $backends                          = [ './backends/graphite' ]
   $debug                             = false
   $mgmt_address                      = '0.0.0.0'
@@ -66,7 +67,6 @@
   $config                            = { }
 
   $dependencies                      = undef
-  $manage_backends                   = true
 
   $package_name                      = 'statsd'
   $package_provider                  = 'npm'
diff --git a/metadata.json b/metadata.json
index 7be3c86..b47f13e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "jdowning-statsd",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "source": "https://github.com/justindowning/puppet-statsd",
   "author": "Justin Downing",
   "license": "Apache-2.0",