deploify 0.2.18 → 0.2.19

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .rvmrc
+.idea

data/lib/deploify/recipes/nginx.rb

@@ -9,6 +9,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :nginx_vhost_type,            :http_only
   set :nginx_vhost_listen_ip,       nil
   set :nginx_upstream_servers,      []
+  set :nginx_proxy_read_timeout,    0
   # secured sites stuff
   set :nginx_secured_site,          false
   set :nginx_secure_user,           "developer"

data/lib/deploify/recipes/rails.rb

@@ -177,6 +177,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       set(:db_password) { Capistrano::CLI.ui.ask "Enter database password" }
       set(:db_name) { application }
       set :db_encoding, "utf8"
+      set :db_pool, 5
 
       desc "Link in the production database.yml"
       task :symlink_database_yml, :roles => :app do
@@ -193,6 +194,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   database: #{db_name}
   encoding: #{db_encoding}
   host:     #{db_host}
+  pool:     #{db_pool}
   socket:   #{db_socket}
 EOF
         std.su_put(database_yml.result, "#{shared_path}/config/database.yml", "/tmp/")

data/lib/deploify/templates/nginx/vhost_http_force_ssl.conf.erb

@@ -47,6 +47,9 @@ server {
   location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
+    <%- if nginx_proxy_read_timeout > 0 -%>
+    proxy_read_timeout <%= nginx_proxy_read_timeout %>;
+    <%- end -%>
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

data/lib/deploify/templates/nginx/vhost_http_only.conf.erb

@@ -34,6 +34,9 @@ server {
   location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
+    <%- if nginx_proxy_read_timeout > 0 -%>
+    proxy_read_timeout <%= nginx_proxy_read_timeout %>;
+    <%- end -%>
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

data/lib/deploify/templates/nginx/vhost_http_with_ssl.conf.erb

@@ -34,6 +34,9 @@ server {
   location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
+    <%- if nginx_proxy_read_timeout > 0 -%>
+    proxy_read_timeout <%= nginx_proxy_read_timeout %>;
+    <%- end -%>
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

data/lib/deploify/version.rb

@@ -1,7 +1,7 @@
 module Deploify
   MAJOR = 0
   MINOR = 2
-  PATCH = 18
+  PATCH = 19
   BUILD = nil
 
   if BUILD.nil?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deploify
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 2
-  - 18
-  version: 0.2.18
+  - 19
+  version: 0.2.19
 platform: ruby
 authors: 
 - Richard Riman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-04 00:00:00 Z
+date: 2013-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler