capistrano3-nginx 2.1.6 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ae98b8736a74dbeb96bc7994875281595cc9aa
-  data.tar.gz: 573da7bababfb631c15eac362c87964db30f32fb
+  metadata.gz: a0d880cf04051698b7c32f78b7ec8d5337f816d0
+  data.tar.gz: 5f9b93d7b67b921316bb62f89939d4da293ab0e6
 SHA512:
-  metadata.gz: 4c3427f401cb63cceffd4406fd65fe8304968875a23b34cb8bfeafb2686d19ad186bef4aaba4e9cedfa66a87dffb68e1062b0e6d81286ca1144faefc380e9d24
-  data.tar.gz: 79e370c156392399bb742c47974e2578c320390389a14cdda762055c7d580a80f1d2deb7f815ebff545be27be747522af0f2cefc600b7a1fdfca925f01f40c2a
+  metadata.gz: 61bdfff4b8698afc094168a0b48fa661f7632fa8d2510d4f38f37d8306e5a28ffd11b43ef55b4c61014fd711c42e4ab67f404fb358ffd69fe68d8fbcca47993d
+  data.tar.gz: 4db79ae2fcbcf70730f4959f92e4fc48f7e25d449418cc89209be2d69f8cf3483b6334b35f4df5d6e37cc114efa2af75950302b9d6a61a588744398be1bdd009

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    capistrano3-nginx (2.2)
+      capistrano (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    airbrussh (1.1.2)
+      sshkit (>= 1.6.1, != 1.7.0)
+    capistrano (3.8.0)
+      airbrussh (>= 1.0.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (>= 1.9.0)
+    i18n (0.8.6)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.1.0)
+    rake (12.3.0)
+    sshkit (1.12.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano3-nginx!
+  rake
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -1,13 +1,12 @@
-# Capistrano::Nginx [![Gem Version](https://badge.fury.io/rb/capistrano3-nginx.svg)](http://badge.fury.io/rb/capistrano3-nginx)
 
-Nginx support for Capistrano 3.x
+Nginx support for Capistrano 3.x, with sudo password prompt
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano3-nginx', '~> 2.0'
-    gem 'capistrano'
+    gem 'capistrano3-nginx', '~> 3.0'
+
 
 And then execute:
 
@@ -23,8 +22,23 @@ Require in `Capfile` to use the default task:
 
 ```ruby
 require 'capistrano/nginx'
+install_plugin Capistrano::Nginx
+```
+
+Make sure pty is enabled in deploy.rb
+
+```ruby
+set :pty, true
 ```
 
+Make sure server has sudo role
+
+```ruby
+server 'example.com',
+  user: 'with_sudo_access',
+  roles: %w{sudo}
+```  
+
 You will get the following tasks
 
 ```ruby
@@ -68,8 +82,8 @@ set :nginx_redirected_domains, "bar.com other.com"
 set :nginx_service_path, "/etc/init.d/nginx"
 
 # Roles the deploy nginx site on,
-# default value: :web
-set :nginx_roles, :web
+# default value: :sudo
+set :nginx_roles, :sudo
 
 # Path, where nginx log file will be stored
 # default value:  "#{shared_path}/log"
@@ -142,22 +156,3 @@ set :app_server_port, 8080
 ## Thanks
 Thansk for the inspiration on several nginx recipes out there
 
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## Credits
-
-Thank you [contributors](https://github.com/platanus/guides/graphs/contributors)!
-
-<img src="http://platan.us/gravatar_with_text.png" alt="Platanus" width="250"/>
-
-capistrano3-nginx is maintained by [platanus](http://platan.us).
-
-## License
-
-Guides is © 2014 platanus, spa. It is free software and may be redistributed under the terms specified in the LICENSE file.

data/capistrano3-nginx.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'capistrano/nginx/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano3-nginx'
-  spec.version       = '2.1.6'
-  spec.authors       = ['Juan Ignacio Donoso']
-  spec.email         = ['jidonoso@gmail.com']
+  spec.version       = Capistrano::NGINX_VERSION
+  spec.authors       = ['Juan Ignacio Donoso', 'treenewbee']
   spec.description   = %q{Adds suuport to nginx for Capistrano 3.x}
   spec.summary       = %q{Adds suuport to nginx for Capistrano 3.x}
-  spec.homepage      = 'https://github.com/platanus/capistrano3-nginx'
+  spec.homepage      = 'https://github.com/treenewbee/capistrano3-nginx'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '>= 3.0.0'
+  spec.add_dependency 'capistrano', '~> 3.0'
 
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 0'
 end

data/lib/capistrano/nginx.rb

@@ -1 +1,56 @@
-load File.expand_path('../tasks/nginx.rake', __FILE__)
+require "capistrano/plugin"
+module Capistrano
+  class Nginx < Capistrano::Plugin
+
+    def set_defaults
+      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_service_path,        -> { 'service nginx' }
+      set :nginx_static_dir,          -> { "#{shared_path}/public/assets" }
+      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,               -> { :sudo }
+      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)}.key" }
+      set :nginx_ssl_certificate_key_path, -> { '/etc/ssl/private' }
+      set :app_server,                     -> { true }
+    end
+
+    def define_tasks
+      eval_rakefile File.expand_path('../tasks/nginx.rake', __FILE__)
+    end
+
+    # prepend :sudo to list if arguments if :key is in :nginx_use_sudo_for list
+    def add_sudo_if_required argument_list, *keys
+      keys.each do | key |
+        if nginx_use_sudo? key
+          argument_list.unshift(:sudo)
+          break
+        end
+      end
+    end
+
+    def nginx_use_sudo? key
+      (fetch(:nginx_sudo_tasks).include?(key) || fetch(:nginx_sudo_paths).include?(key))
+    end
+
+    class PasswdInteractionHandler
+      def on_data(command, stream_name, data, channel)
+        if data.include?("[sudo]")
+          ask(:password, 'sudo', echo: false)
+          channel.send_data("#{fetch(:password)}\n")
+        elsif data.include?("UNIX password")
+          ask(:password, 'UNIX', echo: false)
+          channel.send_data("#{fetch(:password)}\n")
+        else
+        end
+      end
+    end
+
+  end
+end

data/lib/capistrano/nginx/version.rb

@@ -0,0 +1,3 @@
+module Capistrano
+  NGINX_VERSION = '3.0'
+end

data/lib/capistrano/tasks/nginx.rake

@@ -1,46 +1,6 @@
-namespace :load do
-  task :defaults 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_service_path,        -> { 'service nginx' }
-    set :nginx_static_dir,          -> { "public" }
-    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 }
-    set :nginx_ssl_certificate,          -> { "#{fetch(:application)}.crt" }
-    set :nginx_ssl_certificate_path,     -> { '/etc/ssl/certs' }
-    set :nginx_ssl_certificate_key,      -> { "#{fetch(:application)}.key" }
-    set :nginx_ssl_certificate_key_path, -> { '/etc/ssl/private' }
-    set :app_server,                     -> { true }
-  end
-end
+git_plugin = self
 
 namespace :nginx do
-
-  # prepend :sudo to list if arguments if :key is in :nginx_use_sudo_for list
-  def add_sudo_if_required argument_list, *keys
-    keys.each do | key |
-      if use_sudo? key
-        argument_list.unshift(:sudo)
-        break
-      end
-    end
-  end
-
-  def use_sudo? key
-    return (fetch(:nginx_sudo_tasks).include?(key) || fetch(:nginx_sudo_paths).include?(key))
-  end
-
-  def valid_nginx_config?
-    test_sudo = use_sudo?('nginx:configtest') ? 'sudo ' : ''
-    nginx_service = fetch(:nginx_service_path)
-    test "[ $(#{test_sudo}#{nginx_service} configtest | grep -c 'fail') -eq 0 ]"
-  end
-
   task :load_vars do
     set :sites_available,       -> { fetch(:nginx_sites_available_dir) }
     set :sites_enabled,         -> { fetch(:nginx_sites_enabled_dir) }
@@ -48,6 +8,8 @@ namespace :nginx do
     set :available_application, -> { File.join(fetch(:sites_available), fetch(:nginx_application_name)) }
   end
 
+
+
   # validate_sudo_settings
   task :validate_user_settings do
     path_and_dir_keys = [:nginx_log_path, :nginx_sites_enabled_dir, :nginx_sites_available_dir]
@@ -64,7 +26,11 @@ namespace :nginx do
   desc "Configtest nginx service"
   task :configtest do
     on release_roles fetch(:nginx_roles) do
-      abort("nginx configuration is invalid! (Make sure nginx configuration files are readable and correctly formated.)") unless valid_nginx_config?
+      nginx_service = fetch(:nginx_service_path)
+      execute(
+          "sudo #{nginx_service} configtest",
+          interaction_handler: PasswdInteractionHandler.new
+      )
     end
   end
 
@@ -73,8 +39,8 @@ namespace :nginx do
     task command => ['nginx:validate_user_settings'] do
       on release_roles fetch(:nginx_roles) do
         arguments = fetch(:nginx_service_path), command
-        add_sudo_if_required arguments, "nginx:#{command}"
-        execute *arguments
+        git_plugin.add_sudo_if_required arguments, "nginx:#{command}"
+        execute *arguments, interaction_handler: PasswdInteractionHandler.new
       end
     end
     before "nginx:#{command}", 'nginx:configtest' unless command == 'stop'
@@ -84,7 +50,7 @@ namespace :nginx do
     on release_roles fetch(:nginx_roles) do
       arguments = :mkdir, '-pv', fetch(:nginx_log_path)
       add_sudo_if_required arguments, :nginx_log_path
-      execute *arguments
+      execute *arguments, interaction_handler: PasswdInteractionHandler.new
     end
   end
   after 'deploy:check', 'nginx:create_log_paths'
@@ -110,7 +76,7 @@ namespace :nginx do
           config = ERB.new(File.read(config_file)).result(binding)
           upload! StringIO.new(config), '/tmp/nginx.conf'
           arguments = :mv, '/tmp/nginx.conf', fetch(:nginx_application_name)
-          add_sudo_if_required arguments, 'nginx:sites:add', :nginx_sites_available_dir
+          git_plugin.add_sudo_if_required arguments, 'nginx:sites:add', :nginx_sites_available_dir
           execute *arguments
         end
       end
@@ -122,7 +88,7 @@ namespace :nginx do
         if test "! [ -h #{fetch(:enabled_application)} ]"
           within fetch(:sites_enabled) do
             arguments = :ln, '-nfs', fetch(:available_application), fetch(:enabled_application)
-            add_sudo_if_required arguments, 'nginx:sites:enable', :nginx_sites_enabled_dir
+            git_plugin.add_sudo_if_required arguments, 'nginx:sites:enable', :nginx_sites_enabled_dir
             execute *arguments
           end
         end
@@ -135,7 +101,7 @@ namespace :nginx do
         if test "[ -f #{fetch(:enabled_application)} ]"
           within fetch(:sites_enabled) do
             arguments = :rm, '-f', fetch(:nginx_application_name)
-            add_sudo_if_required arguments, 'nginx:sites:disable', :nginx_sites_enabled_dir
+            git_plugin.add_sudo_if_required arguments, 'nginx:sites:disable', :nginx_sites_enabled_dir
             execute *arguments
           end
         end
@@ -148,11 +114,12 @@ namespace :nginx do
         if test "[ -f #{fetch(:available_application)} ]"
           within fetch(:sites_available) do
             arguments = :rm, fetch(:nginx_application_name)
-            add_sudo_if_required arguments, 'nginx:sites:remove', :nginx_sites_available_dir
+            git_plugin.add_sudo_if_required arguments, 'nginx:sites:remove', :nginx_sites_available_dir
             execute *arguments
           end
         end
       end
     end
   end
+
 end

data/templates/nginx.conf.erb

@@ -66,11 +66,12 @@ server {
   location @<%= fetch(:application) %>-app-server {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-FORWARDED_PROTO http;
     proxy_set_header Host $http_host;
   <% if fetch(:nginx_use_ssl) %>
     proxy_set_header X-Forwarded-Proto https;
     proxy_set_header X-Forwarded-Ssl on;
+  <% else %>
+    proxy_set_header X-Forwarded-Proto http;
   <% end %>
   <% if fetch(:nginx_read_timeout) %>
     proxy_read_timeout <%= fetch(:nginx_read_timeout) %>;

metadata

@@ -1,62 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-nginx
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: '3.0'
 platform: ruby
 authors:
 - Juan Ignacio Donoso
+- treenewbee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.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: Adds suuport to nginx for Capistrano 3.x
-email:
-- jidonoso@gmail.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
 - capistrano3-nginx.gemspec
 - lib/capistrano/nginx.rb
+- lib/capistrano/nginx/version.rb
 - lib/capistrano/tasks/nginx.rake
 - lib/capistrano3-nginx.rb
 - templates/nginx.conf.erb
-homepage: https://github.com/platanus/capistrano3-nginx
+homepage: https://github.com/treenewbee/capistrano3-nginx
 licenses:
 - MIT
 metadata: {}
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Adds suuport to nginx for Capistrano 3.x