capitate 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.7 2008-03-10
+
+* Add clean method to sphinx init script
+* Moved install and make_install into build plugin
+* Added symlink option to make_install
+* Added fetch_role and fetch_roles methods
+* Recipe fixes
+
 == 0.2.6 2008-02-29
 
 * Fix SSH connect debug when connecting to more than 1 server.
@@ -51,7 +59,7 @@
 
 * Renamed to 'capitate'
 * Moving centos specific recipes into separate namespace
-* Plugin: script.make_install
+* Plugin: build.make_install
 * Documentation and explicitly fetching vars (for install tasks), showing useful error messages
 
 == 0.1.4 2008-02-07

data/Manifest.txt

@@ -45,11 +45,13 @@ lib/capitate/cap_ext/roles.rb
 lib/capitate/cap_ext/run_via.rb
 lib/capitate/cap_ext/variables.rb
 lib/capitate/plugins/base.rb
+lib/capitate/plugins/build.rb
 lib/capitate/plugins/gem.rb
 lib/capitate/plugins/prompt.rb
 lib/capitate/plugins/script.rb
 lib/capitate/plugins/templates.rb
 lib/capitate/plugins/upload.rb
+lib/capitate/plugins/utils.rb
 lib/capitate/plugins/yum.rb
 lib/capitate/recipes.rb
 lib/capitate/task_node.rb

data/docs/recipes/deploy.txt

@@ -111,9 +111,9 @@ Rolls back to the previously deployed version. The `current' symlink will     be
 
 h3(#deploy:setup). deploy:setup
 
-Prepares one or more servers for deployment. Before you can use any     of the Capistrano deployment tasks with your project, you will need to     make sure all of your servers have been prepared with `cap setup'. When     you add a new server to your cluster, you can easily run the setup task     on just that server by specifying the HOSTS environment variable:
+Prepares one or more servers for deployment. Before you can use any     of the Capistrano deployment tasks with your project, you will need to     make sure all of your servers have been prepared with `cap deploy:setup'. When     you add a new server to your cluster, you can easily run the setup task     on just that server by specifying the HOSTS environment variable:
 
-  $ cap HOSTS=new.server.com setup
+  $ cap HOSTS=new.server.com deploy:setup
 
 It is safe to run this task on servers that have already been set up; it     will not destroy any deployed revisions or data.
 

data/docs/recipes/index.txt

@@ -11,12 +11,13 @@ h2. Namespaces
 * "deploy:web":deploy-web.html (2) 
 * "docs":docs.html (1) 
 * "imagemagick:centos":imagemagick-centos.html (1) 
+* "install":install.html (2) 
 * "memcached:centos":memcached-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":monit.html (3) 
-* "monit:centos":monit-centos.html (1) 
+* "monit:centos":monit-centos.html (2) 
 * "mysql":mysql.html (1) 
 * "mysql:centos":mysql-centos.html (1) 
 * "mysql:monit":mysql-monit.html (1) 
@@ -26,5 +27,5 @@ h2. Namespaces
 * "rails":rails.html (5) 
 * "ruby:centos":ruby-centos.html (1) 
 * "sphinx":sphinx.html (4) 
-* "sphinx:centos":sphinx-centos.html (2) 
+* "sphinx:centos":sphinx-centos.html (3) 
 * "sphinx:monit":sphinx-monit.html (1) 

data/docs/recipes/monit-centos.txt

@@ -6,6 +6,7 @@ h1. monit:centos
 h2. Tasks
 
 * "monit:centos:install":#monit:centos:install 
+* "monit:centos:iptables":#monit:centos:iptables 
 
 
 h2. Task documentation
@@ -36,3 +37,13 @@ Install monit.
 
 
 
+h3(#monit:centos:iptables). monit:centos:iptables
+
+Install monit firewall rule.
+
+*monit_port*: Monit port. _Defaults to 2812_
+
+@set :monit_port, 2812@
+
+
+

data/docs/recipes/monit.txt

@@ -5,7 +5,7 @@ h1. monit
 
 h2. Namespaces
 
-* "monit:centos":monit-centos.html (1) 
+* "monit:centos":monit-centos.html (2) 
 
 
 h2. Tasks

data/docs/recipes/sphinx-centos.txt

@@ -6,6 +6,7 @@ h1. sphinx:centos
 h2. Tasks
 
 * "sphinx:centos:install":#sphinx:centos:install 
+* "sphinx:centos:iptables":#sphinx:centos:iptables 
 * "sphinx:centos:setup":#sphinx:centos:setup 
 
 
@@ -29,6 +30,16 @@ set :sphinx_build_options, {
 
 
 
+h3(#sphinx:centos:iptables). sphinx:centos:iptables
+
+Install sphinx firewall rule.
+
+*sphinx_port*: Sphinx port. _Defaults to 3312_
+
+@set :sphinx_port, 3312@
+
+
+
 h3(#sphinx:centos:setup). sphinx:centos:setup
 
 Setup sphinx for application.
@@ -39,5 +50,7 @@ Setup sphinx for application.
 
 *sphinx_conf_path*: Path to sphinx.conf. _Defaults to "[shared_path]/config/sphinx.conf"_
 
+*sphinx_index_path*: Path to sphinx indexes. _Defaults to "[shared_path]/var/index"_
+
 
 

data/docs/recipes/sphinx.txt

@@ -5,7 +5,7 @@ h1. sphinx
 
 h2. Namespaces
 
-* "sphinx:centos":sphinx-centos.html (2) 
+* "sphinx:centos":sphinx-centos.html (3) 
 * "sphinx:monit":sphinx-monit.html (1) 
 
 
@@ -73,9 +73,9 @@ Update sphinx for application.
 *sphinx_db_port*: Sphinx DB port. _Defaults to db_port_
 
 
-*sphinx_db_host*: Sphinx DB host. _Defaults to location for primary :db role_
+*sphinx_db_host*: Sphinx DB host. _Defaults to db_host_
 
-*sphinx_host*: Sphinx DB host. _Defaults to location for :search role_
+*sphinx_conf_host*: Sphinx DB host to listen on. _Defaults to 127.0.0.1_
 
 
 

data/lib/capitate/cap_ext/connections.rb

@@ -113,7 +113,7 @@ class Capistrano::SSH
       @connect_mutex ||= Mutex.new
       
       @connect_mutex.synchronize do
-        puts "=== Connecting to #{server} with user: #{server.user || options[:user]}"      
+        puts "--- Connecting to #{server} with user: #{server.user || options[:user]}"      
       end
 
       connect_without_logging(server, options, &block)      

data/lib/capitate/cap_ext/variables.rb

@@ -12,8 +12,6 @@ module Capitate
       #
       # See capistrano fetch for usage info.
       #
-      # Recipe docs are in lib/doc/the_namespace.yml
-      #
       def fetch_with_capitate(variable, *args)
         begin
           fetch_without_capitate(variable, *args)
@@ -51,6 +49,58 @@ module Capitate
         end
         default
       end
+      
+      # Fetch roles with name and options
+      #
+      # ==== Options
+      # +name+:: Role name to look for
+      # +options+:: Options to match on, e.g. :primary => true
+      #
+      # ==== Examples
+      #   fetch_roles(:db) => [ "10.0.6.71", "10.0.6.72" ]
+      #   fetch_roles(:db, :primary => true) => [ "10.0.6.71" ]
+      #
+      def fetch_roles(name, options = {})
+        matched_roles = Set.new
+        
+        roles.each do |role_info|
+          role_name = role_info.first 
+          
+          next unless role_name == name
+            
+          role = role_info.last
+          role.each do |server|
+            
+            abort = false
+            options.each do |k, v|
+              unless server.options[k] == v
+                abort = true
+                break 
+              end
+            end
+            next if abort
+            
+            matched_roles << server
+          end
+        end
+        matched_roles.to_a
+      end
+      
+      # Fetch first role with name and options
+      #
+      # ==== Options
+      # +name+:: Role name to look for
+      # +options+:: Options to match on, e.g. :primary => true
+      #
+      # ==== Examples
+      #   fetch_roles(:db) => [ "10.0.6.71", "10.0.6.72" ]
+      #   fetch_roles(:db, :primary => true) => [ "10.0.6.71" ]
+      #
+      def fetch_role(name, options = {})
+        matched = fetch_roles(name, options)
+        return matched.first if matched
+        nil
+      end
     
     end
   end

data/lib/capitate/plugins/base.rb

@@ -1,10 +1,3 @@
-#--
-# =============================================================================
-# Copyright (c) 2007, Gabriel Handford (gabrielh@gmail.com)
-# All rights reserved.
-# =============================================================================
-#++
-
 require 'erb'
 require 'yaml'
 
@@ -70,13 +63,15 @@ module Capitate::Plugins::Base
       EOS
     end
     
-    message += <<-EOS
+    if current_task
+      message += <<-EOS
     
     Usage: 
     
 #{indent_doc(current_task.desc)}
     
-    EOS
+      EOS
+    end
   end
   
   # Indent string block.

data/lib/capitate/plugins/build.rb

@@ -0,0 +1,68 @@
+module Capitate::Plugins::Build
+  
+  # Configure, make, make install.
+  #
+  # ==== Options
+  # +name+:: Name for app
+  # +options+:: Options 
+  # - +build_dest+:: Place to build from, ex. /usr/src, defaults to /tmp/name
+  # - +url+:: URL to download package from
+  # - +configure_options+:: Options for ./configure
+  # - +symlink+:: After install, list of source, dest pairs to symlink 
+  #    [ { "/usr/local/sphinx-0.9.8-rc1" => "/usr/local/sphinx" }, ... ]
+  #    ln -s /usr/local/sphinx-0.9.8-rc1 /usr/local/sphinx
+  #
+  # - +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)
+  #   build.make_install("nginx", { :url => "http://sysoev.ru/nginx/nginx-0.5.35.tar.gz", ... })
+  #
+  def make_install(name, options)
+    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
+      
+      script.run_all <<-CMDS
+        sh -c "cd #{dir} && ./configure #{configure_options} #{to_log}"
+        sh -c "cd #{dir} && make #{to_log}"
+        sh -c "cd #{dir} && make install #{to_log}"
+      CMDS
+      
+      utils.ln(options[:symlink]) unless options[:symlink].blank?
+    end
+  end
+  
+  # Download, unpack and yield (unpacked source director).
+  # 
+  # ==== Options
+  # +name+:: Name for app
+  # +options+:: Options
+  # - +build_dest+:: Place to build from, ex. /usr/src, defaults to /tmp/name
+  # - +url+:: URL to download package from
+  # 
+  # ==== Examples (in capistrano task)
+  #   script.make("rubygems", { :url => :url => "http://rubyforge.org/frs/download.php/29548/rubygems-1.0.1.tgz" }) do |dir|
+  #     sudo "echo 'Running setup...' && cd #{dir} && ruby #{dir}/setup.rb"
+  #   end
+  #
+  def install(name, options, &block)
+    build_dest = options[:build_dest]
+    build_dest ||= "/tmp/#{name}"
+    url = options[:url]    
+    
+    script.unpack(url, build_dest, options) do |dir|
+      yield(dir) if block_given?
+    end      
+  end
+        
+end
+
+Capistrano.plugin :build, Capitate::Plugins::Build

data/lib/capitate/plugins/gem.rb

@@ -6,8 +6,8 @@ module Capitate::Plugins::Gem
   # +gems+:: List of gem names, or a single gem
   #
   # ==== Examples (in capistrano task)
-  #   gemc.install("raspell") 
-  #   gemc.install([ "raspell", "foo" ])
+  #   gems.install("raspell") 
+  #   gems.install([ "raspell", "foo" ])
   #
   def install(gems)
     # If a single object, wrap in array

data/lib/capitate/plugins/prompt.rb

@@ -12,7 +12,7 @@ module Capitate::Plugins::Prompt
   # +label+:: Label
   # +options+:: Options
   # - +verify+:: If true, prompt twice and verify
-  # - +lazy+:: If true, returns a block. _Defaults to true_
+  # - +lazy+:: If true, returns a Proc. _Defaults to true_
   # - +check_hash+:: If present, checks that md5 is same as password md5
   #
   def password(label, options = {})

data/lib/capitate/plugins/script.rb

@@ -1,63 +1,5 @@
 module Capitate::Plugins::Script
   
-  # Configure, make, make install.
-  #
-  # ==== Options
-  # +name+:: Name for app
-  # +options+:: Options 
-  # - +build_dest+:: Place to build from, ex. /usr/src, defaults to /tmp/name
-  # - +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", ... })
-  #
-  def make_install(name, options)
-    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
-        sh -c "cd #{dir} && ./configure #{configure_options} #{to_log}"
-        sh -c "cd #{dir} && make #{to_log}"
-        sh -c "cd #{dir} && make install #{to_log}"
-      CMDS
-    end
-  end
-  
-  # Download, unpack and yield (unpacked source director).
-  # 
-  # ==== Options
-  # +name+:: Name for app
-  # +options+:: Options
-  # - +build_dest+:: Place to build from, ex. /usr/src, defaults to /tmp/name
-  # - +url+:: URL to download package from
-  # 
-  # ==== Examples (in capistrano task)
-  #   script.make("rubygems", { :url => :url => "http://rubyforge.org/frs/download.php/29548/rubygems-1.0.1.tgz" }) do |dir|
-  #     sudo "echo 'Running setup...' && cd #{dir} && ruby #{dir}/setup.rb"
-  #   end
-  #
-  def install(name, options, &block)
-    build_dest = options[:build_dest]
-    build_dest ||= "/tmp/#{name}"
-    url = options[:url]    
-    
-    unpack(url, build_dest, options) do |dir|
-      yield(dir) if block_given?
-    end      
-  end
-    
-  
   # Run (sh) script. If script has .erb extension it will evaluate it.
   #
   # ==== Options
@@ -132,7 +74,6 @@ module Capitate::Plugins::Script
   end
   
   # 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)

data/lib/capitate/plugins/upload.rb

@@ -8,6 +8,9 @@ module Capitate::Plugins::Upload
   # +dest_path:: Remote destination path
   # +options+:: Options (see capistrano 'put')
   #
+  # ==== Examples
+  #   upload.file("/tmp/large_file.tgz", "#{shared_path}/tmp/large_file.tgz")
+  #
   def file(src_path, dest_path, options = {})
     data = FileData.new(src_path)
     put(data, dest_path, options)    

data/lib/capitate/plugins/utils.rb

@@ -0,0 +1,28 @@
+module Capitate::Plugins::Utils
+  
+  # Symlink source to dest
+  #
+  # ==== Options
+  # +args+:: Arguments. If argument is hash, then key is symlinked to value.
+  #
+  # ==== Examples
+  #   ln("src/foo" => "dest/foo") # Run: ln -nfs src/foo dest/foo
+  #
+  def ln(*args)    
+    args.each do |arg|
+      if arg.is_a?(Hash)
+        arg.each do |src, dest|
+          run_via "ln -nfs #{src} #{dest}"    
+        end    
+      end
+    end
+  end
+  
+  def install_template(template_path, destination)
+    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
+
+Capistrano.plugin :utils, Capitate::Plugins::Utils

data/lib/capitate/plugins/yum.rb

@@ -1,4 +1,3 @@
-# Packages must respond to update, remove, install and clean
 module Capitate::Plugins::Yum
   
   # Update all installed packages.

data/lib/capitate/task_node.rb

@@ -1,5 +1,4 @@
 # Task node in the capistrano namespace, task hierarchy.
-#
 class Capitate::TaskNode
   
   include Capitate::Plugins::Base

data/lib/capitate/version.rb

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

data/lib/capitate.rb

@@ -15,6 +15,8 @@ end
 
 require 'capitate/plugins/base'
 require 'capitate/plugins/gem'
+require 'capitate/plugins/build'
+require 'capitate/plugins/utils'
 require 'capitate/plugins/script'
 require 'capitate/plugins/prompt'
 require 'capitate/plugins/templates'
@@ -23,7 +25,6 @@ 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"

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

@@ -1,68 +1,90 @@
-#
-# This is an EXAMPLE deployment script based on some recipes in Capitate.
-#
-
 #
 # For installing apps on the thoughpolice centos 5.1 image
 #
-task :install do
+
+task :check_role do
+  # Can use cap HOSTS=192.168.1.111 install
+  # Otherwise prompt for the service
+  role :install, prompt.ask("Server: ") if find_servers_for_task(current_task).blank?  
+end
+
+namespace :install do
+
+  task :default do
   
-  # Set templates dir to this here gem
-  set :templates_dirs, [ File.dirname(__FILE__) + "/../templates" ]
+    # Add a templates dir
+    # set :templates_dirs, [ File.dirname(__FILE__) + "/../templates" ]
   
-  set :user, "root"
-  set :run_method, :run
+    set :user, "root"
+    set :run_method, :run
   
-  # Can use cap HOSTS=192.168.1.111 install
-  # Otherwise prompt for the service
-  role :install, prompt.ask("Server: ") if find_servers_for_task(current_task).blank?
+    check_role
   
-  # Setup for web  
-  # * Add admin group
-  # * Change inittab to runlevel 3
-  # * Create web apps directory
-  # * Add admin group to suders ALL=(ALL)   ALL
-  script.run_all <<-CMDS  
-    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
-  CMDS
+    # Setup for web  
+    # * Add admin group
+    # * Change inittab to runlevel 3
+    # * Create web apps directory
+    # * Add admin group to suders ALL=(ALL)   ALL
+    script.run_all <<-CMDS  
+      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
+    CMDS
     
-  # Package installs
-  yum.remove [ "openoffice.org-*", "ImageMagick" ]
-  yum.update
-  yum.install [ "gcc", "kernel-devel", "libevent-devel", "libxml2-devel", "openssl", "openssl-devel",
-     "aspell", "aspell-devel", "aspell-en", "aspell-es" ]
+    # Package installs
+    yum.remove [ "openoffice.org-*", "ImageMagick" ]
+    #yum.update
+    yum.install [ "gcc", "kernel-devel", "libevent-devel", "libxml2-devel", "openssl", "openssl-devel",
+       "aspell", "aspell-devel", "aspell-en", "aspell-es" ]
   
-  #
-  # App installs
-  #
+    #
+    # App installs
+    #
   
-  ruby.centos.install
-  # Fix ruby install openssl
-  script.sh("ruby/fix_openssl.sh")
+    ruby.centos.install  
   
-  nginx.centos.install
-  mysql.centos.install
-  sphinx.centos.install
-  monit.centos.install
-  imagemagick.centos.install
-  memcached.centos.install
+    nginx.centos.install
+    mysql.centos.install
+    sphinx.centos.install
+    monit.centos.install
+    imagemagick.centos.install
+    memcached.centos.install
   
-  #
-  # Install monit hooks
-  #
-  nginx.monit.install
-  mysql.monit.install
-  memcached.monit.install
+    #
+    # Install monit hooks
+    #
+    nginx.monit.install
+    mysql.monit.install
+    memcached.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", "mime-types" ])
+    # Install gems
+    gems.install(fetch(:gems_to_install))
+    
+    # Cleanup
+    yum.clean
+  end
   
-  # Cleanup
-  yum.clean
+  desc "Install gems only"
+  task :gems_only do
+    gems.install(fetch(:gems_to_install))
+  end
+end
+
+#
+# To be root, cap as_root nginx:centos:install
+#
+desc "Be root"
+task :as_root do
+  set :user, "root"
+end
+
+#
+# Fixes
+#
+after "ruby:centos:install" do
+  # Fix ruby install openssl
+  script.sh("ruby/fix_openssl.sh")
 end
 
 
@@ -70,9 +92,13 @@ end
 # Install options
 #
 
+set :gems_to_install, [ "rake", "mysql -- --with-mysql-include=/usr/include/mysql --with-mysql-lib=/usr/lib/mysql --with-mysql-config", 
+  "raspell", "rmagick", "mongrel", "mongrel_cluster", "json", "mime-types" ]
+
+
 # Ruby install
 set :ruby_build_options, {
-  :url => "http://capigen.s3.amazonaws.com/ruby-1.8.6-p110.tar.gz",
+  :url => "http://capitate.s3.amazonaws.com/ruby-1.8.6-p110.tar.gz",
   :build_dest => "/usr/src",
   :configure_options => "--prefix=/usr",       
   :clean => false
@@ -93,6 +119,7 @@ set :memcached_build_options, {
 
 # Monit install
 set :monit_conf_dir, "/etc/monit"
+set :monit_pid_path, "/var/run/monit.pid"
 set :monit_port, 2812
 set :monit_build_options, { 
   :url => "http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz" 
@@ -107,23 +134,28 @@ 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"
+--prefix=#{nginx_prefix_path} --with-md5=auto/lib/md5 --with-sha1=auto/lib/sha1 --with-http_ssl_module \
+--with-http_flv_module"
 }
 
 # Sphinx install 
-set :sphinx_prefix, "/usr/local/sphinx"
+set :sphinx_prefix, "/usr/local/sphinx-0.9.8-rc1"
 set :sphinx_build_options, {
-  :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz",
+  :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.8-rc1.tar.gz",
+  #: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}"
+--prefix=#{sphinx_prefix}",
+  :symlink => { sphinx_prefix => "/usr/local/sphinx" }
 }
 
-# Mysql install
+
+
+# For 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",
+  :url => "http://capitate.s3.amazonaws.com/ImageMagick.tar.gz",
   :unpack_dir => "ImageMagick-*"
 }

data/lib/recipes/centos/imagemagick.rb

@@ -20,7 +20,7 @@ namespace :imagemagick do
       yum.install([ "libjpeg-devel", "libpng-devel", "glib2-devel", "fontconfig-devel", "zlib-devel", 
         "libwmf-devel", "freetype-devel", "libtiff-devel" ])
         
-      script.make_install("imagemagick", imagemagick_build_options)
+      build.make_install("imagemagick", imagemagick_build_options)
     end
   
   end

data/lib/recipes/centos/memcached.rb

@@ -28,7 +28,7 @@ namespace :memcached do
       fetch(:memcached_build_options)
 
       # Build
-      script.make_install("memcached", memcached_build_options)
+      build.make_install("memcached", memcached_build_options)
 
       # Install initscript, service
       put template.load("memcached/memcached.initd.centos.erb"), "/tmp/memcached.initd"

data/lib/recipes/centos/monit.rb

@@ -29,7 +29,7 @@ namespace :monit do
       yum.install([ "flex", "byacc" ])
         
       # Build
-      script.make_install("monit", monit_build_options)
+      build.make_install("monit", monit_build_options)
 
       # Install initscript
       put template.load("monit/monit.initd.centos.erb"), "/tmp/monit.initd"
@@ -47,6 +47,19 @@ namespace :monit do
       script.sh("monit/cert.sh")
     end
     
+    desc <<-DESC
+    Install monit firewall rule.
+    
+    *monit_port*: Monit port. _Defaults to 2812_\n    
+    @set :monit_port, 2812@\n
+    DESC
+    task :iptables do
+      # Settings
+      fetch_or_default(:monit_port, 2812)      
+      run_via "iptables -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport #{monit_port} -j ACCEPT"
+      run_via "/sbin/service iptables save"
+    end
+    
   end
   
 end

data/lib/recipes/centos/nginx.rb

@@ -36,7 +36,7 @@ namespace :nginx do
       yum.install([ "pcre-devel", "openssl", "openssl-devel" ]) 
             
       # Build
-      script.make_install("nginx", nginx_build_options)
+      build.make_install("nginx", nginx_build_options)
 
       # Install initscript, and turn it on
       put template.load("nginx/nginx.initd.erb"), "/tmp/nginx.initd"

data/lib/recipes/centos/ruby.rb

@@ -26,10 +26,10 @@ namespace :ruby do
       yum.install([ "zlib", "zlib-devel", "readline-devel" ])
     
       # Install ruby 1.8.6
-      script.make_install("ruby", ruby_build_options)
+      build.make_install("ruby", ruby_build_options)
     
       # Install rubygems
-      script.install("rubygems", rubygems_build_options) do |dir|
+      build.install("rubygems", rubygems_build_options) do |dir|
         run_via "cd #{dir} && ruby setup.rb > install.log", { :shell => true }
       end
     

data/lib/recipes/centos/sphinx.rb

@@ -24,7 +24,7 @@ namespace :sphinx do
       yum.install([ "gcc-c++" ])
       
       # Build
-      script.make_install("sphinx", sphinx_build_options)
+      build.make_install("sphinx", sphinx_build_options)
     end
         
     desc <<-DESC
@@ -32,6 +32,7 @@ namespace :sphinx do
     *sphinx_prefix*: Sphinx install prefix. _Defaults to "/usr/local/sphinx"_\n
     *sphinx_pid_path*: Directory to sphinx pid. _Defaults to "[shared_path]/pids/searchd.pid"_\n
     *sphinx_conf_path*: Path to sphinx.conf. _Defaults to "[shared_path]/config/sphinx.conf"_\n
+    *sphinx_index_path*: Path to sphinx indexes. _Defaults to "[shared_path]/var/index"_\n
     DESC
     task :setup do       
       
@@ -39,6 +40,7 @@ namespace :sphinx do
       fetch_or_default(:sphinx_prefix, "/usr/local/sphinx")
       fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
       fetch_or_default(:sphinx_conf_path, "#{shared_path}/config/sphinx.conf")      
+      fetch_or_default(:sphinx_index_root, "#{shared_path}/var/index")      
 
       # Install initscript
       put template.load("sphinx/sphinx_app.initd.centos.erb"), "/tmp/sphinx.initd"
@@ -48,7 +50,21 @@ namespace :sphinx do
       run_via "/sbin/chkconfig --level 345 sphinx_#{application} on"    
 
       # Create app indexes dir
-      run_via "mkdir -p #{shared_path}/var/index"    
+      run "mkdir -p #{shared_path}/var/index"    
+    end
+    
+    
+    desc <<-DESC
+    Install sphinx firewall rule.
+    
+    *sphinx_port*: Sphinx port. _Defaults to 3312_\n    
+    @set :sphinx_port, 3312@\n
+    DESC
+    task :iptables do
+      # Settings
+      fetch_or_default(:sphinx_port, 3312)      
+      run_via "iptables -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport #{sphinx_port} -j ACCEPT"
+      run_via "/sbin/service iptables save"
     end
   end
   

data/lib/recipes/sphinx.rb

@@ -36,8 +36,8 @@ namespace :sphinx do
   *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
+  *sphinx_db_host*: Sphinx DB host. _Defaults to db_host_\n
+  *sphinx_conf_host*: Sphinx DB host to listen on. _Defaults to 127.0.0.1_\n
   
   DESC
   task :update_conf do
@@ -54,12 +54,9 @@ namespace :sphinx do
     fetch_or_default(:sphinx_db_pass, db_pass)
     fetch_or_default(:sphinx_db_name, db_name)
     fetch_or_default(:sphinx_db_port, db_port)
-    
-    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)
-    
+    fetch_or_default(:sphinx_db_host, db_host)
+    fetch_or_default(:sphinx_conf_host, "127.0.0.1")
+        
     put template.load(sphinx_conf_template), sphinx_conf_path
   end
   

data/lib/templates/sphinx/sphinx_app.initd.centos.erb

@@ -17,6 +17,7 @@ NAME=searchd
 DAEMON=<%= sphinx_prefix %>/bin/searchd
 CONFIGFILE=<%= sphinx_conf_path %>
 PIDFILE=<%= sphinx_pid_path %>
+INDEX_DIR=<%= sphinx_index_root %>
 
 start() {
   daemon --user <%= user %> $DAEMON --config $CONFIGFILE
@@ -33,6 +34,18 @@ reload() {
   kill -HUP `cat $PIDFILE` || echo -n " can't reload"
 }
 
+clean() {
+  pid=`cat $PIDFILE`
+  
+  if checkpid $pid; then
+    echo -n " can't clean; running"
+  else
+    rm -f $INDEX_DIR/*.spl
+    return $?
+  fi
+  return 1 
+}
+
 case "$1" in
   start)
   	echo -n "Starting $DESC: $NAME"
@@ -58,6 +71,11 @@ case "$1" in
   	start
   	RETVAL=$?;
 	;;
+	clean)
+    echo -n "Cleaning $DESC"
+    clean
+    RETVAL=$?;
+    ;;
   *)
 	  echo "Usage: $0 {start|stop|restart|force-reload}" >&2
 	  RETVAL=3;

data/test/test_roles.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'capistrano/configuration'
+
+class TestRoles < Test::Unit::TestCase
+  
+  def setup
+    @config = Capistrano::Configuration.new
+  end
+  
+  def test_fetch
+    
+    @config.load do
+    
+      role :test, "10.0.6.20"
+      role :test_with_options, "10.0.6.21", :op1 => true
+      role :test_with_options, "10.0.6.22", :op2 => true
+      
+      role :test_with_other_options, "10.0.6.23", :sphinx_port => 3312
+    
+    end
+    
+    test_role = @config.fetch_role(:test)
+    
+    assert test_role
+    assert_equal "10.0.6.20", test_role.host
+    
+    test_roles = @config.fetch_roles(:test_with_options)
+    assert test_roles
+    assert_equal [ "10.0.6.21", "10.0.6.22" ], test_roles.collect(&:host)
+        
+    test_roles_with_opts = @config.fetch_roles(:test_with_options, :op1 => true)
+    assert test_roles_with_opts
+    assert_equal [ "10.0.6.21" ], test_roles_with_opts.collect(&:host)    
+    
+    test_role_with_opts = @config.fetch_role(:test_with_options, :op2 => true)
+    assert test_role_with_opts
+    assert_equal "10.0.6.22", test_role_with_opts.host
+    
+    
+    test_role_with_other_opts = @config.fetch_role(:test_with_other_options)
+    assert test_role_with_other_opts
+    assert_equal "10.0.6.23", test_role_with_other_opts.host
+    assert_equal 3312, test_role_with_other_opts.options[:sphinx_port]
+    
+  end
+  
+end

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.6</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.7</a>
     </div>
     
     <div id="recipes">
@@ -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>, 25th February 2008<br>
+      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 10th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-29 00:00:00 -05:00
+date: 2008-03-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,11 +112,13 @@ files:
 - lib/capitate/cap_ext/run_via.rb
 - lib/capitate/cap_ext/variables.rb
 - lib/capitate/plugins/base.rb
+- lib/capitate/plugins/build.rb
 - lib/capitate/plugins/gem.rb
 - lib/capitate/plugins/prompt.rb
 - lib/capitate/plugins/script.rb
 - lib/capitate/plugins/templates.rb
 - lib/capitate/plugins/upload.rb
+- lib/capitate/plugins/utils.rb
 - lib/capitate/plugins/yum.rb
 - lib/capitate/recipes.rb
 - lib/capitate/task_node.rb
@@ -210,4 +212,5 @@ test_files:
 - test/test_helper.rb
 - test/test_plugin_upload.rb
 - test/test_recipes.rb
+- test/test_roles.rb
 - test/test_templates.rb