From 7d82811a1f1d9731266d8319762e0e76b574083e Mon Sep 17 00:00:00 2001 From: c3 Date: Thu, 25 Mar 2010 17:59:39 -0700 Subject: [PATCH 1/7] Select some custom shiz --- cookbooks/main/recipes/default.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/main/recipes/default.rb b/cookbooks/main/recipes/default.rb index 30858318..2596e746 100644 --- a/cookbooks/main/recipes/default.rb +++ b/cookbooks/main/recipes/default.rb @@ -4,25 +4,25 @@ # } #end -require_recipe 'postgres' +# require_recipe 'postgres' # uncomment if you want to run couchdb recipe # require_recipe "couchdb" # uncomment to turn use the MBARI ruby patches for decreased memory usage and better thread/continuationi performance -# require_recipe "mbari-ruby" +require_recipe "mbari-ruby" # uncomment to turn on thinking sphinx -# require_recipe "thinking_sphinx" +require_recipe "thinking_sphinx" # uncomment to turn on ultrasphinx # require_recipe "ultrasphinx" #uncomment to turn on memcached -# require_recipe "memcached" +require_recipe "memcached" #uncomment to run the authorized_keys recipe -#require_recipe "authorized_keys" +require_recipe "authorized_keys" #uncomment to run the eybackup_slave recipe #require_recipe "eybackup_slave" From 589b1637bbb4a5f003fa69217e08d55b4f2ae4aa Mon Sep 17 00:00:00 2001 From: c3 Date: Thu, 25 Mar 2010 18:42:54 -0700 Subject: [PATCH 2/7] use the actual app name --- cookbooks/thinking_sphinx/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/thinking_sphinx/recipes/default.rb b/cookbooks/thinking_sphinx/recipes/default.rb index 23baf725..4c14d70c 100644 --- a/cookbooks/thinking_sphinx/recipes/default.rb +++ b/cookbooks/thinking_sphinx/recipes/default.rb @@ -7,7 +7,7 @@ if ['solo', 'app', 'app_master'].include?(node[:instance_role]) # be sure to replace "app_name" with the name of your application. - run_for_app("app_name") do |app_name, data| + run_for_app("tender") do |app_name, data| directory "/var/run/sphinx" do owner node[:owner_name] From 3d73af5819893753151421250d7d2198c1c56221 Mon Sep 17 00:00:00 2001 From: c3 Date: Thu, 25 Mar 2010 18:56:45 -0700 Subject: [PATCH 3/7] wtf this doesn't exist --- cookbooks/main/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/main/recipes/default.rb b/cookbooks/main/recipes/default.rb index 2596e746..e6eb91d3 100644 --- a/cookbooks/main/recipes/default.rb +++ b/cookbooks/main/recipes/default.rb @@ -10,7 +10,7 @@ # require_recipe "couchdb" # uncomment to turn use the MBARI ruby patches for decreased memory usage and better thread/continuationi performance -require_recipe "mbari-ruby" +# require_recipe "mbari-ruby" # uncomment to turn on thinking sphinx require_recipe "thinking_sphinx" From aa4c9fb138418b1153831aacb275ea9ada995cdb Mon Sep 17 00:00:00 2001 From: c3 Date: Thu, 25 Mar 2010 19:04:25 -0700 Subject: [PATCH 4/7] fuck off and die --- cookbooks/main/recipes/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/main/recipes/default.rb b/cookbooks/main/recipes/default.rb index e6eb91d3..f0d62b92 100644 --- a/cookbooks/main/recipes/default.rb +++ b/cookbooks/main/recipes/default.rb @@ -22,10 +22,10 @@ require_recipe "memcached" #uncomment to run the authorized_keys recipe -require_recipe "authorized_keys" +# require_recipe "authorized_keys" #uncomment to run the eybackup_slave recipe -#require_recipe "eybackup_slave" +require_recipe "eybackup_slave" #uncomment to run the ssmtp recipe #require_recipe "ssmtp" From 315c6aec03d5cec9a1b2c10cfc3f066bfb46acc0 Mon Sep 17 00:00:00 2001 From: c3 Date: Thu, 25 Mar 2010 22:39:31 -0700 Subject: [PATCH 5/7] Add delayed job (from kickstarter on github) --- .../files/default/delayed_job.logrotate | 11 ++++ cookbooks/delayed_job/recipes/default.rb | 60 +++++++++++++++++++ .../templates/default/delayed_job.yml.erb | 4 ++ .../default/delayed_job_worker.monitrc.erb | 5 ++ 4 files changed, 80 insertions(+) create mode 100644 cookbooks/delayed_job/files/default/delayed_job.logrotate create mode 100644 cookbooks/delayed_job/recipes/default.rb create mode 100644 cookbooks/delayed_job/templates/default/delayed_job.yml.erb create mode 100644 cookbooks/delayed_job/templates/default/delayed_job_worker.monitrc.erb diff --git a/cookbooks/delayed_job/files/default/delayed_job.logrotate b/cookbooks/delayed_job/files/default/delayed_job.logrotate new file mode 100644 index 00000000..1604f83d --- /dev/null +++ b/cookbooks/delayed_job/files/default/delayed_job.logrotate @@ -0,0 +1,11 @@ +/var/log/engineyard/delayed_job/*/*.log { + daily + missingok + dateext + rotate 30 + compress + notifempty + sharedscripts + extension gz + copytruncate +} \ No newline at end of file diff --git a/cookbooks/delayed_job/recipes/default.rb b/cookbooks/delayed_job/recipes/default.rb new file mode 100644 index 00000000..0daae28a --- /dev/null +++ b/cookbooks/delayed_job/recipes/default.rb @@ -0,0 +1,60 @@ +# +# Cookbook Name:: delayed_job +# Recipe:: default +# + +# run DelayedJob worker on app instances +if ['solo', 'app', 'app_master', 'util'].include?(node[:instance_role]) + app_name = node[:applications].keys.first + rails_env = node[:environment][:framework_env] + worker_name = "delayed_job" + + directory "/var/run/delayed_job" do + owner node[:owner_name] + group node[:owner_name] + mode 0755 + end + + directory "/var/log/engineyard/delayed_job/#{app_name}" do + recursive true + owner node[:owner_name] + group node[:owner_name] + mode 0755 + end + + remote_file "/etc/logrotate.d/delayed_job" do + owner "root" + group "root" + mode 0755 + source "delayed_job.logrotate" + action :create + end + + template "/etc/monit.d/delayed_job_worker_#{app_name}.monitrc" do + source "delayed_job_worker.monitrc.erb" + owner "root" + group "root" + mode 0644 + variables({ + :app_name => app_name, + :rails_env => rails_env, + :worker_name => worker_name, + :user => node[:owner_name], + :min_priority => 0, + # most servers only handle top priority (0) jobs, but utility servers handle all jobs (0-100) + :max_priority => node[:instance_role] == 'util' ? 100 : 0 + }) + end + + template "/data/#{app_name}/shared/config/delayed_job.yml" do + source "delayed_job.yml.erb" + owner node[:owner_name] + group node[:owner_name] + mode 0644 + variables({ + :app_name => app_name, + :rails_env => rails_env + }) + end + +end \ No newline at end of file diff --git a/cookbooks/delayed_job/templates/default/delayed_job.yml.erb b/cookbooks/delayed_job/templates/default/delayed_job.yml.erb new file mode 100644 index 00000000..d4b3788c --- /dev/null +++ b/cookbooks/delayed_job/templates/default/delayed_job.yml.erb @@ -0,0 +1,4 @@ +<%= @rails_env %>: + log_file: /data/<%= @app_name %>/shared/log/delayed_job.log + pid_dir: /var/run/delayed_job + process_name: delayed_job diff --git a/cookbooks/delayed_job/templates/default/delayed_job_worker.monitrc.erb b/cookbooks/delayed_job/templates/default/delayed_job_worker.monitrc.erb new file mode 100644 index 00000000..ce15c205 --- /dev/null +++ b/cookbooks/delayed_job/templates/default/delayed_job_worker.monitrc.erb @@ -0,0 +1,5 @@ +check process <%= @worker_name %> + with pidfile /data/<%= @app_name %>/shared/pids/<%= @worker_name %>.pid + start program = "/usr/bin/env RAILS_ENV=<%= @rails_env %> /data/<%= @app_name %>/current/script/delayed_job start --min-priority <%= @min_priority %> --max-priority <%= @max_priority %>" as uid <%= @user %> and gid <%= @user %> + stop program = "/usr/bin/env RAILS_ENV=<%= @rails_env %> /data/<%= @app_name %>/current/script/delayed_job stop" as uid <%= @user %> and gid <%= @user %> + group <%= @app_name %>_jobs From c7e92e097c456d251922839af0d8fb5751ccc36b Mon Sep 17 00:00:00 2001 From: c3 Date: Thu, 25 Mar 2010 22:50:40 -0700 Subject: [PATCH 6/7] Actually use dj! --- cookbooks/main/recipes/default.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/cookbooks/main/recipes/default.rb b/cookbooks/main/recipes/default.rb index f0d62b92..f06d735d 100644 --- a/cookbooks/main/recipes/default.rb +++ b/cookbooks/main/recipes/default.rb @@ -26,6 +26,7 @@ #uncomment to run the eybackup_slave recipe require_recipe "eybackup_slave" +require_recipe "delayed_job" #uncomment to run the ssmtp recipe #require_recipe "ssmtp" From 92e10c968015178f08e7a2f568154890e21f3909 Mon Sep 17 00:00:00 2001 From: Courtenay Date: Mon, 19 Dec 2011 07:22:46 -0800 Subject: [PATCH 7/7] Modify JAVA_OPTS call so that it actually uses the memory and heap settings rather than overwriting --- .../elasticsearch/templates/default/elasticsearch.in.sh.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.in.sh.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.in.sh.erb index 075acd93..6ea608bc 100644 --- a/cookbooks/elasticsearch/templates/default/elasticsearch.in.sh.erb +++ b/cookbooks/elasticsearch/templates/default/elasticsearch.in.sh.erb @@ -28,7 +28,7 @@ JAVA_OPTS="$JAVA_OPTS -Djline.enabled=true" #JAVA_OPTS="$JAVA_OPTS -XX:+UseCompressedOops" # This stops an annoying warning -JAVA_OPTS="-server" +JAVA_OPTS="$JAVA_OPTS -server" JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC" JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC" JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled"