capistrano-nginx-unicorn 0.0.8 → 0.1.0.pre

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzNmNWY5ZGViYmU4NGEyYjFiODQ0NTM1NjdmN2JhMWRkZGQ3MGQ4MA==
-  data.tar.gz: !binary |-
-    ZWRmOGM1OTRjZTlhYTA2ZjFkNmViMmUwZjZjYmFkOWYxMWMyOWJkZA==
+SHA1:
+  metadata.gz: 59fd37b04eff080056157c4c3664c58721c4e397
+  data.tar.gz: bd445ae9e88bdb9b9fe1ccc8a21e8030674593fe
 SHA512:
-  metadata.gz: !binary |-
-    MDRjODUzOTcyYzM4MjBjNjVhMDA5ZThlMjYyNWM0ZTViMWQzYTg0ZTgxZGE4
-    ZWI4NTg4N2E2MGMxNWQ1MjAyN2I5NjYyZTUyZjgwZDg4MjQxM2VlZGQ3Yjc2
-    YTM3YjNlNjUxMmExMzZiYzUwZTZhNTViMjc1YWE0YjgxYWY4NzE=
-  data.tar.gz: !binary |-
-    MmQ3MTM4NzhkMmEwZmM5NjZlNWExYzhlMzRkNWQ2ZmMyM2M0MmNjZWI2YjA3
-    NzM4ZWQ1NWFmOTJjMzFlZTg5ZWQyMDIyN2IxZDFhMTM5MjEwNjM5YTRlY2Mz
-    ZWVlOWJhMWY3Y2M3ZjJmNjFhMTZlYTJiNTdhZTU3OGRhYTRkNDc=
+  metadata.gz: 6ecaf78c0a4a7bf9a1ddb6d9cf457222528686b532271c1029b80ad49c37b37699581db41f9515e53732f80295358677ca465aa72f92c5eac764a6c6a3d03a7e
+  data.tar.gz: a9a6196efe630e26f489ad56bb803f4552e3fe9bf5b942b492c8537b2e2ea934e2f0e60a3d2f2e90eb103ac029d7479aa8e6665fab5eb6b9d73439910ba7a34a

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+### From 0.0.8 to 0.1.0
+
+* Separate nginx and unicorn tasks into the appropriate files.
+* Encapsulate default settings in namespace.
+* Rename nginx config file so it has .conf extension.
+* Remove nginx server name prompt.
+* Add nginx_unicorn:setup task.
+* Add several options of starting unicorn (rvm, rbenv).

data/capistrano-nginx-unicorn.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano', '~> 2.0'
+  gem.add_dependency 'capistrano', '~> 3.0'
 
   gem.add_development_dependency "rake"
 end

data/lib/capistrano-nginx-unicorn.rb

@@ -1,2 +0,0 @@
-require "capistrano/nginx_unicorn/version"
-require "capistrano/nginx_unicorn/tasks"

data/lib/capistrano/nginx_unicorn.rb

@@ -0,0 +1,9 @@
+load File.expand_path("../tasks/nginx.rake", __FILE__)
+load File.expand_path("../tasks/unicorn.rake", __FILE__)
+load File.expand_path("../tasks/logrotate.rake", __FILE__)
+
+namespace :load do
+  task :defaults do
+    load 'capistrano/nginx_unicorn/defaults.rb'
+  end
+end

data/lib/capistrano/nginx_unicorn/defaults.rb

@@ -0,0 +1,20 @@
+set :templates_path, "config/deploy/templates"
+set :nginx_server_name, -> { "localhost #{fetch(:application)}.local" }
+set :nginx_config_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
+set :nginx_use_ssl, false
+set :nginx_pid, "/run/nginx.pid"
+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, -> { ask(:nginx_ssl_certificate_local_path, "Local path to ssl certificate: ") }
+set :nginx_ssl_certificate_key_local_path, -> { ask(:nginx_ssl_certificate_key_local_path, "Local path to ssl certificate key: ") }
+set :nginx_config_path, "/etc/nginx/sites-available"
+
+set :unicorn_service_name, -> { "unicorn_#{fetch(:application)}_#{fetch(:stage)}" }
+set :templates_path, "config/deploy/templates"
+set :unicorn_pid, -> { shared_path.join("pids/unicorn.pid") }
+set :unicorn_config, -> { shared_path.join("config/unicorn.rb") }
+set :unicorn_log, -> { shared_path.join("log/unicorn.log") }
+set :unicorn_user, -> { fetch(:user) }
+set :unicorn_workers, 2
+set :sudo, "sudo"

data/lib/capistrano/nginx_unicorn/helpers.rb

@@ -0,0 +1,18 @@
+require 'erb'
+
+module Capistrano
+  module NginxUnicorn
+    module Helpers
+
+      def template(template_name, target)
+        config_file = "#{fetch(:templates_path)}/#{template_name}"
+        # if no customized file, proceed with default
+        unless File.exists?(config_file)
+          config_file = File.join(File.dirname(__FILE__), "../../generators/capistrano/nginx_unicorn/templates/#{template_name}")
+        end
+        config_stream = StringIO.new(ERB.new(File.read(config_file)).result(binding))
+        upload! config_stream, target
+      end
+    end
+  end
+end

data/lib/capistrano/nginx_unicorn/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module NginxUnicorn
-    VERSION = "0.0.8"
+    VERSION = "0.1.0.pre"
   end
 end

data/lib/capistrano/tasks/logrotate.rake

@@ -0,0 +1,12 @@
+namespace :logrotate do
+  desc "Setup logs rotation for nginx and unicorn"
+  task :setup do
+    on roles(:web, :app) do
+      logrotate_config = "#{fetch(:application)}_#{fetch(:stage)}"
+
+      template("logrotate.erb", "/tmp/#{logrotate_config}_logrotate")
+      sudo :mv, "/tmp/#{logrotate_config}_logrotate /etc/logrotate.d/#{logrotate_config}"
+      sudo :chown, "root:root", "/etc/logrotate.d/#{logrotate_config}"
+    end
+  end
+end

data/lib/capistrano/tasks/nginx.rake

@@ -0,0 +1,48 @@
+require 'capistrano/nginx_unicorn/helpers'
+
+include Capistrano::NginxUnicorn::Helpers
+
+namespace :nginx do
+  desc "Setup nginx configuration"
+  task :setup do
+    on roles(:web) do
+      execute :mkdir, "-p", shared_path.join("log")
+      template("nginx_conf.erb", "/tmp/nginx_#{fetch(:nginx_config_name)}")
+      if fetch(:nginx_config_path) == "/etc/nginx/sites-available"
+        sudo :mv, "/tmp/nginx_#{fetch(:nginx_config_name)} /etc/nginx/sites-available/#{fetch(:nginx_config_name)}"
+        sudo :ln, "-fs", "/etc/nginx/sites-available/#{fetch(:nginx_config_name)} /etc/nginx/sites-enabled/#{fetch(:nginx_config_name)}"
+      else
+        sudo :mv, "/tmp/#{fetch(:nginx_config_name)} #{fetch(:nginx_config_path)}/#{fetch(:nginx_config_name)}"
+      end
+    end
+  end
+
+  desc "Setup nginx ssl certs"
+  task :setup_ssl do
+    on roles(:web) do
+      if fetch(:nginx_use_ssl)
+        if fetch(:nginx_upload_local_certificate)
+          upload! fetch(:nginx_ssl_certificate_local_path), "/tmp/#{fetch(:nginx_ssl_certificate)}"
+          upload! fetch(:nginx_ssl_certificate_key_local_path), "/tmp/#{fetch(:nginx_ssl_certificate_key)}"
+
+          sudo :mv, "/tmp/#{fetch(:nginx_ssl_certificate)} /etc/ssl/certs/#{fetch(:nginx_ssl_certificate)}"
+          sudo :mv, "/tmp/#{fetch(:nginx_ssl_certificate_key)} /etc/ssl/private/#{fetch(:nginx_ssl_certificate_key)}"
+        end
+
+        sudo :chown, "root:root /etc/ssl/certs/#{fetch(:nginx_ssl_certificate)}"
+        sudo :chown, "root:root /etc/ssl/private/#{fetch(:nginx_ssl_certificate_key)}"
+      end
+    end
+  end
+
+  desc "Reload nginx configuration"
+  task :reload do
+    on roles(:web) do
+      sudo "/etc/init.d/nginx reload"
+    end
+  end
+end
+
+namespace :deploy do
+  after :publishing, "nginx:reload"
+end

data/lib/capistrano/tasks/unicorn.rake

@@ -0,0 +1,38 @@
+require 'capistrano/nginx_unicorn/helpers'
+
+include Capistrano::NginxUnicorn::Helpers
+
+namespace :unicorn do
+  desc "Setup Unicorn initializer"
+  task :setup_initializer do
+    on roles(:app) do
+      template "unicorn_init.erb", "/tmp/unicorn_init"
+      execute :chmod, "+x", "/tmp/unicorn_init"
+      sudo :mv, "/tmp/unicorn_init /etc/init.d/#{fetch(:unicorn_service_name)}"
+      sudo "update-rc.d -f #{fetch(:unicorn_service_name)} defaults"
+    end
+  end
+
+  desc "Setup Unicorn app configuration"
+  task :setup_app_config do
+    on roles(:app) do
+      execute :mkdir, "-p", shared_path.join("config")
+      execute :mkdir, "-p", shared_path.join("log")
+      execute :mkdir, "-p", shared_path.join("pids")
+      template "unicorn.rb.erb", fetch(:unicorn_config)
+    end
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} unicorn"
+    task command do
+      on roles(:app) do
+        sudo "service #{fetch(:unicorn_service_name)} #{command}"
+      end
+    end
+  end
+end
+
+namespace :deploy do
+  after :publishing, "unicorn:restart"
+end

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

@@ -7,7 +7,7 @@
   delaycompress
 
   lastaction
-    pid=<%= unicorn_pid %>
+    pid=<%= fetch(:unicorn_pid) %>
     test -s $pid && kill -USR1 "$(cat $pid)"
   endscript
 
@@ -18,7 +18,7 @@
   endscript
 
   postrotate
-    nginx_pid=<%= nginx_pid %>
+    nginx_pid=<%= fetch(:nginx_pid) %>
     [ ! -f $nginx_pid ] || kill -USR1 `cat $nginx_pid`
   endscript
 }

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

@@ -1,8 +1,8 @@
-upstream unicorn_<%= application %> {
-  server unix:/tmp/unicorn.<%= application %>.sock fail_timeout=0;
+upstream unicorn_<%= fetch(:nginx_config_name) %> {
+  server unix:/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock fail_timeout=0;
 }
 
-<% if nginx_use_ssl %>
+<% if fetch(:nginx_use_ssl) %>
 server {
   listen 80;
   rewrite ^(.*) https://$host$1 permanent;
@@ -10,11 +10,11 @@ server {
 <% end %>
 
 server {
-<% if nginx_use_ssl %>
+<% if fetch(:nginx_use_ssl) %>
   listen 443;
   ssl on;
-  ssl_certificate /etc/ssl/certs/<%= nginx_ssl_certificate %>;
-  ssl_certificate_key /etc/ssl/private/<%= nginx_ssl_certificate_key %>;
+  ssl_certificate /etc/ssl/certs/<%= fetch(:nginx_ssl_certificate) %>;
+  ssl_certificate_key /etc/ssl/private/<%= fetch(:nginx_ssl_certificate_key) %>;
 <% else %>
   listen 80;
 <% end %>
@@ -25,18 +25,18 @@ server {
   error_page 500 502 504 /500.html;
   error_page 503 @503;
 
-  server_name <%= nginx_server_name %>;
+  server_name <%= fetch(:nginx_server_name) %>;
   root <%= current_path %>/public;
-  try_files $uri/index.html $uri @unicorn_<%= application %>;
+  try_files $uri/index.html $uri @unicorn_<%= fetch(:nginx_config_name) %>;
 
-  location @unicorn_<%= application %> {
+  location @unicorn_<%= fetch(:nginx_config_name) %> {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-<% if nginx_use_ssl %>
+<% if fetch(:nginx_use_ssl) %>
     proxy_set_header X-Forwarded-Proto https;
 <% end %>
-    proxy_pass http://unicorn_<%= application %>;
+    proxy_pass http://unicorn_<%= fetch(:nginx_config_name) %>;
     # limit_req zone=one;
     access_log <%= shared_path %>/log/nginx.access.log;
     error_log <%= shared_path %>/log/nginx.error.log;

data/lib/generators/capistrano/nginx_unicorn/templates/unicorn.rb.erb

@@ -1,10 +1,10 @@
 working_directory "<%= current_path %>"
-pid "<%= unicorn_pid %>"
-stderr_path "<%= unicorn_log %>"
-stdout_path "<%= unicorn_log %>"
+pid "<%= fetch(:unicorn_pid) %>"
+stderr_path "<%= fetch(:unicorn_log) %>"
+stdout_path "<%= fetch(:unicorn_log) %>"
 
-listen "/tmp/unicorn.<%= application %>.sock"
-worker_processes <%= unicorn_workers %>
+listen "/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock"
+worker_processes <%= fetch(:unicorn_workers) %>
 timeout 30
 
 preload_app true

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

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ### BEGIN INIT INFO
 # Provides: unicorn
 # Required-Start: $remote_fs $syslog
@@ -13,11 +13,18 @@ set -e
 # Feel free to change any of the following variables for your app:
 TIMEOUT=${TIMEOUT-60}
 APP_ROOT=<%= current_path %>
-PID=<%= unicorn_pid %>
+PID=<%= fetch(:unicorn_pid) %>
 
-CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= unicorn_config %> -E production"
+# no rvm and no rbenv
+CMD="cd $APP_ROOT; bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>"
 
-AS_USER=<%= unicorn_user %>
+# rvm
+#CMD="cd <%= current_path %>; <%= fetch(:rvm_path) %>/bin/rvm do bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>"
+
+# rbenv TODO
+# doesn't work CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env) %>"
+
+AS_USER=<%= fetch(:unicorn_user) %>
 set -u
 
 OLD_PIN="$PID.oldbin"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nginx-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0.pre
 platform: ruby
 authors:
 - Ivan Tkalin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -17,26 +17,26 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Capistrano tasks for configuration and management nginx+unicorn combo
@@ -49,14 +49,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - capistrano-nginx-unicorn.gemspec
 - lib/capistrano-nginx-unicorn.rb
-- lib/capistrano/nginx_unicorn/tasks.rb
+- lib/capistrano/nginx_unicorn.rb
+- lib/capistrano/nginx_unicorn/defaults.rb
+- lib/capistrano/nginx_unicorn/helpers.rb
 - lib/capistrano/nginx_unicorn/version.rb
+- lib/capistrano/tasks/logrotate.rake
+- lib/capistrano/tasks/nginx.rake
+- lib/capistrano/tasks/unicorn.rake
 - lib/generators/capistrano/nginx_unicorn/USAGE
 - lib/generators/capistrano/nginx_unicorn/config_generator.rb
 - lib/generators/capistrano/nginx_unicorn/templates/logrotate.erb
@@ -72,14 +78,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11

data/lib/capistrano/nginx_unicorn/tasks.rb

@@ -1,102 +0,0 @@
-require 'capistrano'
-
-Capistrano::Configuration.instance.load do
-  def set_default(name, *args, &block)
-    set(name, *args, &block) unless exists?(name)
-  end
-
-  set_default(:templates_path, "config/deploy/templates")
-
-  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_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}")
-      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
-        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}"
-        end
-
-        run "#{sudo} chown root:root /etc/ssl/certs/#{nginx_ssl_certificate}"
-        run "#{sudo} chown root:root /etc/ssl/private/#{nginx_ssl_certificate_key}"
-      end
-    end
-
-    after "deploy:setup", "nginx:setup"
-    after "deploy:setup", "nginx:reload"
-
-    desc "Reload nginx configuration"
-    task :reload, roles: :web do
-      run "#{sudo} /etc/init.d/nginx reload"
-    end
-  end
-
-  namespace :unicorn do
-    desc "Setup Unicorn initializer and app configuration"
-    task :setup, roles: :app do
-      run "mkdir -p #{shared_path}/config"
-      template "unicorn.rb.erb", unicorn_config
-      template "unicorn_init.erb", "/tmp/unicorn_init"
-      run "chmod +x /tmp/unicorn_init"
-      run "#{sudo} mv /tmp/unicorn_init /etc/init.d/unicorn_#{application}"
-      run "#{sudo} update-rc.d -f unicorn_#{application} defaults"
-    end
-
-    after "deploy:setup", "unicorn:setup"
-
-    %w[start stop restart].each do |command|
-      desc "#{command} unicorn"
-      task command, roles: :app do
-        run "service unicorn_#{application} #{command}"
-      end
-
-      after "deploy:#{command}", "unicorn:#{command}"
-    end
-  end
-
-  desc "Setup logs rotation for nginx and unicorn"
-  task :logrotate, roles: [:web, :app] do
-    template("logrotate.erb", "/tmp/#{application}_logrotate")
-    run "#{sudo} mv /tmp/#{application}_logrotate /etc/logrotate.d/#{application}"
-    run "#{sudo} chown root:root /etc/logrotate.d/#{application}"
-  end
-
-  after "deploy:setup", "logrotate"
-
-  def template(template_name, target)
-    config_file = "#{templates_path}/#{template_name}"
-    # if no customized file, proceed with default
-    unless File.exists?(config_file)
-      config_file = File.join(File.dirname(__FILE__), "../../generators/capistrano/nginx_unicorn/templates/#{template_name}")
-    end
-    put ERB.new(File.read(config_file)).result(binding), target
-  end
-
-end