capistrano3-nginx_unicorn 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7ca63dadb9199894b6ca18f4fdb6645fc4597fc7
+  data.tar.gz: dd6771567a3a1a849d5db4a407b3a14d15b3595e
+SHA512:
+  metadata.gz: 60db9a9f0a332ac991d355e46a59d4a7006b42eaf2e6424208a2967b711ec9d5f59f9c11b9c936cc74f2f0d6aeaf63ffb2bc07a7b2fc2f7f38c8957b7898d0f1
+  data.tar.gz: 3cd45e8c988085bc3b5cd2d4b43b37d4bf90018b24e4dc0f2d87e226f3f92ba5293d62224537f9356b38e7a637a6c9ade454279fa791f40f2ac3112a2cde5287

data/README.md

@@ -33,7 +33,7 @@ Or install it yourself as:
 
 Add this line to your `Capfile`
 
-    require 'capistrano/nginx_unicorn'
+    require 'capistrano3/nginx_unicorn'
 
 Note, that following capistrano variables should be defined:
 
@@ -112,8 +112,8 @@ set :unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid"
 set :unicorn_config, "#{shared_path}/config/unicorn.rb"
 
 # path, where unicorn log file will be stored
-# default value: `"#{shared_path}/config/unicorn.rb"`
-set :unicorn_log, "#{shared_path}/config/unicorn.rb"
+# default value: `"#{shared_path}/log/unicorn.log"`
+set :unicorn_log, "#{shared_path}/log/unicorn.log"
 
 # user name to run unicorn
 # default value: `user` (user varibale defined in your `deploy.rb`)
@@ -158,21 +158,20 @@ your `deploy.rb` will look like this:
 ```ruby
 set :server_name, "example.com"
 set :unicorn_workers, 4
-require 'capistrano-nginx-unicorn'
 ```
 
 ### Template Customization
 
 If you want to change default templates, you can generate them using `rails generator`
 
-    rails g capistrano:nginx_unicorn:config
+    rails g capistrano3:nginx_unicorn:config
 
 This will copy default templates to `config/deploy/templates` directory,
 so you can customize them as you like, and capistrano tasks will use this templates instead of default.
 
 You can also provide path, where to generate templates:
 
-    rails g capistrano:nginx_unicorn:config config/templates
+    rails g capistrano3:nginx_unicorn:config config/templates
 
 # TODO:
 

data/lib/capistrano3/nginx_unicorn/version.rb

@@ -1,5 +1,5 @@
 module Capistrano3
   module NginxUnicorn
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/capistrano3/tasks/nginx_unicorn.rake

@@ -2,15 +2,16 @@ require 'capistrano'
 
 namespace :load do
   task :defaults do
-    set :templates_path, "config/deploy/templates" 
+    set :templates_path, "config/deploy/templates"
 
     set :nginx_server_name, -> { "www.example.com" }
-    set :nginx_use_ssl, false 
+    set :nginx_config_path, -> { "/etc/nginx" }
+    set :nginx_use_ssl, false
     set :nginx_ssl_certificate, -> { "#{fetch(:nginx_server_name)}.crt" }
     set :nginx_ssl_certificate_key, -> { "#{fetch(:nginx_server_name)}.key" }
     set :nginx_upload_local_certificate, -> { true }
-    set :nginx_ssl_certificate_local_path, -> { "/etc/certificates/" }
-    set :nginx_ssl_certificate_key_local_path, -> { "/etc/certificates/keys" }
+    set :nginx_ssl_certificate_local_path, -> { "../certificates/#{fetch(:nginx_ssl_certificate)}" }
+    set :nginx_ssl_certificate_key_local_path, -> { "../certificates/#{fetch(:nginx_ssl_certificate_key)}" }
 
     set :unicorn_pid, -> { "#{current_path}/tmp/pids/unicorn.pid" }
     set :unicorn_config, -> { "#{shared_path}/config/unicorn.rb" }
@@ -25,16 +26,20 @@ namespace :nginx do
   task :setup do
     on roles(:web) do
       template("nginx_conf.erb", "/tmp/#{fetch(:application)}.conf")
-      execute "sudo mv /tmp/#{fetch(:application)}.conf /etc/nginx/sites-available/#{fetch(:application)}.conf"
-      execute "sudo ln -fs /etc/nginx/sites-available/#{fetch(:application)}.conf /etc/nginx/sites-enabled/#{fetch(:application)}.conf"
+      execute "sudo mv /tmp/#{fetch(:application)}.conf #{fetch(:nginx_config_path)}/sites-available/#{fetch(:application)}.conf"
+      execute "sudo ln -fs #{fetch(:nginx_config_path)}/sites-available/#{fetch(:application)}.conf #{fetch(:nginx_config_path)}/sites-enabled/#{fetch(:application)}.conf"
 
       if fetch(:nginx_use_ssl)
-        if nginx_upload_local_certificate
-          put File.read(nginx_ssl_certificate_local_path), "/tmp/#{fetch(:nginx_ssl_certificate)}"
-          put File.read(nginx_ssl_certificate_key_local_path), "/tmp/#{fetch(:nginx_ssl_certificate_key)}"
+        if fetch(:nginx_upload_local_certificate)
+          if File.exists?(fetch(:nginx_ssl_certificate_local_path))
+            upload! StringIO.new(File.read(fetch(:nginx_ssl_certificate_local_path))), "/tmp/#{fetch(:nginx_ssl_certificate)}"
+            execute "sudo mv /tmp/#{fetch(:nginx_ssl_certificate)} /etc/ssl/certs/#{fetch(:nginx_ssl_certificate)}"
+          end
+          if File.exists?(fetch(:nginx_ssl_certificate_key_local_path))
+            upload! StringIO.new(File.read(fetch(:nginx_ssl_certificate_key_local_path))), "/tmp/#{fetch(:nginx_ssl_certificate_key)}"
+            execute "sudo mv /tmp/#{fetch(:nginx_ssl_certificate_key)} /etc/ssl/private/#{fetch(:nginx_ssl_certificate_key)}"
+          end
 
-          execute "sudo mv /tmp/#{fetch(:nginx_ssl_certificate)} /etc/ssl/certs/#{fetch(:nginx_ssl_certificate)}"
-          execute "sudo mv /tmp/#{fetch(:nginx_ssl_certificate_key)} /etc/ssl/private/#{fetch(:nginx_ssl_certificate_key)}"
         end
 
         execute "sudo chown root:root /etc/ssl/certs/#{fetch(:nginx_ssl_certificate)}"
@@ -47,12 +52,13 @@ namespace :nginx do
   task :reload do
     on roles(:web) do
       execute "mkdir -p #{shared_path}/log"
-      execute "sudo /etc/init.d/nginx reload"
+      execute "sudo /etc/init.d/nginx restart"
     end
   end
 
-  after "deploy:check", "nginx:setup"
-  after "deploy:finished", "nginx:reload"
+  # after "deploy:check", "nginx:setup"
+  # after "deploy:finished", "nginx:reload"
+  after "unicorn:setup", "nginx:setup"
 
 end
 
@@ -70,7 +76,7 @@ namespace :unicorn do
     end
   end
 
-  after "deploy:check", "unicorn:setup"
+  # after "deploy:check", "unicorn:setup"
 
 end
 
@@ -88,14 +94,14 @@ end
 
 desc "Setup logs rotation for nginx and unicorn"
 task :logrotate do
-  on roles([:web, :app]) do
+  on roles(:web, :app) do
     template("logrotate.erb", "/tmp/#{fetch(:application)}_logrotate")
     execute "sudo mv /tmp/#{fetch(:application)}_logrotate /etc/logrotate.d/#{fetch(:application)}"
     execute "sudo chown root:root /etc/logrotate.d/#{fetch(:application)}"
   end
 end
 
-after "deploy:check", "logrotate"
+after "unicorn:setup", "logrotate"
 
 def template(template_name, target)
   config_file = "#{fetch(:templates_path)}/#{template_name}"
@@ -105,4 +111,3 @@ def template(template_name, target)
   end
   upload! StringIO.new(ERB.new(File.read(config_file)).result(binding)), target
 end
-

data/lib/generators/capistrano3/nginx_unicorn/templates/nginx_conf.erb

@@ -5,6 +5,7 @@ upstream unicorn_<%= fetch(:application) %> {
 <% if fetch(:nginx_use_ssl) %>
 server {
   listen 80;
+  server_name <%= fetch(:nginx_server_name) %>;
   rewrite ^(.*) https://$host$1 permanent;
 }
 <% end %>

data/lib/generators/capistrano3/nginx_unicorn/templates/unicorn_init.erb

@@ -19,7 +19,11 @@ PID=<%= fetch(:unicorn_pid) %>
 if [ "$RVM_TYPE" == "system" ]; then
   CMD="cd <%= current_path %>; rvm_path=/usr/local/rvm /usr/local/rvm/bin/rvm-shell 'default' -c 'bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>'"
 else
-  CMD="cd <%= current_path %>; source \"/home/<%= fetch(:user) %>/.rvm/environments/default\"; bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>"
+  <% if fetch(:rvm_ruby_version) %>
+    CMD="cd <%= current_path %>; source \"/home/<%= fetch(:user) %>/.rvm/environments/ruby-<%= fetch(:rvm_ruby_version) %>\"; bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>"
+  <% else %>
+    CMD="cd <%= current_path %>; source \"/home/<%= fetch(:user) %>/.rvm/environments/default\"; bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>"
+  <% end %>
 fi
 
 AS_USER=<%= fetch(:unicorn_user) %>

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-nginx_unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Ivan Tkalin
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Capistrano v3 tasks for configuration and management nginx+unicorn combo
@@ -54,7 +49,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,27 +67,25 @@ files:
 - lib/generators/capistrano3/nginx_unicorn/templates/unicorn_init.erb
 homepage: https://github.com/jesson/capistrano3-nginx_unicorn
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.6.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Create and manage nginx+unicorn configs from capistrano v3
 test_files: []
-has_rdoc: