lib/capitate/cap_ext/docs.rb lib/recipes/logrotate/mysql.rb lib/recipes/monit/database.rb lib/templates/mysql/my.cnf.innodb_1024.erb @@ -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 Capfile @@ -1,3 +1,10 @@ +== 0.2.14 + +* 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 History.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 Manifest.txt @@ -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 lib/capitate.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. # lib/capitate/cap_ext/connections.rb @@ -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 lib/capitate/cap_ext/variables.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 lib/capitate/version.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") lib/recipes/logrotate/backgroundrb.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") lib/recipes/logrotate/mongrel_cluster.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 lib/recipes/logrotate/monit.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 lib/recipes/logrotated.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 lib/recipes/memcached.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}" lib/recipes/monit/backgroundrb.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 \ No newline at end of file lib/recipes/monit/mysql.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 lib/recipes/monit/nginx.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 lib/recipes/mysql.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> lib/recipes/nginx.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 test/test_recipes.rb lib/capitate/cap_ext/roles.rb test/test_roles.rb 03cbc3dde5bf11d8eb4a52a69db508be11a3f12f Gabe gabrielh@gmail.com http://github.com/gabriel/capitate/commit/d482ddbcaf346eac68e50ccd72370bb5fd3ac7de d482ddbcaf346eac68e50ccd72370bb5fd3ac7de 2008-03-27T15:26:55-07:00 2008-03-27T15:26:55-07:00 adding mysql recipes/templates, cleaning up docs 3c21fbf28e17732152cf4585a1879d2fa99cfa7b Gabe gabrielh@gmail.com