capistrano-nginx-unicorn 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmYwNTI4YjA3ZjEzYzBmYTIyM2Y4NDAyYTMzNGQ5MTkyY2JhODZhMw==
+  data.tar.gz: !binary |-
+    M2NkYzhjMGNjOTUxZjZhYjdhNDRiMDNiN2E0YWE5Nzk0ZDQ5NWM2ZA==
+SHA512:
+  metadata.gz: !binary |-
+    ZjZkZjg4NWI5OTY5MjM0ZjYxNDViODkwNzEyY2RmMWFmNzBhZjMzZmNhMjNj
+    ZTEyOWM4YWNhMDAyMmQ3NTEwOWVlMGMzNmMwNWY4NjAyOGJiYTVlMzdhM2I4
+    NzU0ZTQ4N2E1M2Q3ZWRmMTUwMzMwMzI5NWU0MDkyNGI3ODdkY2M=
+  data.tar.gz: !binary |-
+    Mzc2MTc0MWQ1NWEwZWFlN2VkMDg2OTAwMTY3MGRjNTQ5MTQ5Njg4YzM1ZDgw
+    MmFjOTM0ODE5OGEwMDU2ZWMxMjZiZDdiZDkwZjZjMzdkMzllMjBiNTM0YTRj
+    Njk5NGRjMzZkNzI3ODEzZTJhODgyZGZlNTgyMmIwNzEwNjdkMzE=

data/README.md

@@ -64,7 +64,7 @@ and for unicorn:
     # reload unicorn with no downtime
     # old workers will process new request until new master is fully loaded
     # then old workers will be automatically killed and new workers will start processing requests
-    cap unicorn:reload
+    cap unicorn:restart
 
 and shared:
 
@@ -105,6 +105,10 @@ set :nginx_server_name, "example.com"
 # default value: `"#{current_path}/tmp/pids/unicorn.pid"`
 set :unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid"
 
+# path, where nginx pid file will be stored (used in logrotate recipe)
+# default value: `"/run/nginx.pid"`
+set :nginx_pid, "/run/nginx.pid"
+
 # path, where unicorn config file will be stored
 # default value: `"#{shared_path}/config/unicorn.rb"`
 set :unicorn_config, "#{shared_path}/config/unicorn.rb"
@@ -127,6 +131,10 @@ set :unicorn_workers, 4
 # default value: false
 set :nginx_use_ssl, false
 
+# if set, it will ask to upload certificates from a local path. Otherwise, it will expect
+# the certificate and key defined in the next 2 variables to be already in the server.
+set :nginx_upload_local_certificate, { true }
+
 # remote file name of the certificate, only makes sense if `nginx_use_ssl` is set
 # default value: `nginx_server_name + ".crt"`
 set :nginx_ssl_certificate, "#{nginx_server_name}.crt"

data/capistrano-nginx-unicorn.gemspec

@@ -6,18 +6,18 @@ require 'capistrano/nginx_unicorn/version'
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-nginx-unicorn"
   gem.version       = Capistrano::NginxUnicorn::VERSION
-  gem.authors       = ["Ivan Tkalin"]
-  gem.email         = ["itkalin@gmail.com"]
-  gem.description   = %q{Deprecated! Capistrano tasks for configuration and management nginx+unicorn combo for zero downtime deployments of Rails applications. Configs can be copied to the application using generators and easily customized.}
-  gem.summary       = %q{Deprecated! Create and manage nginx+unicorn configs from capistrano}
-  gem.homepage      = "https://github.com/ivalkeen/capistrano-nginx-unicorn"
+  gem.authors       = ["Ivan Tkalin", "Kalys Osmonov"]
+  gem.email         = ["kalys@osmonov.com"]
+  gem.description   = %q{Capistrano tasks for configuration and management nginx+unicorn combo for zero downtime deployments of Rails applications. Configs can be copied to the application using generators and easily customized.}
+  gem.summary       = %q{Create and manage nginx+unicorn configs from capistrano}
+  gem.homepage      = "https://github.com/kalys/capistrano-nginx-unicorn"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano', '>= 2.0'
+  gem.add_dependency 'capistrano', '~> 2.0'
 
   gem.add_development_dependency "rake"
 end

data/lib/capistrano/nginx_unicorn/tasks.rb

@@ -9,30 +9,40 @@ Capistrano::Configuration.instance.load do
 
   set_default(:nginx_server_name) { Capistrano::CLI.ui.ask "Nginx server name: " }
   set_default(:nginx_use_ssl, false)
+  set_default(:nginx_pid) { "/run/nginx.pid" }
   set_default(:nginx_ssl_certificate) { "#{nginx_server_name}.crt" }
   set_default(:nginx_ssl_certificate_key) { "#{nginx_server_name}.key" }
+  set_default(:nginx_upload_local_certificate) { true }
   set_default(:nginx_ssl_certificate_local_path) {Capistrano::CLI.ui.ask "Local path to ssl certificate: "}
   set_default(:nginx_ssl_certificate_key_local_path) {Capistrano::CLI.ui.ask "Local path to ssl certificate key: "}
 
-  set_default(:unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid")
-  set_default(:unicorn_config, "#{shared_path}/config/unicorn.rb")
-  set_default(:unicorn_log, "#{shared_path}/log/unicorn.log")
-  set_default(:unicorn_user, user)
+  set_default(:unicorn_pid) { "#{current_path}/tmp/pids/unicorn.pid" }
+  set_default(:unicorn_config) { "#{shared_path}/config/unicorn.rb" }
+  set_default(:unicorn_log) { "#{shared_path}/log/unicorn.log" }
+  set_default(:unicorn_user) { user }
   set_default(:unicorn_workers) { Capistrano::CLI.ui.ask "Number of unicorn workers: " }
+  
+  set_default(:nginx_config_path) { "/etc/nginx/sites-available" }
 
   namespace :nginx do
     desc "Setup nginx configuration for this application"
     task :setup, roles: :web do
       template("nginx_conf.erb", "/tmp/#{application}")
-      run "#{sudo} mv /tmp/#{application} /etc/nginx/sites-available/#{application}"
-      run "#{sudo} ln -fs /etc/nginx/sites-available/#{application} /etc/nginx/sites-enabled/#{application}"
+      if nginx_config_path == "/etc/nginx/sites-available"
+          run "#{sudo} mv /tmp/#{application} /etc/nginx/sites-available/#{application}"
+          run "#{sudo} ln -fs /etc/nginx/sites-available/#{application} /etc/nginx/sites-enabled/#{application}"
+      else
+          run "#{sudo} mv /tmp/#{application} #{nginx_config_path}/#{application}.conf"
+      end
 
       if nginx_use_ssl
-        put File.read(nginx_ssl_certificate_local_path), "/tmp/#{nginx_ssl_certificate}"
-        put File.read(nginx_ssl_certificate_key_local_path), "/tmp/#{nginx_ssl_certificate_key}"
+        if nginx_upload_local_certificate
+          put File.read(nginx_ssl_certificate_local_path), "/tmp/#{nginx_ssl_certificate}"
+          put File.read(nginx_ssl_certificate_key_local_path), "/tmp/#{nginx_ssl_certificate_key}"
 
-        run "#{sudo} mv /tmp/#{nginx_ssl_certificate} /etc/ssl/certs/#{nginx_ssl_certificate}"
-        run "#{sudo} mv /tmp/#{nginx_ssl_certificate_key} /etc/ssl/private/#{nginx_ssl_certificate_key}"
+          run "#{sudo} mv /tmp/#{nginx_ssl_certificate} /etc/ssl/certs/#{nginx_ssl_certificate}"
+          run "#{sudo} mv /tmp/#{nginx_ssl_certificate_key} /etc/ssl/private/#{nginx_ssl_certificate_key}"
+        end
 
         run "#{sudo} chown root:root /etc/ssl/certs/#{nginx_ssl_certificate}"
         run "#{sudo} chown root:root /etc/ssl/private/#{nginx_ssl_certificate_key}"

data/lib/capistrano/nginx_unicorn/version.rb

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

data/lib/generators/capistrano/nginx_unicorn/templates/logrotate.erb

@@ -18,6 +18,7 @@
   endscript
 
   postrotate
-    [ ! -f /run/nginx.pid ] || kill -USR1 `cat /run/nginx.pid`
+    nginx_pid=<%= nginx_pid %>
+    [ ! -f $nginx_pid ] || kill -USR1 `cat $nginx_pid`
   endscript
 }

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

@@ -14,7 +14,9 @@ set -e
 TIMEOUT=${TIMEOUT-60}
 APP_ROOT=<%= current_path %>
 PID=<%= unicorn_pid %>
+
 CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= unicorn_config %> -E production"
+
 AS_USER=<%= unicorn_user %>
 set -u
 
@@ -82,3 +84,4 @@ reopen-logs)
   exit 1
   ;;
 esac
+

metadata

@@ -1,53 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nginx-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Ivan Tkalin
+- Kalys Osmonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: capistrano
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
-description: Deprecated! Capistrano tasks for configuration and management nginx+unicorn
-  combo for zero downtime deployments of Rails applications. Configs can be copied
-  to the application using generators and easily customized.
+description: Capistrano tasks for configuration and management nginx+unicorn combo
+  for zero downtime deployments of Rails applications. Configs can be copied to the
+  application using generators and easily customized.
 email:
-- itkalin@gmail.com
+- kalys@osmonov.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -67,8 +63,9 @@ files:
 - lib/generators/capistrano/nginx_unicorn/templates/nginx_conf.erb
 - lib/generators/capistrano/nginx_unicorn/templates/unicorn.rb.erb
 - lib/generators/capistrano/nginx_unicorn/templates/unicorn_init.erb
-homepage: https://github.com/ivalkeen/capistrano-nginx-unicorn
+homepage: https://github.com/kalys/capistrano-nginx-unicorn
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -78,23 +75,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1944416260668696748
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1944416260668696748
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
-summary: Deprecated! Create and manage nginx+unicorn configs from capistrano
+specification_version: 4
+summary: Create and manage nginx+unicorn configs from capistrano
 test_files: []