capitate 0.2.15 → 0.3.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.1 2008-04-02
+
+* Fixing the init scripts to use killproc and have nice output (centos)
+* Fixing sphinx initscript to clean on start (if process does not exist)
+* Removing some roles options. Roles are confusing, I don't want to use them.
+
 == 0.2.15 2008-03-31
 
 * Adding backgroundjob recipes and templates.

data/Manifest.txt

@@ -75,7 +75,7 @@ lib/templates/logrotated/conf.erb
 lib/templates/memcached/memcached.initd.centos.erb
 lib/templates/memcached/memcached.monitrc.erb
 lib/templates/memcached/memcached.yml.erb
-lib/templates/mongrel/mongrel_cluster.initd.erb
+lib/templates/mongrel/mongrel_cluster.initd.centos.erb
 lib/templates/mongrel/mongrel_cluster.monitrc.erb
 lib/templates/mongrel/mongrel_cluster.yml.erb
 lib/templates/monit/monit.cnf
@@ -83,9 +83,10 @@ 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/my.cnf.innodb_512.erb
 lib/templates/mysql/mysql.monitrc.erb
 lib/templates/nginx/nginx.conf.erb
-lib/templates/nginx/nginx.initd.erb
+lib/templates/nginx/nginx.initd.centos.erb
 lib/templates/nginx/nginx.monitrc.erb
 lib/templates/nginx/nginx_vhost.conf.erb
 lib/templates/rails/database.yml.erb

data/lib/capitate/plugins/prompt.rb

@@ -22,22 +22,23 @@ module Capitate::Plugins::Prompt
   # +verify+:: If true, prompt twice and verify
   # +lazy+:: If true, returns a Proc. _Defaults to true_
   # +check_hash+:: If present, checks that md5 is same as password md5
+  # +max_attempts+:: Number of attempts to retry. _Defaults to 3_
   #
   def password(label, options = {})
     
     verify = options[:verify]
     lazy = options[:lazy].nil? ? true : options[:lazy]
     check_hash = options[:check_hash]
+    max_attempts = options[:max_attempts] || 3
     
     # Lazy
     password_prompt = Proc.new { 
       
-      max_attempts = 2
       attempts = 0
       password = nil
       success = true
 
-      loop { 
+      loop do
         password = Capistrano::CLI.password_prompt(label)
         attempts += 1
     
@@ -52,13 +53,16 @@ module Capitate::Plugins::Prompt
         if check_hash
           if MD5.md5(password).hexdigest != check_hash
             logger.important "Invalid password, try again." 
-            success = false
+            success = false            
           end         
         end
         
         break if success
         break if attempts >= max_attempts
-      }
+        
+        # Reset success
+        success = true
+      end
       
       raise "Invalid password, too many tries" unless success
     

data/lib/capitate/plugins/utils.rb

@@ -19,6 +19,24 @@ module Capitate::Plugins::Utils
     end
   end
   
+  # Delete file.
+  #
+  # ==== Options
+  # +path+:: Path to delete
+  #
+  def rm(path)
+    run_via "rm #{path}"
+  end
+
+  # Delete file (recursive/force)
+  #
+  # ==== Options
+  # +path+:: Path to delete
+  #  
+  def rm_rf(path)
+    run_via "rm -rf #{path}"
+  end
+  
   # Load template and install it.
   # Removes temporary files during transfer and ensures desination directory is created before install.
   #

data/lib/capitate/task_node.rb

@@ -169,7 +169,9 @@ class Capitate::TaskNode
         file.puts "\n\nh2. Task documentation\n\n"        
         sorted_tasks.each do |task|
           file.puts %{<div class="recipe">\n\n}
-          file.puts "h3(##{task.fully_qualified_name}). #{task.fully_qualified_name}\n\n"
+          options = ""
+          options = "<span class='options'>, #{task.options.inspect}</span>" unless task.options.blank?
+          file.puts "h3(##{task.fully_qualified_name}). #{task.fully_qualified_name}#{options}\n\n"
           file.puts "#{unindent(task.desc)}\n\n"                    
           file.puts "</div>\n\n\n"
         end

data/lib/capitate/version.rb

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

data/lib/recipes/centos/backgroundjob.rb

@@ -25,9 +25,6 @@ namespace :backgroundjob do
     "Source":#{link_to_source(__FILE__)}
     DESC
     task :setup do       
-      
-      
-      
       # Settings
       fetch_or_default(:backgroundjob_pid_path, "#{shared_path}/pids/bj.pid")
       fetch_or_default(:backgroundjob_log_path, "#{shared_path}/log/bj.log")

data/lib/recipes/centos/memcached.rb

@@ -48,11 +48,37 @@ namespace :memcached do
       # Build
       build.make_install("memcached", memcached_build_options)
 
-      # Install initscript, service
-      put template.load("memcached/memcached.initd.centos.erb"), "/tmp/memcached.initd"
-      run_via "install -o root /tmp/memcached.initd /etc/init.d/memcached && rm -f /tmp/memcached.initd"
-      run_via "/sbin/chkconfig --level 345 memcached on"
-
+      initscript
+    end
+    
+    desc <<-DESC
+    Install memcached initscript.    
+    
+    <dl>
+    <dt>memcached_memory</dt>
+    <dd>Memcached memory (in MB).</dd>
+    <dd>@set :memcached_memory, 64@</dd>
+    
+    <dt>memcached_pid_path*</dt>
+    <dd>Path to memcached pid file.</dd>
+    <dd class="default">Defaults to @/var/run/memcached.pid@</dd>
+    <dd>@set :memcached_pid_path, "/var/run/memcached.pid"@</dd>
+    
+    <dt>memcached_port</dt>
+    <dd>Memcached port<dd>
+    <dd class="default">Defaults to 11211.</dd>
+    <dd>@set :memcached_port, 11211@</dd>
+    </dl>
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task :initscript do
+      
+      fetch_or_default(:memcached_pid_path, "/var/run/memcached.pid")
+      fetch_or_default(:memcached_port, 11211)
+      fetch(:memcached_memory)            
+      
+      utils.install_template("memcached/memcached.initd.centos.erb", "/etc/init.d/memcached")
+      run_via "/sbin/chkconfig --level 345 memcached on"      
     end
     
   end

data/lib/recipes/centos/mongrel_cluster.rb

@@ -61,16 +61,24 @@ namespace :mongrel do
         
         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"
 
-        # Setup the mongrel_cluster init script
-        sudo "install -o root /tmp/#{mongrel_initscript_name}.initd /etc/init.d/#{mongrel_initscript_name}"
+        initscript
+      end    
+    
+      desc "Mongrel cluster setup initscript for application"
+      task :initscript do
+
+        fetch_or_default(:mongrel_config_dir, "#{shared_path}/config/mongrel")
+        fetch_or_default(:mongrel_pid_dir, "#{shared_path}/pids")      
+        fetch_or_default(:mongrel_cluster_command, "mongrel_cluster_ctl")
+        fetch_or_default(:mongrel_initscript_name, "mongrel_cluster_#{application}")
 
-        sudo "/sbin/chkconfig --level 345 #{mongrel_initscript_name} on"
+        utils.install_template("mongrel/mongrel_cluster.initd.centos.erb", "/etc/init.d/#{mongrel_initscript_name}")
+        run_via "/sbin/chkconfig --level 345 #{mongrel_initscript_name} on"
       end
-    
+      
     end
     
   end

data/lib/recipes/centos/monit.rb

@@ -52,7 +52,7 @@ namespace :monit do
       yum.install([ "flex", "byacc" ])
         
       # Build
-      #build.make_install("monit", monit_build_options)
+      build.make_install("monit", monit_build_options)
 
       # Install initscript
       utils.install_template("monit/monit.initd.centos.erb", "/etc/init.d/monit")
@@ -82,20 +82,7 @@ namespace :monit do
       # HUP the inittab
       run_via "telinit q"
     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

@@ -57,10 +57,8 @@ namespace :nginx do
       # Build
       build.make_install("nginx", nginx_build_options)
 
-      # Install initscript, and turn it on
-      put template.load("nginx/nginx.initd.erb"), "/tmp/nginx.initd"
-      run_via "install -o root /tmp/nginx.initd /etc/init.d/nginx && rm -f /tmp/nginx.initd"
-      run_via "/sbin/chkconfig --level 345 nginx on"
+      # Initscript
+      initscript
 
       # Setup nginx
       run_via "mkdir -p /etc/nginx/vhosts"
@@ -72,6 +70,16 @@ namespace :nginx do
       run_via "id nginx || /usr/sbin/adduser -r nginx"
     end
     
+    desc "Install nginx initscript"
+    task :initscript do
+      fetch_or_default(:nginx_bin_path, "/sbin/nginx")
+      fetch_or_default(:nginx_conf_path, "/etc/nginx/nginx.conf")
+      fetch_or_default(:nginx_pid_path, "/var/run/nginx.pid")
+      
+      utils.install_template("nginx/nginx.initd.centos.erb", "/etc/init.d/nginx")
+      run_via "/sbin/chkconfig --level 345 nginx on"
+    end
+    
     # Restart nginx
     desc "Restart nginx (service)"
     task :restart do

data/lib/recipes/centos/sphinx.rb

@@ -57,37 +57,26 @@ namespace :sphinx do
       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"
-      run_via "install -o root /tmp/sphinx.initd /etc/init.d/sphinx_#{application}"
-
-      # Enable service
-      run_via "/sbin/chkconfig --level 345 sphinx_#{application} on"    
+      initscript
 
       # Create app indexes dir
       run "mkdir -p #{shared_path}/var/index"    
     end
     
     
-    desc <<-DESC
-    Install sphinx firewall rule.
-    
-    This doesn't work yet (doesn't insert in right place).
-    
-    <dl>
-    <dt>sphinx_portdt>
-    <dd>Sphinx port</dd>
-    <dd class="default">Defaults to @3312@</dd>    
-    <dd>@set :sphinx_port, 3312@</dd>
-    </dl>
-    "Source":#{link_to_source(__FILE__)}
-    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"
+    desc "Setup sphinx initscript"
+    task :initscript 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")      
+      
+      utils.install_template("sphinx/sphinx_app.initd.centos.erb", "/etc/init.d/sphinx_#{application}")
+      run_via "/sbin/chkconfig --level 345 sphinx_#{application} on"
+      
     end
+    
   end
   
 end

data/lib/recipes/logrotate/mysql.rb

@@ -3,7 +3,7 @@ namespace :mysql do
   namespace :logrotate do
     
     desc <<-DESC
-    Install logrotated conf for nginx.
+    Install logrotated conf for mysql.
     
     <dl>
     <dt>mysql_logrotate_path</dt>
@@ -12,7 +12,7 @@ namespace :mysql do
     </dl>
     "Source":#{link_to_source(__FILE__)}    
     DESC
-    task :install, :roles => :db do
+    task :install do
       fetch_or_default(:mysql_logrotate_path, "/var/lib/mysql/localhost-slow.log")
       
       set :logrotate_name, "mysql"

data/lib/recipes/monit/backgroundjob.rb

@@ -3,11 +3,11 @@ namespace :backgroundjob do
   namespace :monit do
   
     desc <<-DESC
-    Generate and install backgroundjob (for application) monitrc.
+    Setup backgroundjob (for application) monitrc.
     
     "Source":#{link_to_source(__FILE__)}
     DESC
-    task :install do
+    task :setup do
     
       # Settings
       fetch_or_default(:backgroundjob_pid_path, "#{shared_path}/pids/bj.pid")

data/lib/recipes/monit/mysql.rb

@@ -20,7 +20,7 @@ namespace :mysql do
     
     "Source":#{link_to_source(__FILE__)}  
     DESC
-    task :install, :roles => :db do
+    task :install do
     
       # Settings 
       fetch_or_default(:mysql_pid_path, "/var/run/mysqld/mysqld.pid")

data/lib/recipes/mysql.rb

@@ -22,28 +22,34 @@ namespace :mysql do
   <dd>Grant privilege types.</dd>
   <dd>Defaults to @ALL@</dd>
   
+  <dt>mysql_admin_user</dt>
+  <dd>Mysql admin user.</dd>
+  <dd>Defaults to password prompt.</dd>
+  
   <dt>mysql_admin_password</dt>
-  <dd>Mysql admin password (to use to connect).</dd>
+  <dd>Mysql admin password.</dd>
   <dd>Defaults to password prompt.</dd>
   </dl>
   "Source":#{link_to_source(__FILE__)}
   DESC
-  task :setup, :roles => :db do    
+  task :setup do    
     
     # Settings
     fetch(:db_name)
     fetch(:db_user)
     fetch(:db_pass)
+    fetch_or_default(:mysql_admin_user, "root")
     fetch_or_default(:mysql_admin_password, prompt.password('Mysql admin password: '))
     fetch_or_default(:mysql_grant_priv_type, "ALL")
     fetch_or_default(:mysql_grant_locations, [ "localhost" ])
     
     sql = template.load("mysql/install_db.sql.erb")       
     
-    logger.trace "Running sql:\n#{sql}"
+    logger.trace "Running sql:\n#{sql}\n"
         
-    put sql, "/tmp/install_db_#{application}.sql"    
-    run "mysql -u root -p#{mysql_admin_password} < /tmp/install_db_#{application}.sql"
+    put sql, "/tmp/install_db_#{application}.sql"        
+    run "mysql -u #{mysql_admin_user} -p#{mysql_admin_password} < /tmp/install_db_#{application}.sql"
+    utils.rm("/tmp/install_db_#{application}.sql")
   end
   
   desc <<-DESC
@@ -64,7 +70,7 @@ namespace :mysql do
   
   "Source":#{link_to_source(__FILE__)}
   DESC
-  task :install_my_cnf, :roles => :db do      
+  task :install_my_cnf 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)

data/lib/recipes/rails.rb

@@ -2,19 +2,34 @@
 namespace :rails do
   
   desc <<-DESC
-  Create database yaml in shared path. Note: If both <tt>:db_host</tt> and <tt>:db_socket</tt> are used,
-  db_socket wins.
+  Create database yaml in shared path. Note: If both @:db_host@ and @:db_socket@ are used, @db_socket@ wins.
   
-  *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    
-  *db_host*: Database host (can be nil, if you are using socket). _Defaults to nil_\n
-  *db_socket*: Database socket (can be nil, if you are using host). _Defaults to nil_\n    
-  @set :db_socket, "/var/lib/mysql/mysql.sock"@\n
-  *database_yml_template*: Path to database yml erb template. _Defaults to <tt>rails/database.yml.erb</tt>_ (in this GEM)\n
+  <dl>
+  <dt>db_name</dt>
+  <dd>Database name (rails).</dd>  
+  <dd>@set :db_name, "app_db_name"@</dd>
+  
+  <dt>db_user</dt>
+  <dd>Database user (rails).</dd>
+  <dd>@set :db_user, "app_db_user"@</dd>    
+  
+  <dt>db_pass</dt>
+  <dd>Database password (rails).</dd>
+  <dd>@set :db_pass, "the_password"@</dd>   
+  
+  <dt>db_host</dt>
+  <dd>Database host (can be nil, if you are using socket).</dd>
+  <dd class="default">Defaults to @nil@</dd>
+  
+  <dt>db_socket</dt>
+  <dd>Database socket (can be nil, if you are using host).</dd>
+  <dd class="default">Defaults to @nil@</dd>      
+  <dd>@set :db_socket, "/var/lib/mysql/mysql.sock"@</dd>
+  
+  <dt>database_yml_template</dt>
+  <dd>Path to database yml erb template.
+  <dd class="default">Defaults to @rails/database.yml.erb@ (in this GEM)</dd>
+  </dl>
   
   "Source":#{link_to_source(__FILE__)}
   DESC

data/lib/templates/backgroundjob/backgroundjob.initd.centos.erb

@@ -17,31 +17,30 @@ DAEMON="<%= backgroundjob_bin_path %>"
 PIDFILE="<%= backgroundjob_pid_path %>"
 
 start() {
-  daemon --user <%= user %> --pidfile $PIDFILE $DAEMON
+  echo -n $"Starting $DESC: "
+  daemon --user sick --pidfile $PIDFILE $DAEMON
   RETVAL=$?
   echo
   return $RETVAL;  
 }
 
 stop() {
-  kill -TERM `cat $PIDFILE` || echo -n " not running"
+  echo -n $"Stopping $DESC:"
+  killproc -p $PIDFILE
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 case "$1" in
   start)
-  	echo -n "Starting $DESC: $NAME"
   	start
-    RETVAL=$?;
 	;;
-  stop)
-  	echo -n "Stopping $DESC: $NAME"
-  	stop
-  	RETVAL=$?;
+  stop)  	
+  	stop  	
 	;;
   restart)
-  	echo -n "Restarting $DESC: $NAME"
   	stop
-  	# Sleep after stop
   	sleep 1
   	start
   	RETVAL=$?;

data/lib/templates/memcached/memcached.initd.centos.erb

@@ -22,6 +22,7 @@ PORT=<%= memcached_port %>
 USER=root
 
 start() {
+  echo -n $"Starting $DESC: "
   daemon $DAEMON -d -m $MEM -p $PORT -u $USER -P $PIDFILE
   RETVAL=$?
   echo
@@ -29,40 +30,27 @@ start() {
 }
 
 stop() {
-  kill -QUIT `cat $PIDFILE` || echo -n " not running"
-}
-
-reload() {
-  kill -HUP `cat $PIDFILE` || echo -n " can't reload"
+  echo -n $"Stopping $DESC: "
+  killproc -p $PIDFILE memcached
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 case "$1" in
   start)
-  	echo -n "Starting $DESC: $NAME"
   	start
-    RETVAL=$?;
 	;;
   stop)
-  	echo "Stopping $DESC: $NAME"
   	stop
-  	RETVAL=$?;
 	;;
-  reload)
-  	echo -n "Reloading $DESC configuration..."
-  	reload
-  	RETVAL=$?;
-  	echo "reloaded."
-  ;;
   restart)
-  	echo -n "Restarting $DESC: $NAME"
   	stop
-  	# Sleep after stop
   	sleep 1
   	start
-  	RETVAL=$?;
 	;;
   *)
-	  echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	  echo "Usage: $0 {start|stop|restart}" >&2
 	  RETVAL=3;
 	;;
 esac

data/lib/templates/mongrel/{mongrel_cluster.initd.erb → mongrel_cluster.initd.centos.erb}

@@ -11,8 +11,12 @@
 # Modified by: Gabriel Handford http://ducktyper.com
 #              
 
-set -e
+# Source function library
+. /etc/rc.d/init.d/functions
 
+RETVAL=0
+
+NAME="mongrel_cluster_<%= application %>"
 CONF_DIR=<%= mongrel_config_dir %>
 PID_DIR=<%= mongrel_pid_dir %>
 USER=<%= user %>
@@ -20,6 +24,40 @@ CMD=<%= mongrel_cluster_command %>
 
 RETVAL=0
 
+start() {
+  echo -n $"Starting $NAME: "
+  $CMD start -c $CONF_DIR --clean >/dev/null
+  RETVAL=$?
+  [ "$RETVAL" -eq 0 ] && success $"$NAME start" || failure $"$NAME start"
+  echo
+  return $RETVAL;  
+}
+
+stop() {
+  echo -n $"Stopping $NAME: "
+  $CMD stop -c $CONF_DIR >/dev/null
+  RETVAL=$?
+  [ "$RETVAL" -eq 0 ] && success $"$NAME shutdown" || failure $"$NAME shutdown"
+  echo
+  return $RETVAL;
+}
+
+restart() {
+  echo -n $"Restarting $NAME: "
+  $CMD restart -c $CONF_DIR >/dev/null
+  RETVAL=$?
+  [ "$RETVAL" -eq 0 ] && success $"$NAME restart" || failure $"$NAME restart"
+  echo 
+  return $RETVAL;
+}
+
+status() {
+  $CMD status -c $CONF_DIR
+  RETVAL=$?
+  echo 
+  return $RETVAL;
+}
+
 fail() {
   echo "Failed to start: $1"
   exit 1
@@ -31,30 +69,25 @@ which $CMD >/dev/null || fail "$CMD not found"
 # Go no further if config directory is missing.
 [ -d "$CONF_DIR" ] || fail "$CONF_DIR not found"
 
+# Go no further if config directory is missing.
+[ -d "$PID_DIR" ] || fail "$PID_DIR not found"
+
 case "$1" in
     start)
-      # Create pid directory
-      mkdir -p $PID_DIR
-      chown $USER:$USER $PID_DIR
-
-      $CMD start -c $CONF_DIR --clean
-      RETVAL=$?
+      start
   ;;
     stop)
-      $CMD stop -c $CONF_DIR
-      RETVAL=$?
+      stop
   ;;
     restart)
-      $CMD restart -c $CONF_DIR
-      RETVAL=$?
+      restart
   ;;
     status)
-      $CMD status -c $CONF_DIR
-      RETVAL=$?
+      status
   ;;
     *)
       echo "Usage: $0 {start|stop|restart|status}"
-      exit 1
+      RETVAL=3;
   ;;
 esac      
 

data/lib/templates/monit/monit.initd.centos.erb

@@ -19,7 +19,9 @@ CONFFILE=/etc/monitrc
 LOGFILE=<%= monit_log_path %>
 PIDFILE=<%= monit_pid_path %>
 
+
 start() {
+  echo -n $"Starting $DESC: "
   daemon $DAEMON -l $LOGFILE -p $PIDFILE -c $CONFFILE
   RETVAL=$?
   echo
@@ -27,40 +29,38 @@ start() {
 }
 
 stop() {
-  kill -QUIT `cat $PIDFILE` || echo -n " not running"
+  echo -n $"Stopping $DESC: "
+  killproc -p $PIDFILE monit -TERM
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 reload() {
-  kill -HUP `cat $PIDFILE` || echo -n " can't reload"
+  echo -n $"Reloading $DESC: "
+  killproc -p $PIDFILE monit -HUP
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 case "$1" in
   start)
-  	#echo -n "Starting $DESC: $NAME"
   	start
-    RETVAL=$?;
 	;;
   stop)
-  	echo "Stopping $DESC: $NAME"
   	stop
-  	RETVAL=$?;
 	;;
   reload)
-  	echo -n "Reloading $DESC configuration..."
   	reload
-  	RETVAL=$?;
-  	echo "reloaded."
   ;;
   restart)
-  	echo -n "Restarting $DESC: $NAME"
   	stop
-  	# Sleep after stop
   	sleep 1
   	start
-  	RETVAL=$?;
 	;;
   *)
-	  echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	  echo "Usage: $0 {start|stop|restart|reload}" >&2
 	  RETVAL=3;
 	;;
 esac

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

@@ -16,6 +16,8 @@
 # Licensed under the Academic Free License v. 3.0
 # http://blog.evanweaver.com/files/mysql/LICENSE
 #
+# Modified by: gabrielh@gmail.com (http://ducktyper.com)
+#
 
 [client]
 port = <%= db_port %>
@@ -99,7 +101,7 @@ log_long_format
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 32M
 
 [mysql]
 no-auto-rehash

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

@@ -0,0 +1,127 @@
+#
+# 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
+#
+# Modified by: gabrielh@gmail.com (http://ducktyper.com)
+#
+
+[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 = 160M    
+# 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 = 48M
+# 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 = 64
+# 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 = 32M
+# 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 = 64M
+# 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 = 32M
+
+[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/lib/templates/nginx/{nginx.initd.erb → nginx.initd.centos.erb}

@@ -8,7 +8,8 @@
 # Modified: Geoffrey Grosenbach http://topfunky.com
 # Modified: Gabriel Handford http://ducktyper.com
 
-set -e
+# Source function library
+. /etc/rc.d/init.d/functions
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DESC="nginx daemon"
@@ -21,35 +22,41 @@ PIDFILE=<%= nginx_pid_path %>
 test -x $DAEMON || exit 0
 
 start() {
-  $DAEMON -c $CONFIGFILE || echo -n " already running"
+  echo -n $"Starting $DESC: "
+  daemon $DAEMON -c $CONFIGFILE
+  RETVAL=$?
+  echo
+  return $RETVAL;  
 }
 
 stop() {
-  kill -QUIT `cat $PIDFILE` || echo -n " not running"
+  echo -n $"Stopping $DESC: "
+  killproc -p $PIDFILE nginx -QUIT
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 reload() {
-  kill -HUP `cat $PIDFILE` || echo -n " can't reload"
+  echo -n $"Reloading $DESC: "
+  killproc -p $PIDFILE nginx -HUP
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 case "$1" in
   start)
-  	echo -n "Starting $DESC: $NAME"
   	start
 	;;
   stop)
-  	echo -n "Stopping $DESC: $NAME"
   	stop
 	;;
   reload)
-  	echo -n "Reloading $DESC configuration..."
   	reload
-  	echo "reloaded."
   ;;
   restart)
-  	echo -n "Restarting $DESC: $NAME"
   	stop
-  	# Sleep before start
   	sleep 1
   	start
 	;;
@@ -59,4 +66,4 @@ case "$1" in
 	;;
 esac
 
-exit 0
+exit $RETVAL;

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

@@ -18,58 +18,63 @@ DAEMON=<%= sphinx_prefix %>/bin/searchd
 CONFIGFILE=<%= sphinx_conf_path %>
 PIDFILE=<%= sphinx_pid_path %>
 INDEX_DIR=<%= sphinx_index_root %>
+USER=<%= user %>
+
 
 start() {
-  daemon --user <%= user %> $DAEMON --config $CONFIGFILE
+  echo -n $"Starting $DESC: "
+  daemon --user $USER --pidfile $PIDFILE $DAEMON --config $CONFIGFILE
   RETVAL=$?
   echo
   return $RETVAL;  
 }
 
 stop() {
-  kill -QUIT `cat $PIDFILE` || echo -n " not running"
+  echo -n $"Stopping $DESC: "
+  killproc -p $PIDFILE
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 reload() {
-  kill -HUP `cat $PIDFILE` || echo -n " can't reload"
+  echo -n $"Reloading $DESC: "
+  killproc -p $PIDFILE searchd -HUP
+  RETVAL=$?
+  echo 
+  return $RETVAL;
 }
 
 clean() {
-  pid=`cat $PIDFILE`
+  echo -n $"Cleaning $DESC: "
+  pid=`cat $PIDFILE 2>/dev/null`
   
   if checkpid $pid; then
-    echo -n " can't clean; running"
+    failure $"$NAME clean"
   else
     rm -f $INDEX_DIR/*.spl
-    return $?
+    RETVAL=$?
+    [ "$RETVAL" -eq 0 ] && success $"$NAME clean" || failure $"$NAME clean"    
   fi
-  return 1 
+  echo
+  return $RETVAL;
 }
 
 case "$1" in
   start)
-  	echo -n "Starting $DESC: $NAME"
+    clean
   	start
-    RETVAL=$?;
 	;;
   stop)
-  	echo -n "Stopping $DESC: $NAME"
   	stop
-  	RETVAL=$?;
 	;;
   reload)
-  	echo -n "Reloading $DESC configuration..."
   	reload
-  	RETVAL=$?;
-  	echo "reloaded."
   ;;
   restart)
-  	echo -n "Restarting $DESC: $NAME"
   	stop
-  	# Sleep after stop
   	sleep 1
   	start
-  	RETVAL=$?;
 	;;
 	clean)
     echo -n "Cleaning $DESC"
@@ -77,7 +82,7 @@ case "$1" in
     RETVAL=$?;
     ;;
   *)
-	  echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	  echo "Usage: $0 {start|stop|restart|reload|clean}" >&2
 	  RETVAL=3;
 	;;
 esac

data/website/index.html

@@ -35,7 +35,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.15</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.3.1</a>
     </div>
     
     <div id="recipes">

data/website/stylesheets/screen.css

@@ -165,6 +165,10 @@ h2+ul {
 	cursor:	hand;
 }
 
+.options {
+  font-size: 0.8em;
+}
+
 /* Code highlighter */
 pre, code {
   font-family: "Bitstream Vera Sans Mono", monospace;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.15
+  version: 0.3.1
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-31 00:00:00 -04:00
+date: 2008-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ files:
 - lib/templates/memcached/memcached.initd.centos.erb
 - lib/templates/memcached/memcached.monitrc.erb
 - lib/templates/memcached/memcached.yml.erb
-- lib/templates/mongrel/mongrel_cluster.initd.erb
+- lib/templates/mongrel/mongrel_cluster.initd.centos.erb
 - lib/templates/mongrel/mongrel_cluster.monitrc.erb
 - lib/templates/mongrel/mongrel_cluster.yml.erb
 - lib/templates/monit/monit.cnf
@@ -120,9 +120,10 @@ files:
 - lib/templates/monit/monitrc.erb
 - lib/templates/mysql/install_db.sql.erb
 - lib/templates/mysql/my.cnf.innodb_1024.erb
+- lib/templates/mysql/my.cnf.innodb_512.erb
 - lib/templates/mysql/mysql.monitrc.erb
 - lib/templates/nginx/nginx.conf.erb
-- lib/templates/nginx/nginx.initd.erb
+- lib/templates/nginx/nginx.initd.centos.erb
 - lib/templates/nginx/nginx.monitrc.erb
 - lib/templates/nginx/nginx_vhost.conf.erb
 - lib/templates/rails/database.yml.erb