capitate 0.2.3 → 0.2.5

data/History.txt

@@ -1,3 +1,17 @@
+== 0.2.5 2008-02-28
+
+* Adding application configuration for mongrel cluster monit setup.
+* Renaming recipes, using consistent names for namespaces.
+* Capistrano patch: if missing role, ignore the task instead of throwing error.
+* Capistranp patch: Showing debug statement on SSH connect.
+
+== 0.2.4 2008-02-26
+
+* Change prompt.password to take options
+* Adding password retry and check_hash
+* Fixing :shell option for build scripting
+* Add readline-devel to ruby centos install dependency
+
 == 0.2.3 2008-02-25
 
 * Various task and recipe fixes.

data/Manifest.txt

@@ -17,23 +17,31 @@ docs/recipes/imagemagick-centos.txt
 docs/recipes/imagemagick.txt
 docs/recipes/index.txt
 docs/recipes/memcached-centos.txt
+docs/recipes/memcached-monit.txt
 docs/recipes/memcached.txt
-docs/recipes/mongrel_cluster-centos.txt
-docs/recipes/mongrel_cluster.txt
+docs/recipes/mongrel-cluster-centos.txt
+docs/recipes/mongrel-cluster-monit.txt
+docs/recipes/mongrel-cluster.txt
+docs/recipes/mongrel.txt
 docs/recipes/monit-centos.txt
 docs/recipes/monit.txt
 docs/recipes/mysql-centos.txt
+docs/recipes/mysql-monit.txt
 docs/recipes/mysql.txt
 docs/recipes/nginx-centos.txt
+docs/recipes/nginx-mongrel.txt
+docs/recipes/nginx-monit.txt
 docs/recipes/nginx.txt
 docs/recipes/rails.txt
 docs/recipes/ruby-centos.txt
 docs/recipes/ruby.txt
 docs/recipes/sphinx-centos.txt
+docs/recipes/sphinx-monit.txt
 docs/recipes/sphinx.txt
 lib/capitate.rb
 lib/capitate/cap_ext/connections.rb
 lib/capitate/cap_ext/extension_proxy.rb
+lib/capitate/cap_ext/roles.rb
 lib/capitate/cap_ext/run_via.rb
 lib/capitate/cap_ext/variables.rb
 lib/capitate/plugins/base.rb

data/docs/recipes/imagemagick-centos.txt

@@ -15,6 +15,12 @@ h3(#imagemagick:centos:install). imagemagick:centos:install
 Install imagemagick.
 
 *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>
 
 
 

data/docs/recipes/index.txt

@@ -11,16 +11,19 @@ h2. Namespaces
 * "deploy:web":deploy-web.html (2) 
 * "docs":docs.html (1) 
 * "imagemagick:centos":imagemagick-centos.html (1) 
-* "memcached":memcached.html (1) 
 * "memcached:centos":memcached-centos.html (1) 
-* "mongrel_cluster":mongrel_cluster.html (1) 
-* "mongrel_cluster:centos":mongrel_cluster-centos.html (1) 
+* "memcached:monit":memcached-monit.html (1) 
+* "mongrel-cluster:centos":mongrel-cluster-centos.html (1) 
+* "mongrel-cluster:monit":mongrel-cluster-monit.html (1) 
 * "monit:centos":monit-centos.html (2) 
-* "mysql":mysql.html (2) 
+* "mysql":mysql.html (1) 
 * "mysql:centos":mysql-centos.html (1) 
-* "nginx":nginx.html (2) 
+* "mysql:monit":mysql-monit.html (1) 
 * "nginx:centos":nginx-centos.html (2) 
+* "nginx:mongrel":nginx-mongrel.html (1) 
+* "nginx:monit":nginx-monit.html (1) 
 * "rails":rails.html (5) 
 * "ruby:centos":ruby-centos.html (1) 
-* "sphinx":sphinx.html (5) 
+* "sphinx":sphinx.html (4) 
 * "sphinx:centos":sphinx-centos.html (2) 
+* "sphinx:monit":sphinx-monit.html (1) 

data/docs/recipes/memcached-centos.txt

@@ -16,6 +16,13 @@ Install memcached.
 
 *memcached_build_options*: Memcached build options.
 
+<pre>
+set :memcached_build_options, {
+  :url => "http://www.danga.com/memcached/dist/memcached-1.2.4.tar.gz",
+  :configure_options => "--prefix=/usr/local"
+}
+</pre>
+
 *memcached_memory*: Memcached memory (in MB).
 
 @set :memcached_memory, 64@

data/docs/recipes/memcached-monit.txt

@@ -0,0 +1,30 @@
+h1. memcached:monit
+
+ "home":../index.html > "recipes":index.html >  "memcached":memcached.html  >  monit  
+
+
+h2. Tasks
+
+* "memcached:monit:install":#memcached:monit:install 
+
+
+h2. Task documentation
+
+h3(#memcached:monit:install). memcached:monit:install
+
+Generate and install memcached monitrc.
+
+*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"@
+
+
+

data/docs/recipes/memcached.txt

@@ -6,30 +6,4 @@ h1. memcached
 h2. Namespaces
 
 * "memcached:centos":memcached-centos.html (1) 
-
-
-h2. Tasks
-
-* "memcached:install_monit":#memcached:install_monit 
-
-
-h2. Task documentation
-
-h3(#memcached:install_monit). memcached:install_monit
-
-Generate and install memcached monitrc.
-
-*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"@
-
-
-
+* "memcached:monit":memcached-monit.html (1) 

data/docs/recipes/{mongrel_cluster-centos.txt → mongrel-cluster-centos.txt}

@@ -1,33 +1,37 @@
-h1. mongrel_cluster:centos
+h1. mongrel-cluster:centos
 
- "home":../index.html > "recipes":index.html >  "mongrel_cluster":mongrel_cluster.html  >  centos  
+ "home":../index.html > "recipes":index.html >  "mongrel-cluster":mongrel-cluster.html  >  centos  
 
 
 h2. Tasks
 
-* "mongrel_cluster:centos:setup":#mongrel_cluster:centos:setup 
+* "mongrel:cluster:centos:setup":#mongrel:cluster:centos:setup 
 
 
 h2. Task documentation
 
-h3(#mongrel_cluster:centos:setup). mongrel_cluster:centos:setup
+h3(#mongrel:cluster:centos:setup). mongrel:cluster:centos:setup
 
 Create mongrel cluster.
-
+    
 *mongrel_size*: Number of mongrels.
-
+    
 @set :mongrel_size, 3@
 
 *mongrel_port*: Starting port for mongrels. If there are 3 mongrels with port 9000, 
 then instances will be at 9000, 9001, and 9002
-  
+
 @set :mongrel_port, 9000@
-  
+
 *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_
   
 @set :mongrel_config_script, "config/mongrel_handler.rb"@
 
+*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>_
+
 
 

data/docs/recipes/{mongrel_cluster.txt → mongrel-cluster-monit.txt}

@@ -1,39 +1,35 @@
-h1. mongrel_cluster
+h1. mongrel-cluster:monit
 
- "home":../index.html > "recipes":index.html >  mongrel_cluster  
-
-
-h2. Namespaces
-
-* "mongrel_cluster:centos":mongrel_cluster-centos.html (1) 
+ "home":../index.html > "recipes":index.html >  "mongrel-cluster":mongrel-cluster.html  >  monit  
 
 
 h2. Tasks
 
-* "mongrel_cluster:setup_monit":#mongrel_cluster:setup_monit 
+* "mongrel:cluster:monit:setup":#mongrel:cluster:monit:setup 
 
 
 h2. Task documentation
 
-h3(#mongrel_cluster:setup_monit). mongrel_cluster:setup_monit
+h3(#mongrel:cluster:monit:setup). mongrel:cluster:monit:setup
 
 Create monit configuration for mongrel cluster.
-
+  
+*mongrel_application*: Name of application (monit group). _Defaults to <tt>"mongrel_cluster_#{fetch(:application)}"</tt>_
 *mongrel_size*: Number of mongrels.
-
+  
 @set :mongrel_size, 3@
 
 *mongrel_port*: Starting port for mongrels. If there are 3 mongrels with port 9000, then instances 
 will be at 9000, 9001, and 9002
-  
+    
 @set :mongrel_port, 9000@
-  
+    
 *mongrel_config_script*: Config script to load with mongrel. _Defaults to nil_
-
-@set :mongrel_config_script, "config/mongrel_handler.rb"@
   
+@set :mongrel_config_script, "config/mongrel_handler.rb"@
+    
 *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
-
+  
 @set :monit_conf_dir, "/etc/monit"@
 
 

data/docs/recipes/mongrel-cluster.txt

@@ -0,0 +1,9 @@
+h1. mongrel:cluster
+
+ "home":../index.html > "recipes":index.html >  "mongrel":mongrel.html  >  cluster  
+
+
+h2. Namespaces
+
+* "mongrel-cluster:centos":mongrel-cluster-centos.html (1) 
+* "mongrel-cluster:monit":mongrel-cluster-monit.html (1) 

data/docs/recipes/mongrel.txt

@@ -0,0 +1,9 @@
+h1. mongrel
+
+ "home":../index.html > "recipes":index.html >  mongrel  
+
+
+h2. Namespaces
+
+* "mongrel-cluster:centos":mongrel-cluster-centos.html (1) 
+* "mongrel-cluster:monit":mongrel-cluster-monit.html (1) 

data/docs/recipes/monit-centos.txt

@@ -17,6 +17,8 @@ Install monit.
 
 *monit_build_options*: Monit build options.
 
+@set :monit_build_options, { :url => "http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz" }@
+
 *monit_port*: Monit port. _Defaults to 2812_
 
 @set :monit_port, 2812@

data/docs/recipes/mysql-monit.txt

@@ -0,0 +1,28 @@
+h1. mysql:monit
+
+ "home":../index.html > "recipes":index.html >  "mysql":mysql.html  >  monit  
+
+
+h2. Tasks
+
+* "mysql:monit:install":#mysql:monit:install 
+
+
+h2. Task documentation
+
+h3(#mysql:monit:install). mysql:monit:install
+
+Install mysql monit hooks.
+  
+*db_port*: Mysql port. _Defaults to 3306_
+
+*mysql_pid_path*: Path to mysql pid file. _Defaults to /var/run/mysqld/mysqld.pid_
+
+@set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"@
+
+*monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
+
+@set :monit_conf_dir, "/etc/monit"@
+
+
+

data/docs/recipes/mysql.txt

@@ -6,32 +6,16 @@ h1. mysql
 h2. Namespaces
 
 * "mysql:centos":mysql-centos.html (1) 
+* "mysql:monit":mysql-monit.html (1) 
 
 
 h2. Tasks
 
-* "mysql:install_monit":#mysql:install_monit 
 * "mysql:setup":#mysql:setup 
 
 
 h2. Task documentation
 
-h3(#mysql:install_monit). mysql:install_monit
-
-Install mysql monit hooks.
-
-*db_port*: Mysql port. _Defaults to 3306_
-
-*mysql_pid_path*: Path to mysql pid file. _Defaults to /var/run/mysqld/mysqld.pid_
-
-@set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"@
-
-*monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
-
-@set :monit_conf_dir, "/etc/monit"@
-
-
-
 h3(#mysql:setup). mysql:setup
 
 Create database, database user, and set grant permissions.
@@ -44,11 +28,11 @@ Create database, database user, and set grant permissions.
 
 *mysql_grant_locations*: Grant locations. _Defaults to localhost_
 
-@set :grant_locations, [ "localhost", "192.168.1.111" ]@
+@set :mysql_grant_locations, [ "localhost", "192.168.1.111" ]@
 
 *mysql_grant_priv_type*: Grant privilege types. _Defaults to ALL_
 
-@set :grant_priv_type, "ALL"@
+@set :mysql_grant_priv_type, "ALL"@
 
 *mysql_admin_password*: Mysql admin password (to use to connect). Defaults to password prompt.
 

data/docs/recipes/nginx-centos.txt

@@ -17,6 +17,15 @@ Install nginx, conf, initscript, nginx user and service.
 
 *nginx_build_options*: Nginx build options.
 
+<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>
+
 *nginx_bin_path*: Nginx sbin path. _Defaults to /sbin/nginx_
 
 @set :nginx_bin_path, "/sbin/nginx"@

data/docs/recipes/nginx-mongrel.txt

@@ -0,0 +1,33 @@
+h1. nginx:mongrel
+
+ "home":../index.html > "recipes":index.html >  "nginx":nginx.html  >  mongrel  
+
+
+h2. Tasks
+
+* "nginx:mongrel:setup":#nginx:mongrel:setup 
+
+
+h2. Task documentation
+
+h3(#nginx:mongrel:setup). nginx:mongrel:setup
+
+Create and update the nginx vhost include.
+  
+*mongrel_application*: Mongrel application. _Defaults to <tt>:application</tt>_
+*mongrel_size*: Number of mongrels.
+
+@set :mongrel_size, 3@
+
+*mongrel_port*: Starting port for mongrels.
+
+If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002
+
+@set :mongrel_port, 9000@
+
+*domain_name*: Domain name for nginx virtual host, (without www prefix).
+  
+@set :domain_name, "foo.com"@
+
+
+

data/docs/recipes/nginx-monit.txt

@@ -0,0 +1,26 @@
+h1. nginx:monit
+
+ "home":../index.html > "recipes":index.html >  "nginx":nginx.html  >  monit  
+
+
+h2. Tasks
+
+* "nginx:monit:install":#nginx:monit:install 
+
+
+h2. Task documentation
+
+h3(#nginx:monit:install). nginx:monit:install
+
+Install nginx monit hooks.
+  
+*nginx_pid_path*: Path to nginx pid file. _Defaults to /var/run/nginx.pid_
+  
+@set :nginx_pid_path, "/var/run/nginx.pid"@
+  
+*monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
+
+@set :monit_conf_dir, "/etc/monit"@
+
+
+

data/docs/recipes/nginx.txt

@@ -6,47 +6,5 @@ h1. nginx
 h2. Namespaces
 
 * "nginx:centos":nginx-centos.html (2) 
-
-
-h2. Tasks
-
-* "nginx:install_monit":#nginx:install_monit 
-* "nginx:setup_mongrel":#nginx:setup_mongrel 
-
-
-h2. Task documentation
-
-h3(#nginx:install_monit). nginx:install_monit
-
-Install nginx monit hooks.
-
-*nginx_pid_path*: Path to nginx pid file. _Defaults to /var/run/nginx.pid_
-
-@set :nginx_pid_path, "/var/run/nginx.pid"@
-
-*monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
-
-@set :monit_conf_dir, "/etc/monit"@
-
-
-
-h3(#nginx:setup_mongrel). nginx:setup_mongrel
-
-Create and update the nginx vhost include.
-
-*mongrel_size*: Number of mongrels.
-
-@set :mongrel_size, 3@
-  
-*mongrel_port*: Starting port for mongrels.
-
-If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002
-
-@set :mongrel_port, 9000@
-
-*domain_name*: Domain name for nginx virtual host, (without www prefix).
-
-@set :domain_name, "foo.com"@
-
-
-
+* "nginx:mongrel":nginx-mongrel.html (1) 
+* "nginx:monit":nginx-monit.html (1) 

data/docs/recipes/ruby-centos.txt

@@ -18,5 +18,14 @@ Install ruby and rubygems.
 
 *rubygems_build_options*: Rubygems build options.
 
+<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>
+
 
 

data/docs/recipes/sphinx-centos.txt

@@ -17,6 +17,14 @@ Install sphinx.
 
 *sphinx_build_options*: Sphinx build options.
 
+<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>
+
 *sphinx_prefix*: Sphinx install prefix. _Defaults to "/usr/local/sphinx"_
 
 

data/docs/recipes/sphinx-monit.txt

@@ -0,0 +1,22 @@
+h1. sphinx:monit
+
+ "home":../index.html > "recipes":index.html >  "sphinx":sphinx.html  >  monit  
+
+
+h2. Tasks
+
+* "sphinx:monit:setup":#sphinx:monit:setup 
+
+
+h2. Task documentation
+
+h3(#sphinx:monit:setup). sphinx:monit:setup
+
+Create monit configuration for sphinx.
+  
+*monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
+
+*sphinx_pid_path*: Location for sphinx pid. _Defaults to "[shared_path]/pids/searchd.pid"_
+
+
+

data/docs/recipes/sphinx.txt

@@ -6,6 +6,7 @@ h1. sphinx
 h2. Namespaces
 
 * "sphinx:centos":sphinx-centos.html (2) 
+* "sphinx:monit":sphinx-monit.html (1) 
 
 
 h2. Tasks
@@ -13,7 +14,6 @@ h2. Tasks
 * "sphinx:index_all":#sphinx:index_all 
 * "sphinx:restart":#sphinx:restart 
 * "sphinx:rotate_all":#sphinx:rotate_all 
-* "sphinx:setup_monit":#sphinx:setup_monit 
 * "sphinx:update_conf":#sphinx:update_conf 
 
 
@@ -45,16 +45,6 @@ Rotate sphinx index for application.
 
 
 
-h3(#sphinx:setup_monit). sphinx:setup_monit
-
-Create monit configuration for sphinx.
-
-*monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_
-
-*sphinx_pid_path*: Location for sphinx pid. _Defaults to "[shared_path]/pids/searchd.pid"_
-
-
-
 h3(#sphinx:update_conf). sphinx:update_conf
 
 Update sphinx for application.

data/lib/capitate/cap_ext/connections.rb

@@ -76,21 +76,23 @@ module Capistrano::Configuration::Connections
   def reset_password
     set :password, Proc.new {
       Capistrano::CLI.password_prompt("Password (for user: #{user}): ")
-    }
+    }  
   end
     
 end
 
 # Debug connections
-# class Capistrano::SSH
-#   
-#   class << self  
-#   
-#     def connect_with_logging(server, options={}, &block)
-#       connect_without_logging(server, options, &block)
-#     end
-#   
-#     alias_method_chain :connect, :logging
-#   
-#   end
-# end
+class Capistrano::SSH
+  
+  class << self  
+  
+    def connect_with_logging(server, options={}, &block)      
+      puts "=== Connecting to #{server} with user: #{options[:user]}"
+      
+      connect_without_logging(server, options, &block)
+    end
+  
+    alias_method_chain :connect, :logging
+  
+  end
+end

data/lib/capitate/cap_ext/roles.rb

@@ -0,0 +1,26 @@
+module Capitate
+  module CapExt
+    module Roles
+      
+      def self.included(base) #:nodoc:
+        base.send :alias_method, :role_list_from_without_capitate, :role_list_from
+        base.send :alias_method, :role_list_from, :role_list_from_with_capitate
+      end
+      
+      def role_list_from_with_capitate(roles)        
+        roles = roles.split(/,/) if String === roles
+        roles = build_list(roles)
+        roles.map { |role|
+          role = String === role ? role.strip.to_sym : role
+          unless self.roles.key?(role)
+            logger.important "unknown role `#{role}'" 
+            nil
+          else
+            role
+          end
+        }.compact
+      end
+      
+    end
+  end
+end

data/lib/capitate/plugins/base.rb

@@ -110,6 +110,7 @@ module Capitate::Plugins::Base
     tasks
   end
   
+  # Task tree
   def task_tree
     top_node = Capitate::TaskNode.new("top")