capistrano-unicorn-nginx 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d07f364efb0a3c692f5a90e291944f3039f0a0a0
-  data.tar.gz: 261aa7183d26027881a31024196e536f478f59d2
+  metadata.gz: 4a085d975552c671521de286709e2e731f7d19bf
+  data.tar.gz: 8bacbef4e56838264db0b0a59771dfcf7a0594d5
 SHA512:
-  metadata.gz: 1afb2f016b9c6859c722daacc25ab981959dc87834da8d0a76f2add162587d3afaabff5ce3d7230446c43df74ba98a7cf0ceb5a5499310ff5975cbe46e562166
-  data.tar.gz: e0cd00708bb708bcedd7412b82c448815f6ef49702552ed5523e9a307a353a37cc3c71c0aa021196ad57f2e783f6f71234864755f7bae54061ca7b76f789b11c
+  metadata.gz: b6bd91e9a7be816ee858a03b28f6b48d0cad24ad99e9f0841b2917924b294087e83f28eb382a23144d5b4fed5fd6e2f14a2c0ae8f288bc7ea95b5e88ade889ff
+  data.tar.gz: 75bb34d856885f4d07aeb17e3e6b57387c88c538896a0489e1d4a394593cb9f19fe298c0b2a32a3e53bb311d02e1f7c670e8588d03f79b939db8cbb1da5b2b3a

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### master
 
+### v3.1.0, 2014-10-07
+- setup nginx and unicorn to use TCP if web and app roles are using different
+  servers
+- update default nginx log dir location to `/var/log/nginx`
+
 ### v3.0.0, 2014-10-05
 - enable setting unicorn app environment with `rails_env` option.
   If `rails_env` is not set, `stage` option is used as until now. (@bruno-)

data/README.md

@@ -26,7 +26,7 @@ Add this to `Gemfile`:
 
     group :development do
       gem 'capistrano', '~> 3.2.1'
-      gem 'capistrano-unicorn-nginx', '~> 3.0.0'
+      gem 'capistrano-unicorn-nginx', '~> 3.1.0'
     end
 
 And then:
@@ -43,6 +43,11 @@ Depending on your needs 2 general scenarios are covered:
 - [multiple server setup](https://github.com/capistrano-plugins/capistrano-unicorn-nginx/wiki/Multiple-server-setup)<br/>
   Webserver (nginx) and application server (unicorn) run on different nodes.
 
+### Default log file directories
+
+- nginx: `/var/log/nginx/`
+- unicorn: `#{shared_path}/log/`
+
 ### Configuration
 
 See the

data/lib/capistrano/dsl/nginx_paths.rb

@@ -37,11 +37,11 @@ module Capistrano
 
       # log files
       def nginx_access_log_file
-        shared_path.join('log/nginx.access.log')
+        "/var/log/nginx/#{fetch(:nginx_config_name)}.access.log"
       end
 
       def nginx_error_log_file
-        shared_path.join('log/nginx.error.log')
+        "/var/log/nginx/#{fetch(:nginx_config_name)}.error.log"
       end
 
     end

data/lib/capistrano/tasks/nginx.rake

@@ -31,26 +31,8 @@ namespace :nginx do
     end
   end
 
-  # this is needed when the web role is a non release role -> deploy directories are not created, and nginx log files
-  # are written to "#{deploy_path}/shared/log/"
-  desc "Create the nginx log directory"
-  task :create_log_dir do
-    on roles :web do
-      # create the deploy_to, shared_path and the directory in which the nginx_access_log_file resides.
-      # We need to be conservative and ensure that all are created with the correct ownership: it could happen that
-      # web does become a release role later, in which case the ownerships need to be correct.
-      [deploy_path, shared_path, File.dirname(nginx_access_log_file)].each do |dir|
-        next if file_exists? dir
-        sudo :mkdir, '-pv', dir
-        user = capture :id, '-un'
-        group = capture :id, '-gn'
-        sudo :chown, "#{user}:#{group}", dir
-      end
-    end
-  end
-
   desc 'Setup nginx configuration'
-  task setup: [:create_log_dir] do
+  task :setup do
     on roles :web do
       sudo_upload! template('nginx_conf.erb'), nginx_sites_available_file
       sudo :ln, '-fs', nginx_sites_available_file, nginx_sites_enabled_file

data/lib/capistrano/tasks/unicorn.rake

@@ -12,7 +12,7 @@ namespace :load do
     set :unicorn_config, -> { unicorn_default_config_file }
     set :unicorn_workers, 2
     set :unicorn_tcp_listen_port, 8080
-    set :unicorn_use_tcp, -> { roles(:app).count > 1}  # use tcp if there are multiple app nodes
+    set :unicorn_use_tcp, -> { roles(:app, :web).count > 1 } # use tcp if web and app nodes are on different servers
     set :unicorn_app_env, -> { fetch(:rails_env) || fetch(:stage) }
     # set :unicorn_user # default set in `unicorn:defaults` task
 

data/lib/capistrano/unicorn_nginx/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module UnicornNginx
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-nginx
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano