capitate 0.2.3 → 0.2.5

data/lib/recipes/mysql.rb

@@ -1,24 +1,28 @@
 # Mysql recipes
 namespace :mysql do
   
-  desc <<-DESC
-  Install mysql monit hooks.
+  namespace :monit do
   
-  *db_port*: Mysql port. _Defaults to 3306_\n
-  *mysql_pid_path*: Path to mysql pid file. _Defaults to /var/run/mysqld/mysqld.pid_\n
-  @set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"@\n
-  *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
-  @set :monit_conf_dir, "/etc/monit"@\n
-  DESC
-  task :install_monit do
+    desc <<-DESC
+    Install mysql monit hooks.
+  
+    *db_port*: Mysql port. _Defaults to 3306_\n
+    *mysql_pid_path*: Path to mysql pid file. _Defaults to /var/run/mysqld/mysqld.pid_\n
+    @set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"@\n
+    *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
+    @set :monit_conf_dir, "/etc/monit"@\n
+    DESC
+    task :install do
+    
+      # Settings 
+      fetch_or_default(:mysql_pid_path, "/var/run/mysqld/mysqld.pid")
+      fetch_or_default(:db_port, 3306)   
+      fetch_or_default(:monit_conf_dir, "/etc/monit") 
     
-    # Settings 
-    fetch_or_default(:mysql_pid_path, "/var/run/mysqld/mysqld.pid")
-    fetch_or_default(:db_port, 3306)   
-    fetch_or_default(:monit_conf_dir, "/etc/monit") 
+      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
     
-    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
   
   desc <<-DESC
@@ -28,9 +32,9 @@ namespace :mysql do
   *db_user*: Database user (application).\n    
   *db_pass*: Database password (application).\n
   *mysql_grant_locations*: Grant locations. _Defaults to localhost_\n
-  @set :grant_locations, [ "localhost", "192.168.1.111" ]@\n
+  @set :mysql_grant_locations, [ "localhost", "192.168.1.111" ]@\n
   *mysql_grant_priv_type*: Grant privilege types. _Defaults to ALL_\n
-  @set :grant_priv_type, "ALL"@\n
+  @set :mysql_grant_priv_type, "ALL"@\n
   *mysql_admin_password*: Mysql admin password (to use to connect). Defaults to password prompt.\n
   @set :mysql_admin_password, prompt.password('Mysql admin password: '))@    
   DESC

data/lib/recipes/nginx.rb

@@ -1,49 +1,57 @@
 # Nginx recipes
 namespace :nginx do
   
-  desc <<-DESC 
-  Install nginx monit hooks.
+  namespace :monit do 
+    
+    desc <<-DESC 
+    Install nginx monit hooks.
   
-  *nginx_pid_path*: Path to nginx pid file. _Defaults to /var/run/nginx.pid_\n  
-  @set :nginx_pid_path, "/var/run/nginx.pid"@\n  
-  *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
-  @set :monit_conf_dir, "/etc/monit"@\n  
-  DESC
-  task :install_monit do
-    
-    # Settings
-    fetch_or_default(:nginx_pid_path, "/var/run/nginx.pid")
-    fetch_or_default(:monit_conf_dir, "/etc/monit")
-    
-    put template.load("nginx/nginx.monitrc.erb", binding), "/tmp/nginx.monitrc"    
-    run_via "install -o root /tmp/nginx.monitrc #{monit_conf_dir}/nginx.monitrc"
+    *nginx_pid_path*: Path to nginx pid file. _Defaults to /var/run/nginx.pid_\n  
+    @set :nginx_pid_path, "/var/run/nginx.pid"@\n  
+    *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
+    @set :monit_conf_dir, "/etc/monit"@\n  
+    DESC
+    task :install do
+    
+      # Settings
+      fetch_or_default(:nginx_pid_path, "/var/run/nginx.pid")
+      fetch_or_default(:monit_conf_dir, "/etc/monit")
+    
+      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
+    
   end
     
-  desc <<-DESC
-  Create and update the nginx vhost include.
+  namespace :mongrel do
+    desc <<-DESC
+    Create and update the nginx vhost include.
   
-  *mongrel_size*: Number of mongrels.\n
-  @set :mongrel_size, 3@\n    
-  *mongrel_port*: Starting port for mongrels.\n
-  If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002\n
-  @set :mongrel_port, 9000@\n
-  *domain_name*: Domain name for nginx virtual host, (without www prefix).\n  
-  @set :domain_name, "foo.com"@
-  DESC
-  task :setup_mongrel do 
-    
-    # Settings
-    fetch(:mongrel_size)
-    fetch(:mongrel_port)
-    fetch(:domain_name)
-    
-    set :ports, (0...mongrel_size).collect { |i| mongrel_port + i }
-    set :public_path, current_path + "/public"
-    
-    run "mkdir -p #{shared_path}/config"
-    put template.load("nginx/nginx_vhost.conf.erb"), "/tmp/nginx_#{application}.conf"    
-    
-    sudo "install -o root /tmp/nginx_#{application}.conf /etc/nginx/vhosts/#{application}.conf"        
+    *mongrel_application*: Mongrel application. _Defaults to <tt>:application</tt>_
+    *mongrel_size*: Number of mongrels.\n
+    @set :mongrel_size, 3@\n    
+    *mongrel_port*: Starting port for mongrels.\n
+    If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002\n
+    @set :mongrel_port, 9000@\n
+    *domain_name*: Domain name for nginx virtual host, (without www prefix).\n  
+    @set :domain_name, "foo.com"@
+    DESC
+    task :setup do 
+    
+      # Settings
+      fetch(:mongrel_size)
+      fetch(:mongrel_port)
+      fetch(:domain_name)
+      fetch_or_default(:mongrel_application, fetch(:application))
+    
+      set :ports, (0...mongrel_size).collect { |i| mongrel_port + i }
+      set :public_path, current_path + "/public"
+    
+      run "mkdir -p #{shared_path}/config"
+      put template.load("nginx/nginx_vhost.conf.erb"), "/tmp/nginx_#{mongrel_application}.conf"    
+    
+      sudo "install -o root /tmp/nginx_#{mongrel_application}.conf /etc/nginx/vhosts/#{mongrel_application}.conf"        
+    end
   end
         
 end

data/lib/recipes/rails.rb

@@ -23,6 +23,16 @@ namespace :rails do
     fetch_or_default(:db_host, nil)
     fetch_or_default(:db_socket, nil)
     
+    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("rails/database.yml.erb"), "#{shared_path}/config/database.yml"
   end

data/lib/recipes/sphinx.rb

@@ -1,19 +1,23 @@
 # Sphinx recipes
 namespace :sphinx do
   
-  desc <<-DESC
-  Create monit configuration for sphinx.\n  
-  *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
-  *sphinx_pid_path*: Location for sphinx pid. _Defaults to "[shared_path]/pids/searchd.pid"_\n
-  DESC
-  task :setup_monit do    
+  namespace :monit do
+  
+    desc <<-DESC
+    Create monit configuration for sphinx.\n  
+    *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
+    *sphinx_pid_path*: Location for sphinx pid. _Defaults to "[shared_path]/pids/searchd.pid"_\n
+    DESC
+    task :setup do    
+    
+      # Settings
+      fetch_or_default(:monit_conf_dir, "/etc/monit")
+      fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
     
-    # Settings
-    fetch_or_default(:monit_conf_dir, "/etc/monit")
-    fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
+      put template.load("sphinx/sphinx.monitrc.erb"), "/tmp/sphinx_#{application}.monitrc"            
+      sudo "install -o root /tmp/sphinx_#{application}.monitrc #{monit_conf_dir}/sphinx_#{application}.monitrc"
+    end
     
-    put template.load("sphinx/sphinx.monitrc.erb"), "/tmp/sphinx_#{application}.monitrc"            
-    sudo "install -o root /tmp/sphinx_#{application}.monitrc #{monit_conf_dir}/sphinx_#{application}.monitrc"
   end
   
   desc <<-DESC

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

@@ -12,11 +12,11 @@
 #              
 
 set -e
-trap ERROR ERR
 
 CONF_DIR=<%= mongrel_config_dir %>
 PID_DIR=<%= mongrel_pid_dir %>
 USER=<%= user %>
+CMD=<%= mongrel_cluster_command %>
 
 RETVAL=0
 
@@ -26,7 +26,7 @@ fail() {
 }
 
 # Gracefully exit if the controller is missing.
-which mongrel_cluster_ctl >/dev/null || fail "mongrel_cluster_ctl not found"
+which $CMD >/dev/null || fail "$CMD not found"
 
 # Go no further if config directory is missing.
 [ -d "$CONF_DIR" ] || fail "$CONF_DIR not found"
@@ -37,19 +37,19 @@ case "$1" in
       mkdir -p $PID_DIR
       chown $USER:$USER $PID_DIR
 
-      mongrel_cluster_ctl start -c $CONF_DIR --clean
+      $CMD start -c $CONF_DIR --clean
       RETVAL=$?
   ;;
     stop)
-      mongrel_cluster_ctl stop -c $CONF_DIR
+      $CMD stop -c $CONF_DIR
       RETVAL=$?
   ;;
     restart)
-      mongrel_cluster_ctl restart -c $CONF_DIR
+      $CMD restart -c $CONF_DIR
       RETVAL=$?
   ;;
     status)
-      mongrel_cluster_ctl status -c $CONF_DIR
+      $CMD status -c $CONF_DIR
       RETVAL=$?
   ;;
     *)

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

@@ -1,7 +1,7 @@
 <% processes.each do |process| %>
   
-check process mongrel_cluster_<%= application %>_<%= process[:port] %> with pidfile <%= process[:pid_path] %>
-   group mongrel_cluster_<%= application %>
+check process <%= mongrel_application %>_<%= process[:port] %> with pidfile <%= process[:pid_path] %>
+   group <%= mongrel_application %>
    start program = "<%= process[:name] %> start <%= process[:start_options] %>"
    stop program = "<%= process[:name] %> stop <%= process[:stop_options] %>"
    if failed host 127.0.0.1 port <%= process[:port] %> protocol http

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

@@ -8,4 +8,4 @@ pid_file: <%= mongrel_pid_dir %>/mongrel.pid
 servers: <%= mongrel_size %>
 user: <%= user %>
 group: <%= user %>
-config_script: <%= mongrel_config_script unless mongrel_config_script.blank? %>
+<% mongrel_config_options.each do |k, v| %><%= "#{k}: #{v}\n" %><% end %>

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

@@ -7,7 +7,7 @@
 # * Redirects domain.com to www.domain.com (IMO should be the other way around; www is deprecated)
 #
 
-upstream mongrel-cluster-<%= application %> {
+upstream <%= mongrel_application %> {
   <% ports.each do |port| %>
   server 127.0.0.1:<%= port %>;
   <% end %>
@@ -20,8 +20,10 @@ server {
     # 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 %>;
@@ -53,7 +55,7 @@ server {
       # For iphone unique url
       if ($http_user_agent ~* "(iPhone|iPod)") {
         rewrite ^/$ /iphone break;
-        proxy_pass http://mongrel-cluster-<%= application %>;
+        proxy_pass http://<%= mongrel_application %>;
         break;
       }
 
@@ -74,7 +76,7 @@ server {
       }
 
       if (!-f $request_filename) {
-        proxy_pass http://mongrel-cluster-<%= application %>;
+        proxy_pass http://<%= mongrel_application %>;
         break;
       }
     }
@@ -89,7 +91,9 @@ server {
     } 
 }
 
+<% unless domain_name.blank? or domain_name == "localhost" %>
 server {
   server_name <%= domain_name %>;
   rewrite ^/(.*) http://www.<%= domain_name %>/$1 permanent;
-}
+}
+<% end %>

data/lib/templates/rails/database.yml.erb

@@ -4,5 +4,4 @@ production:
   database: <%= db_name %>
   username: <%= db_user %>
   password: <%= db_pass %>
-  <%= "host: #{db_host}" unless db_host.blank? %>
-  <%= "socket: #{db_socket}" unless db_socket.blank? %>
+  <%= "#{db_connect_type}: #{db_connect}" %>  

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.5
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-25 00:00:00 -05:00
+date: 2008-02-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,19 +42,26 @@ extra_rdoc_files:
 - docs/recipes/imagemagick.txt
 - docs/recipes/index.txt
 - docs/recipes/memcached-centos.txt
+- docs/recipes/memcached-monit.txt
 - docs/recipes/memcached.txt
-- docs/recipes/mongrel_cluster-centos.txt
-- docs/recipes/mongrel_cluster.txt
+- docs/recipes/mongrel-cluster-centos.txt
+- docs/recipes/mongrel-cluster-monit.txt
+- docs/recipes/mongrel-cluster.txt
+- docs/recipes/mongrel.txt
 - docs/recipes/monit-centos.txt
 - docs/recipes/monit.txt
 - docs/recipes/mysql-centos.txt
+- docs/recipes/mysql-monit.txt
 - docs/recipes/mysql.txt
 - docs/recipes/nginx-centos.txt
+- docs/recipes/nginx-mongrel.txt
+- docs/recipes/nginx-monit.txt
 - docs/recipes/nginx.txt
 - docs/recipes/rails.txt
 - docs/recipes/ruby-centos.txt
 - docs/recipes/ruby.txt
 - docs/recipes/sphinx-centos.txt
+- docs/recipes/sphinx-monit.txt
 - docs/recipes/sphinx.txt
 - website/index.txt
 files: 
@@ -77,23 +84,31 @@ files:
 - docs/recipes/imagemagick.txt
 - docs/recipes/index.txt
 - docs/recipes/memcached-centos.txt
+- docs/recipes/memcached-monit.txt
 - docs/recipes/memcached.txt
-- docs/recipes/mongrel_cluster-centos.txt
-- docs/recipes/mongrel_cluster.txt
+- docs/recipes/mongrel-cluster-centos.txt
+- docs/recipes/mongrel-cluster-monit.txt
+- docs/recipes/mongrel-cluster.txt
+- docs/recipes/mongrel.txt
 - docs/recipes/monit-centos.txt
 - docs/recipes/monit.txt
 - docs/recipes/mysql-centos.txt
+- docs/recipes/mysql-monit.txt
 - docs/recipes/mysql.txt
 - docs/recipes/nginx-centos.txt
+- docs/recipes/nginx-mongrel.txt
+- docs/recipes/nginx-monit.txt
 - docs/recipes/nginx.txt
 - docs/recipes/rails.txt
 - docs/recipes/ruby-centos.txt
 - docs/recipes/ruby.txt
 - docs/recipes/sphinx-centos.txt
+- docs/recipes/sphinx-monit.txt
 - docs/recipes/sphinx.txt
 - lib/capitate.rb
 - lib/capitate/cap_ext/connections.rb
 - lib/capitate/cap_ext/extension_proxy.rb
+- lib/capitate/cap_ext/roles.rb
 - lib/capitate/cap_ext/run_via.rb
 - lib/capitate/cap_ext/variables.rb
 - lib/capitate/plugins/base.rb