lib/recipes/active_record.rb lib/recipes/centos/merb.rb lib/recipes/logrotate/merb.rb lib/recipes/monit/merb.rb lib/templates/merb/merb.initd.centos.erb lib/templates/merb/merb.monitrc.erb lib/templates/nginx/nginx_vhost_generic.conf.erb @@ -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) History.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 Manifest.txt @@ -2,7 +2,7 @@ module Capitate #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 3 - TINY = 2 + TINY = 3 STRING = [MAJOR, MINOR, TINY].join('.') end lib/capitate/version.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> lib/recipes/centos/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" ], lib/recipes/monit/mongrel_cluster.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> lib/recipes/nginx.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> lib/recipes/rails.rb @@ -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 lib/templates/nginx/nginx_vhost.conf.erb d7572bd50d1099e061bcbdec3d4d985c9acf434a Gabe gabrielh@gmail.com http://github.com/gabriel/capitate/commit/cca59da1bcc33828625db037c6c5d8c4ff1f0a0a cca59da1bcc33828625db037c6c5d8c4ff1f0a0a 2008-04-29T17:19:43-07:00 2008-04-29T17:19:43-07:00 adding merb support 444dddb3ec681636048e03909721ee34f07d8fce Gabe gabrielh@gmail.com