capitate 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2008-02-24
+
+* Fixes to setup tasks.
+* Removing with_user on add_user task. 
+
 == 0.2.1 2008-02-24
 
 * Removing all my brain dead recipes.

data/docs/recipes/centos.txt

@@ -14,9 +14,9 @@ h3(#centos:add_user). centos:add_user
 
 Add user and set user password for application. Adds user to specified groups. 
 
-*user*: User to add.
+*user_add*: User to add.
 
-@set :user, "app_user"@
+@set :user_add, "app_user"@
 *groups*: Groups for user to be in. _Defaults to none_
 
 @set :groups, "admin,foo"@

data/docs/recipes/mongrel_cluster-centos.txt

@@ -22,6 +22,12 @@ Create mongrel cluster.
 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"@
 
 
 

data/docs/recipes/mysql.txt

@@ -42,11 +42,11 @@ Create database, database user, and set grant permissions.
   
 *db_pass*: Database password (application).
 
-*grant_locations*: Grant locations. _Defaults to localhost_
+*mysql_grant_locations*: Grant locations. _Defaults to localhost_
 
 @set :grant_locations, [ "localhost", "192.168.1.111" ]@
 
-*grant_priv_type*: Grant privilege types. _Defaults to ALL_
+*mysql_grant_priv_type*: Grant privilege types. _Defaults to ALL_
 
 @set :grant_priv_type, "ALL"@
 

data/docs/recipes/nginx.txt

@@ -34,18 +34,19 @@ h3(#nginx:setup_mongrel). nginx:setup_mongrel
 
 Create and update the nginx vhost include.
 
-mongrel_size: Number of mongrels.    
+*mongrel_size*: Number of mongrels.
 
-  set :mongrel_size, 3
+@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    
+*mongrel_port*: Starting port for mongrels.
 
-  set :mongrel_port, 9000
+If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002
 
-domain_name: Domain name for nginx virtual host, (without www prefix).    
+@set :mongrel_port, 9000@
 
-  set :domain_name, "foo.com"
+*domain_name*: Domain name for nginx virtual host, (without www prefix).
+
+@set :domain_name, "foo.com"@
 
 
 

data/docs/recipes/rails.txt

@@ -30,15 +30,15 @@ h3(#rails:setup). rails:setup
 
 Create database yaml in shared path.
 
-*db_name*: Database name (rails).    
-
+*db_name*: Database name (rails).
+  
 @set :db_name, "app_db_name"@
 
-*db_user*: Database user (rails).    
+*db_user*: Database user (rails).
 
 @set :db_user, "app_db_user"@
   
-*db_pass*: Database password (rails).    
+*db_pass*: Database password (rails).
 
 @set :db_pass, "the_password"@
 

data/docs/recipes/sphinx.txt

@@ -80,6 +80,8 @@ Update sphinx for application.
 
 *sphinx_db_name*: Sphinx DB name. _Defaults to db_name_
 
+*sphinx_db_port*: Sphinx DB port. _Defaults to db_port_
+
 
 *sphinx_db_host*: Sphinx DB host. _Defaults to location for primary :db role_
 

data/lib/capitate/cap_ext/connections.rb

@@ -12,10 +12,10 @@ module Capistrano::Configuration::Connections
   #   # Do something as user nginx
   #
   def set_user(new_user)
-    backup_user = fetch(:user)
+    previous_user = fetch(:user)
     
-    return if backup_user == new_user
-    @backup_user = backup_user
+    return if previous_user == new_user
+    set :previous_user, previous_user
     
     set :user, new_user
     clear_sessions
@@ -32,8 +32,9 @@ module Capistrano::Configuration::Connections
   #   # User is now root
   #
   def reset_user
-    set :user, @backup_user
-    @backup_user = nil
+    return unless exists?(:previous_user)
+    set :user, fetch(:previous_user)
+    unset :previous_user
     clear_sessions
   end
   
@@ -51,7 +52,7 @@ module Capistrano::Configuration::Connections
   def with_user(new_user, &block)
     begin
       set_user(new_user)
-      yield @backup_user
+      yield exists?(:previous_user) ? fetch(:previous_user) : nil
     ensure
       reset_user
     end

data/lib/capitate/plugins/prompt.rb

@@ -5,18 +5,21 @@ module Capitate::Plugins::Prompt
     Capistrano::CLI.ui.ask(label, &block)
   end
   
-  def password(label, verify = false)
+  def password(label, verify = false, lazy = true)
     # Lazy
-    Proc.new { 
+    password_prompt = Proc.new { 
       password = Capistrano::CLI.password_prompt(label)
     
       if verify
-        password_verify = Capistrano::CLI.password_prompt("[Verify] #{label}")
+        password_verify = Capistrano::CLI.password_prompt("[VERIFY] #{label}")
         raise "Passwords do not match" if password != password_verify
       end
     
       password
     }
+    
+    return password_prompt if lazy
+    password_prompt.call
   end
   
 end

data/lib/capitate/plugins/script.rb

@@ -9,6 +9,7 @@ module Capitate::Plugins::Script
   # - +url+:: URL to download package from
   # - +configure_options+:: Options for ./configure
   # - +unpack_dir+:: Directory that is unpacked from tgz (if not matching the file name)
+  # - +to_log+:: If specified, will redirect output to this path
   #
   # ==== Examples (in capistrano task)
   #   script.make_install("nginx", { :url => "http://sysoev.ru/nginx/nginx-0.5.35.tar.gz", ... })
@@ -17,10 +18,18 @@ module Capitate::Plugins::Script
     install(name, options) do |dir|
       configure_options = options[:configure_options] || ""
       
+      # Whether to capture build output
+      unless options.has_key?(:to_log)
+        to_log = ">> debug.log"
+      else
+        to_log = ""
+        to_log = ">> #{options[:to_log]}" unless options[:to_log].blank?
+      end
+      
       run_all <<-CMDS
-        echo 'Configuring #{name}...' && cd #{dir} && ./configure #{configure_options} > configure.log
-        echo 'Compiling #{name}...' && cd #{dir} && make > make.log
-        echo 'Installing #{name}...' && cd #{dir} && make install > make_install.log
+        cd #{dir} && ./configure #{configure_options} #{to_log}
+        cd #{dir} && make #{to_log}
+        cd #{dir} && make install #{to_log}
       CMDS
     end
   end
@@ -103,9 +112,11 @@ module Capitate::Plugins::Script
     
     unpack_dir ||= file.gsub(/\.tar\.gz|\.tgz/, "")
     
+    http_get_method = fetch(:http_get_method, "wget -nv")
+    
     run_all <<-CMDS
-      echo 'Getting #{url}...' && mkdir -p #{dest} && cd #{dest} && wget -nv #{url}
-      echo 'Unpacking...' && cd #{dest} && tar zxf #{file}
+      mkdir -p #{dest} && cd #{dest} && #{http_get_method} #{url}
+      cd #{dest} && tar zxf #{file}
     CMDS
     
     if block_given?
@@ -115,7 +126,8 @@ module Capitate::Plugins::Script
     end
   end
   
-  # Run all commands (separated by newlines)
+  # Run all commands (separated by newlines).
+  # Runs with <tt>sh -c</tt>, so sudo can work with any command
   #
   # ==== Options
   # +cmds+:: Commands (separated by newlines)
@@ -123,7 +135,9 @@ module Capitate::Plugins::Script
   #
   def run_all(cmds, options = {}, &block)
     cmds.split("\n").each do |cmd|
-      run_via(cmd, options, &block)
+      cmd = cmd.gsub(/^\s+/, "")
+      sh_cmd = %{sh -c "#{cmd.gsub("\"", "\"\"")}"}
+      run_via(sh_cmd, options, &block)
     end    
   end
   

data/lib/capitate/plugins/templates.rb

@@ -21,7 +21,6 @@ module Capitate::Plugins::Templates
   #   put template.load("memcached/memcached.monitrc.erb"), "/tmp/memcached.monitrc"
   #
   def load(path, override_binding = nil)
-    
     template_dirs_found = template_dirs.select { |dir| File.exist?("#{dir}/#{path}") }
     
     # Not found anywhere, throw error
@@ -75,7 +74,7 @@ protected
     @template_dir ||= begin
       template_dirs = []      
       template_dirs += fetch(:templates_dirs) if exists?(:templates_dirs)      
-      template_dirs << [ "." ]
+      template_dirs << "."
       template_dirs << project_root if exists?(:project_root)
       template_dirs << gem_templates_root
       template_dirs

data/lib/capitate/version.rb

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

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

@@ -26,7 +26,7 @@ task :install do
     egrep "^admin" /etc/group || /usr/sbin/groupadd admin 
     sed -i -e 's/^id:5:initdefault:/id:3:initdefault:/g' /etc/inittab
     mkdir -p /var/www/apps
-    egrep "^%admin" /etc/sudoers || echo "%admin  ALL=(ALL)   ALL" > /etc/sudoers
+    egrep "^%admin" /etc/sudoers || echo "%admin  ALL=(ALL)   ALL" >> /etc/sudoers
   CMDS
     
   # Package installs
@@ -65,14 +65,6 @@ task :install do
 end
 
 
-# For mysql:install
-set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"
-set :db_port, 3306
-
-# For sphinx:install
-set :sphinx_prefix, "/usr/local/sphinx"
-
-
 #
 # Install options
 #
@@ -118,12 +110,17 @@ set :nginx_build_options, {
 }
 
 # Sphinx install 
+set :sphinx_prefix, "/usr/local/sphinx"
 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}"
 }
 
+# Mysql install
+set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"
+set :db_port, 3306
+
 # Imagemagick install
 set :imagemagick_build_options, {
   :url => "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick.tar.gz",

data/lib/recipes/centos/centos.rb

@@ -5,8 +5,8 @@ namespace :centos do
   desc <<-DESC
   Add user and set user password for application. Adds user to specified groups. 
   
-  *user*: User to add.\n
-  @set :user, "app_user"@
+  *user_add*: User to add.\n
+  @set :user_add, "app_user"@
   *groups*: Groups for user to be in. _Defaults to none_\n
   @set :groups, "admin,foo"@\n
   *home*: Home directory for user. _Defaults to <tt>:deploy_to</tt> setting_\n
@@ -17,35 +17,28 @@ namespace :centos do
   task :add_user do
     
     # Settings
-    fetch(:user)
+    fetch(:user_add)
     fetch_or_default(:groups, nil)
     fetch_or_default(:home, deploy_to)
     fetch_or_default(:home_readable, true)
     
-    # Need to be root because we don't have any other users at this point
-    install_user = "root"
-    
-    with_user(install_user) do
-      
-      adduser_options = []
-      adduser_options << "-d #{home}" unless home.blank?
-      adduser_options << "-G #{groups}" unless groups.blank?
-    
-      run "id sick || /usr/sbin/adduser #{adduser_options.join(" ")} #{user}"
-            
-      run "chmod a+rx #{home}" if home_readable
+    adduser_options = []
+    adduser_options << "-d #{home}" unless home.blank?
+    adduser_options << "-G #{groups}" unless groups.blank?
   
-      new_password = prompt.password("Password for user (#{user}): ", true)
+    run "id #{user_add} || /usr/sbin/adduser #{adduser_options.join(" ")} #{user_add}"
+          
+    run "chmod a+rx #{home}" if home_readable
   
-      run "passwd #{user}" do |channel, stream, data|
-        logger.info data
-    
-        if data =~ /password:/i
-          channel.send_data "#{new_password}\n"
-          channel.send_data "#{new_password}\n"
-        end
+    new_password = prompt.password("Password to set for #{user_add}: ", true, false)
+  
+    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"
       end
-      
     end
         
   end

data/lib/recipes/centos/mongrel_cluster.rb

@@ -10,23 +10,24 @@ namespace :mongrel_cluster do
     *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 
 
       # 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)
       
-      run "mkdir -p #{shared_path}/config"
-
-      # Mongrel cluster config needs its own config directory
-      mongrel_config_path = "#{shared_path}/config/mongrel" 
-      run "mkdir -p #{mongrel_config_path}"
-
-      pid_path = "#{shared_path}/pids"
+      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_path}/mongrel_cluster.yml"
+      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}"

data/lib/recipes/mysql.rb

@@ -27,9 +27,9 @@ namespace :mysql do
   *db_name*: Database name (application).\n
   *db_user*: Database user (application).\n    
   *db_pass*: Database password (application).\n
-  *grant_locations*: Grant locations. _Defaults to localhost_\n
+  *mysql_grant_locations*: Grant locations. _Defaults to localhost_\n
   @set :grant_locations, [ "localhost", "192.168.1.111" ]@\n
-  *grant_priv_type*: Grant privilege types. _Defaults to ALL_\n
+  *mysql_grant_priv_type*: Grant privilege types. _Defaults to ALL_\n
   @set :grant_priv_type, "ALL"@\n
   *mysql_admin_password*: Mysql admin password (to use to connect). Defaults to password prompt.\n
   @set :mysql_admin_password, prompt.password('Mysql admin password: '))@    
@@ -41,12 +41,20 @@ namespace :mysql do
     fetch(:db_user)
     fetch(:db_pass)
     fetch_or_default(:mysql_admin_password, prompt.password('Mysql admin password: '))
-    fetch_or_default(:grant_locations, [ "localhost" ])
-    fetch_or_default(:grant_priv_type, "ALL")
-        
-    # Add localhost to grant locations
-    set :locations_for_grant, [ "localhost", web_host, db_host ].compact
+    fetch_or_default(:mysql_grant_priv_type, "ALL")
     
+    # Set grant locations to all servers in roles: :search, :db, :app
+    unless exists?(:mysql_grant_locations) 
+      mysql_grant_locations = [ "localhost" ]
+      role_names = [ :search, :db, :app ]
+      role_names.each do |role_name| 
+        roles[role_name].each do |role|
+          mysql_grant_locations << role.host
+        end unless roles[role_name].blank?
+      end
+      set :mysql_grant_locations, mysql_grant_locations
+    end        
+        
     put template.load("mysql/install_db.sql.erb"), "/tmp/install_db_#{application}.sql"    
     run "mysql -u root -p#{mysql_admin_password} < /tmp/install_db_#{application}.sql"
   end

data/lib/recipes/nginx.rb

@@ -4,14 +4,10 @@ namespace :nginx do
   desc <<-DESC 
   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"@
-  
+  *nginx_pid_path*: Path to nginx pid file. _Defaults to /var/run/nginx.pid_\n  
+  @set :nginx_pid_path, "/var/run/nginx.pid"@\n  
+  *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
+  @set :monit_conf_dir, "/etc/monit"@\n  
   DESC
   task :install_monit do
     
@@ -26,19 +22,13 @@ namespace :nginx do
   desc <<-DESC
   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"
-    
+  *mongrel_size*: Number of mongrels.\n
+  @set :mongrel_size, 3@\n    
+  *mongrel_port*: Starting port for mongrels.\n
+  If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002\n
+  @set :mongrel_port, 9000@\n
+  *domain_name*: Domain name for nginx virtual host, (without www prefix).\n  
+  @set :domain_name, "foo.com"@
   DESC
   task :setup_mongrel do 
     

data/lib/recipes/rails.rb

@@ -4,18 +4,12 @@ namespace :rails do
   desc <<-DESC
   Create database yaml in shared path.
   
-  *db_name*: Database name (rails).    
-  
-  @set :db_name, "app_db_name"@
-  
-  *db_user*: Database user (rails).    
-  
-  @set :db_user, "app_db_user"@
-    
-  *db_pass*: Database password (rails).    
-  
-  @set :db_pass, "the_password"@
-    
+  *db_name*: Database name (rails).\n    
+  @set :db_name, "app_db_name"@\n  
+  *db_user*: Database user (rails).\n  
+  @set :db_user, "app_db_user"@\n    
+  *db_pass*: Database password (rails).\n  
+  @set :db_pass, "the_password"@\n    
   DESC
   task :setup do    
     

data/lib/recipes/sphinx.rb

@@ -30,6 +30,7 @@ namespace :sphinx do
   *sphinx_db_user*: Sphinx DB user. _Defaults to db_user_\n
   *sphinx_db_pass*: Sphinx DB password. _Defaults to db_pass_\n
   *sphinx_db_name*: Sphinx DB name. _Defaults to db_name_\n
+  *sphinx_db_port*: Sphinx DB port. _Defaults to db_port_\n
   
   *sphinx_db_host*: Sphinx DB host. _Defaults to location for primary :db role_\n
   *sphinx_host*: Sphinx DB host. _Defaults to location for :search role_\n
@@ -48,24 +49,12 @@ namespace :sphinx do
     fetch_or_default(:sphinx_db_user, db_user)
     fetch_or_default(:sphinx_db_pass, db_pass)
     fetch_or_default(:sphinx_db_name, db_name)
+    fetch_or_default(:sphinx_db_port, db_port)
     
-    unless exists?(:sphinx_db_host)
-      db_servers = roles[:db]
-      unless db_servers.empty?
-        set :sphinx_db_host, db_servers.first.host
-      else
-        raise "No :db roles, and no :sphinx_db_host setting specified"
-      end
-    end
-    
-    unless exists?(:sphinx_host)
-      search_servers = roles[:search]
-      unless search_servers.empty?
-        set :sphinx_host, search_servers.first.host
-      else
-        raise "No :search roles, and no :sphinx_host setting specified"
-      end
-    end    
+    set :sphinx_db_host, roles[:db].first.host unless roles[:db].empty? || exists?(:sphinx_db_host)    
+    set :sphinx_host, roles[:search].first.host unless roles[:search].empty? || exists?(:sphinx_host)
+    raise "No :db roles, and no :sphinx_db_host setting specified" unless exists?(:sphinx_db_host)
+    raise "No :search roles, and no :sphinx_host setting specified" unless exists?(:sphinx_host)
     
     put template.load(sphinx_conf_template), sphinx_conf_path
   end

data/lib/templates/mongrel/mongrel_cluster.initd.erb

@@ -14,8 +14,8 @@
 set -e
 trap ERROR ERR
 
-CONF_DIR=<%= mongrel_config_path %>
-PID_DIR=<%= pid_path %>
+CONF_DIR=<%= mongrel_config_dir %>
+PID_DIR=<%= mongrel_pid_dir %>
 USER=<%= user %>
 
 RETVAL=0

data/lib/templates/mongrel/mongrel_cluster.yml.erb

@@ -4,8 +4,8 @@ log_file: log/mongrel.log
 port: "<%= mongrel_port %>"
 environment: production
 address: 127.0.0.1
-pid_file: <%= pid_path %>/mongrel.pid
+pid_file: <%= mongrel_pid_dir %>/mongrel.pid
 servers: <%= mongrel_size %>
 user: <%= user %>
 group: <%= user %>
-config_script: <%= mongrel_config_script %>
+config_script: <%= mongrel_config_script unless mongrel_config_script.blank? %>

data/lib/templates/mysql/install_db.sql.erb

@@ -1,5 +1,5 @@
-<% grant_locations.each do |location| %>
-GRANT <%= grant %> ON <%= db_name %>.* TO '<%= db_user %>'@'<%= location %>' IDENTIFIED BY '<%= db_pass %>';
+<% mysql_grant_locations.each do |location| %>
+GRANT <%= mysql_grant_priv_type %> ON <%= db_name %>.* TO '<%= db_user %>'@'<%= location %>' IDENTIFIED BY '<%= db_pass %>';
 <% end %>
 
 CREATE DATABASE IF NOT EXISTS <%= db_name %>;

data/website/index.html

@@ -38,7 +38,7 @@
 
     <div id="version" class="clickable box" onclick='document.location = "http://rubyforge.org/projects/capitate"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.1</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.2</a>
     </div>
     
     <div id="recipes">
@@ -80,8 +80,8 @@
 
 
 	<ul>
-	<li>Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, and run scripts.</li>
-		<li>Templates for init scripts and application configuration.</li>
+	<li>Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.</li>
+		<li>Templates for init scripts, application configuration, etc.</li>
 		<li>Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.</li>
 	</ul>
 
@@ -104,7 +104,7 @@
 	<pre><code>cap HOSTS=x.x.x.x install</code></pre>
 
 
-	<h3>Use it</h3>
+	<h3>Use recipes</h3>
 
 
 	<p><a href="recipes/index.html">View recipes documentation</a></p>
@@ -137,7 +137,7 @@
 	<p>Comments are welcome. Send an email to <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a> via the <a href="http://groups.google.com/group/capitate">forum</a></p>
     </div>
     <p class="coda">
-      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 23rd February 2008<br>
+      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 25th February 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -23,8 +23,8 @@ h2. The basics
 
 Capitate has:
 
-* Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, and run scripts.
-* Templates for init scripts and application configuration.
+* Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.
+* Templates for init scripts, application configuration, etc.
 * Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.
 
 
@@ -41,7 +41,7 @@ and then:
   cap HOSTS=x.x.x.x install
 
 
-h3. Use it
+h3. Use recipes
 
 "View recipes documentation":recipes/index.html
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-platform: ruby
+  version: 0.2.2
+platform: ""
 authors: 
 - Gabriel Handford
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-02-24 00:00:00 -05:00
+date: 2008-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capitate
-rubygems_version: 1.0.1
+rubygems_version: 0.9.5
 signing_key: 
 specification_version: 2
 summary: Capistrano recipes, plugins and templates.