capitate 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.6 2008-02-29
+
+* Fix SSH connect debug when connecting to more than 1 server.
+* Added monit restart (hup) recipe.
+* Mysql setup task, showing sql. Setting to :db role only.
+* Capistrano patch: execute_on_servers_without_capitate(options, &block) to rescue Capistrano::NoMatchingServersError, and ignore as non-fatal
+
 == 0.2.5 2008-02-28
 
 * Adding application configuration for mongrel cluster monit setup.

data/Manifest.txt

@@ -68,6 +68,7 @@ lib/recipes/centos/sphinx.rb
 lib/recipes/docs.rb
 lib/recipes/memcached.rb
 lib/recipes/mongrel_cluster.rb
+lib/recipes/monit.rb
 lib/recipes/mysql.rb
 lib/recipes/nginx.rb
 lib/recipes/rails.rb

data/docs/recipes/index.txt

@@ -15,7 +15,8 @@ h2. Namespaces
 * "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) 
+* "monit":monit.html (3) 
+* "monit:centos":monit-centos.html (1) 
 * "mysql":mysql.html (1) 
 * "mysql:centos":mysql-centos.html (1) 
 * "mysql:monit":mysql-monit.html (1) 

data/docs/recipes/mongrel-cluster-monit.txt

@@ -15,6 +15,7 @@ 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_bin_path*: Path to mongrel command. _Defaults to <tt>/usr/bin/mongrel_rails</tt>_
 *mongrel_size*: Number of mongrels.
   
 @set :mongrel_size, 3@

data/docs/recipes/monit-centos.txt

@@ -6,7 +6,6 @@ h1. monit:centos
 h2. Tasks
 
 * "monit:centos:install":#monit:centos:install 
-* "monit:centos:restart":#monit:centos:restart 
 
 
 h2. Task documentation
@@ -37,13 +36,3 @@ Install monit.
 
 
 
-h3(#monit:centos:restart). monit:centos:restart
-
-Monit HUP.
-
-*monit_pid_path*: Path to monit pid.
-
-@set :monit_pid_path, "/var/run/monit.pid"@
-
-
-

data/docs/recipes/monit.txt

@@ -5,4 +5,41 @@ h1. monit
 
 h2. Namespaces
 
-* "monit:centos":monit-centos.html (2) 
+* "monit:centos":monit-centos.html (1) 
+
+
+h2. Tasks
+
+* "monit:monitor_all":#monit:monitor_all 
+* "monit:restart":#monit:restart 
+* "monit:unmonitor_all":#monit:unmonitor_all 
+
+
+h2. Task documentation
+
+h3(#monit:monitor_all). monit:monitor_all
+
+Monitor all.
+
+*monit_bin_path*: Path to monit bin. _Defaults to <tt>monit</tt>_
+
+
+
+h3(#monit:restart). monit:restart
+
+Restart (HUP) monit process.
+
+HUP's the process from the pid file, if it exists.
+
+*monit_pid_path*: Path to monit pid file. _Defaults to <tt>/var/run/monit.pid</tt>_
+
+
+
+h3(#monit:unmonitor_all). monit:unmonitor_all
+
+Unmonitor all.
+
+*monit_bin_path*: Path to monit bin. _Defaults to <tt>monit</tt>_
+
+
+

data/docs/recipes/nginx-mongrel.txt

@@ -12,7 +12,7 @@ h2. Task documentation
 
 h3(#nginx:mongrel:setup). nginx:mongrel:setup
 
-Create and update the nginx vhost include.
+Generate the nginx vhost include (for a mongrel setup).
   
 *mongrel_application*: Mongrel application. _Defaults to <tt>:application</tt>_
 *mongrel_size*: Number of mongrels.

data/lib/capitate/cap_ext/connections.rb

@@ -1,84 +1,107 @@
 # Patch to add ability to clear sessions/connections.
-module Capistrano::Configuration::Connections
+module Capitate
+  module CapExt
+    module Connections
   
-  # Set the user to something new (but save the old user; reset_user will set it back).
-  # Takes care of invalidating current connections. Will force a re-login.
-  # 
-  # ==== Options
-  # +new_user+:: User to become
-  #
-  # ==== Examples
-  #   set_user("nginx")
-  #   # Do something as user nginx
-  #
-  def set_user(new_user)
-    previous_user = fetch(:user)
+      def self.included(base) #:nodoc:
+        base.send :alias_method, :execute_on_servers_without_capitate, :execute_on_servers
+        base.send :alias_method, :execute_on_servers, :execute_on_servers_with_capitate
+      end
+  
+      # Determines the set of servers within the current task's scope and
+      # establishes connections to them, and then yields that list of
+      # servers.
+      #
+      # Overriden to handle NoMatchingServersError as NON-FATAL
+      #  
+      def execute_on_servers_with_capitate(options={}, &block)
+        begin
+          execute_on_servers_without_capitate(options, &block)
+        rescue Capistrano::NoMatchingServersError => e
+          logger.important "`#{current_task.fully_qualified_name}' is only run for servers matching #{current_task.options.inspect}, but no servers matched"
+        end
+      end
+  
+      # Set the user to something new (but save the old user; reset_user will set it back).
+      # Takes care of invalidating current connections. Will force a re-login.
+      # 
+      # ==== Options
+      # +new_user+:: User to become
+      #
+      # ==== Examples
+      #   set_user("nginx")
+      #   # Do something as user nginx
+      #
+      def set_user(new_user)
+        previous_user = fetch(:user)
     
-    return if previous_user == new_user
-    set :previous_user, previous_user
+        return if previous_user == new_user
+        set :previous_user, previous_user
     
-    set :user, new_user
-    clear_sessions
-  end
+        set :user, new_user
+        clear_sessions
+      end
   
-  # Reset to the old user.
-  # Takes care of invalidating current connections. Will force a re-login.
-  # 
-  # ==== Examples
-  #   # User is "root"
-  #   set_user("nginx")
-  #   # Do something as user nginx
-  #   reset_user
-  #   # User is now root
-  #
-  def reset_user
-    return unless exists?(:previous_user)
-    set :user, fetch(:previous_user)
-    unset :previous_user
-    clear_sessions
-  end
+      # Reset to the old user.
+      # Takes care of invalidating current connections. Will force a re-login.
+      # 
+      # ==== Examples
+      #   # User is "root"
+      #   set_user("nginx")
+      #   # Do something as user nginx
+      #   reset_user
+      #   # User is now root
+      #
+      def reset_user
+        return unless exists?(:previous_user)
+        set :user, fetch(:previous_user)
+        unset :previous_user
+        clear_sessions
+      end
   
-  # Yields the previous user.
-  #
-  # ==== Options
-  # +new_user+:: User to become
-  #
-  # ==== Examples
-  #   new_user("nginx") do |old_user|
-  #     # Do something as user nginx
-  #   end
-  #   # Now as user old_user
-  #
-  def with_user(new_user, &block)
-    begin
-      set_user(new_user)
-      yield exists?(:previous_user) ? fetch(:previous_user) : nil
-    ensure
-      reset_user
-    end
+      # Yields the previous user.
+      #
+      # ==== Options
+      # +new_user+:: User to become
+      #
+      # ==== Examples
+      #   new_user("nginx") do |old_user|
+      #     # Do something as user nginx
+      #   end
+      #   # Now as user old_user
+      #
+      def with_user(new_user, &block)
+        begin
+          set_user(new_user)
+          yield exists?(:previous_user) ? fetch(:previous_user) : nil
+        ensure
+          reset_user
+        end
     
-    clear_sessions
-  end
+        clear_sessions
+      end
   
-  # Close all open sessions.
-  # Will force user to re-login.
-  def clear_sessions    
-    sessions.each do |key, session|
-      logger.info "Closing: #{key}"
-      session.close
-    end    
-    sessions.clear    
-    reset_password
-  end
+      # Close all open sessions.
+      # Will force user to re-login.
+      def clear_sessions    
+        sessions.each do |key, session|
+          logger.info "Closing: #{key}"
+          session.close
+        end    
+        sessions.clear    
+        reset_password
+      end
   
-  # Reset the password.
-  # Display the current user that is asking for the password.
-  def reset_password
-    set :password, Proc.new {
-      Capistrano::CLI.password_prompt("Password (for user: #{user}): ")
-    }  
-  end
+      # Reset the password.
+      # Display the current user that is asking for the password.
+      def reset_password
+        set :password, Proc.new {
+          Capistrano::CLI.password_prompt("Password (for user: #{user}): ")
+        }  
+      end
     
+    end
+  end
 end
 
 # Debug connections
@@ -87,9 +110,13 @@ class Capistrano::SSH
   class << self  
   
     def connect_with_logging(server, options={}, &block)      
-      puts "=== Connecting to #{server} with user: #{options[:user]}"
+      @connect_mutex ||= Mutex.new
       
-      connect_without_logging(server, options, &block)
+      @connect_mutex.synchronize do
+        puts "=== Connecting to #{server} with user: #{server.user || options[:user]}"      
+      end
+
+      connect_without_logging(server, options, &block)      
     end
   
     alias_method_chain :connect, :logging

data/lib/capitate/version.rb

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

data/lib/capitate.rb

@@ -32,7 +32,10 @@ class Capistrano::Configuration
   include Capitate::CapExt::Variables
   include Capitate::CapExt::RunVia
   include Capitate::CapExt::Roles
+  include Capitate::CapExt::Connections
 end
 
+#module Capistrano::Configuration::Connections; end
+
 require 'capitate/task_node'
 

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

@@ -55,6 +55,7 @@ task :install do
   #
   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", 

data/lib/recipes/centos/mongrel_cluster.rb

@@ -38,6 +38,9 @@ namespace :mongrel do
         end
       
         run "mkdir -p #{mongrel_config_dir}"
+        
+        set :mongrel_pid_path, "#{mongrel_pid_dir}/#{mongrel_application}.pid"
+        set :mongrel_log_path, "log/#{mongrel_application}.log"
 
         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"

data/lib/recipes/centos/monit.rb

@@ -47,20 +47,6 @@ namespace :monit do
       script.sh("monit/cert.sh")
     end
     
-    desc <<-DESC
-    Monit HUP.
-    
-    *monit_pid_path*: Path to monit pid.\n
-    @set :monit_pid_path, "/var/run/monit.pid"@\n
-    DESC
-    task :restart do
-      
-      # Settings
-      fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
-      
-      sudo "kill -HUP `cat #{monit_pid_path}`"
-    end
-
   end
   
 end

data/lib/recipes/mongrel_cluster.rb

@@ -9,6 +9,7 @@ namespace :mongrel do
       Create monit configuration for mongrel cluster.
   
       *mongrel_application*: Name of application (monit group). _Defaults to <tt>"mongrel_cluster_\#{fetch(:application)}"</tt>_
+      *mongrel_bin_path*: Path to mongrel command. _Defaults to <tt>/usr/bin/mongrel_rails</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 
@@ -30,6 +31,7 @@ namespace :mongrel do
         fetch(:mongrel_size)
         fetch(:mongrel_port)
         fetch_or_default(:mongrel_application, Proc.new { "mongrel_cluster_#{fetch(:application)}" })
+        fetch_or_default(:mongrel_bin_path, "/usr/bin/mongrel_rails")
         fetch_or_default(:mongrel_config_script, nil)
         fetch_or_default(:monit_conf_dir, "/etc/monit")
     
@@ -37,7 +39,7 @@ namespace :mongrel do
         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_application}.#{port}.pid"
       
           default_options = [
             [ "-d" ], 
@@ -48,7 +50,7 @@ namespace :mongrel do
             [ "--group", user ],
             [ "-p", port ], 
             [ "-P", pid_path ],
-            [ "-l", "log/mongrel.#{port}.log" ]
+            [ "-l", "log/#{mongrel_application}.#{port}.log" ]
           ]
       
           default_options << [ "-S", mongrel_config_script ] if mongrel_config_script 
@@ -57,7 +59,7 @@ namespace :mongrel do
           #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 }
+          processes << { :port => port, :start_options => start_options, :stop_options => stop_options, :name => mongrel_bin_path, :pid_path => pid_path }
         end
     
         set :processes, processes

data/lib/recipes/monit.rb

@@ -0,0 +1,39 @@
+namespace :monit do
+  
+  desc <<-DESC
+  Restart (HUP) monit process.
+  
+  HUP's the process from the pid file, if it exists.
+  
+  *monit_pid_path*: Path to monit pid file. _Defaults to <tt>/var/run/monit.pid</tt>_
+  DESC
+  task :restart do    
+    fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
+    
+    run_via %{sh -c "[ ! -e '#{monit_pid_path}' ] || kill -HUP `cat #{monit_pid_path}`"}
+    
+  end
+  
+  desc <<-DESC
+  Unmonitor all.
+  
+  *monit_bin_path*: Path to monit bin. _Defaults to <tt>monit</tt>_
+  DESC
+  task :unmonitor_all do
+    fetch_or_default(:monit_bin_path, "monit")
+    
+    run_via "#{monit_bin_path} unmonitor all"
+  end
+  
+  desc <<-DESC
+  Monitor all.
+  
+  *monit_bin_path*: Path to monit bin. _Defaults to <tt>monit</tt>_
+  DESC
+  task :monitor_all do
+    fetch_or_default(:monit_bin_path, "monit")
+    
+    run_via "#{monit_bin_path} monitor all"
+  end
+  
+end

data/lib/recipes/mysql.rb

@@ -38,7 +38,7 @@ namespace :mysql do
   *mysql_admin_password*: Mysql admin password (to use to connect). Defaults to password prompt.\n
   @set :mysql_admin_password, prompt.password('Mysql admin password: '))@    
   DESC
-  task :setup do    
+  task :setup, :roles => :db do    
     
     # Settings
     fetch(:db_name)
@@ -56,10 +56,14 @@ namespace :mysql do
           mysql_grant_locations << role.host
         end unless roles[role_name].blank?
       end
-      set :mysql_grant_locations, mysql_grant_locations
-    end        
+      set :mysql_grant_locations, mysql_grant_locations.uniq!
+    end 
+    
+    sql = template.load("mysql/install_db.sql.erb")       
+    
+    logger.trace "Running sql:\n#{sql}"
         
-    put template.load("mysql/install_db.sql.erb"), "/tmp/install_db_#{application}.sql"    
+    put sql, "/tmp/install_db_#{application}.sql"    
     run "mysql -u root -p#{mysql_admin_password} < /tmp/install_db_#{application}.sql"
   end
   

data/lib/recipes/nginx.rb

@@ -25,7 +25,7 @@ namespace :nginx do
     
   namespace :mongrel do
     desc <<-DESC
-    Create and update the nginx vhost include.
+    Generate the nginx vhost include (for a mongrel setup).
   
     *mongrel_application*: Mongrel application. _Defaults to <tt>:application</tt>_
     *mongrel_size*: Number of mongrels.\n

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

@@ -1,10 +1,10 @@
 --- 
 cwd: <%= current_path %>
-log_file: log/mongrel.log
+log_file: <%= mongrel_log_path %>
 port: "<%= mongrel_port %>"
 environment: production
 address: 127.0.0.1
-pid_file: <%= mongrel_pid_dir %>/mongrel.pid
+pid_file: <%= mongrel_pid_path %>
 servers: <%= mongrel_size %>
 user: <%= user %>
 group: <%= user %>

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

@@ -1,5 +1,4 @@
-<% mysql_grant_locations.each do |location| %>
-GRANT <%= mysql_grant_priv_type %> 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.5</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.6</a>
     </div>
     
     <div id="recipes">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ""
 authors: 
 - Gabriel Handford
@@ -135,6 +135,7 @@ files:
 - lib/recipes/docs.rb
 - lib/recipes/memcached.rb
 - lib/recipes/mongrel_cluster.rb
+- lib/recipes/monit.rb
 - lib/recipes/mysql.rb
 - lib/recipes/nginx.rb
 - lib/recipes/rails.rb