From 5bdf54c14179cef4a029d7245271525e2ee09e62 Mon Sep 17 00:00:00 2001 From: Blake Smith Date: Tue, 8 Dec 2015 09:57:22 -0600 Subject: [PATCH 1/2] Remove unused nsq common directory. Fix nsqd data_path --- attributes/default.rb | 3 --- attributes/nsqd.rb | 2 +- recipes/nsqd.rb | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index e11098e..2e919ed 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -7,8 +7,5 @@ # Architecture default['nsq']['arch'] = 'linux-amd64' -# Common directories -default['nsq']['data_path'] = '/var/spool/nsq' - # Should we setup upstart services? default['nsq']['setup_services'] = true diff --git a/attributes/nsqd.rb b/attributes/nsqd.rb index ad3dccc..ce8c7f0 100644 --- a/attributes/nsqd.rb +++ b/attributes/nsqd.rb @@ -30,7 +30,7 @@ default['nsq']['nsqd']['max_heartbeat_interval'] = '1m0s' # -data-path='': path to store disk-backed messages -default['nsq']['nsqd']['data_path'] = default['nsq']['data_path'] +default['nsq']['nsqd']['data_path'] = '/var/spool/nsq' # -tls-cert='': path to tls certificate file default['nsq']['nsqd']['tls_cert'] = '' diff --git a/recipes/nsqd.rb b/recipes/nsqd.rb index 485e055..845cee3 100644 --- a/recipes/nsqd.rb +++ b/recipes/nsqd.rb @@ -16,7 +16,7 @@ nsq_release = "nsq-#{node['nsq']['version']}-#{node['nsq']['go_version']}" # Create path for the on-disk queue files are stored -directory node['nsq']['data_path'] do +directory node['nsq']['nsqd']['data_path'] do action :create mode '0770' owner 'nsqd' From 4e95438fa895035f54dff9d5316ce42bf3a57ad8 Mon Sep 17 00:00:00 2001 From: Blake Smith Date: Tue, 8 Dec 2015 11:21:50 -0600 Subject: [PATCH 2/2] Add note to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb7c2b5..53e7304 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +* 1.2.4 + - Fixed data_path consistency, if you're using `['nsq']['data_path']` in production + to set the nsqd data_path, please update to `['nsq']['nsqd']['data_path']`. * 1.2.3 - Added support for missing nsqd options * 1.2.2 - Added support for customizing the system users used to run nsq services * 1.2.1 - Fixed bug in nsqlookupd upstart template when default attributes used