ricodigo-capistrano-recipes 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/ricodigo-install-server

@@ -32,7 +32,7 @@ def install_packages(ssh)
   packages = %w[
     bind9 build-essential ufw libreadline6-dev git-core 
     libxslt1-dev libxml2-dev libssl-dev nginx mongodb-10gen curl 
-    libcurl4-openssl-dev graphicsmagick
+    libcurl4-openssl-dev graphicsmagick openjdk-6-jre-headless libsasl2-dev
   ]
 
   ssh.exec! "sudo apt-get install -y --force-yes #{packages.join(" ")}" do |channel, stream, data|

data/generators/magent.bluepill.erb

@@ -0,0 +1,37 @@
+queue               = "<%= magent_queue %>"
+identity            =  "#{queue}-#{Socket.gethostname.split('.')[0]}"
+app_name            = 'magent'
+rails_root          = "<%= deploy_to %>/current"
+rails_env           = "<%= environment %>"
+log_file            = "#{rails_root}/log/magent_bluepill.log"
+magent_bin         = "/usr/bin/env RAILS_ENV=#{rails_env} bundle exec magent"
+magent_pid_path    = "#{rails_root}/tmp/pids"
+magent_pid_file    = "#{magent_pid_path}/magent.#{identity}.pid"
+grace_time         = <%= magent_grace_time %>
+
+magent_start_cmd   = "#{magent_bin} -d -Q #{queue} -l #{rails_root}/log -P #{magent_pid_path} start"
+magent_stop_cmd    = "#{magent_bin} -d -Q #{queue} -l #{rails_root}/log -P #{magent_pid_path} stop"
+magent_restart_cmd = "#{magent_bin} -d -Q #{queue} -l #{rails_root}/log -P #{magent_pid_path} restart"
+
+
+puts ">> Starting #{app_name} bluepill with RAILS_ROOT=#{rails_root} and RAILS_ENV=#{rails_env}"
+
+Bluepill.application(app_name, :log_file => log_file) do |app|
+  app.process("magent-#{queue}") do |process|
+    process.pid_file = magent_pid_file
+    process.working_dir = rails_root
+
+    process.start_command = magent_start_cmd
+    process.stop_command = magent_stop_cmd
+    process.restart_command = magent_restart_cmd
+
+    process.start_grace_time = grace_time
+    process.stop_grace_time = grace_time
+    process.restart_grace_time = grace_time
+
+    process.uid = "app"
+    process.gid = "app"
+
+    process.checks :mem_usage, :every => 15.seconds, :below => 165.megabytes, :times => [3,4], :fires => :stop
+  end
+end

data/generators/nginx.conf.erb

@@ -15,8 +15,8 @@ server {
 
     # path for static files
     root <%= deploy_to %>/current/public;
-    access_log <%= deploy_to %>/current/log/nginx.access.log main;
-    error_log  <%= deploy_to %>/current/log/nginx.error.log info;
+    access_log <%= deploy_to %>/current/log/nginx.access.log;
+    error_log  <%= deploy_to %>/current/log/nginx.error.log;
 
     # this rewrites all the requests to the maintenance.html
     # page if it exists in the doc root. This is for capistrano's
@@ -120,8 +120,8 @@ server {
   client_max_body_size    50M;
 
   root <%= deploy_to %>/current/public;
-  access_log <%= deploy_to %>/current/log/nginx.access.log main;
-  error_log  <%= deploy_to %>/current/log/nginx.error.log info;
+  access_log <%= deploy_to %>/current/log/nginx.access.log;
+  error_log  <%= deploy_to %>/current/log/nginx.error.log;
 
   # this rewrites all the requests to the maintenance.html
   # page if it exists in the doc root. This is for capistrano's

data/generators/template.bluepill.erb

@@ -0,0 +1,36 @@
+app_name            = 'FIXME'
+grace_time          = 120
+rails_root          = '<%= deploy_to %>/current'
+rails_env           = '<%= environment %>'
+log_file            = "#{rails_root}/log/#{app_name}_bluepill.log"
+cmd_bin             = "/usr/bin/env RAILS_ENV=#{rails_env} bundle exec script/#{app_name}"
+cmd_pid             = "#{rails_root}/tmp/pids/#{app_name}.pid"
+
+cmd_start_cmd       = "#{cmd_bin}"
+cmd_stop_cmd        = "kill -QUIT {{PID}}"
+cmd_restart_cmd     = "bash -c '#{cmd_stop_cmd} && #{cmd_start_cmd}'"
+
+
+puts ">> Starting #{app_name} bluepill with RAILS_ROOT=#{rails_root} and RAILS_ENV=#{rails_env}"
+
+Bluepill.application(app_name, :log_file => log_file) do |app|
+  app.process("cmd-#{app_name}") do |process|
+    process.pid_file = cmd_pid
+    process.daemonize = true
+    process.working_dir = rails_root
+
+    process.start_command = cmd_start_cmd
+    process.stop_command = cmd_stop_cmd
+    process.restart_command = cmd_restart_cmd
+
+    process.start_grace_time = grace_time
+    process.stop_grace_time = grace_time
+    process.restart_grace_time = grace_time
+
+    process.uid = "app"
+    process.gid = "app"
+
+    process.checks :mem_usage, :every => 15.seconds, :below => 165.megabytes, :times => [3,4], :fires => :stop
+    process.checks :cpu_usage, :every => 15.seconds, :below => 90, :times => [3,4], :fires => :stop
+  end
+end

data/lib/recipes/bluepill.rb

@@ -1,13 +1,18 @@
 Capistrano::Configuration.instance.load do
-  set(:bluepill_local_config) { "#{templates_path}/app.bluepill.erb" } unless exists?(:nginx_local_config)
-  set(:bluepill_remote_config) { "#{shared_path}/config/pills/#{application}.pill" } unless exists?(:nginx_remote_config)
+  set(:bluepill_local_config) { "#{templates_path}/app.bluepill.erb" } unless exists?(:bluepill_local_config)
+  set(:bluepill_remote_config) { "#{shared_path}/config/pills/#{application}.pill" } unless exists?(:bluepill_remote_config)
 
   namespace :bluepill do
-    desc "|capistrano-recipes| Parses and uploads nginx configuration for this app."
+    desc "|capistrano-recipes| Parses and uploads bluepill configuration for this app."
     task :setup, :roles => :app , :except => { :no_release => true } do
       generate_config(bluepill_local_config, bluepill_remote_config)
     end
 
+    desc "|capistrano-recipes| Parses and uploads a bluepill template."
+    task :template, :roles => :app , :except => { :no_release => true } do
+      generate_config("#{templates_path}/template.bluepill.erb", "#{shared_path}/config/pills/template.pill")
+    end
+
     desc "|capistrano-recipes| Install the bluepill monitoring tool"
     task :install, :roles => [:app] do
       sudo "gem install bluepill"

data/lib/recipes/magent.rb

@@ -1,15 +1,44 @@
 Capistrano::Configuration.instance.load do
+  set(:magent_queue, :default) unless exists?(:magent_queue)
+  set(:magent_grace_time, 120) unless exists?(:magent_grace_time)
+  set(:magent_local_config) { "#{templates_path}/magent.bluepill.erb" } unless exists?(:magent_local_config)
+  set(:magent_remote_config) { "#{shared_path}/config/pills/magent.pill" } unless exists?(:magent_remote_config)
+
   namespace :magent do
+    desc "Configure magent pill"
+    task :setup do
+      generate_config(magent_local_config, magent_remote_config)
+    end
+
+    desc "Init magent with bluepill"
+    task :init do
+      rvmsudo "bluepill load #{magent_remote_config}"
+    end
+
+    desc "Start magent with bluepill"
     task :start do
-      run "export RAILS_ENV=#{rails_env}; cd #{current_path}; bundle exec magent -d -Q default -l #{current_path}/log -P #{current_path}/tmp/pids start; true"
+      rvmsudo "bluepill magent start"
     end
 
+    desc "Restart magent with bluepill"
     task :restart do
-      run "export RAILS_ENV=#{rails_env}; cd #{current_path}; bundle exec magent -d -Q default -l #{current_path}/log -P #{current_path}/tmp/pids restart; true"
+      rvmsudo "bluepill magent restart"
     end
 
+    desc "Stop magent with bluepill"
     task :stop do
-      run "export RAILS_ENV=#{rails_env}; cd #{current_path}; bundle exec magent -d -Q default -l #{current_path}/log -P #{current_path}/tmp/pids stop; true"
+      rvmsudo "bluepill magent stop"
+    end
+
+    desc "Display the bluepill status"
+    task :status do
+      rvmsudo "bluepill magent status"
+    end
+
+    desc "Stop magent and quit bluepill"
+    task :quit do
+      rvmsudo "bluepill magent stop"
+      rvmsudo "bluepill magent quit"
     end
   end
 end

data/lib/recipes/nginx.rb

@@ -8,7 +8,7 @@ Capistrano::Configuration.instance.load do
 
   # Path to where your remote config will reside (I use a directory sites inside conf)
   set(:nginx_remote_config) do
-    "#{nginx_path_prefix}/conf/sites/#{application}.conf"
+    "#{nginx_path_prefix}/conf.d/#{application}.site.conf"
   end unless exists?(:nginx_remote_config)
 
   # Nginx tasks are not *nix agnostic, they assume you're using Debian/Ubuntu.

data/ricodigo-capistrano-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ricodigo-capistrano-recipes}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2011-05-25}
+  s.date = %q{2011-05-26}
   s.default_executable = %q{ricodigo-install-server}
   s.description = %q{our capistrano recipes. forked from capistrano-recipes}
   s.email = %q{krawek@gmail.com}
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/ricodigo-install-server",
     "generators/app.bluepill.erb",
+    "generators/magent.bluepill.erb",
     "generators/nginx.conf.erb",
+    "generators/template.bluepill.erb",
     "generators/unicorn.rb.erb",
     "lib/helpers.rb",
     "lib/recipes/application.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -05:00
+date: 2011-05-26 00:00:00 -05:00
 default_executable: ricodigo-install-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,7 +174,9 @@ files:
 - VERSION
 - bin/ricodigo-install-server
 - generators/app.bluepill.erb
+- generators/magent.bluepill.erb
 - generators/nginx.conf.erb
+- generators/template.bluepill.erb
 - generators/unicorn.rb.erb
 - lib/helpers.rb
 - lib/recipes/application.rb
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2322525543932527939
+      hash: 2507973693654577722
       segments: 
       - 0
       version: "0"