capistrano-unicorn-nginx 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b24ca75112ef51965b402453911b78ad2464cb7
-  data.tar.gz: dcf24a353ca4264baeed850c4869b29867ce4b81
+  metadata.gz: a719968571f3516541a994ebb85e6ad80d94446f
+  data.tar.gz: d0d724977fa49ae5db7538e90db38e79b00bdc54
 SHA512:
-  metadata.gz: 9960a5da13b29a0be460ffc64b58b05344b129646771972258f4174a274ff317425d92ecd9ae5ded81922bf50a4180ec9e2ebc13537b1d394f28f6ac7aea55e2
-  data.tar.gz: 3f67ac584a2ac65d6b85557b36b1ecfe3305405389935e61aba1b9267228a65489675bcd012c8d7d1a8fc35fc21ab293df8cd99b8c0102f4cab35b12243b5787
+  metadata.gz: f81d6942cfc03393c79f428268d790e2a6f4c1a9df01355d452d0ba3c0978485142d174aff7b4f75284ca96c252007958fde31c71cc6378ea2935061ce8cb7bb
+  data.tar.gz: 8f717e021876d225e375cc867fa9e76957e9006d299327ba1ef9b4c8ca2c00282e8254c2da06812de9b6e70d55f69e122116cf3fd45d203211d1aa95cdc3e7d7

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### v2.0.0, 2014-04-11
+- all the work is moved to the `setup` task
 ### v1.0.2, 2014-03-30
 - add `sudo_upload!` helper method for easier uploads
 - improve the way how templates are handled
@@ -5,5 +7,5 @@
 - refactor all unicorn and nginx paths to separate modules
 - speed up `nginx:setup_ssl` task
 - small README update
-### v1.0.0, 2014-03-39
+### v1.0.0, 2014-03-29
 - @bruno- all the v1.0.0 features

data/README.md

@@ -30,7 +30,7 @@ Add this to `Gemfile`:
 
     group :development do
       gem 'capistrano', '~> 3.1'
-      gem 'capistrano-unicorn-nginx'
+      gem 'capistrano-unicorn-nginx', '~> 2.0'
     end
 
 And then:
@@ -41,23 +41,39 @@ And then:
 
 Add this line to `Capfile`
 
-    require 'capistrano/unicorn-nginx'
+    require 'capistrano/unicorn_nginx'
 
-If you already have a domain for your app, set `nginx_server_name` in stage
-file, example `config/deploy/production.rb`:
+Only if you already have a domain for your app, set `nginx_server_name` in
+stage file, example `config/deploy/production.rb`:
 
     set :nginx_server_name, 'mydomain.com'
 
 If you don't have a domain yet, you do not have to do anything
 (`nginx_server_name` will use the default value - server IP).
 
+**SSL only setup**
+
+If you want to setup SSL for your page, add these options to stage file
+(i.e. `config/deploy/production.rb`):
+
+    # ignore this if you do not need SSL
+    set :nginx_use_ssl, true
+    set :nginx_ssl_cert_local_path, "/path/to/ssl_cert.crt"
+    set :nginx_ssl_cert_key_local_path, "/path/to/ssl_cert.key"
+
 And you're all set!
 
-Execute:
+**Setup task**
 
-    $ bundle exec cap deploy production
+Make sure the `deploy_to` path exists and has the right privileges on the
+server (i.e. `/var/www/myapp`).<br/>
+Or just install
+[capistrano-safe-deploy-to](https://github.com/bruno-/capistrano-safe-deploy-to)
+plugin and don't think about it.
 
-and enjoy watching your app being deployed!
+To setup the server for unicorn and nginx, run:
+
+    $ bundle exec cap production setup
 
 ### Configuration
 
@@ -129,24 +145,30 @@ Number of unicorn workers.
 
 ### How it works
 
-`capistrano-unicorn-nginx` integrates seamlessly with the capistrano deploy task.
-Here's what happens when you run `bundle exec cap production deploy`:
+Here's what happens when you run `$ bundle exec cap production setup`:
 
 **Nginx**
 
-- `after :started, "nginx:setup"`<br/>
-Generates and uploads nginx config file. Symlinks config file to `/etc/nginx/sites-enabled`.
-- `after :started, "nginx:setup_ssl"`<br/>
-Performs SSL related tasks (false by default).
-- `after :publishing, "nginx:reload"`<br/>
-Reloads nginx.
+- `nginx:setup`<br/>
+Generates and uploads nginx config file. Symlinks config file to
+`/etc/nginx/sites-enabled`.
+- `nginx:setup_ssl`<br/>
+Performs SSL related tasks if `nginx_use_ssl` is true (false by default).
 
 **Unicorn**
 
-- `after :updated, "unicorn:setup_initializer"`<br/>
+- `unicorn:setup_initializer`<br/>
 Uploads unicorn initializer file.
-- `after :updated, "unicorn:setup_app_config"`<br/>
+- `unicorn:setup_app_config`<br/>
 Generates unicorn application config file
+
+**Capistrano `deploy` task**
+
+This plugin also integrates seamlessly with Capistrano `deploy` task.
+Here's what happens when you run `$ bundle exec cap production deploy`:
+
+- `after :publishing, "nginx:reload"`<br/>
+Reloads nginx.
 - `after :publishing, "unicorn:restart"`<br/>
 Restarts unicorn after new release.
 

data/lib/capistrano/tasks/nginx.rake

@@ -66,7 +66,11 @@ namespace :nginx do
 end
 
 namespace :deploy do
-  after :started, 'nginx:setup'
-  after :started, 'nginx:setup_ssl'
   after :publishing, 'nginx:reload'
 end
+
+desc 'Server setup tasks'
+task :setup do
+  invoke 'nginx:setup'
+  invoke 'nginx:setup_ssl'
+end

data/lib/capistrano/tasks/unicorn.rake

@@ -39,6 +39,7 @@ namespace :unicorn do
   task :setup_app_config do
     on roles :app do
       next if file_exists? fetch(:unicorn_config)
+      execute :mkdir, '-pv', File.dirname(fetch(:unicorn_config))
       upload! template('unicorn.rb.erb'), fetch(:unicorn_config)
     end
   end
@@ -57,7 +58,11 @@ namespace :unicorn do
 end
 
 namespace :deploy do
-  after :updated, 'unicorn:setup_initializer'
-  after :updated, 'unicorn:setup_app_config'
   after :publishing, 'unicorn:restart'
 end
+
+desc 'Server setup tasks'
+task :setup do
+  invoke 'unicorn:setup_initializer'
+  invoke 'unicorn:setup_app_config'
+end

data/lib/capistrano/unicorn_nginx/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module UnicornNginx
-    VERSION = "1.0.2"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano