capitate 0.2.13 → 0.2.14

data/Capfile

@@ -11,25 +11,3 @@ require 'lib/capitate/recipes'
 
 require 'erb'
 
-# Test
-task :test_egrep do  
-  role :test, "10.0.6.118", :user => "root"
-  
-  found = utils.egrep("^mail.\\*", "/etc/syslog.conf")
-  puts "Found? #{found}"
-  
-  found = utils.egrep("^fooo", "/etc/syslog.conf")
-  puts "Found? #{found}"
-end
-
-task :test_app do  
-  set :application, "sick"
-  set :deploy_to, "/var/www/apps/sick"
-  role :web, "10.0.6.118", :user => "root"
-  role :app, "10.0.6.118", :user => "root"
-end
-
-task :test_install do
-  load File.dirname(__FILE__) + "/lib/deployment/centos-5.1-64-web/install.rb"
-  role :test, "10.0.6.118", :user => "root"
-end

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.14 2008-03-27
+
+* Removing my lame monkey patches
+* Mysql cnf template
+* Cleaning up mysql grant locations
+* Logrotate for mysql slow query log
+
 == 0.2.13 2008-03-26
 
 * Fixing monit re/start for mongrel cluster and backgroundrb

data/Manifest.txt

@@ -10,7 +10,7 @@ config/requirements.rb
 docs/nginx.README
 lib/capitate.rb
 lib/capitate/cap_ext/connections.rb
-lib/capitate/cap_ext/roles.rb
+lib/capitate/cap_ext/docs.rb
 lib/capitate/cap_ext/run_via.rb
 lib/capitate/cap_ext/variables.rb
 lib/capitate/plugins/base.rb
@@ -41,6 +41,7 @@ lib/recipes/docs.rb
 lib/recipes/logrotate/backgroundrb.rb
 lib/recipes/logrotate/mongrel_cluster.rb
 lib/recipes/logrotate/monit.rb
+lib/recipes/logrotate/mysql.rb
 lib/recipes/logrotate/nginx.rb
 lib/recipes/logrotate/rails.rb
 lib/recipes/logrotate/sphinx.rb
@@ -48,6 +49,7 @@ lib/recipes/logrotated.rb
 lib/recipes/memcached.rb
 lib/recipes/monit.rb
 lib/recipes/monit/backgroundrb.rb
+lib/recipes/monit/database.rb
 lib/recipes/monit/memcached.rb
 lib/recipes/monit/mongrel_cluster.rb
 lib/recipes/monit/mysql.rb
@@ -75,6 +77,7 @@ lib/templates/monit/monit.cnf
 lib/templates/monit/monit.initd.centos.erb
 lib/templates/monit/monitrc.erb
 lib/templates/mysql/install_db.sql.erb
+lib/templates/mysql/my.cnf.innodb_1024.erb
 lib/templates/mysql/mysql.monitrc.erb
 lib/templates/nginx/nginx.conf.erb
 lib/templates/nginx/nginx.initd.erb
@@ -96,7 +99,6 @@ tasks/website.rake
 test/test_helper.rb
 test/test_plugin_upload.rb
 test/test_recipes.rb
-test/test_roles.rb
 test/test_templates.rb
 website/index.html
 website/index.txt

data/lib/capitate/cap_ext/connections.rb

@@ -3,33 +3,6 @@ module Capitate
   module CapExt
     module Connections
   
-      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.
-      #
-      # If you set:
-      #
-      #   set :ignore_missing_roles, true
-      #
-      # Overriden to handle NoMatchingServersError as NON-FATAL.      
-      #  
-      def execute_on_servers_with_capitate(options={}, &block)        
-        if exists?(:ignore_missing_roles) && fetch(:ignore_missing_roles)        
-          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
-        else
-          execute_on_servers_without_capitate(options, &block)
-        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.
       # 

data/lib/capitate/cap_ext/docs.rb

@@ -0,0 +1,26 @@
+module Capitate
+  
+  module CapExt
+    
+    module Docs
+      
+      # Get link to github source, so we can refer to recipe code.
+      #
+      # ==== Options
+      # +recipe+:: Recipe path, probably use __FILE__
+      #
+      # ==== Examples
+      #   # In a lib/recipes/foo/foo.rb
+      #   link_to_source(__FILE__) => "http://github.com/gabriel/capitate/tree/master/lib/recipes/foo/foo.rb"
+      #
+      def link_to_source(recipe_path)
+        full_path = File.expand_path(recipe_path)
+        project_path = File.expand_path(File.dirname(__FILE__) + "/../../../")
+        "http://github.com/gabriel/capitate/tree/master#{full_path.sub(project_path, "")}"
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/capitate/cap_ext/variables.rb

@@ -21,7 +21,7 @@ module Capitate
           if message.blank?
             message = <<-EOS
 
-            Please set :#{variable} variable in your Capfile or profile.
+            Please set :#{variable} variable in your Capfile or deploy.rb
 
             EOS
           end
@@ -125,13 +125,6 @@ module Capitate
         nil
       end
       
-      
-      def link_to_source(recipe_path)
-        full_path = File.expand_path(recipe_path)
-        project_path = File.expand_path(File.dirname(__FILE__) + "/../../../")
-        "http://github.com/gabriel/capitate/tree/master#{full_path.sub(project_path, "")}"
-      end
-    
     end
   end
   

data/lib/capitate/plugins/base.rb

@@ -71,6 +71,7 @@ module Capitate::Plugins::Base
     
       EOS
     end
+    message
   end
   
   # Indent string block.

data/lib/capitate/version.rb

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

data/lib/capitate.rb

@@ -27,13 +27,13 @@ require 'capitate/plugins/yum'
 require "capitate/cap_ext/connections"
 require "capitate/cap_ext/variables"
 require "capitate/cap_ext/run_via"
-require "capitate/cap_ext/roles"
+require "capitate/cap_ext/docs"
         
 class Capistrano::Configuration   
   include Capitate::CapExt::Variables
   include Capitate::CapExt::RunVia
-  include Capitate::CapExt::Roles
   include Capitate::CapExt::Connections
+  include Capitate::CapExt::Docs
 end
 
 #module Capistrano::Configuration::Connections; end

data/lib/recipes/logrotate/backgroundrb.rb

@@ -10,6 +10,7 @@ namespace :backgroundrb do
     <dd>Backgroundrb logrotate paths.</dd>
     <dd class="default">Defaults to @\#{shared_path}/log/backgroundrb*.log@</dd>
     </dl>
+    "Source":#{link_to_source(__FILE__)}    
     DESC
     task :install do
       fetch_or_default(:backgroundrb_logrotate_path, "#{shared_path}/log/backgroundrb*.log")

data/lib/recipes/logrotate/mongrel_cluster.rb

@@ -6,7 +6,12 @@ namespace :mongrel do
       desc <<-DESC
       Install logrotated conf for mongrel cluster.
     
-      *mongrel_cluster_logrotate_path*: Mongrel cluster logrotate path. _Defaults to <tt>{shared_path}/log/mongrel_cluster_*.log</tt>_
+      <dl>
+      <dt>mongrel_cluster_logrotate_path</dt>
+      <dd>Mongrel cluster logrotate path</dd>
+      <dd class="default">Defaults to @\#{shared_path}/log/mongrel_cluster_*.log@</dd>
+      </dl>
+      "Source":#{link_to_source(__FILE__)}    
       DESC
       task :install do
         fetch_or_default(:mongrel_cluster_logrotate_path, "#{shared_path}/log/mongrel_cluster_*.log")

data/lib/recipes/logrotate/monit.rb

@@ -5,7 +5,12 @@ namespace :monit do
     desc <<-DESC
     Install logrotated conf for monit.
     
-    *monit_log_path*: Path to monit log. _Defaults to <tt>/var/log/monit.log</tt>_
+    <dl>
+    <dt>monit_log_path</dt>
+    <dd>Path to monit log</dd>
+    <dd class="default">Defaults to @"/var/log/monit.log"@</dd>
+    </dl>
+    "Source":#{link_to_source(__FILE__)}    
     DESC
     task :install do
       

data/lib/recipes/logrotate/mysql.rb

@@ -0,0 +1,26 @@
+namespace :mysql do
+  
+  namespace :logrotate do
+    
+    desc <<-DESC
+    Install logrotated conf for nginx.
+    
+    <dl>
+    <dt>mysql_logrotate_path</dt>
+    <dd>Mysql logrotate path</dd>
+    <dd class="default">Defaults to @"/var/lib/mysql/localhost-slow.log"@</dd>    
+    </dl>
+    "Source":#{link_to_source(__FILE__)}    
+    DESC
+    task :install, :roles => :db do
+      fetch_or_default(:mysql_logrotate_path, "/var/lib/mysql/localhost-slow.log")
+      
+      set :logrotate_name, "mysql"
+      set :logrotate_log_path, mysql_logrotate_path
+      set :logrotate_options, [ { :rotate => 7, :size => "10M" }, :daily, :missingok, :notifempty, :copytruncate ]
+      
+      logrotated.install_conf      
+    end    
+        
+  end
+end

data/lib/recipes/logrotated.rb

@@ -55,6 +55,17 @@ namespace :logrotated do
   
   desc <<-DESC
   Force rotate files.
+  
+  <dl>
+  <dt>logrotate_prefix</dt>
+  <dd>Path to logrotate</dd>
+  <dd>Defaults to none</dd>
+  
+  <dt>logrotate_conf_path</dt>
+  <dd>Path to logrotate conf</dd>
+  <dd>Defaults to @"/etc/logrotate.conf"@</dd>
+  </dl>
+  "Source":#{link_to_source(__FILE__)}   
   DESC
   task :force do 
         

data/lib/recipes/memcached.rb

@@ -1,6 +1,38 @@
 namespace :memcached do
   
-  desc "Create memcached yaml in shared path."
+  desc <<-DESC
+  Create memcached yaml in shared path.
+    
+  <dl>
+  <dt>memcached_namespace</dt>
+  
+  <dt>memcached_ttl</dt>
+  <dd class="default">Defaults to @3600@</dd>
+  
+  <dt>memcached_readonly</dt>
+  <dd class="default">Defaults to @false@</dd>
+  
+  <dt>memcached_urlencode</dt>
+  <dd class="default">Defaults to @false@</dd>
+  
+  <dt>memcached_c_threshold</dt>
+  <dd class="default">Defaults to @10000@</dd>
+  
+  <dt>memcached_compression</dt>
+  <dd class="default">Defaults to @true@</dd>
+  
+  <dt>memcached_debug</dt>
+  <dd class="default">Defaults to @false@</dd>
+  
+  <dt>memcached_servers</dt>
+  <dd class="default">Defaults to @[ "localhost:11211" ]@</dd>
+  
+  <dt>memcached_yml_template</dt>
+  <dd class="default">Defaults to @"memcached/memcached.yml.erb"@</dd>
+  </dl>
+  
+  "Source":#{link_to_source(__FILE__)}   
+  DESC
   task :setup do    
 
     # Settings

data/lib/recipes/monit/backgroundrb.rb

@@ -23,13 +23,13 @@ namespace :backgroundrb do
       sudo "#{monit_bin_path} restart backgroundrb_#{application}"
     end
     
-    desc "Start mongrel cluster (for application)"
+    desc "Start backgroundrb (for application)"
     task :start do
       fetch_or_default(:monit_bin_path, "monit")
       sudo "#{monit_bin_path} start backgroundrb_#{application}" 
     end
     
-    desc "Stop mongrel cluster (for application)"
+    desc "Stop backgroundrb (for application)"
     task :stop do
       fetch_or_default(:monit_bin_path, "monit")
       sudo "#{monit_bin_path} stop backgroundrb_#{application}"

data/lib/recipes/monit/database.rb

@@ -0,0 +1,25 @@
+namespace :database do
+  
+  namespace :monit do
+    
+    desc "Restart database (monit group)"
+    task :restart do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} -g database restart all"
+    end
+    
+    desc "Start database (monit group)"
+    task :start do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} -g database start all" 
+    end
+    
+    desc "Stop database (monit group)"
+    task :stop do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} -g database stop all"
+    end
+    
+  end
+  
+end

data/lib/recipes/monit/mysql.rb

@@ -3,9 +3,24 @@ namespace :mysql do
   namespace :monit do
   
     desc <<-DESC
-    Install mysql monit hooks. "Source":#{link_to_source(__FILE__)}  
+    Install mysql monit hooks. 
+    
+    <dl>
+    <dt>mysql_pid_path</dt>
+    <dd>Path to mysql pid file</dd>
+
+    <dt>db_port</dt>
+    <dd>Mysql port</dd>
+    <dd class="default">Defaults to @3306@</dd>
+    
+    <dt>monit_conf_dir</dt>
+    <dd>Monitrd directory.</dd>
+    <dd class="default">Defaults to @"/etc/monit"@</dd>
+    </dl>    
+    
+    "Source":#{link_to_source(__FILE__)}  
     DESC
-    task :install do
+    task :install, :roles => :db do
     
       # Settings 
       fetch_or_default(:mysql_pid_path, "/var/run/mysqld/mysqld.pid")
@@ -14,8 +29,8 @@ namespace :mysql do
     
       put template.load("mysql/mysql.monitrc.erb", binding), "/tmp/mysql.monitrc"    
       run_via "install -o root /tmp/mysql.monitrc #{monit_conf_dir}/mysql.monitrc"
-    end
-    
+    end      
+        
   end
   
 end

data/lib/recipes/monit/nginx.rb

@@ -5,8 +5,7 @@ namespace :nginx do
     desc <<-DESC 
     Install nginx monit hooks.
   
-    <dl>
-    
+    <dl>    
     <dt>nginx_pid_path</dt>
     <dd>Path to nginx pid file</dd>
     <dd>Defaults to /var/run/nginx.pid</dd>
@@ -28,6 +27,24 @@ namespace :nginx do
       put template.load("nginx/nginx.monitrc.erb", binding), "/tmp/nginx.monitrc"    
       run_via "install -o root /tmp/nginx.monitrc #{monit_conf_dir}/nginx.monitrc"
     end
+        
+    desc "Restart nginx (through monit)"
+    task :restart do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} restart nginx"
+    end
+    
+    desc "Start nginx (through monit)"
+    task :start do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} start nginx" 
+    end
+    
+    desc "Stop nginx (through monit)"
+    task :stop do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} stop nginx"
+    end
     
   end
   

data/lib/recipes/mysql.rb

@@ -36,18 +36,7 @@ namespace :mysql do
     fetch(:db_pass)
     fetch_or_default(:mysql_admin_password, prompt.password('Mysql admin password: '))
     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.uniq!
-    end 
+    fetch_or_default(:mysql_grant_locations, [ "localhost" ])
     
     sql = template.load("mysql/install_db.sql.erb")       
     
@@ -57,4 +46,31 @@ namespace :mysql do
     run "mysql -u root -p#{mysql_admin_password} < /tmp/install_db_#{application}.sql"
   end
   
+  desc <<-DESC
+  Create my.cnf based on template.
+  
+  <dl>
+  <dt>my_cnf_template</dt>
+  <dd>Path to my.cnf template</dd>
+  
+  <dt>db_socket</dt>
+  <dd>Path to mysql .sock</dd>
+  <dd class="default">Defaults to @"/var/lib/mysql/mysql.sock"@</dd>
+  
+  <dt>db_port</dt>
+  <dd>Mysql port</dd>
+  <dd class="default">Defaults to @3306@</dd>
+  </dl>
+  
+  "Source":#{link_to_source(__FILE__)}
+  DESC
+  task :install_my_cnf, :roles => :db do      
+    fetch_or_default(:my_cnf_template, "mysql/my.cnf.innodb_1024.erb")      
+    fetch_or_default(:db_socket, "/var/lib/mysql/mysql.sock")
+    fetch_or_default(:db_port, 3306)
+    
+    utils.install_template(my_cnf_template, "/etc/my.cnf")    
+  end
+  
+  
 end

data/lib/recipes/nginx.rb

@@ -7,10 +7,12 @@ namespace :nginx do
   
     <dl>
     <dt>mongrel_application</dt>
-    <dd>Mongrel application. _Defaults to <tt>:application</tt>_
+    <dd>Mongrel application.</dd>
+    <dd class="default">Defaults to @:application@</dd>
     
-    <dt>mongrel_size</dt>: Number of mongrels.\n
-    <dd>@set :mongrel_size, 3@\n    
+    <dt>mongrel_size</dt>
+    <dd>Number of mongrels.</dd>
+    <dd>@set :mongrel_size, 3@</dd>  
     
     <dt>*mongrel_port</dt>
     <dd>Starting port for mongrels. If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002</dd>

data/lib/templates/mysql/my.cnf.innodb_1024.erb

@@ -0,0 +1,120 @@
+#
+# my.cnf.innodb_1024
+#
+# This is a MySQL 5.x configuration file designed for the typical
+# webapp, running on a 1GB server that is also the app and 
+# httpd server. The below configuration dedicates about half of 
+# the system resources to MySQL. It is InnoDB-specific, and 
+# will not perform well with many MyISAM tables. It supports 
+# limited ACID and referential integrity. It does not support 
+# replication.
+#
+# By Evan Weaver
+# http://blog.evanweaver.com/articles/2007/04/30/top-secret-tuned-mysql-configurations-for-rails
+#
+# Copyright 2007, Cloudburst, LLC
+# Licensed under the Academic Free License v. 3.0
+# http://blog.evanweaver.com/files/mysql/LICENSE
+#
+
+[client]
+port = <%= db_port %>
+socket = <%= db_socket %>
+max_allowed_packet = 32M
+
+[mysqld]
+######### engine and access interfaces
+skip-networking 
+skip-locking 
+skip-bdb
+
+port = <%= db_port %>
+socket = <%= db_socket %>
+default-storage-engine = innodb
+
+######### character sets
+character_set_server = utf8
+collation_server = utf8_general_ci
+
+######### innodb options
+innodb_additional_mem_pool_size = 16M
+# buffer pool size is most critical for innodb's performance and memory usage
+innodb_buffer_pool_size = 256M    
+innodb_data_file_path = ibdata1:10M:autoextend
+innodb_data_home_dir = /var/lib/mysql
+innodb_file_io_threads = 4
+innodb_thread_concurrency = 4
+# 2 is fastest but slightly less reliable than 0 or 1, if you don't trust your hard disks
+innodb_flush_log_at_trx_commit = 2
+
+innodb_log_buffer_size = 64M
+# innodb_log_file_size * innodb_log_files_in_group < buffer_pool_size
+innodb_log_file_size = 80M
+innodb_log_files_in_group = 3
+# use a secondary volume if possible for a concurrent read/write speed boost
+innodb_log_group_home_dir = /var/lib/mysql 
+
+innodb_max_dirty_pages_pct = 90
+innodb_lock_wait_timeout = 120
+     
+######### myisam
+# innodb still requires the myisam engine for mysql's internal metadata table
+key_buffer_size = 16M
+
+######### general
+connect_timeout = 10
+back_log = 50
+# you can't have more mongrels or fastcgi processes than the max_connections setting
+max_connections = 96
+max_connect_errors = 10
+table_cache = 2048
+max_allowed_packet = 32M
+
+open_files_limit = 1024
+# this is the in-memory tmp table max size
+max_heap_table_size = 64M
+# below are per-connection and per-sub-query
+join_buffer_size = 4M
+read_buffer_size = 4M
+sort_buffer_size = 8M
+read_rnd_buffer_size = 8M
+
+thread_cache_size = 8
+thread_concurrency = 8
+
+# query_cache_size is a global setting
+query_cache_size = 128M
+query_cache_limit = 2M
+thread_stack = 192K
+transaction_isolation = READ-COMMITTED
+# this is the on-disk max size
+tmp_table_size = 128M
+tmpdir = /tmp
+
+
+# You can log slow queries to the mysql log directory to help isolate performance problems
+log_slow_queries
+long_query_time = 3
+log_long_format
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+
+[myisamchk]
+# not used except when repairing the database at startup
+key_buffer = 64M
+sort_buffer_size = 64M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+[mysqld_safe]
+open-files-limit = 8192
+
+# PS. Do not under any circumstances enable binlog

data/test/test_recipes.rb

@@ -2,8 +2,34 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestRecipes < Test::Unit::TestCase
   
-  def test_load
-    #load File.dirname(__FILE__) + "/../lib/capitate/recipes.rb"
+  def test_egrep
+    # task :test_egrep do  
+    #   role :test, "10.0.6.118", :user => "root"
+    # 
+    #   found = utils.egrep("^mail.\\*", "/etc/syslog.conf")
+    #   puts "Found? #{found}"
+    # 
+    #   found = utils.egrep("^fooo", "/etc/syslog.conf")
+    #   puts "Found? #{found}"
+    # end    
+    assert true
+  end
+  
+  def test_app
+    # task :test_app do  
+    #   set :application, "sick"
+    #   set :deploy_to, "/var/www/apps/sick"
+    #   role :web, "10.0.6.118", :user => "root"
+    #   role :app, "10.0.6.118", :user => "root"
+    # end
+    assert true
+  end
+
+  def test_install
+    # task :test_install do
+    #   load File.dirname(__FILE__) + "/lib/deployment/centos-5.1-64-web/install.rb"
+    #   role :test, "10.0.6.118", :user => "root"
+    # end
     assert true
   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.13</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.14</a>
     </div>
     
     <div id="recipes">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.2.14
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-26 00:00:00 -04:00
+date: 2008-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - docs/nginx.README
 - lib/capitate.rb
 - lib/capitate/cap_ext/connections.rb
-- lib/capitate/cap_ext/roles.rb
+- lib/capitate/cap_ext/docs.rb
 - lib/capitate/cap_ext/run_via.rb
 - lib/capitate/cap_ext/variables.rb
 - lib/capitate/plugins/base.rb
@@ -78,6 +78,7 @@ files:
 - lib/recipes/logrotate/backgroundrb.rb
 - lib/recipes/logrotate/mongrel_cluster.rb
 - lib/recipes/logrotate/monit.rb
+- lib/recipes/logrotate/mysql.rb
 - lib/recipes/logrotate/nginx.rb
 - lib/recipes/logrotate/rails.rb
 - lib/recipes/logrotate/sphinx.rb
@@ -85,6 +86,7 @@ files:
 - lib/recipes/memcached.rb
 - lib/recipes/monit.rb
 - lib/recipes/monit/backgroundrb.rb
+- lib/recipes/monit/database.rb
 - lib/recipes/monit/memcached.rb
 - lib/recipes/monit/mongrel_cluster.rb
 - lib/recipes/monit/mysql.rb
@@ -112,6 +114,7 @@ files:
 - lib/templates/monit/monit.initd.centos.erb
 - lib/templates/monit/monitrc.erb
 - lib/templates/mysql/install_db.sql.erb
+- lib/templates/mysql/my.cnf.innodb_1024.erb
 - lib/templates/mysql/mysql.monitrc.erb
 - lib/templates/nginx/nginx.conf.erb
 - lib/templates/nginx/nginx.initd.erb
@@ -133,7 +136,6 @@ files:
 - test/test_helper.rb
 - test/test_plugin_upload.rb
 - test/test_recipes.rb
-- test/test_roles.rb
 - test/test_templates.rb
 - website/index.html
 - website/index.txt
@@ -174,5 +176,4 @@ test_files:
 - test/test_helper.rb
 - test/test_plugin_upload.rb
 - test/test_recipes.rb
-- test/test_roles.rb
 - test/test_templates.rb

data/lib/capitate/cap_ext/roles.rb

@@ -1,26 +0,0 @@
-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/test/test_roles.rb

@@ -1,47 +0,0 @@
-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