capistrano3-nginx 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d6a15b4f7b0023807b6c9924d0ecc3a74ea28d
-  data.tar.gz: ab02b0e917aa042a113888dddb947a55d6ce9ce0
+  metadata.gz: 75a49cbbb0fd1e3ec4362432bb7912913b56767d
+  data.tar.gz: 8a91a5b8e45653238dcad99266de0f4787a2def8
 SHA512:
-  metadata.gz: 48b67e2caa72c0a94bc13b80cfa474bd7b05e7681927d56f7372cb69863342b264e538f402efa45541d6119aad5ebbd75065fa24c7e05bcd8b7d147a15f0b7ac
-  data.tar.gz: 933f964e789260dc1b1e9ac47c4e3d070d2746bcd2e7e803adae1765463401fc930dc1c81b19352d68522f73c6cb44aa78478bd01b8c564e53cb53de41d8f834
+  metadata.gz: d2ae8ce4d02753a7cef985099e1b15c0c6dc5da168f1d927784eb3f8cb567a09bcb35d5c6baf0f16af2e87f1b59c594af5f8c950eb339dfb78b26f692cb6f0b2
+  data.tar.gz: 0aeb78b2e026d02ebf82e3b59a8cbc37f00bc7b82c0cd14d0d42a3713a3764721b93042c87c19a277d3c1ea1d33268126074a43b0c4024114da8c68d4ddea759

data/README.md

@@ -38,20 +38,26 @@ cap nginx:site:enable              # Enables the site creating a symbolic link i
 cap nginx:site:remove              # Removes the site removing the configuration file from the available folder
 ```
 
-Configurable options, shown here with examples:
+Configurable options (copy into deploy.rb), shown here with examples:
 
 ```ruby
 # Server name for nginx
 # No default vaue
 set :nginx_domains, "foo.bar.com"
 
+# nginx service script
+# Defaults to using the 'service' convinience script.
+# You might prefer using the init.d instead depending on sudo privilages.
+# default value: "service nginx"
+set :nginx_service_path, "/etc/init.d/nginx"
+
 # Roles the deploy nginx site on,
 # default value: :web
 set :nginx_roles, :web
 
 # Path, where nginx log file will be stored
 # default value:  "#{shared_path}/log"
-set :nginx_log_path, "#{shared_path}/log"
+# set :nginx_log_path, "#{shared_path}/log"
 
 # Path where nginx is installed
 # default value: "/etc/nginx"
@@ -59,7 +65,7 @@ set :nginx_root_path, "/etc/nginx"
 
 # Path where to look for static files
 # default value: "public"
-set :nginx_root_path, "my_static_folder"
+set :nginx_static_dir, "my_static_folder"
 
 # Path where nginx available site are stored
 # default value: "sites-available"
@@ -72,14 +78,29 @@ set :nginx_sites_enabled, "sites-enabled"
 # Path to look for custom config template
 # `:default` will use the bundled nginx template
 # default value: :default
-set :nginx_template, "#{fetch(:stage_config_path)}/#{stage}/nginx.conf.erb"
-set :nginx_tempalte, :default
+set :nginx_template, "#{stage_config_path}/#{fetch :stage}/nginx.conf.erb"
 
-# Use ssl on port 443 to serve on https. Every request to por 80
+# Use SSL on port 443 to serve on https. Every request to por 80
 # will be rewritten to 443
 # default value: false
 set :nginx_use_ssl, false
 
+# Name of SSL certificate file
+# default value: "#{application}.crt"
+set :nginx_ssl_certificate, 'my-domain.crt'
+
+# SSL certificate file path
+# default value: "/etc/ssl/certs"
+set :nginx_ssl_certificate_path, "#{shared_path}/ssl/certs"
+
+# Name of SSL certificate private key
+# default value: "#{application}.key"
+set :nginx_ssl_certificate_key, 'my-domain.key'
+
+# SSL certificate private key path
+# default value: "/etc/ssl/private"
+set :nginx_ssl_certificate_key_path, "#{shared_path}/ssl/private"
+
 # Whether you want to server an application through a proxy pass
 # default value: true
 set :app_server, true
@@ -87,15 +108,15 @@ set :app_server, true
 # Socket file that nginx will use as upstream to serve the application
 # Note: Socket upstream has priority over host:port upstreams
 # no default value
-set :app_server_socket, "#{shared_path}/sockets/#{application}.sock"
+set :app_server_socket, "#{shared_path}/sockets/unicorn-#{fetch :application}.sock"
 
 # The host that nginx will use as upstream to server the application
 # default value: 127.0.0.1
-set :app_server_port,
+set :app_server_host, "127.0.0.1"
 
 # The port the application server is running on
 # no default value
-set :app_server_host,
+set :app_server_port, 8080
 ```
 
 ## Thanks

data/capistrano3-nginx.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano3-nginx'
-  spec.version       = '2.0.1'
+  spec.version       = '2.0.2'
   spec.authors       = ['Juan Ignacio Donoso']
   spec.email         = ['jidonoso@gmail.com']
   spec.description   = %q{Adds suuport to nginx for Capistrano 3.x}

data/lib/capistrano/tasks/nginx.rake

@@ -1,5 +1,6 @@
 namespace :load do
   task :defaults do
+    set :nginx_service_path, -> { 'service nginx' }
     set :nginx_roles, -> { :web }
     set :nginx_log_path, -> { "#{shared_path}/log" }
     set :nginx_root_path, -> { "/etc/nginx" }
@@ -8,6 +9,10 @@ namespace :load do
     set :nginx_sites_available, -> { "sites-available" }
     set :nginx_template, -> { :default }
     set :nginx_use_ssl, -> { false }
+    set :nginx_ssl_certificate, -> { "#{fetch(:application)}.crt" }
+    set :nginx_ssl_certificate_path, -> { '/etc/ssl/certs' }
+    set :nginx_ssl_certificate_key, -> { "#{fetch(:application)}.crt" }
+    set :nginx_ssl_certificate_key_path, -> { '/etc/ssl/private' }
     set :app_server, -> { true }
   end
 end
@@ -23,9 +28,10 @@ namespace :nginx do
   %w[start stop restart reload].each do |command|
     desc "#{command.capitalize} nginx service"
     task command do
+      nginx_service = fetch(:nginx_service_path)
       on release_roles fetch(:nginx_roles) do
-        if command === 'stop' || (test "sudo nginx -t")
-          execute :sudo, "service nginx #{command}"
+        if command === 'stop' || (test "[ $(sudo #{nginx_service} configtest | grep -c 'fail') -eq 0 ]")
+          execute :sudo, "#{nginx_service} #{command}"
         end
       end
     end

data/templates/nginx.conf.erb

@@ -23,8 +23,8 @@ server {
 <% 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 <%= fetch(:nginx_ssl_certificate_path) %>/<%= fetch(:nginx_ssl_certificate) %>;
+  ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key_path) %>/<%= fetch(:nginx_ssl_certificate_key) %>;
 <% else %>
   listen 80;
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-nginx
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano