@@ -1,3 +1,8 @@ +== 0.3.4 2008-05-05 + +* Removed upload plugin (obsolete) +* Fixing nginx host recipe + == 0.3.3 2008-04-29 * Adding merb init script (for Centos) History.txt @@ -20,7 +20,6 @@ require 'capitate/plugins/utils' require 'capitate/plugins/script' require 'capitate/plugins/prompt' require 'capitate/plugins/templates' -require 'capitate/plugins/upload' require 'capitate/plugins/yum' # Extensions + Patches lib/capitate.rb @@ -2,7 +2,7 @@ module Capitate #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 3 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end lib/capitate/version.rb @@ -46,7 +46,7 @@ namespace :memcached do fetch_or_default(:memcached_servers, [ "localhost:11211" ]) fetch_or_default(:memcached_yml_template, "memcached/memcached.yml.erb") - utils.install_template(memcached_yml_template, "#{shared_path}/config/memcached.yml") + put(memcached_yml_template, "#{shared_path}/config/memcached.yml") end desc "Symlink memcached configuration after deploy." lib/recipes/memcached.rb @@ -32,13 +32,10 @@ namespace :nginx do fetch(:nginx_upstream_size) fetch(:nginx_upstream_port) - set :ports, (0...nginx_upstream_size).collect { |i| nginx_upstream_port + i } + set :nginx_upstream_ports, (0...nginx_upstream_size.to_i).collect { |i| nginx_upstream_port.to_i + 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" + utils.install_template("nginx/nginx_vhost_generic.conf.erb", "/etc/nginx/vhosts/#{nginx_upstream_name}.conf") end end lib/recipes/nginx.rb @@ -55,7 +55,7 @@ server { # For iphone unique url if ($http_user_agent ~* "(iPhone|iPod)") { rewrite ^/$ /iphone break; - proxy_pass http://<%= nginx_upstream %>; + proxy_pass http://<%= nginx_upstream_name %>; break; } @@ -76,7 +76,7 @@ server { } if (!-f $request_filename) { - proxy_pass http://<%= nginx_upstream %>; + proxy_pass http://<%= nginx_upstream_name %>; break; } } lib/templates/nginx/nginx_vhost_generic.conf.erb lib/capitate/plugins/upload.rb cca59da1bcc33828625db037c6c5d8c4ff1f0a0a Gabe gabrielh@gmail.com http://github.com/gabriel/capitate/commit/61eb21e3accb10297cb50baa4f9e2f9b408b96cf 61eb21e3accb10297cb50baa4f9e2f9b408b96cf 2008-05-05T12:24:21-07:00 2008-05-05T12:24:21-07:00 Fixes for cap 2.3 and nginx host recipe dce5e6365a1ddc87047262bf1de4bac221beaf67 Gabe gabrielh@gmail.com