diff --git a/README.md b/README.md index bf5ecce..264bba6 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Attributes ## Default +* `node['logstash']['homedir']` - the home directory of the logstash user * `node['logstash']['basedir']` - the base directory for all the Logstash components * `node['logstash']['user']` - the owner for all Logstash components diff --git a/attributes/default.rb b/attributes/default.rb index 0a7e2c7..a07580e 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -8,6 +8,7 @@ default['logstash']['pid_dir'] = '/var/run/logstash' default['logstash']['create_account'] = true default['logstash']['join_groups'] = [] +default['logstash']['homedir'] = '/var/lib/logstash' # roles/flags for various search/discovery default['logstash']['graphite_role'] = 'graphite_server' diff --git a/recipes/agent.rb b/recipes/agent.rb index cc2d876..c9aa656 100644 --- a/recipes/agent.rb +++ b/recipes/agent.rb @@ -53,7 +53,7 @@ group node['logstash']['group'] end - link "/var/lib/logstash/#{ldir}" do + link "#{node['logstash']['homedir']}/#{ldir}" do to "#{node['logstash']['agent']['home']}/#{ldir}" end end diff --git a/recipes/default.rb b/recipes/default.rb index 5e908bd..cce024f 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -14,13 +14,21 @@ user node['logstash']['user'] do group node['logstash']['group'] - home '/var/lib/logstash' + home node['logstash']['homedir'] system true action :create manage_home true uid node['logstash']['uid'] end +else + directory node['logstash']['homedir'] do + recursive true + action :create + group node['logstash']['group'] + owner node['logstash']['user'] + mode '0755' + end end directory node['logstash']['basedir'] do diff --git a/recipes/haproxy.rb b/recipes/haproxy.rb index 99a0c18..84e38c2 100644 --- a/recipes/haproxy.rb +++ b/recipes/haproxy.rb @@ -17,7 +17,8 @@ group node['logstash']['group'] end -link '/var/lib/logstash/apache_logs' do +apache_logs = "#{node['logstash']['homedir']}/apache_logs" +link apache_logs do to "#{node['logstash']['server']['home']}/apache_logs" end