capistrano-unicorn-nginx 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba9014b437c5edd7f11ec63c8837813a8e62e51
-  data.tar.gz: 31a185073e53a2affe02dc71014cfc104643dde2
+  metadata.gz: 63a6067c1a22a6f89b2d5406c2f05cd2b81c5d59
+  data.tar.gz: 13cc40fd4612c0d29fb6109c3ba6b3cbb5c2a262
 SHA512:
-  metadata.gz: c2b336eb13f766af1dd17053d348931640d0c802af5d35b38401484fdd9f0b53893f5f0fdf273deaf344e3bdfa2edd463ecc8f1352e2bfa1af3cadb467d25152
-  data.tar.gz: 7b0c1270d455a5bf65e48635c6f8b92886f1f92e03e315d589a6808c8792edcfe071d3020db5f28e308faa0d6c94fd01548901906d9b66db47942e948ca83fae
+  metadata.gz: 66a25720f758524dccb47ba0c376ee3fd729cf6c991c2512e2d32f9fcf91907b66c9c895ddfa5ca321913ea7a80b6f6d287b4c54a9a72c783311ac16ee5c58a0
+  data.tar.gz: 45fe6bff72128006fa5e2bd2fb96433f572b40e2e4b3190288d4064146e0c533b3faae406115c1c6a1fa78be49ecdd277ad0e59a2bde4e35024efd1779303568

data/README.md

@@ -43,14 +43,13 @@ Add this line to `Capfile`
 
     require 'capistrano/unicorn-nginx'
 
-Set `nginx_server_name` in stage file, example `config/deploy/production.rb`:
+If you already have a domain for your app, set `nginx_server_name` in stage
+file, example `config/deploy/production.rb`:
 
-    set :user, 'deployer'   # user doing the deploy
     set :nginx_server_name, 'mydomain.com'
 
-or if you don't have a domain yet:
-
-    set :nginx_server_name, '<server_ip>'
+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).
 
 And you're all set!
 
@@ -76,10 +75,8 @@ In order to override the default, put the option in the stage file, for example:
 
 Defaults are listed near option name in the first line.
 
-- `set :nginx_server_name` # no default, required<br/>
-Your application's domain. You will be prompted if this option is not set.
-If you do not have a domain, you can put server IP - in this case you can
-deploy only one application on the server.
+- `set :nginx_server_name` # defaults to <server_IP><br/>
+Your application's domain. The default is your server's IP address.
 
 - `set :nginx_pid, "/run/nginx.pid"`<br/>
 Path for nginx process pid file.
@@ -127,10 +124,6 @@ Path for unicorn config file.
 - `set :unicorn_log, shared_path.join("log/unicorn.log")`<br/>
 Unicorn log path.
 
-- `set :user` # no default, required<br/>
-User name to run unicorn. This should be the name of the user doing the deploy,
-example: `set :user, 'deploy'`
-
 - `set :unicorn_workers, 2`<br/>
 Number of unicorn workers.
 

data/lib/capistrano/tasks/nginx.rake

@@ -4,35 +4,35 @@ include Capistrano::UnicornNginx::Helpers
 
 namespace :load do
   task :defaults do
-    set :templates_path, "config/deploy/templates"
-    set :nginx_server_name, -> { ask(:nginx_server_name, "Nginx server name: ") }
+    set :templates_path, 'config/deploy/templates'
+    set :nginx_server_name, -> { host.to_s }
     set :nginx_config_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
-    set :nginx_pid, "/run/nginx.pid"
+    set :nginx_pid, '/run/nginx.pid'
     # ssl options
     set :nginx_use_ssl, false
     set :nginx_ssl_cert, -> { "#{fetch(:nginx_server_name)}.crt" }
     set :nginx_ssl_cert_key, -> { "#{fetch(:nginx_server_name)}.key" }
     set :nginx_upload_local_cert, true
-    set :nginx_ssl_cert_local_path, -> { ask(:nginx_ssl_cert_local_path, "Local path to ssl certificate: ") }
-    set :nginx_ssl_cert_key_local_path, -> { ask(:nginx_ssl_cert_key_local_path, "Local path to ssl certificate key: ") }
+    set :nginx_ssl_cert_local_path, -> { ask(:nginx_ssl_cert_local_path, 'Local path to ssl certificate: ') }
+    set :nginx_ssl_cert_key_local_path, -> { ask(:nginx_ssl_cert_key_local_path, 'Local path to ssl certificate key: ') }
   end
 end
 
 namespace :nginx do
-  desc "Setup nginx configuration"
+  desc 'Setup nginx configuration'
   task :setup do
     on roles :web do
       config_name = fetch(:nginx_config_name)
       next if file_exists? "/etc/nginx/sites-available/#{config_name}"
 
-      execute :mkdir, "-p", shared_path.join("log")
-      template "nginx_conf.erb", "#{fetch(:tmp_dir)}/#{config_name}"
+      execute :mkdir, '-p', shared_path.join('log')
+      template 'nginx_conf.erb', "#{fetch(:tmp_dir)}/#{config_name}"
       sudo :mv, "#{fetch(:tmp_dir)}/#{config_name}", "/etc/nginx/sites-available/#{config_name}"
-      sudo :ln, "-fs", "/etc/nginx/sites-available/#{config_name}", "/etc/nginx/sites-enabled/#{config_name}"
+      sudo :ln, '-fs', "/etc/nginx/sites-available/#{config_name}", "/etc/nginx/sites-enabled/#{config_name}"
     end
   end
 
-  desc "Setup nginx ssl certs"
+  desc 'Setup nginx ssl certs'
   task :setup_ssl do
     on roles :web do
       next unless fetch(:nginx_use_ssl)
@@ -44,21 +44,21 @@ namespace :nginx do
         sudo :mv, "#{fetch(:tmp_dir)}/#{fetch(:nginx_ssl_cert)}", "/etc/ssl/certs/#{fetch(:nginx_ssl_cert)}"
         sudo :mv, "#{fetch(:tmp_dir)}/#{fetch(:nginx_ssl_cert_key)}", "/etc/ssl/private/#{fetch(:nginx_ssl_cert_key)}"
       end
-      sudo :chown, "root:root", "/etc/ssl/certs/#{fetch(:nginx_ssl_cert)}"
-      sudo :chown, "root:root", "/etc/ssl/private/#{fetch(:nginx_ssl_cert_key)}"
+      sudo :chown, 'root:root', "/etc/ssl/certs/#{fetch(:nginx_ssl_cert)}"
+      sudo :chown, 'root:root', "/etc/ssl/private/#{fetch(:nginx_ssl_cert_key)}"
     end
   end
 
-  desc "Reload nginx configuration"
+  desc 'Reload nginx configuration'
   task :reload do
     on roles :web do
-      sudo "/etc/init.d/nginx reload"
+      sudo '/etc/init.d/nginx reload'
     end
   end
 end
 
 namespace :deploy do
-  after :started, "nginx:setup"
-  after :started, "nginx:setup_ssl"
-  after :publishing, "nginx:reload"
+  after :started, 'nginx:setup'
+  after :started, 'nginx:setup_ssl'
+  after :publishing, 'nginx:reload'
 end

data/lib/capistrano/tasks/unicorn.rake

@@ -9,33 +9,36 @@ namespace :load do
     set :unicorn_pid, -> { shared_path.join("tmp/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_user, nil # user is set by executing `id -un` on the server
     set :unicorn_workers, 2
   end
 end
 
 namespace :unicorn do
-  desc "Setup Unicorn initializer"
+  desc 'Setup Unicorn initializer'
   task :setup_initializer do
     on roles :app do
       next if file_exists? "/etc/init.d/#{fetch(:unicorn_service_name)}"
 
-      template "unicorn_init.erb", "#{fetch(:tmp_dir)}/unicorn_init"
-      execute :chmod, "+x", "#{fetch(:tmp_dir)}/unicorn_init"
-      sudo :mv, "#{fetch(:tmp_dir)}/unicorn_init", "/etc/init.d/#{fetch(:unicorn_service_name)}"
-      sudo "update-rc.d -f #{fetch(:unicorn_service_name)} defaults"
+      set :unicorn_user, capture(:id, '-un') unless fetch(:unicorn_user)
+      init_tmp = "#{fetch(:tmp_dir)}/unicorn_init"
+
+      template 'unicorn_init.erb', init_tmp
+      execute :chmod, "+x", init_tmp
+      sudo :mv, init_tmp, "/etc/init.d/#{fetch(:unicorn_service_name)}"
+      sudo 'update-rc.d', '-f', fetch(:unicorn_service_name), 'defaults'
     end
   end
 
-  desc "Setup Unicorn app configuration"
+  desc 'Setup Unicorn app configuration'
   task :setup_app_config do
     on roles :app do
       next if file_exists? fetch(:unicorn_config)
 
-      execute :mkdir, "-p", shared_path.join("config")
-      execute :mkdir, "-p", shared_path.join("log")
-      execute :mkdir, "-p", shared_path.join("tmp/pids")
-      template "unicorn.rb.erb", fetch(:unicorn_config)
+      execute :mkdir, '-p', shared_path.join('config')
+      execute :mkdir, '-p', shared_path.join('log')
+      execute :mkdir, '-p', shared_path.join('tmp/pids')
+      template 'unicorn.rb.erb', fetch(:unicorn_config)
     end
   end
 
@@ -50,7 +53,7 @@ namespace :unicorn do
 end
 
 namespace :deploy do
-  after :updated, "unicorn:setup_initializer"
-  after :updated, "unicorn:setup_app_config"
-  after :publishing, "unicorn:restart"
+  after :updated, 'unicorn:setup_initializer'
+  after :updated, 'unicorn:setup_app_config'
+  after :publishing, 'unicorn:restart'
 end

data/lib/capistrano/unicorn_nginx/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module UnicornNginx
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Bruno Sutic