capitate 0.2.3 → 0.2.5

data/lib/capitate/plugins/prompt.rb

@@ -1,3 +1,4 @@
+require 'md5'
 
 module Capitate::Plugins::Prompt
   
@@ -5,21 +6,63 @@ module Capitate::Plugins::Prompt
     Capistrano::CLI.ui.ask(label, &block)
   end
   
-  def password(label, verify = false, lazy = true)
+  # Prompt for password.
+  #
+  # ==== Options
+  # +label+:: Label
+  # +options+:: Options
+  # - +verify+:: If true, prompt twice and verify
+  # - +lazy+:: If true, returns a block. _Defaults to true_
+  # - +check_hash+:: If present, checks that md5 is same as password md5
+  #
+  def password(label, options = {})
+    
+    verify = options[:verify]
+    lazy = options[:lazy].nil? ? true : options[:lazy]
+    check_hash = options[:check_hash]
+    
     # Lazy
     password_prompt = Proc.new { 
-      password = Capistrano::CLI.password_prompt(label)
+      
+      max_attempts = 2
+      attempts = 0
+      password = nil
+      success = true
+
+      loop { 
+        password = Capistrano::CLI.password_prompt(label)
+        attempts += 1
     
-      if verify
-        password_verify = Capistrano::CLI.password_prompt("[VERIFY] #{label}")
-        raise "Passwords do not match" if password != password_verify
-      end
+        if verify
+          password_verify = Capistrano::CLI.password_prompt("[VERIFY] #{label}")
+          if password != password_verify
+            logger.important "Passwords do not match" 
+            success = false
+          end
+        end
+      
+        if check_hash
+          if MD5.md5(password).hexdigest != check_hash
+            logger.important "Invalid password, try again." 
+            success = false
+          end         
+        end
+        
+        break if success
+        break if attempts >= max_attempts
+      }
+      
+      raise "Invalid password, too many tries" unless success
     
       password
     }
     
     return password_prompt if lazy
     password_prompt.call
+  end  
+  
+  def check_password_hash(password, hash)
+    MD5.md5()
   end
   
 end

data/lib/capitate/plugins/script.rb

@@ -51,11 +51,8 @@ module Capitate::Plugins::Script
     build_dest = options[:build_dest]
     build_dest ||= "/tmp/#{name}"
     url = options[:url]    
-    dependencies = options[:dependencies]
     
-    package.install(dependencies) if dependencies
-    
-    unpack(url, build_dest, options[:clean], options[:unpack_dir]) do |dir|
+    unpack(url, build_dest, options) do |dir|
       yield(dir) if block_given?
     end      
   end
@@ -85,7 +82,10 @@ module Capitate::Plugins::Script
     end
     
     # If want verbose, -v
-    run_via "sh -v #{dest} && rm -rf #{File.dirname(dest)}"
+    run_all <<-CMDS
+      sh -v #{dest}
+      rm -rf #{File.dirname(dest)}
+    CMDS
   end
   
   # Download and unpack URL.
@@ -94,15 +94,16 @@ module Capitate::Plugins::Script
   # ==== Options
   # +url+:: URL to download
   # +dest+:: Destination directory
-  # +clean+:: If true will remove the unpacked directory
-  # +unpack_dir+:: Directory that is unpacked from tgz (if not matching the file name)
+  # +options+::
+  # - +clean+:: If true will remove the unpacked directory. _Defaults to true_
+  # - +unpack_dir+:: Directory that is unpacked from tgz (if not matching the file name)
   #
   # ==== Examples
   #   script.unpack("http://rubyforge.org/frs/download.php/29548/rubygems-1.0.1.tgz", "/tmp/rubygems") do
   #     sudo "ruby setup.rb"
   #   end
   #
-  def unpack(url, dest, clean = true, unpack_dir = nil, &block)        
+  def unpack(url, dest, options, &block)        
     file = url.split("/").last
     
     # TODO: Support other types
@@ -110,12 +111,16 @@ module Capitate::Plugins::Script
       raise "Can't unpack this file: #{file}; only support tar.gz and tgz formats"
     end
     
+    options[:clean] = true if options[:clean].nil?
+    unpack_dir = options[:unpack_dir]
+    clean = options[:clean]
+    
     unpack_dir ||= file.gsub(/\.tar\.gz|\.tgz/, "")
     
     http_get_method = fetch(:http_get_method, "wget -nv")
-    
+        
     run_all <<-CMDS
-      mkdir -p #{dest} && cd #{dest} && #{http_get_method} #{url}
+      sh -c "mkdir -p #{dest} && cd #{dest} && #{http_get_method} #{url}"
       sh -c "cd #{dest} && tar zxf #{file}"
     CMDS
     
@@ -133,10 +138,9 @@ module Capitate::Plugins::Script
   # +cmds+:: Commands (separated by newlines)
   # +options+:: See invoke_command options
   #
-  def run_all(cmds, options = {}, &block)
+  def run_all(cmds, options = {}, &block)    
     cmds.split("\n").each do |cmd|
-      cmd = cmd.gsub(/^\s+/, "")
-      #sh_cmd = %{sh -c "#{cmd.gsub("\"", "\"\"")}"}
+      cmd = cmd.gsub(/^\s+/, "")        
       run_via(cmd, options, &block)
     end    
   end

data/lib/capitate/recipes.rb

@@ -3,6 +3,3 @@ recipes = Dir[File.dirname(__FILE__) + "/../recipes/**/*.rb"].collect { |recipe|
 recipes.each do |recipe|
   Capistrano::Configuration.instance.load recipe
 end
-
-# Reset the password var
-Capistrano::Configuration.instance.load(:string => "reset_password")

data/lib/capitate/version.rb

@@ -2,7 +2,7 @@ module Capitate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/capitate.rb

@@ -21,14 +21,17 @@ require 'capitate/plugins/templates'
 require 'capitate/plugins/upload'
 require 'capitate/plugins/yum'
 
+# Extensions + Patches
 require "capitate/cap_ext/connections"
 require "capitate/cap_ext/extension_proxy"
 require "capitate/cap_ext/variables"
 require "capitate/cap_ext/run_via"
+require "capitate/cap_ext/roles"
         
 class Capistrano::Configuration   
   include Capitate::CapExt::Variables
   include Capitate::CapExt::RunVia
+  include Capitate::CapExt::Roles
 end
 
 require 'capitate/task_node'

data/lib/deployment/deploy.rb

@@ -28,15 +28,12 @@ role :db, "192.168.1.111", :primary => true
 # Callbacks 
 before "deploy:setup", "centos:add_user"
 
-after "deploy:setup", "mysql:setup", "rails:setup", "mongrel_cluster:centos:setup",
-  "nginx:setup_mongrel", "sphinx:centos:setup"
+after "deploy:setup", "mysql:setup", "rails:setup", "mongrel:cluster:centos:setup",
+  "nginx:mongrel:setup", "sphinx:centos:setup", "sphinx:setup_monit", "mongrel:cluster:monit:setup"
   
-after "sphinx:centos:setup", "sphinx:setup_monit"
-after "mongrel_cluster:centos:setup", "mongrel_cluster:setup_monit"
+after "nginx:mongrel:setup", "nginx:centos:restart"
 
-after "nginx:setup_mongrels", "nginx:centos:restart"
-
-after "deploy:update_code", "rails:update_code", "sphinx:update_code"
+after "deploy:update_code", "rails:update_code", "sphinx:update_conf"
 
 # Auto cleanup after deploy
 after "deploy", "deploy:cleanup"

data/lib/deployment/install-centos-rubyweb.rb

@@ -53,12 +53,12 @@ task :install do
   #
   # Install monit hooks
   #
-  nginx.install_monit
-  mysql.install_monit
+  nginx.monit.install
+  mysql.monit.install
   
   # Gem installs
   gems.install([ "rake", "mysql -- --with-mysql-include=/usr/include/mysql --with-mysql-lib=/usr/lib/mysql --with-mysql-config", 
-    "raspell", "rmagick", "mongrel", "mongrel_cluster","json" ])
+    "raspell", "rmagick", "mongrel", "mongrel_cluster","json", "mime-types" ])
   
   # Cleanup
   yum.clean

data/lib/recipes/centos/centos.rb

@@ -26,18 +26,26 @@ namespace :centos do
     adduser_options << "-d #{home}" unless home.blank?
     adduser_options << "-G #{groups}" unless groups.blank?
   
-    run "id #{user_add} || /usr/sbin/adduser #{adduser_options.join(" ")} #{user_add}"
-          
-    run "chmod a+rx #{home}" if home_readable
+    user_existed = false
+    run "id #{user_add} || /usr/sbin/adduser #{adduser_options.join(" ")} #{user_add}" do |channel, stream, data|
+      logger.info data
+      user_existed = data =~ /uid/
+    end
+    
+    logger.info "User already existed, aborting..." if user_existed
+    
+    unless user_existed
+      run "chmod a+rx #{home}" if home_readable
   
-    new_password = prompt.password("Password to set for #{user_add}: ", true, false)
+      new_password = prompt.password("Password to set for #{user_add}: ", :verify => true, :lazy => false)
   
-    run "passwd #{user_add}" do |channel, stream, data|
-      logger.info data
+      run "passwd #{user_add}" do |channel, stream, data|
+        logger.info data
   
-      if data =~ /password:/i
-        channel.send_data "#{new_password}\n"
-        channel.send_data "#{new_password}\n"
+        if data =~ /password:/i
+          channel.send_data "#{new_password}\n"
+          channel.send_data "#{new_password}\n"
+        end
       end
     end
         

data/lib/recipes/centos/imagemagick.rb

@@ -4,6 +4,12 @@ namespace :imagemagick do
     desc <<-DESC
     Install imagemagick.\n    
     *imagemagick_build_options*: Imagemagick build options.
+    <pre>
+    set :imagemagick_build_options, {
+      :url => "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick.tar.gz",
+      :unpack_dir => "ImageMagick-*"
+    }
+    </pre>
     DESC
     task :install do
       

data/lib/recipes/centos/memcached.rb

@@ -6,6 +6,12 @@ namespace :memcached do
     Install memcached.
     
     *memcached_build_options*: Memcached build options.\n
+    <pre>
+    set :memcached_build_options, {
+      :url => "http://www.danga.com/memcached/dist/memcached-1.2.4.tar.gz",
+      :configure_options => "--prefix=/usr/local"
+    }
+    </pre>\n
     *memcached_memory*: Memcached memory (in MB).\n    
     @set :memcached_memory, 64@\n
     *memcached_pid_path*: Path to memcached pid file. Defaults to /var/run/memcached.pid\n    

data/lib/recipes/centos/mongrel_cluster.rb

@@ -1,40 +1,54 @@
-namespace :mongrel_cluster do 
+namespace :mongrel do
+
+  namespace :cluster do 
   
-  namespace :centos do
+    namespace :centos do
     
-    desc <<-DESC
-    Create mongrel cluster.
+      desc <<-DESC
+      Create mongrel cluster.
     
-    *mongrel_size*: Number of mongrels.\n    
-    @set :mongrel_size, 3@\n
-    *mongrel_port*: Starting port for mongrels. If there are 3 mongrels with port 9000, 
-    then instances will be at 9000, 9001, and 9002\n      
-    @set :mongrel_port, 9000@\n      
-    *mongrel_config_dir*: Directory for mongrel config. _Defaults to "[shared_path]/config/mongrel"_
-    *mongrel_pid_dir*: Directory for mongrel pids. _Defaults to "[shared_path]/pids"
-    *mongrel_config_script*: Config script to load with mongrel. _Defaults to nil_\n  
-    @set :mongrel_config_script, "config/mongrel_handler.rb"@\n
-    DESC
-    task :setup do 
+      *mongrel_size*: Number of mongrels.\n    
+      @set :mongrel_size, 3@\n
+      *mongrel_port*: Starting port for mongrels. If there are 3 mongrels with port 9000, 
+      then instances will be at 9000, 9001, and 9002\n      
+      @set :mongrel_port, 9000@\n      
+      *mongrel_config_dir*: Directory for mongrel config. _Defaults to "[shared_path]/config/mongrel"_
+      *mongrel_pid_dir*: Directory for mongrel pids. _Defaults to "[shared_path]/pids"
+      *mongrel_config_script*: Config script to load with mongrel. _Defaults to nil_\n  
+      @set :mongrel_config_script, "config/mongrel_handler.rb"@\n
+      *mongrel_cluster_command*: Mongrel cluster command. _Defaults to mongrel_cluster_ctl_
+      *mongrel_initscript_name*: Mongrel initscript name. _Defaults to mongrel_cluster_\#{application}_
+      *mongrel_config_options*: Config options appended to cluster yml. _Defaults to <tt>{}</tt>_
+      DESC
+      task :setup do 
 
-      # Settings
-      fetch(:mongrel_size)
-      fetch(:mongrel_port)
-      fetch_or_default(:mongrel_config_dir, "#{shared_path}/config/mongrel")
-      fetch_or_default(:mongrel_pid_dir, "#{shared_path}/pids")
-      fetch_or_default(:mongrel_config_script, nil)
+        # Settings
+        fetch(:mongrel_size)
+        fetch(:mongrel_port)
+        fetch_or_default(:mongrel_config_dir, "#{shared_path}/config/mongrel")
+        fetch_or_default(:mongrel_pid_dir, "#{shared_path}/pids")
+        fetch_or_default(:mongrel_config_script, nil)
+        
+        fetch_or_default(:mongrel_cluster_command, "mongrel_cluster_ctl")
+        fetch_or_default(:mongrel_initscript_name, "mongrel_cluster_#{application}")
+        fetch_or_default(:mongrel_config_options, {})
+        
+        unless mongrel_config_script.blank?
+          mongrel_config_options["config_script"] = mongrel_config_script
+        end
       
-      run "mkdir -p #{mongrel_config_dir}"
+        run "mkdir -p #{mongrel_config_dir}"
 
-      put template.load("mongrel/mongrel_cluster.initd.erb"), "/tmp/mongrel_cluster_#{application}.initd"    
-      put template.load("mongrel/mongrel_cluster.yml.erb"), "#{mongrel_config_dir}/mongrel_cluster.yml"
+        put template.load("mongrel/mongrel_cluster.initd.erb"), "/tmp/#{mongrel_initscript_name}.initd"    
+        put template.load("mongrel/mongrel_cluster.yml.erb"), "#{mongrel_config_dir}/mongrel_cluster.yml"
 
-      # Setup the mongrel_cluster init script
-      sudo "install -o root /tmp/mongrel_cluster_#{application}.initd /etc/init.d/mongrel_cluster_#{application}"
+        # Setup the mongrel_cluster init script
+        sudo "install -o root /tmp/#{mongrel_initscript_name}.initd /etc/init.d/#{mongrel_initscript_name}"
 
-      sudo "/sbin/chkconfig --level 345 mongrel_cluster_#{application} on"
-    end
+        sudo "/sbin/chkconfig --level 345 #{mongrel_initscript_name} on"
+      end
     
+    end
     
   end
   

data/lib/recipes/centos/monit.rb

@@ -6,6 +6,7 @@ namespace :monit do
     Install monit.
     
     *monit_build_options*: Monit build options.\n
+    @set :monit_build_options, { :url => "http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz" }@\n
     *monit_port*: Monit port. _Defaults to 2812_\n    
     @set :monit_port, 2812@\n
     *monit_password*: Monit password. _Defaults to password prompt_\n    
@@ -19,7 +20,7 @@ namespace :monit do
       
       # Settings
       fetch_or_default(:monit_port, 2812)
-      fetch_or_default(:monit_password, prompt.password('Monit admin password (to set): ', true))
+      fetch_or_default(:monit_password, prompt.password('Monit admin password (to set): ', :verify => true))
       fetch_or_default(:monit_conf_dir, "/etc/monit")
       fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
       fetch(:monit_build_options)

data/lib/recipes/centos/mysql.rb

@@ -11,7 +11,7 @@ namespace :mysql do
     task :install do    
       
       # Settings
-      fetch_or_default(:mysql_admin_password_set, prompt.password('Mysql admin password (to set): ', true))
+      fetch_or_default(:mysql_admin_password_set, prompt.password('Mysql admin password (to set): ', :verify => true))
 
       # Install through package manager
       yum.install([ "mysql", "mysql-devel", "mysql-server" ])

data/lib/recipes/centos/nginx.rb

@@ -6,6 +6,14 @@ namespace :nginx do
     Install nginx, conf, initscript, nginx user and service.
     
     *nginx_build_options*: Nginx build options.\n
+    <pre>
+    set :nginx_build_options, {
+      :url => "http://sysoev.ru/nginx/nginx-0.5.35.tar.gz",
+      :configure_options => "--sbin-path=\#{nginx_bin_path} --conf-path=\#{nginx_conf_path}
+        --pid-path=\#{nginx_pid_path} --error-log-path=/var/log/nginx_master_error.log --lock-path=/var/lock/nginx 
+        --prefix=\#{nginx_prefix_path} --with-md5=auto/lib/md5 --with-sha1=auto/lib/sha1 --with-http_ssl_module"
+    }
+    </pre>\n
     *nginx_bin_path*: Nginx sbin path. _Defaults to /sbin/nginx_\n    
     @set :nginx_bin_path, "/sbin/nginx"@\n
     *nginx_conf_path*: Path to nginx conf. _Defaults to /etc/nginx/nginx.conf_\n    

data/lib/recipes/centos/ruby.rb

@@ -7,6 +7,14 @@ namespace :ruby do
     
     *ruby_build_options*: Ruby build options.\n
     *rubygems_build_options*: Rubygems build options.\n
+    <pre>
+    set :ruby_build_options, {
+      :url => "http://capitate.s3.amazonaws.com/ruby-1.8.6-p110.tar.gz",
+      :build_dest => "/usr/src",
+      :configure_options => "--prefix=/usr",       
+      :clean => false
+    }
+    </pre>
     DESC
     task :install do 
 
@@ -15,14 +23,14 @@ namespace :ruby do
       fetch(:rubygems_build_options)
     
       # Install dependencies
-      yum.install([ "zlib", "zlib-devel" ])
+      yum.install([ "zlib", "zlib-devel", "readline-devel" ])
     
       # Install ruby 1.8.6
       script.make_install("ruby", ruby_build_options)
     
       # Install rubygems
       script.install("rubygems", rubygems_build_options) do |dir|
-        run_via "echo 'Running setup...' && cd #{dir} && ruby setup.rb > install.log"
+        run_via "cd #{dir} && ruby setup.rb > install.log", { :shell => true }
       end
     
     end        

data/lib/recipes/centos/sphinx.rb

@@ -4,7 +4,14 @@ namespace :sphinx do
     
     desc <<-DESC
     Install sphinx.\n
-    *sphinx_build_options*: Sphinx build options.\n
+    *sphinx_build_options*: Sphinx build options.\n    
+    <pre>
+    set :sphinx_build_options, {
+      :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz",
+      :configure_options => "--with-mysql-includes=/usr/include/mysql --with-mysql-libs=/usr/lib/mysql 
+        --prefix=\#{sphinx_prefix}"
+    }
+    </pre>\n
     *sphinx_prefix*: Sphinx install prefix. _Defaults to "/usr/local/sphinx"_\n
     DESC
     task :install do 

data/lib/recipes/memcached.rb

@@ -1,30 +1,28 @@
 namespace :memcached do
   
-  desc <<-DESC
-  Generate and install memcached monitrc.
+  namespace :monit do
   
-  *memcached_pid_path*: Path to memcached pid file. _Defaults to /var/run/memcached.pid_
-  
-  @set :memcached_pid_path, "/var/run/memcached.pid"@
-  
-  *memcached_port*: Memcached port. _Defaults to 11211_   
-  
-  @set :memcached_port, 11211@
-     
-  *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
-  
-  @set :monit_conf_dir, "/etc/monit"@
-     
-  DESC
-  task :install_monit do
+    desc <<-DESC
+    Generate and install memcached monitrc.
+    
+    *memcached_pid_path*: Path to memcached pid file. _Defaults to /var/run/memcached.pid_\n  
+    @set :memcached_pid_path, "/var/run/memcached.pid"@\n  
+    *memcached_port*: Memcached port. _Defaults to 11211_\n  
+    @set :memcached_port, 11211@\n     
+    *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n  
+    @set :monit_conf_dir, "/etc/monit"@\n     
+    DESC
+    task :install do
+    
+      # Settings
+      fetch_or_default(:memcached_pid_path, "/var/run/memcached.pid")
+      fetch_or_default(:memcached_port, 11211)    
+      fetch_or_default(:monit_conf_dir, "/etc/monit")
     
-    # Settings
-    fetch_or_default(:memcached_pid_path, "/var/run/memcached.pid")
-    fetch_or_default(:memcached_port, 11211)    
-    fetch_or_default(:monit_conf_dir, "/etc/monit")
+      put template.load("memcached/memcached.monitrc.erb"), "/tmp/memcached.monitrc"    
+      run_via "install -o root /tmp/memcached.monitrc #{monit_conf_dir}/memcached.monitrc"
+    end
     
-    put template.load("memcached/memcached.monitrc.erb"), "/tmp/memcached.monitrc"    
-    run_via "install -o root /tmp/memcached.monitrc #{monit_conf_dir}/memcached.monitrc"
   end
   
 end

data/lib/recipes/mongrel_cluster.rb

@@ -1,63 +1,73 @@
 # Create init script
-namespace :mongrel_cluster do
+namespace :mongrel do
 
-  desc <<-DESC
-  Create monit configuration for mongrel cluster.
+  namespace :cluster do
+
+    namespace :monit do
+      
+      desc <<-DESC
+      Create monit configuration for mongrel cluster.
   
-  *mongrel_size*: Number of mongrels.\n  
-  @set :mongrel_size, 3@\n
-  *mongrel_port*: Starting port for mongrels. If there are 3 mongrels with port 9000, then instances 
-  will be at 9000, 9001, and 9002\n    
-  @set :mongrel_port, 9000@\n    
-  *mongrel_config_script*: Config script to load with mongrel. _Defaults to nil_\n  
-  @set :mongrel_config_script, "config/mongrel_handler.rb"@\n    
-  *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n  
-  @set :monit_conf_dir, "/etc/monit"@\n  
-  DESC
-  task :setup_monit do
-    
-    # See http://www.igvita.com/2006/11/07/monit-makes-mongrel-play-nice/
-    
-    # TODO: For depends on memcached setting
-    # See http://blog.labratz.net/articles/2007/5/1/monit-for-your-uptime 
-    
-    # Settings
-    fetch(:mongrel_size)
-    fetch(:mongrel_port)
-    fetch_or_default(:mongrel_config_script, nil)
-    fetch_or_default(:monit_conf_dir, "/etc/monit")
-    
-    processes = []
-    ports = (0...mongrel_size).collect { |i| mongrel_port + i }
-    ports.each do |port|
+      *mongrel_application*: Name of application (monit group). _Defaults to <tt>"mongrel_cluster_\#{fetch(:application)}"</tt>_
+      *mongrel_size*: Number of mongrels.\n  
+      @set :mongrel_size, 3@\n
+      *mongrel_port*: Starting port for mongrels. If there are 3 mongrels with port 9000, then instances 
+      will be at 9000, 9001, and 9002\n    
+      @set :mongrel_port, 9000@\n    
+      *mongrel_config_script*: Config script to load with mongrel. _Defaults to nil_\n  
+      @set :mongrel_config_script, "config/mongrel_handler.rb"@\n    
+      *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n  
+      @set :monit_conf_dir, "/etc/monit"@\n  
+      DESC
+      task :setup do
+    
+        # See http://www.igvita.com/2006/11/07/monit-makes-mongrel-play-nice/
+    
+        # TODO: For depends on memcached setting
+        # See http://blog.labratz.net/articles/2007/5/1/monit-for-your-uptime 
+    
+        # Settings
+        fetch(:mongrel_size)
+        fetch(:mongrel_port)
+        fetch_or_default(:mongrel_application, Proc.new { "mongrel_cluster_#{fetch(:application)}" })
+        fetch_or_default(:mongrel_config_script, nil)
+        fetch_or_default(:monit_conf_dir, "/etc/monit")
+    
+        processes = []
+        ports = (0...mongrel_size).collect { |i| mongrel_port + i }
+        ports.each do |port|
       
-      pid_path = "#{shared_path}/pids/mongrel.#{port}.pid"
+          pid_path = "#{shared_path}/pids/mongrel.#{port}.pid"
       
-      default_options = [
-        [ "-d" ], 
-        [ "-e", "production" ],
-        [ "-a", "127.0.0.1" ],
-        [ "-c", current_path ],
-        [ "--user", user ], 
-        [ "--group", user ],
-        [ "-p", port ], 
-        [ "-P", pid_path ],
-        [ "-l", "log/mongrel.#{port}.log" ]
-      ]
+          default_options = [
+            [ "-d" ], 
+            [ "-e", "production" ],
+            [ "-a", "127.0.0.1" ],
+            [ "-c", current_path ],
+            [ "--user", user ], 
+            [ "--group", user ],
+            [ "-p", port ], 
+            [ "-P", pid_path ],
+            [ "-l", "log/mongrel.#{port}.log" ]
+          ]
       
-      default_options << [ "-S", mongrel_config_script ] if mongrel_config_script 
+          default_options << [ "-S", mongrel_config_script ] if mongrel_config_script 
       
-      start_options = default_options.collect { |a| a.join(" ") }.join(" ")      
-      #start_options = "-d -e production -a 127.0.0.1 -c #{current_path} --user #{user} --group #{user} -p #{port} -P #{pid_path} -l log/mongrel.#{port}.log"
-      stop_options = "-p #{port} -P #{pid_path}"
+          start_options = default_options.collect { |a| a.join(" ") }.join(" ")      
+          #start_options = "-d -e production -a 127.0.0.1 -c #{current_path} --user #{user} --group #{user} -p #{port} -P #{pid_path} -l log/mongrel.#{port}.log"
+          stop_options = "-p #{port} -P #{pid_path}"
       
-      processes << { :port => port, :start_options => start_options, :stop_options => stop_options, :name => "/usr/bin/mongrel_rails", :pid_path => pid_path }
-    end
+          processes << { :port => port, :start_options => start_options, :stop_options => stop_options, :name => "/usr/bin/mongrel_rails", :pid_path => pid_path }
+        end
+    
+        set :processes, processes
     
-    set :processes, processes
+        put template.load("mongrel/mongrel_cluster.monitrc.erb"), "/tmp/#{mongrel_application}.monitrc"    
+        sudo "install -o root /tmp/#{mongrel_application}.monitrc #{monit_conf_dir}/#{mongrel_application}.monitrc"
+      end
+      
+    end
     
-    put template.load("mongrel/mongrel_cluster.monitrc.erb"), "/tmp/mongrel_cluster_#{application}.monitrc"    
-    sudo "install -o root /tmp/mongrel_cluster_#{application}.monitrc #{monit_conf_dir}/mongrel_cluster_#{application}.monitrc"
   end
     
 end