Skip to content
This repository was archived by the owner on Dec 27, 2022. It is now read-only.

Create homedir attribute, ensure it's always available #242

Merged
merged 1 commit into from
Mar 2, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion recipes/agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion recipes/haproxy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down