capistrano-buildpack 0.0.7 → 0.0.8

data/README.md

@@ -64,6 +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:
+
+* `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.
+
 ## Running remote commands
 
 Sometimes you want to run a command on the other end that isn't defined in a Procfile. Do that with `cap remote`:
@@ -75,8 +82,6 @@ Sometimes you want to run a command on the other end that isn't defined in a Pro
 `Capistrano::Buildpack` will *not* run `bin/release` from the buildpack, so any environment variables that that attempts to set need to be set using `read_env`.
 In addition, at the moment the exported nginx config does not have compression turned on.
 
-Also, note that right now this does not support HTTPS. I'm working on it.
-
 ## Contributing
 
 1. Fork it

data/lib/capistrano-buildpack/tasks.rb

@@ -1,8 +1,24 @@
 require 'digest/sha1'
 
+def _cset(name, *args, &block)
+  unless exists?(name)
+    set(name, *args, &block)
+  end
+end
+
 if Capistrano::Configuration.instance
   Capistrano::Configuration.instance.load do
 
+    _cset(:deploy_to) { "/apps/#{application}" }
+    _cset(:buildpack_url) { abort "Please specify the buildpack URL to use, set :buildpack_url, 'http://example.com/buildpack'" }
+    _cset(:base_port) { abort "Please specify a base port to use, set :base_port, 6500" }
+    _cset(:concurrency) { abort "Please specify a concurrency level to use, set :concurrency, 'web-1'" }
+
+    _cset :foreman_export_path, "/etc/init"
+    _cset :foreman_export_type, "upstart"
+    _cset :nginx_export_path, "/etc/nginx/conf.d"
+    _cset :additional_domains, []
+
     def read_env(name)
       env = {}
       filename = ".env.#{name}"
@@ -21,20 +37,15 @@ if Capistrano::Configuration.instance
     namespace :buildpack do
 
       task :setup_env do
-        set :deploy_to, "/apps/#{application}"
-        set :foreman_export_path, "/etc/init"
-        set :foreman_export_type, "upstart"
-        set :nginx_export_path, "/etc/nginx/conf.d"
 
-        set :buildpack_hash, Digest::SHA1.hexdigest(buildpack_url)
-        set :buildpack_path, "#{shared_path}/buildpack-#{buildpack_hash}"
+        set(:buildpack_hash) { Digest::SHA1.hexdigest(buildpack_url) }
+        set(:buildpack_path) { "#{shared_path}/buildpack-#{buildpack_hash}" }
 
         default_run_options[:pty] = true
         default_run_options[:shell] = '/bin/bash'
       end
       
       task :setup do
-        setup_env
 
         sudo "mkdir -p #{deploy_to}"
         sudo "chown -R #{user} #{deploy_to}"
@@ -62,15 +73,21 @@ if Capistrano::Configuration.instance
       end
 
       task "foreman_export" do
+        _use_ssl = exists?(:use_ssl) ? "USE_SSL=on" : ''
+        _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}" : ''
+
         sudo "foreman export #{foreman_export_type} #{foreman_export_path} -d #{release_path} -l /var/log/#{application} -a #{application} -u #{user} -p #{base_port} -c #{concurrency}"
-        sudo "env 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 #{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 #{user} -p #{base_port} -c #{concurrency}"
         sudo "service #{application} restart || service #{application} start"
         sudo "service nginx reload || service nginx start"
       end
 
     end
 
-
+    before "deploy", "buildpack:setup_env"
+    before "deploy:setup", "buildpack:setup_env"
     before "deploy:setup", "buildpack:setup"
     after  "deploy:setup", "buildpack:install_foreman_export_nginx"
     before "deploy", "buildpack:setup"

data/lib/capistrano-buildpack/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Buildpack
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-buildpack
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies: []
 description: Deploy 12-factor applications using Capistrano
 email: