capitate 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,11 @@
+== 0.3.3 2008-04-29
+
+* Adding merb init script (for Centos)
+* Adding merb monit confs
+* Adding merb logrotate
+* Created generic nginx vhost template
+* Deprecated rails:setup for active_record:setup (for merb setup)
+
 == 0.3.2 2008-04-03
 
 * Adding hostname helper (utils.hostname) 

data/Manifest.txt

@@ -26,12 +26,14 @@ lib/capitate/recipes.rb
 lib/capitate/task_node.rb
 lib/capitate/version.rb
 lib/deployment/centos-5.1-64-web/install.rb
+lib/recipes/active_record.rb
 lib/recipes/backgroundrb.rb
 lib/recipes/centos/backgroundjob.rb
 lib/recipes/centos/backgroundrb.rb
 lib/recipes/centos/centos.rb
 lib/recipes/centos/imagemagick.rb
 lib/recipes/centos/memcached.rb
+lib/recipes/centos/merb.rb
 lib/recipes/centos/mongrel_cluster.rb
 lib/recipes/centos/monit.rb
 lib/recipes/centos/mysql.rb
@@ -41,6 +43,7 @@ lib/recipes/centos/sphinx.rb
 lib/recipes/docs.rb
 lib/recipes/logrotate/backgroundjob.rb
 lib/recipes/logrotate/backgroundrb.rb
+lib/recipes/logrotate/merb.rb
 lib/recipes/logrotate/mongrel_cluster.rb
 lib/recipes/logrotate/monit.rb
 lib/recipes/logrotate/mysql.rb
@@ -54,6 +57,7 @@ lib/recipes/monit/backgroundjob.rb
 lib/recipes/monit/backgroundrb.rb
 lib/recipes/monit/database.rb
 lib/recipes/monit/memcached.rb
+lib/recipes/monit/merb.rb
 lib/recipes/monit/mongrel_cluster.rb
 lib/recipes/monit/mysql.rb
 lib/recipes/monit/nginx.rb
@@ -75,6 +79,8 @@ 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/merb/merb.initd.centos.erb
+lib/templates/merb/merb.monitrc.erb
 lib/templates/mongrel/mongrel_cluster.initd.centos.erb
 lib/templates/mongrel/mongrel_cluster.monitrc.erb
 lib/templates/mongrel/mongrel_cluster.yml.erb
@@ -89,6 +95,7 @@ lib/templates/nginx/nginx.conf.erb
 lib/templates/nginx/nginx.initd.centos.erb
 lib/templates/nginx/nginx.monitrc.erb
 lib/templates/nginx/nginx_vhost.conf.erb
+lib/templates/nginx/nginx_vhost_generic.conf.erb
 lib/templates/rails/database.yml.erb
 lib/templates/ruby/fix_openssl.sh
 lib/templates/sphinx/sphinx.conf.erb

data/lib/capitate/plugins/utils.rb

@@ -116,10 +116,11 @@ module Capitate::Plugins::Utils
   #   utils.hostname => "localhost.localdomain"
   #
   def hostname
+    hostname = nil
     run "hostname" do |channel, stream, data|
-      return data.chomp
+      hostname = data.chomp
     end
-    nil
+    hostname
   end
   
   # Append data to a file.

data/lib/capitate/version.rb

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

data/lib/recipes/active_record.rb

@@ -0,0 +1,65 @@
+namespace :active_record do
+  
+  desc <<-DESC
+  Create (ActiveRecord) database yaml in shared path. 
+  Note: If both @:db_host@ and @:db_socket@ are used, @db_socket@ wins.
+  
+  <dl>
+  <dt>db_name</dt>
+  <dd>Database name.</dd>  
+  <dd>@set :db_name, "app_db_name"@</dd>
+  
+  <dt>db_user</dt>
+  <dd>Database user.</dd>
+  <dd>@set :db_user, "app_db_user"@</dd>    
+  
+  <dt>db_pass</dt>
+  <dd>Database password.</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
+  task :setup, :roles => :app do    
+    
+    # Settings
+    fetch(:db_name)
+    fetch(:db_user)
+    fetch(:db_pass)
+    fetch_or_default(:db_host, nil)
+    fetch_or_default(:db_socket, nil)
+    fetch_or_default(:database_yml_template, "rails/database.yml.erb")
+    
+    unless db_host.blank?
+      set :db_connect_type, "host"
+      set :db_connect, db_host
+    end
+    
+    unless db_socket.blank?
+      set :db_connect_type, "socket"
+      set :db_connect, db_socket
+    end
+    
+    run "mkdir -p #{shared_path}/config"
+    put template.load(database_yml_template), "#{shared_path}/config/database.yml"
+  end
+
+  desc "Make symlink for database yaml" 
+  task :update_code do
+    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
+  end
+  
+end

data/lib/recipes/centos/merb.rb

@@ -0,0 +1,49 @@
+namespace :merb do
+  namespace :centos do
+    
+    desc <<-DESC
+    Setup merb.
+      
+    <dl>
+    <dt>merb_command_path</dt>
+    <dd>The path for merb startup command</dd>
+    <dd class="default">Defaults to @merb@</dd>
+    
+    <dt>merb_nodes</dt>
+    <dd>Number of merb daemons to run</dd>
+    <dd>@set :merb_nodes, 3@</dd>
+    
+    <dt>merb_port</dt>
+    <dd>Starting port for merb nodes. If there are 3 merb nodes with port 9000, 
+    then instances will be at 9000, 9001, and 9002</dd>
+    <dd>@set :merb_port, 9000@</dd>
+    
+    <dt>merb_root</dt>
+    <dd>Directory for merb root</dd>
+    <dd class="default">Defaults to @\#{current_path}@</dd>
+    
+    <dt>merb_pid_path</dt>
+    <dd>Path for merb pids</dd> 
+    <dd class="default">Defaults to @\#{shared_path}/pids/merb.pid@</dd>      
+    </dl>
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task :setup do 
+
+      # Settings
+      fetch(:merb_nodes)
+      fetch(:merb_port)
+      fetch_or_default(:merb_command_path, "merb")
+      fetch_or_default(:merb_pid_path, "#{shared_path}/pids/merb.pid")
+      fetch_or_default(:merb_root, current_path)
+      fetch_or_default(:merb_application, "merb_#{application}")
+      
+      fetch_or_default(:merb_initscript_name, "merb_#{application}")
+
+      utils.install_template("merb/merb.initd.centos.erb", "/etc/init.d/#{merb_initscript_name}")
+      run_via "/sbin/chkconfig --level 345 #{merb_initscript_name} on"
+    end
+    
+  end
+  
+end

data/lib/recipes/centos/mongrel_cluster.rb

@@ -8,6 +8,10 @@ namespace :mongrel do
       Create mongrel cluster.
       
       <dl>
+      <dt>mongrel_application</dt>
+      <dd>Name of mongrel application</dd>
+      <dd>@set :mongrel_application, "mongrel_cluster_\#{application}"@</dd>
+      
       <dt>mongrel_size</dt><dd>Number of mongrels</dd>
       <dd>@set :mongrel_size, 3@</dd>
       

data/lib/recipes/logrotate/merb.rb

@@ -0,0 +1,25 @@
+namespace :merb do
+  
+  namespace :logrotate do
+    desc <<-DESC
+    Install logrotated conf for merb.
+  
+    <dl>
+    <dt>merb_logrotate_path</dt>
+    <dd>Merb logrotate path</dd>
+    <dd class="default">Defaults to @\#{shared_path}/log/merb_*.log@</dd>
+    </dl>
+    "Source":#{link_to_source(__FILE__)}    
+    DESC
+    task :install do
+      fetch_or_default(:merb_logrotate_path, "#{shared_path}/log/merb_*.log")
+    
+      set :logrotate_name, "merb_#{application}"
+      set :logrotate_log_path, merb_logrotate_path
+      set :logrotate_options, [ { :rotate => 7 }, :daily, :missingok, :notifempty, :copytruncate ]
+    
+      logrotated.install_conf      
+    end
+  end
+  
+end

data/lib/recipes/monit/merb.rb

@@ -0,0 +1,63 @@
+
+namespace :merb do
+
+    namespace :monit do
+    
+    desc <<-DESC
+    Create monit configuration for merb.
+    
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task :setup do
+  
+      # Settings
+      fetch(:merb_nodes)
+      fetch(:merb_port)
+      fetch_or_default(:merb_application, "merb_#{application}")
+      fetch_or_default(:merb_initscript_name, "merb_#{application}")
+      fetch_or_default(:monit_conf_dir, "/etc/monit")
+  
+      fetch_or_default(:merb_pid_dir, "#{shared_path}/pids")
+  
+      processes = []
+      ports = (0...merb_nodes).collect { |i| merb_port + i }
+      ports.each do |port|
+        
+        pid_path = "#{merb_pid_dir}/#{merb_application}.#{port}.pid"
+        
+        start = "/etc/init.d/#{merb_initscript_name} start_only #{port}"
+        stop = "/etc/init.d/#{merb_initscript_name} stop_only #{port}"
+        
+        processes << { :port => port, :start => start, :stop => stop, :pid_path => pid_path }
+      end
+  
+      set :processes, processes
+  
+      put template.load("merb/merb.monitrc.erb"), "/tmp/#{merb_application}.monitrc"    
+      sudo "install -o root /tmp/#{merb_application}.monitrc #{monit_conf_dir}/#{merb_application}.monitrc"
+    end
+    
+    desc "Restart merb (for application)"
+    task :restart do       
+      fetch_or_default(:monit_bin_path, "monit") 
+      fetch_or_default(:merb_application, "merb_#{application}")
+      sudo "#{monit_bin_path} -g #{merb_application} restart all"
+    end
+    
+    desc "Start merb (for application)"
+    task :start do        
+      fetch_or_default(:monit_bin_path, "monit") 
+      fetch_or_default(:merb_application, "merb_#{application}")
+      sudo "#{monit_bin_path} -g #{merb_application} start all" 
+    end
+    
+    desc "Stop merb (for application)"
+    task :stop do        
+      fetch_or_default(:monit_bin_path, "monit") 
+      fetch_or_default(:merb_application, "merb_#{application}")  
+      sudo "#{monit_bin_path} -g #{merb_application} stop all" 
+    end
+    
+  end
+    
+end

data/lib/recipes/monit/mongrel_cluster.rb

@@ -1,4 +1,3 @@
-# Create init script
 namespace :mongrel do
 
   namespace :cluster do
@@ -23,12 +22,13 @@ namespace :mongrel do
         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")
+        fetch_or_default(:mongrel_pid_dir, "#{shared_path}/pids")
     
         processes = []
         ports = (0...mongrel_size).collect { |i| mongrel_port + i }
         ports.each do |port|
       
-          pid_path = "#{shared_path}/pids/#{mongrel_application}.#{port}.pid"
+          pid_path = "#{mongrel_pid_dir}/#{mongrel_application}.#{port}.pid"
       
           default_options = [
             [ "-d" ], 

data/lib/recipes/nginx.rb

@@ -1,9 +1,53 @@
 # Nginx recipes
 namespace :nginx do
   
+  namespace :host do
+    
+    desc <<-DESC
+    Generate the nginx vhost include.
+    
+    <dl>
+    <dt>nginx_upstream_name</dt>
+    <dd>Application name (for upstream definition).</dd>
+    <dd class="default">Defaults to @:application@</dd>
+    
+    <dt>nginx_upstream_size</dt>
+    <dd>Number of nodes for upstream.</dd>
+    <dd>@set :nginx_upstream_size, 3@</dd>  
+    
+    <dt>nginx_upstream_port</dt>
+    <dd>Starting port for upstream. If there are 3 nodes with port 9000, then instances will be at 9000, 9001, and 9002</dd>
+    <dd>@set :nginx_upstream_port, 9000@</dd>
+    
+    <dt>domain_name</dt>: Domain name for nginx virtual host, (without www prefix).</dd>
+    <dd>@set :domain_name, "foo.com"@</dd>
+    </dl>
+    
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task :setup do 
+    
+      # Settings
+      fetch_or_default(:nginx_upstream_name, fetch(:application))
+      fetch(:nginx_upstream_size)
+      fetch(:nginx_upstream_port)
+    
+      set :ports, (0...nginx_upstream_size).collect { |i| nginx_upstream_port + i }
+      set :public_path, current_path + "/public"
+    
+      run "mkdir -p #{shared_path}/config"
+      put template.load("nginx/nginx_vhost_generic.conf.erb"), "/tmp/nginx_#{nginx_upstream_name}.conf"    
+    
+      sudo "install -o root /tmp/nginx_#{nginx_upstream_name}.conf /etc/nginx/vhosts/#{nginx_upstream_name}.conf"        
+    end
+    
+  end
+  
   namespace :mongrel do
     desc <<-DESC
     Generate the nginx vhost include (for a mongrel setup).
+    
+    *THIS IS DEPRECATED*: Use @nginx:host:setup@
   
     <dl>
     <dt>mongrel_application</dt>

data/lib/recipes/rails.rb

@@ -4,17 +4,19 @@ namespace :rails do
   desc <<-DESC
   Create database yaml in shared path. Note: If both @:db_host@ and @:db_socket@ are used, @db_socket@ wins.
   
+  *DEPRECATED*: Use @active_record:setup@
+  
   <dl>
   <dt>db_name</dt>
-  <dd>Database name (rails).</dd>  
+  <dd>Database name.</dd>  
   <dd>@set :db_name, "app_db_name"@</dd>
   
   <dt>db_user</dt>
-  <dd>Database user (rails).</dd>
+  <dd>Database user.</dd>
   <dd>@set :db_user, "app_db_user"@</dd>    
   
   <dt>db_pass</dt>
-  <dd>Database password (rails).</dd>
+  <dd>Database password.</dd>
   <dd>@set :db_pass, "the_password"@</dd>   
   
   <dt>db_host</dt>

data/lib/recipes/sphinx.rb

@@ -32,8 +32,7 @@ namespace :sphinx do
     fetch_or_default(:sphinx_conf_root, "#{current_path}/config")
     fetch_or_default(:sphinx_index_root, "#{shared_path}/var/index")
     fetch_or_default(:sphinx_log_root, "#{shared_path}/log")
-    fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")    
-    fetch_or_default(:sphinx_hostname, Proc.new { utils.hostname }) # Runs if needed
+    fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
     
     fetch_or_set(:sphinx_db_user, :db_user)
     fetch_or_set(:sphinx_db_pass, :db_pass)
@@ -42,7 +41,7 @@ namespace :sphinx do
     fetch_or_set(:sphinx_db_host, :db_host)
     fetch_or_default(:sphinx_conf_host, "127.0.0.1")
         
-    put template.load(sphinx_conf_template), sphinx_conf_path
+    put(template.load(sphinx_conf_template), sphinx_conf_path)        
   end
   
   desc "Make symlink for sphinx conf" 

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

@@ -0,0 +1,123 @@
+#!/bin/bash
+#
+# Copyright (c) 2008 Gabriel Handford, gabrielh@gmail.com
+#
+# merb_<%= application %>   Startup script for Merb (<%= application %>)
+#
+# chkconfig: - 85 15
+# description: merb_<%= application %> Merb runtime for <%= application %>
+#
+# WARNING: Relies on some patches:
+#   This requires a couple of submitted patches to merb-core (on version 0.9.2),
+#   for correct pid file and kill handling.
+#
+# Also have to cd into the project before starting merb. There are some issues with plugins
+# and Merb.root
+#
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+NAME="merb_<%= application %>"
+USER="<%= user %>"
+GROUP="<%= user %>"
+
+PID_PATH="<%= merb_pid_path %>"
+NODES=<%= merb_nodes %>
+PORT=<%= merb_port %>
+ROOT_DIR="<%= merb_root %>"
+
+CMD="<%= merb_command_path %>"
+CMD_OPTIONS="-u $USER -G $GROUP -P $PID_PATH -m $ROOT_DIR -e production"
+
+RETVAL=0
+
+start() {
+  echo -n $"Starting $NAME: "
+  cd $ROOT_DIR
+  $CMD $CMD_OPTIONS -c $NODES -p $PORT 
+  RETVAL=$?
+  [ "$RETVAL" -eq 0 ] && success $"$NAME start" || failure $"$NAME start"
+  echo
+  return $RETVAL;  
+}
+
+# Start only a single daemon function ($1=port)
+start_only() {
+  cd $ROOT_DIR
+  $CMD $CMD_OPTIONS -c 1 -p $1
+}
+
+stop() {
+  echo -n $"Stopping $NAME: "
+  cd $ROOT_DIR
+  $CMD $CMD_OPTIONS -c $NODES -p $PORT -K all
+  RETVAL=$?
+  [ "$RETVAL" -eq 0 ] && success $"$NAME shutdown" || failure $"$NAME shutdown"
+  echo
+  return $RETVAL;
+}
+
+# Stop only a single daemon ($1=port) 
+stop_only() {
+  cd $ROOT_DIR
+  $CMD $CMD_OPTIONS -c 1 -p $PORT -K $1
+}
+
+restart() {
+  stop
+  sleep 1
+  start
+}
+
+status() {
+  echo "Don't know"
+  RETVAL=$?
+  echo 
+  return $RETVAL;
+}
+
+fail() {
+  echo "Failed to start: $1"
+  exit 1
+}
+
+# Gracefully exit if the controller is missing.
+which $CMD >/dev/null || fail "$CMD not found"
+
+case "$1" in
+  start)
+    start
+  ;;
+  start_only)
+    start_only $2
+  ;;
+  stop)
+    stop
+  ;;
+  stop_only)
+    stop_only $2
+  ;;
+  restart)
+    restart
+  ;;
+  status)
+    status
+  ;;
+  *)
+    echo "Usage: $0"
+    echo " "
+    echo "  start"
+    echo "  stop"
+    echo "  restart"
+    echo "  status"
+    echo "  start_only [port]"
+    echo "  stop_only [port]"
+    echo " "
+    RETVAL=3;
+  ;;
+esac      
+
+exit $RETVAL

data/lib/templates/merb/merb.monitrc.erb

@@ -0,0 +1,15 @@
+<% processes.each do |process| %>
+  
+check process <%= merb_application %>_<%= process[:port] %> with pidfile <%= process[:pid_path] %>
+   group <%= merb_application %>
+   start program = "<%= process[:start]  %>"
+   stop program = "<%= process[:stop] %>"
+   if failed host 127.0.0.1 port <%= process[:port] %> protocol http
+      and request "/" then alert
+   if totalmem > 100 Mb then restart
+   if cpu is greater than 60% for 2 cycles then alert
+   if cpu > 80% for 5 cycles then restart
+   if loadavg(5min) greater than 10 for 8 cycles then restart
+   if 3 restarts within 5 cycles then timeout
+   
+<% end %>

data/lib/templates/nginx/nginx_vhost.conf.erb

@@ -1,4 +1,6 @@
 #
+# DEPRECATED: USE nginx_vhost_generic.conf.erb (This is here for backwards compatibility)
+#
 # Nginx virtual host conf
 #
 # * Uses cache directory configured for public/cache

data/lib/templates/nginx/nginx_vhost_generic.conf.erb

@@ -0,0 +1,99 @@
+#
+# Nginx virtual host conf
+#
+# * Uses cache directory configured for public/cache
+# * Re-writes url for iphone user agent to /iphone (so as not to conflict with cache)
+# * TODO-gabe: Same for mobile user agents
+# * Redirects domain.com to www.domain.com (IMO should be the other way around; www is deprecated)
+#
+
+upstream <%= nginx_upstream_name %> {
+  <% nginx_upstream_ports.each do |port| %>
+  server 127.0.0.1:<%= port %>;
+  <% end %>
+}
+
+server {
+    # port to listen on. Can also be set to an IP:PORT.
+    listen 80;
+
+    # Set the max size for file uploads to 50Mb
+    client_max_body_size 50M;
+    
+    <% unless domain_name.blank? or domain_name == "localhost" %>
+    # sets the domain[s] that this vhost server requests for
+    server_name  www.<%= domain_name %>;
+    <% end %>
+    
+    # doc root
+    root <%= public_path %>;
+
+    # vhost specific access log
+    access_log  <%= shared_path %>/log/nginx.<%= application %>.access.log  main;
+    
+    # this rewrites all the requests to the maintenance.html
+    # page if it exists in the doc root. This is for capistrano's
+    # disable web task
+    if (-f $document_root/system/maintenance.html) {
+      rewrite  ^(.*)$  /system/maintenance.html last;
+      break;
+    }
+
+    location / {
+      # Uncomment to allow server side includes so nginx can 
+      # post-process Rails content
+      ## ssi on;
+      
+      proxy_set_header  X-Real-IP  $remote_addr;
+      
+      # needed for HTTPS
+      proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header Host $http_host;
+      proxy_redirect false;
+      proxy_max_temp_file_size 0;
+
+      # For iphone unique url
+      if ($http_user_agent ~* "(iPhone|iPod)") {
+        rewrite ^/$ /iphone break;
+        proxy_pass http://<%= nginx_upstream %>;
+        break;
+      }
+
+      if (-f $request_filename) {
+        break;
+      }
+      
+      if (-f $document_root/cache/$uri/index.html) {
+        rewrite (.*) /cache/$1/index.html break;
+      }
+
+      if (-f $document_root/cache/$uri.html) {
+        rewrite (.*) /cache/$1.html break;
+      }
+
+      if (-f $document_root/cache/$uri) {
+        rewrite (.*) /cache/$1 break;
+      }
+
+      if (!-f $request_filename) {
+        proxy_pass http://<%= nginx_upstream %>;
+        break;
+      }
+    }
+
+    #error_page  404              /404.html;
+      
+    # redirect server error pages to the static page /50x.html
+    # 
+    error_page   500 502 503 504  /500.html;
+    location = /500.html {
+        root   <%= public_path %>;
+    } 
+}
+
+<% unless domain_name.blank? or domain_name == "localhost" %>
+server {
+  server_name <%= domain_name %>;
+  rewrite ^/(.*) http://www.<%= domain_name %>/$1 permanent;
+}
+<% end %>

data/lib/templates/sphinx/sphinx.conf.erb

@@ -23,14 +23,14 @@ source pages
 
   sql_query_pre = SET NAMES UTF8
   sql_query_pre = SET SESSION query_cache_type=OFF
-  sql_query_pre = INSERT INTO indexer_status (id, started_at, status, index_name, hostname) VALUES (10, NOW(), 'indexing', 'pages', '<%= sphinx_hostname %>') \
+  sql_query_pre = INSERT INTO indexer_status (started_at, status, index_name, hostname) VALUES (NOW(), 'indexing', 'pages', USER()) \
     ON DUPLICATE KEY UPDATE started_at = NOW(), status = 'indexing'
   
   sql_query = SELECT id, user_id, language, UNIX_TIMESTAMP(created_at) AS created_at, UNIX_TIMESTAMP(updated_at) AS updated_at, body, title FROM pages WHERE id>=$start AND id<=$end
   sql_query_range = SELECT MIN(id),MAX(id) FROM pages where type='Article'
   sql_range_step = 1000
   
-  sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages' and hostname = '<%= sphinx_hostname %>'
+  sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages' and hostname = USER()
   
   sql_attr_uint      = user_id
   sql_attr_timestamp = created_at
@@ -43,15 +43,15 @@ source pages_delta : pages
   sql_query_pre =
   sql_query_pre = SET NAMES UTF8
   sql_query_pre = SET SESSION query_cache_type=OFF
-  sql_query_pre = INSERT INTO indexer_status (id, started_at, status, index_name, hostname) VALUES (11, NOW(), 'indexing', 'pages_delta', '<%= sphinx_hostname %>') \
+  sql_query_pre = INSERT INTO indexer_status (id, started_at, status, index_name, hostname) VALUES (NOW(), 'indexing', 'pages_delta', USER()) \
     ON DUPLICATE KEY UPDATE started_at = NOW(), status = 'indexing'
   
   sql_query = SELECT id, user_id, language, UNIX_TIMESTAMP(created_at) AS created_at, UNIX_TIMESTAMP(updated_at) AS updated_at, body, title \
    FROM pages \
-   WHERE updated_at >= (SELECT updated_at FROM indexer_status WHERE id = 11)  
+   WHERE updated_at >= (SELECT updated_at FROM indexer_status WHERE index_name = 'pages_delta' and hostname = USER())  
    
   sql_query_post = 
-  sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages_delta' and hostname = '<%= sphinx_hostname %>'
+  sql_query_post = UPDATE indexer_status SET updated_at = NOW(), status = 'updated' WHERE index_name = 'pages_delta' and hostname = USER()
   sql_query_range =
   sql_range_step =
 }

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.3.2</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.3.3</a>
     </div>
     
     <div id="recipes">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-03 00:00:00 -04:00
+date: 2008-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,12 +63,14 @@ files:
 - lib/capitate/task_node.rb
 - lib/capitate/version.rb
 - lib/deployment/centos-5.1-64-web/install.rb
+- lib/recipes/active_record.rb
 - lib/recipes/backgroundrb.rb
 - lib/recipes/centos/backgroundjob.rb
 - lib/recipes/centos/backgroundrb.rb
 - lib/recipes/centos/centos.rb
 - lib/recipes/centos/imagemagick.rb
 - lib/recipes/centos/memcached.rb
+- lib/recipes/centos/merb.rb
 - lib/recipes/centos/mongrel_cluster.rb
 - lib/recipes/centos/monit.rb
 - lib/recipes/centos/mysql.rb
@@ -78,6 +80,7 @@ files:
 - lib/recipes/docs.rb
 - lib/recipes/logrotate/backgroundjob.rb
 - lib/recipes/logrotate/backgroundrb.rb
+- lib/recipes/logrotate/merb.rb
 - lib/recipes/logrotate/mongrel_cluster.rb
 - lib/recipes/logrotate/monit.rb
 - lib/recipes/logrotate/mysql.rb
@@ -91,6 +94,7 @@ files:
 - lib/recipes/monit/backgroundrb.rb
 - lib/recipes/monit/database.rb
 - lib/recipes/monit/memcached.rb
+- lib/recipes/monit/merb.rb
 - lib/recipes/monit/mongrel_cluster.rb
 - lib/recipes/monit/mysql.rb
 - lib/recipes/monit/nginx.rb
@@ -112,6 +116,8 @@ files:
 - lib/templates/memcached/memcached.initd.centos.erb
 - lib/templates/memcached/memcached.monitrc.erb
 - lib/templates/memcached/memcached.yml.erb
+- lib/templates/merb/merb.initd.centos.erb
+- lib/templates/merb/merb.monitrc.erb
 - lib/templates/mongrel/mongrel_cluster.initd.centos.erb
 - lib/templates/mongrel/mongrel_cluster.monitrc.erb
 - lib/templates/mongrel/mongrel_cluster.yml.erb
@@ -126,6 +132,7 @@ files:
 - lib/templates/nginx/nginx.initd.centos.erb
 - lib/templates/nginx/nginx.monitrc.erb
 - lib/templates/nginx/nginx_vhost.conf.erb
+- lib/templates/nginx/nginx_vhost_generic.conf.erb
 - lib/templates/rails/database.yml.erb
 - lib/templates/ruby/fix_openssl.sh
 - lib/templates/sphinx/sphinx.conf.erb