From fc09446265aa31b2017fccb6ef16c4c05770048b Mon Sep 17 00:00:00 2001 From: Pneumatus Date: Thu, 23 Jan 2014 09:42:35 +0000 Subject: [PATCH] Convert Ruby 1.9 hashes back to Ruby 1.8 syntax --- recipes/agent.rb | 20 ++++++++++---------- recipes/beaver.rb | 28 ++++++++++++++-------------- recipes/server.rb | 26 +++++++++++++------------- recipes/source.rb | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/recipes/agent.rb b/recipes/agent.rb index b084615..cc2d876 100644 --- a/recipes/agent.rb +++ b/recipes/agent.rb @@ -78,7 +78,7 @@ source 'patterns.erb' owner node['logstash']['user'] group node['logstash']['group'] - variables(patterns: hash) + variables(:patterns => hash) mode '0644' notifies :restart, service_resource end @@ -115,8 +115,8 @@ group node['logstash']['group'] mode '0644' variables( - logstash_server_ip: logstash_server_ip, - patterns_dir: patterns_dir) + :logstash_server_ip => logstash_server_ip, + :patterns_dir => patterns_dir) notifies :restart, service_resource only_if { node['logstash']['agent']['config_file'] } end @@ -190,17 +190,17 @@ group 'root' mode '0774' variables( - config_file: node['logstash']['agent']['config_dir'], - home: node['logstash']['agent']['home'], - log_file: node['logstash']['agent']['log_file'], - name: 'agent', - max_heap: node['logstash']['agent']['xmx'], - min_heap: node['logstash']['agent']['xms'] + :config_file => node['logstash']['agent']['config_dir'], + :home => node['logstash']['agent']['home'], + :log_file => node['logstash']['agent']['log_file'], + :name => 'agent', + :max_heap => node['logstash']['agent']['xmx'], + :min_heap => node['logstash']['agent']['xms'] ) end service 'logstash_agent' do - supports restart: true, reload: true, status: true + supports :restart => true, :reload => true, :status => true action :enable end end diff --git a/recipes/beaver.rb b/recipes/beaver.rb index eccddfb..54bfbc3 100644 --- a/recipes/beaver.rb +++ b/recipes/beaver.rb @@ -137,8 +137,8 @@ owner node['logstash']['user'] group node['logstash']['group'] variables( - conf: conf, - files: files + :conf => conf, + :files => files ) notifies :restart, 'service[logstash_beaver]' end @@ -161,17 +161,17 @@ mode '0644' source 'logstash_beaver.conf.erb' variables( - cmd: cmd, - group: node['logstash']['supervisor_gid'], - user: node['logstash']['user'], - log: log_file, - supports_setuid: supports_setuid + :cmd => cmd, + :group => node['logstash']['supervisor_gid'], + :user => node['logstash']['user'], + :log => log_file, + :supports_setuid => supports_setuid ) notifies :restart, 'service[logstash_beaver]' end service 'logstash_beaver' do - supports restart: true, reload: false + supports :restart => true, :reload => false action [:enable, :start] provider Chef::Provider::Service::Upstart end @@ -180,17 +180,17 @@ mode '0755' source 'init-beaver.erb' variables( - cmd: cmd, - pid_file: pid_file, - user: node['logstash']['user'], - log: log_file, - platform: node['platform'] + :cmd => cmd, + :pid_file => pid_file, + :user => node['logstash']['user'], + :log => log_file, + :platform => node['platform'] ) notifies :restart, 'service[logstash_beaver]' end service 'logstash_beaver' do - supports restart: true, reload: false, status: true + supports :restart => true, :reload => false, :status => true action [:enable, :start] end end diff --git a/recipes/server.rb b/recipes/server.rb index a790661..c4b9c44 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -116,7 +116,7 @@ source 'patterns.erb' owner node['logstash']['user'] group node['logstash']['group'] - variables(patterns: hash) + variables(:patterns => hash) mode '0644' notifies :restart, service_resource end @@ -138,11 +138,11 @@ group node['logstash']['group'] mode '0644' variables( - graphite_server_ip: graphite_server_ip, - es_server_ip: es_server_ip, - enable_embedded_es: node['logstash']['server']['enable_embedded_es'], - es_cluster: node['logstash']['elasticsearch_cluster'], - patterns_dir: patterns_dir + :graphite_server_ip => graphite_server_ip, + :es_server_ip => es_server_ip, + :enable_embedded_es => node['logstash']['server']['enable_embedded_es'], + :es_cluster => node['logstash']['elasticsearch_cluster'], + :patterns_dir => patterns_dir ) notifies :restart, service_resource action :create @@ -213,17 +213,17 @@ owner 'root' group 'root' mode '0774' - variables(config_file: node['logstash']['server']['config_dir'], - home: node['logstash']['server']['home'], - name: type, - log_file: node['logstash']['server']['log_file'], - max_heap: node['logstash']['server']['xmx'], - min_heap: node['logstash']['server']['xms'] + variables(:config_file => node['logstash']['server']['config_dir'], + :home => node['logstash']['server']['home'], + :name => type, + :log_file => node['logstash']['server']['log_file'], + :max_heap => node['logstash']['server']['xmx'], + :min_heap => node['logstash']['server']['xms'] ) end service "logstash_#{type}" do - supports restart: true, reload: true, status: true + supports :restart => true, :reload => true, :status => true action [:enable, :start] end end diff --git a/recipes/source.rb b/recipes/source.rb index a78464f..5608b4d 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -27,7 +27,7 @@ execute 'build-logstash' do cwd "#{node['logstash']['basedir']}/source" environment( - JAVA_HOME: node['logstash']['source']['java_home'] + :JAVA_HOME => node['logstash']['source']['java_home'] ) user 'root' # This variant is useful for troubleshooting stupid environment problems