capistrano-buildpack 0.0.9 → 0.0.10

data/README.md

@@ -64,12 +64,13 @@ Deploy will do the following things:
 The nginx config will list at least one domain for the app: `<application>.<hostname>`, which in this case is `bugsplatdotinfo.examplevps.bugsplat.info`. Anything
 you add to the `:additional_domains` setting gets tacked on at the end.
 
-Several other settings are available for controlling SSL:
+Several other settings are available:
 
 * `use_ssl`: true to listen on port 443
 * `ssl_cert_path`: a path to a certificate file on the server. You are responsible for getting the certificate there.
 * `ssl_key_path`: a path to a key file on the server. You are responsible for getting it there.
 * `force_ssl`: Force a redirect to SSL. This will unconditionally redirect to the first domain in `additional_domains`, so if you have multiple you may want to do this in your app instead.
+* `force_domain`: Force a redirect to the given domain.
 
 To run your app as a different user than `:user`, use the `:app_user` setting. This user will not be created for you, you'll need to create it yourself, and it must have a proper home directory.
 

data/lib/capistrano-buildpack/tasks.rb

@@ -81,9 +81,10 @@ if Capistrano::Configuration.instance
         _ssl_cert_path = exists?(:ssl_cert_path) ? "SSL_CERT_PATH=#{ssl_cert_path}" : ''
         _ssl_key_path = exists?(:ssl_key_path) ? "SSL_KEY_PATH=#{ssl_key_path}" : ''
         _force_ssl = exists?(:force_ssl) ? "FORCE_SSL=#{force_ssl}" : ''
+        _force_domain = exists?(:force_domain) ? "FORCE_DOMAIN=#{force_domain}" : ''
 
         sudo "foreman export #{foreman_export_type} #{foreman_export_path} -d #{release_path} -l /var/log/#{application} -a #{application} -u #{app_user} -p #{base_port} -c #{concurrency}"
-        sudo "env #{_use_ssl} #{_ssl_cert_path} #{_ssl_key_path} #{_force_ssl} ADDITIONAL_DOMAINS=#{additional_domains.join(',')} BASE_DOMAIN=$CAPISTRANO:HOST$ nginx-foreman export nginx #{nginx_export_path} -d #{release_path} -l /var/log/apps -a #{application} -u #{app_user} -p #{base_port} -c #{concurrency}"
+        sudo "env #{_use_ssl} #{_ssl_cert_path} #{_ssl_key_path} #{_force_ssl} #{_force_domain} ADDITIONAL_DOMAINS=#{additional_domains.join(',')} BASE_DOMAIN=$CAPISTRANO:HOST$ nginx-foreman export nginx #{nginx_export_path} -d #{release_path} -l /var/log/apps -a #{application} -u #{app_user} -p #{base_port} -c #{concurrency}"
         sudo "service #{application} restart || service #{application} start"
         sudo "service nginx reload || service nginx start"
       end

data/lib/capistrano-buildpack/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Buildpack
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-buildpack
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies: []
 description: Deploy 12-factor applications using Capistrano
 email:
@@ -52,4 +52,3 @@ signing_key:
 specification_version: 3
 summary: Deploy 12-factor applications using Capistrano
 test_files: []
-has_rdoc: