capistrano3-nginx 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9316c106530f6bc76e2a5773e5c2ba4011d5e673
-  data.tar.gz: 729b6b5a88fbff7200acb05c879103d543cdb848
+  metadata.gz: 4f6e7d1368a04ff2f7d4fe12d7f4039ddc3ef016
+  data.tar.gz: 08f71ee4dbe9d161ed1f701359af32a1cd144013
 SHA512:
-  metadata.gz: 8edc74c79f72b672e86e97a3226810d2a121571880e4182cca1000640035d920ebd8838b29cb108ae38d48a34ed0feb521d5f7b80433da3fb104a3a8d3ece0e9
-  data.tar.gz: 3348c0adc01760d9ecf994d485a8adaa7df9efb17b11f70f9a0625f7a010d85a0a19de9cc4b115501a128d36d6fa1ab1bd4a08ebd3a040237d0e750dea4a33d4
+  metadata.gz: 6c2fcaf7da40ce09f14f5f00133fc28ea9b2298399b004bf06febd4c85b54d0466bfd764c66c65832abbb2beb33ba0be64b9a6c42896246cf452130915c43b4a
+  data.tar.gz: fb425faaa2b1c1c9d7e52c5d96eb15f7a485330ae09e0800a6b84a72030c0c0de7faaa446694545f584ced32767ad7769090459f21241f2803ef9246117de6c5

data/README.md

@@ -75,21 +75,21 @@ set :nginx_roles, :web
 # default value:  "#{shared_path}/log"
 # set :nginx_log_path, "#{shared_path}/log"
 
-# Path where nginx is installed
-# default value: "/etc/nginx"
-set :nginx_root_path, "/etc/nginx"
-
 # Path where to look for static files
 # default value: "public"
 set :nginx_static_dir, "my_static_folder"
 
 # Path where nginx available site are stored
-# default value: "sites-available"
-set :nginx_sites_available_dir, "sites-available"
+# default value: "/etc/nginx/sites-available"
+set :nginx_sites_available_dir, "/opt/nginx/sites-available"
+
+# Name of file stored in site-enabled/available
+# default value: "#{fetch :application}"
+set :nginx_application_name, "#{fetch :application}-#{fetch :stage}"
 
 # Path where nginx available site are stored
-# default value: "sites-enabled"
-set :nginx_sites_enabled_dir, "sites-enabled"
+# default value: "/etc/nginx/sites-enabled"
+set :nginx_sites_enabled_dir, "/opt/nginx/sites-enabled"
 
 # Path to look for custom config template
 # `:default` will use the bundled nginx template

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.1.2'
+  spec.version       = '2.1.3'
   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

@@ -3,11 +3,11 @@ namespace :load do
     set :nginx_sudo_paths,          -> { [:nginx_log_path, :nginx_sites_enabled_dir, :nginx_sites_available_dir] }
     set :nginx_sudo_tasks,          -> { ['nginx:start', 'nginx:stop', 'nginx:restart', 'nginx:reload', 'nginx:configtest', 'nginx:site:add', 'nginx:site:disable', 'nginx:site:enable', 'nginx:site:remove' ] }
     set :nginx_log_path,            -> { "#{shared_path}/log" }
-    set :nginx_root_path,           -> { "/etc/nginx" }
     set :nginx_service_path,        -> { 'service nginx' }
     set :nginx_static_dir,          -> { "public" }
-    set :nginx_sites_enabled_dir,   -> { "sites-enabled" }
-    set :nginx_sites_available_dir, -> { "sites-available" }
+    set :nginx_application_name,    -> { fetch(:application) }
+    set :nginx_sites_enabled_dir,   -> { "/etc/nginx/sites-enabled" }
+    set :nginx_sites_available_dir, -> { "/etc/nginx/sites-available" }
     set :nginx_roles,               -> { :web }
     set :nginx_template,            -> { :default }
     set :nginx_use_ssl,             -> { false }
@@ -42,10 +42,10 @@ namespace :nginx do
   end
 
   task :load_vars do
-    set :sites_available,       -> { File.join(fetch(:nginx_root_path), fetch(:nginx_sites_available_dir)) }
-    set :sites_enabled,         -> { File.join(fetch(:nginx_root_path), fetch(:nginx_sites_enabled_dir)) }
-    set :enabled_application,   -> { File.join(fetch(:sites_enabled),   fetch(:application)) }
-    set :available_application, -> { File.join(fetch(:sites_available), fetch(:application)) }
+    set :sites_available,       -> { fetch(:nginx_sites_available_dir) }
+    set :sites_enabled,         -> { fetch(:nginx_sites_enabled_dir) }
+    set :enabled_application,   -> { File.join(fetch(:sites_enabled),   fetch(:nginx_application_name)) }
+    set :available_application, -> { File.join(fetch(:sites_available), fetch(:nginx_application_name)) }
   end
 
   # validate_sudo_settings
@@ -108,7 +108,7 @@ namespace :nginx do
           end
           config = ERB.new(File.read(config_file)).result(binding)
           upload! StringIO.new(config), '/tmp/nginx.conf'
-          arguments = :mv, '/tmp/nginx.conf', fetch(:application)
+          arguments = :mv, '/tmp/nginx.conf', fetch(:nginx_application_name)
           add_sudo_if_required arguments, 'nginx:sites:add', :nginx_sites_available_dir
           execute *arguments
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-nginx
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Adds suuport to nginx for Capistrano 3.x