Permalink
Browse files

Merge branch 'COOK-864'

  • Loading branch information...
2 parents e0d8c89 + 84ea75b commit 98c9814a38afe56cb4a7c18b609f19ddad6e0bc9 @jtimberman jtimberman committed Dec 20, 2011
@@ -1,13 +1,15 @@
Bluepill.application("chef-expander") do |app|
-
app.process("chef-expander") do |process|
- process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-expander.pid"
- process.working_dir = "<%= node['chef_server']['path'] %>"
- process.start_command = "env PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%> chef-expander"
- process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/expander.log"
- process.start_grace_time = 5.seconds
- process.stop_grace_time = 5.seconds
+ process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-expander.pid"
+ process.working_dir = "<%= node['chef_server']['path'] %>"
+ process.start_command = "chef-expander"
+ process.daemonize = true
+ process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/expander.log"
+ process.start_grace_time = 5.seconds
+ process.stop_grace_time = 5.seconds
process.restart_grace_time = 30.seconds
+ process.environment = {
+ 'PATH' => "/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%>:$PATH"
+ }
end
-
end
@@ -1,13 +1,15 @@
Bluepill.application("chef-server-webui") do |app|
-
app.process("chef-server-webui") do |process|
- process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-server-webui.pid"
- process.working_dir = "<%= node['chef_server']['path'] %>"
- process.start_command = "env PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%> -N -p <%= node['chef_server']['webui_port'] %> -e production -P <%= node['chef_server']['run_path'] %>/server-webui.%s.pid"
- process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/server-webui.log"
- process.start_grace_time = 5.seconds
- process.stop_grace_time = 5.seconds
+ process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-server-webui.pid"
+ process.working_dir = "<%= node['chef_server']['path'] %>"
+ process.start_command = "chef-server-webui -N -p <%= node['chef_server']['webui_port'] %> -e production"
+ process.daemonize = true
+ process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/server-webui.log"
+ process.start_grace_time = 5.seconds
+ process.stop_grace_time = 5.seconds
process.restart_grace_time = 30.seconds
+ process.environment = {
+ 'PATH' => "/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%>:$PATH"
+ }
end
-
end
@@ -1,13 +1,15 @@
Bluepill.application("chef-server") do |app|
-
app.process("chef-server") do |process|
- process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-server.pid"
- process.working_dir = "<%= node['chef_server']['path'] %>"
- process.start_command = "env PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%> chef-server -N -p <%= node['chef_server']['api_port'] %> -e production -P <%= node['chef_server']['run_path'] %>/server.%s.pid"
- process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/server.log"
- process.start_grace_time = 5.seconds
- process.stop_grace_time = 5.seconds
+ process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-server.pid"
+ process.working_dir = "<%= node['chef_server']['path'] %>"
+ process.start_command = "chef-server -N -p <%= node['chef_server']['api_port'] %> -e production"
+ process.daemonize = true
+ process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/server.log"
+ process.start_grace_time = 5.seconds
+ process.stop_grace_time = 5.seconds
process.restart_grace_time = 30.seconds
+ process.environment = {
+ 'PATH' => "/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%>:$PATH"
+ }
end
-
end
@@ -1,13 +1,15 @@
Bluepill.application("chef-solr") do |app|
-
app.process("chef-solr") do |process|
- process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-solr.pid"
- process.working_dir = "<%= node['chef_server']['path'] %>"
- process.start_command = "env PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%> chef-solr"
- process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/solr.log"
- process.start_grace_time = 5.seconds
- process.stop_grace_time = 5.seconds
+ process.pid_file = "<%= node['chef_server']['run_path'] %>/chef-solr.pid"
+ process.working_dir = "<%= node['chef_server']['path'] %>"
+ process.start_command = "chef-solr"
+ process.daemonize = true
+ process.stdout = process.stderr = "<%= node['chef_server']['log_dir'] %>/solr.log"
+ process.start_grace_time = 5.seconds
+ process.stop_grace_time = 5.seconds
process.restart_grace_time = 30.seconds
+ process.environment = {
+ 'PATH' => "/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node['languages']['ruby']['gems_dir'] %>:<%= node['languages']['ruby']['gems_dir'] %>/bin<% end -%>:$PATH"
+ }
end
-
end

0 comments on commit 98c9814

Please sign in to comment.