capistrano-pumaio 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eba443a7557705de098dc57c7ddc04cff4d1fee
-  data.tar.gz: 769107845b57cda95938bf49e35633be0daee2fe
+  metadata.gz: a76626d7c63be2c1cc1c3ed05768b81db37fedb9
+  data.tar.gz: 6900bdcdf0015d351c7490aa442deebc3bfeb8c2
 SHA512:
-  metadata.gz: 5398079d4eb19c45fac8dfa43619c2a6c2ced936ab4fa036b33688fd8d94dd7bafcb45773393fbe7bec48f00228fc871eba9cf7ac1133741371e20778f4183cb
-  data.tar.gz: e5df0905abd18cb1aceeedce28821fe9871afbec9978afe7be2e28a0b70d4d6b49ecab871c7877ee55ae606e75a2a232734b8d4426109b1a8a8175a072ed05e9
+  metadata.gz: 504c3b284df8023af5a8c2b3aa57ff7730773b18d76a59d1e3b2407fd575b5c6fd114c7dd8e43664039775830f582505f552fca85112568608a39c66b63970e8
+  data.tar.gz: c5c1756365e7f38b02fc1f54a5dce6591ada8a38c5a709cbf9708899cedb4cf496ea9f769fcd05d5334f3afb240132e635bf7532298a3bed6387152fa67d4822

data/Gemfile

@@ -1,10 +1,10 @@
-source 'http://rubygems.org'
-
-gem 'capistrano', '~> 3.4'
-gem 'activesupport', '>= 3.0'
-gem 'capistrano-monit_runit', '~> 3.0.2'
-
-group :development do
-  gem 'bundler', '~> 1.7'
-  gem 'jeweler', '~> 2.0'
-end
+source 'http://rubygems.org'
+
+gem 'capistrano', '~> 3.4'
+gem 'activesupport', '>= 4.0'
+gem 'capistrano-monit_runit', '~> 3.1.0'
+
+group :development do
+  gem 'bundler', '~> 1.7'
+  gem 'juwelier'
+end

data/Gemfile.lock

@@ -1,39 +1,38 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
+    addressable (2.4.0)
     builder (3.2.2)
     capistrano (3.4.0)
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capistrano-monit_runit (3.0.2)
-      activesupport (>= 3.0)
+    capistrano-monit_runit (3.1.0)
+      activesupport (>= 4.0)
       capistrano (~> 3.4)
-    colorize (0.7.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.3)
-      addressable (~> 2.3)
+    git (1.3.0)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.4.0)
-    highline (1.7.1)
+    hashie (3.4.3)
+    highline (1.7.8)
     i18n (0.7.0)
-    jeweler (2.0.1)
+    json (1.8.3)
+    juwelier (2.1.0)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -42,29 +41,28 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.2)
-    jwt (1.4.1)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    jwt (1.5.1)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
+    net-ssh (3.0.2)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
-    sshkit (1.7.1)
-      colorize (>= 0.7.0)
+      rack (>= 1.2, < 3)
+    rack (1.6.4)
+    rake (11.1.1)
+    rdoc (4.2.2)
+      json (~> 1.4)
+    sshkit (1.9.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thread_safe (0.3.5)
@@ -75,8 +73,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0)
+  activesupport (>= 4.0)
   bundler (~> 1.7)
   capistrano (~> 3.4)
-  capistrano-monit_runit (~> 3.0.2)
-  jeweler (~> 2.0)
+  capistrano-monit_runit (~> 3.1.0)
+  juwelier
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -1,6 +1,6 @@
 # Capistrano Recipes for Puma
 
-This gem provides recipes for [Puma](http://puma.io) to setup [runit](http://smarden.org/runit/), [monit](http://mmonit.com/monit) and [nginx](http://nginx.org) for both running and monitoring puma and a nginx site connected to a puma socket
+This gem provides recipes for [Puma](http://puma.io) to setup [runit](http://smarden.org/runit/) and [monit](http://mmonit.com/monit) for both running and monitoring puma
 
 ## Versioning
 
@@ -25,14 +25,6 @@ Add this to your Capfile:
 require 'capistrano/puma'
 ```
 
-Create a new file in in /etc/sudoers.d/ and add the output of the following commands:
-
-```
-cap production runit:sudoers
-cap production monit:sudoers
-cap production puma:nginx:sudoers
-```
-
 ### Monit
 
 ```ruby
@@ -98,40 +90,9 @@ before  "monit:monitor",   "puma:runit:restart"
 
 ### nginx
 
-#### Specific to puma and nginx for the application:
-
-```ruby
-cap puma:nginx:disable          # Disable nginx site for the application
-cap puma:nginx:enable           # Enable nginx site for the application
-cap puma:nginx:purge            # Purge nginx site config for the application
-cap puma:nginx:setup            # Parses and uploads nginx configuration for this app.
-```
-
-#### Global nginx commands
-
-```ruby
-cap nginx:restart               # Restart nginx
-cap nginx:start                 # Start nginx
-cap nginx:status                # Show nginx status
-cap nginx:stop                  # Stop nginx
-```
-
-#### Configuration for nginx
-
-See nginx.rb for configuration options.
-
-#### Notes when using nginx
-
-
-You have to run ``` cap production puma:nginx:setup ``` to automatically setup nginx.
-
-If you do not enable the site during setup, be sure to run the following two commands when you want to enable your site:
-
-```ruby
-cap puma:nginx:enable
-cap nginx:restart
-```
+This has been removed, because it is better practice to setup nginx should as part of your infrastructure.
 
+Most likely you have one or more load balancer and several app servers.
 
 ## Configuration of Monit/Runit
 

data/Rakefile

@@ -11,14 +11,14 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = 'capistrano-pumaio'
   gem.homepage = 'https://github.com/leifcr/capistrano-puma'
   gem.license = 'MIT'
   gem.summary = 'Capistrano recipes for puma using runit and monit'
-  gem.description = 'Capistrano recipes for puma using runit and monit. Includes nginx recipes for the app server.'
+  gem.description = 'Capistrano recipes for puma using runit and monit.'
   gem.email = 'leifcr@gmail.com'
   gem.authors = ['Leif Ringstad']
   gem.files.exclude '.ruby-*'
@@ -26,7 +26,7 @@ Jeweler::Tasks.new do |gem|
   gem.files.exclude '.rubocop.yml'
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 # require 'rdoc/task'
 # Rake::RDocTask.new do |rdoc|
@@ -36,4 +36,4 @@ Jeweler::RubygemsDotOrgTasks.new
 #   rdoc.title = 'capistrano-empty #{version}'
 #   rdoc.rdoc_files.include('README*')
 #   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
+# end

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.1.1

data/capistrano-pumaio.gemspec

@@ -1,18 +1,18 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano-pumaio 3.0.3 ruby lib
+# stub: capistrano-pumaio 3.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-pumaio"
-  s.version = "3.0.3"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Leif Ringstad"]
-  s.date = "2015-10-28"
-  s.description = "Capistrano recipes for puma using runit and monit. Includes nginx recipes for the app server."
+  s.date = "2016-03-18"
+  s.description = "Capistrano recipes for puma using runit and monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -27,17 +27,12 @@ Gem::Specification.new do |s|
     "VERSION",
     "capistrano-pumaio.gemspec",
     "lib/capistrano/helpers/puma/monit.rb",
-    "lib/capistrano/helpers/puma/nginx.rb",
     "lib/capistrano/helpers/puma/template_paths.rb",
     "lib/capistrano/puma.rb",
     "lib/capistrano/tasks/config.rake",
     "lib/capistrano/tasks/monit.rake",
-    "lib/capistrano/tasks/nginx.rake",
-    "lib/capistrano/tasks/nginx_config.rake",
     "lib/capistrano/tasks/runit.rake",
     "templates/monit/puma.conf.erb",
-    "templates/nginx/application.conf.erb",
-    "templates/nginx/htpasswd.erb",
     "templates/puma-config.rb.erb",
     "templates/runit/control/q.erb",
     "templates/runit/finish.erb",
@@ -46,7 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/leifcr/capistrano-puma"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.6"
+  s.rubygems_version = "2.5.1"
   s.summary = "Capistrano recipes for puma using runit and monit"
 
   if s.respond_to? :specification_version then
@@ -54,23 +49,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<capistrano>, ["~> 3.4"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_runtime_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 4.0"])
+      s.add_runtime_dependency(%q<capistrano-monit_runit>, ["~> 3.1.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<juwelier>, [">= 0"])
     else
       s.add_dependency(%q<capistrano>, ["~> 3.4"])
-      s.add_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
+      s.add_dependency(%q<activesupport>, [">= 4.0"])
+      s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.1.0"])
       s.add_dependency(%q<bundler>, ["~> 1.7"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<juwelier>, [">= 0"])
     end
   else
     s.add_dependency(%q<capistrano>, ["~> 3.4"])
-    s.add_dependency(%q<activesupport>, [">= 3.0"])
-    s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
+    s.add_dependency(%q<activesupport>, [">= 4.0"])
+    s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.1.0"])
     s.add_dependency(%q<bundler>, ["~> 1.7"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<juwelier>, [">= 0"])
   end
 end
 

data/lib/capistrano/puma.rb

@@ -6,16 +6,8 @@ def try_require(library)
   end
 end
 
-# try_require 'tasks/config.rake'
-# try_require 'tasks/monit.rake'
-# try_require 'tasks/runit.rake'
-# try_require 'tasks/nginx_config.rake'
-# try_require 'tasks/nginx.rake'
-# try_require 'tasks/.rake'
 try_require 'capistrano/monit'
 try_require 'capistrano/runit'
 load File.expand_path('../tasks/config.rake', __FILE__)
 load File.expand_path('../tasks/monit.rake', __FILE__)
 load File.expand_path('../tasks/runit.rake', __FILE__)
-load File.expand_path('../tasks/nginx_config.rake', __FILE__)
-load File.expand_path('../tasks/nginx.rake', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-pumaio
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: capistrano-monit_runit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +67,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-description: Capistrano recipes for puma using runit and monit. Includes nginx recipes
-  for the app server.
+        version: '0'
+description: Capistrano recipes for puma using runit and monit.
 email: leifcr@gmail.com
 executables: []
 extensions: []
@@ -97,17 +96,12 @@ files:
 - VERSION
 - capistrano-pumaio.gemspec
 - lib/capistrano/helpers/puma/monit.rb
-- lib/capistrano/helpers/puma/nginx.rb
 - lib/capistrano/helpers/puma/template_paths.rb
 - lib/capistrano/puma.rb
 - lib/capistrano/tasks/config.rake
 - lib/capistrano/tasks/monit.rake
-- lib/capistrano/tasks/nginx.rake
-- lib/capistrano/tasks/nginx_config.rake
 - lib/capistrano/tasks/runit.rake
 - templates/monit/puma.conf.erb
-- templates/nginx/application.conf.erb
-- templates/nginx/htpasswd.erb
 - templates/puma-config.rb.erb
 - templates/runit/control/q.erb
 - templates/runit/finish.erb
@@ -133,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Capistrano recipes for puma using runit and monit

data/lib/capistrano/helpers/puma/nginx.rb

@@ -1,18 +0,0 @@
-module Capistrano
-  module Helpers
-    module Puma
-      ##
-      # Module Nginx provides helper functions for nginx configuration
-      ##
-      module Nginx
-        module_function
-
-        def default_pw_generator
-          pw = SecureRandom.random_number(36**10).to_s(36).rjust(10, '0')
-          info "Random password generated: #{pw}"
-          pw
-        end
-      end
-    end
-  end
-end

data/lib/capistrano/tasks/nginx.rake

@@ -1,119 +0,0 @@
-require 'capistrano/dsl/base_paths'
-require 'capistrano/helpers/base'
-require 'capistrano/helpers/puma/nginx'
-include Capistrano::DSL::BasePaths
-include Capistrano::Helpers::Base
-include Capistrano::Helpers::Puma::Nginx
-
-namespace :puma do
-  namespace :nginx do
-    desc 'Get the config needed to add to sudoers for nginx commands'
-    task :sudoers do
-      run_locally do
-        puts '#---------------ENTRIES FOR SUDOERS (Nginx)---------------------'
-        puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{fetch(:nginx_log_path)}"
-        puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown -R #{fetch(:user)}\\:root #{fetch(:nginx_log_path)}"
-        puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 6775 #{fetch(:nginx_log_path)}"
-        puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{fetch(:nginx_sites_enabled_path)}"
-        puts "#{fetch(:user)} ALL=NOPASSWD: /usr/sbin/service nginx *"
-        puts '#---------------------------------------------------------------'
-      end
-      # info "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy:root #{monit_monitrc_file}"
-    end
-
-    desc 'Generates and uploads nginx configuration for this app to the App server(s)'
-    # task :setup, :roles => :app , :except => { :no_release => true } do
-    task :setup do
-      # Will setup nginx on the application server, as single-host app/web server is used behind load balancer
-      # Nginx is used for talking over socket to puma instead of opening puma to the 'world'
-      on roles(:app) do |host|
-        info "NGINX: Setting up for puma for #{fetch(:application)} on #{host}"
-        upload! template_to_s_io(fetch(:nginx_config_template)), fetch(:nginx_remote_config)
-        if (fetch(:nginx_use_simple_auth)) || fetch(:nginx_ssl_use_simple_auth)
-          set :pw, ask('', '')
-          set :create_httpwd, ask('Create .httpasswd configuration file [Yn]', 'Y')
-          # if auth is enabled, upload htpasswd file
-          # Since passwords are stored in plaintext in the deployment file, you should use simple auth with care.
-          # It is generally better to implement a full authorization stack like oauth, use devise on rails,
-          # or other login/auth system
-          if fetch(:create_httpwd)
-            set :nginx_simple_auth_password, default_pw_generator if fetch(:nginx_simple_auth_password).nil?
-            upload! template_to_s_io(fetch(:nginx_htpasswd_template)), fetch(:nginx_remote_htpasswd)
-          else
-            set :nginx_use_simple_auth, false
-            set :nginx_ssl_use_simple_auth, false
-          end
-        end
-        # create log path
-        # /var/log/nginx must be writable by 'deploy' user, usually this can be acomplished by adding the deploy user to
-        # the www-data group
-        execute :sudo, :mkdir, "-p #{fetch(:nginx_log_path)}"
-        execute :sudo, :chown, "-R #{fetch(:user)}:root #{fetch(:nginx_log_path)}"
-        execute :sudo, :chmod, "6775 #{fetch(:nginx_log_path)}"
-        execute :mkdir, "-p #{fetch(:nginx_app_log_path)}"
-      end
-    end
-
-    desc 'Enable nginx site for the application'
-    task :enable do
-      on roles(:app) do |host|
-        if test("[ ! -h #{fetch(:nginx_sites_enabled_symlink)} ]")
-          info "NGINX: Enabling application #{fetch(:application)} on #{host}"
-          # Make sure deploy user can symlink site
-          execute :sudo, :chown, "#{fetch(:user)}:root #{fetch(:nginx_sites_enabled_path)}"
-          execute :ln, "-sf #{fetch(:nginx_remote_config)} #{fetch(:nginx_sites_enabled_symlink)}"
-        else
-          info "NGINX: Already enabled application #{fetch(:application)} on #{host}"
-        end
-      end
-    end
-
-    desc 'Disable nginx site for the application'
-    task :disable do
-      on roles(:app) do |host|
-        if test("[ -h #{fetch(:nginx_sites_enabled_symlink)} ]")
-          info "NGINX: Disabling application #{fetch(:application)} on #{host}"
-          # Make sure deploy user can unsymlink site
-          execute :sudo, :chown, "#{fetch(:user)}:root #{fetch(:nginx_sites_enabled_path)}"
-          execute :rm, "-f #{fetch(:nginx_sites_enabled_symlink)}"
-        else
-          info "NGINX: Already disabled application #{fetch(:application)} on #{host}"
-        end
-      end
-    end
-
-    desc 'Purge nginx site config for the application'
-    task :purge do
-      on roles(:app) do |host|
-        info "NGINX: Purging configuration for #{fetch(:application)} on #{host}"
-        execute :rm, "-f #{fetch(:nginx_sites_enabled_symlink)}" if test("[ -h #{fetch(:nginx_sites_enabled_symlink)} ]")
-        execute :rm, "-f #{fetch(:nginx_remote_htpasswd)}"
-        execute :rm, "-f #{fetch(:nginx_remote_config)}"
-        # must restart nginx to make sure site is disabled when config is purge
-        execute :sudo, :service, 'nginx restart'
-      end
-    end
-  end
-end
-
-namespace :nginx do
-  %w(start stop restart status).each do |nginx_cmd|
-    desc "Nginx/Puma: #{nginx_cmd.capitalize}"
-    task nginx_cmd.to_sym do
-      on roles(:app) do |host|
-        info "NGINX: Performing #{nginx_cmd} for #{fetch(:application)} on #{host}"
-        execute :sudo, :service, "nginx #{nginx_cmd}"
-      end
-    end
-  end
-end
-
-# after 'deploy:setup' do
-#   puma.nginx.setup if Capistrano::CLI.ui.agree("Create nginx configuration file? [Yn]")
-#   if Capistrano::CLI.ui.agree("Enable site in nginx? [Yn]")
-#     puma.nginx.enable
-#     nginx.restart # must restart after enable for nginx to pickup new site
-#   end
-# end
-
-after 'sudoers', 'puma:nginx:sudoers'

data/lib/capistrano/tasks/nginx_config.rake

@@ -1,63 +0,0 @@
-require 'active_support'
-require 'active_support/core_ext/string/filters'
-require 'capistrano/helpers/puma/template_paths'
-require 'capistrano/helpers/base'
-include Capistrano::Helpers::Base
-
-namespace :load do
-  task :defaults do
-    # Where your nginx lives. Usually /opt/nginx or /usr/local/nginx for source compiled.
-    set :nginx_sites_enabled_path, '/etc/nginx/sites-enabled'
-
-    # simple authorization in nginx recipe
-    # Remember NOT to share your deployment file in case you have sensitive passwords stored in it...
-    # This is added to make it easier to deploy staging sites with a simple htpasswd.
-
-    set :nginx_use_simple_auth, false
-    set :nginx_simple_auth_message, 'Restricted site'
-    set :nginx_simple_auth_user, 'user'
-    set :nginx_simple_auth_password, nil # if set to nil, it will automatically be generated
-    set :nginx_simple_auth_salt, (0...8).map { ('a'..'z').to_a[rand(26)] }.join
-
-    # Server names. Defaults to application name.
-    set :server_names, proc { app_env_underscore }
-
-    # Path to the nginx erb template to be parsed before uploading to remote
-    set :nginx_config_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'nginx', 'application.conf.erb') # rubocop:disable Metrics/LineLength
-
-    # Path to where your remote config will reside (I use a directory sites inside conf)
-    set :nginx_remote_config, proc { shared_path.join('config', "nginx_#{app_env_underscore}.conf") }
-
-    # Path to local htpasswd template file
-    set :nginx_htpasswd_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'nginx', 'htpasswd.erb')
-
-    # Path to remote htpasswd file
-    set :nginx_remote_htpasswd, proc { shared_path.join('config', '.htpasswd') }
-
-    set :nginx_sites_enabled_symlink, proc { File.join(fetch(:nginx_sites_enabled_path), app_env_underscore) }
-
-    set :nginx_uses_http, true
-    set :nginx_uses_ssl, false
-    set :nginx_port, 80
-
-    set :nginx_log_path, proc { File.join('/var', 'log', 'nginx') }
-
-    set :nginx_app_log_path, proc { File.join(fetch(:nginx_log_path), fetch(:application).squish.downcase.gsub(/[\s|-]/, '_')) }
-
-    set :nginx_client_max_body_size, '10M'
-
-    set :nginx_ssl_port, 443
-    set :nginx_ssl_use_simple_auth, false
-    set :nginx_ssl_client_max_body_size, '10M'
-    set :nginx_ssl_public_crt, File.join('/etc', 'certs', 'server.crt')
-    set :nginx_ssl_private_key, File.join('/etc', 'certs', 'server.key')
-
-    set :nginx_puma_server_url, proc { "unix:#{fetch(:puma_socket_file)}" }
-    set :nginx_puma_server_timeout, proc { 'fail_timeout=0' }
-
-    # Supply a block of text to add to the nginx config file before hitting puma server (rewrites etc)
-    set :nginx_extra_rules, nil
-    # Same as above but for ssl
-    set :nginx_extra_rules_ssl, nil
-  end
-end

data/templates/nginx/application.conf.erb

@@ -1,184 +0,0 @@
-# Nginx configuration
-# <%= "#{fetch(:application)} running as #{fetch(:user)} in environment #{environment}" %>
-# <%
-  upstream_name     = "#{fetch(:application)}_#{environment}_app_server"
-  upstream_name_ssl = "#{fetch(:application)}_#{environment}_app_server_ssl"
-  %>
-#
-
-upstream <%= upstream_name %> {
-  server <%= fetch(:nginx_puma_server_url) %> <%= fetch(:nginx_puma_server_timeout) %>;
-}
-
-<% if fetch(:nginx_uses_http) %>
-#
-# HTTP server configuration
-#
-server {
-  listen <%= fetch(:nginx_port) %>;
-  client_max_body_size <%= fetch(:nginx_client_max_body_size) %>;
-  server_name <%= fetch(:server_names) %>;
-
-  # ~2 seconds is often enough for most folks to parse HTML/CSS and
-  # retrieve needed images/icons/frames, connections are cheap in
-  # nginx so increasing this is generally safe...
-  # 8 seconds might be needed for some mobile devs
-  keepalive_timeout 8;
-
-  # path for static files
-  root <%= fetch(:deploy_to) %>/current/public;
-  access_log <%= fetch(:nginx_app_log_path) %>/<%= environment %>.access.log;
-  error_log  <%= fetch(:nginx_app_log_path) %>/<%= environment %>.error.log info;
-
-  # this rewrites all the requests to the maintenance.html
-  # page if it exists in the doc root. This is for capistrano's
-  # disable web task
-  if (-f $document_root/system/maintenance.html) {
-    rewrite  ^(.*)$  /system/maintenance.html last;
-    break;
-  }
-
-  location / {
-  <% if fetch(:nginx_use_simple_auth) %>
-    auth_basic "<%= fetch(:nginx_simple_auth_message) %>";
-    auth_basic_user_file <%= fetch(:nginx_remote_htpasswd) %>;
-  <% end %>
-
-    # needed to forward user's IP address to rails
-    proxy_set_header  X-Real-IP  $remote_addr;
-
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-
-    # if the request is for a static resource, nginx should serve it directly
-    # and add a far future expires header to it, making the browser
-    # cache the resource and navigate faster over the website.
-    location ~ ^/(assets)/.+-([0-9a-zA-Z])+\. {
-      gzip_static on;
-      expires max;
-      add_header Cache-Control public;
-    }
-
-    # Serve images outside the asset path
-    # Now this supposedly should work as it gets the filenames with querystrings that Rails provides.
-    # BUT there's a chance it could break the ajax calls.
-    location ~* \.(ico|css|gif|jpe?g|png)(\?[0-9]+)?$ {
-       expires max;
-    }
-
-    # Serve javascript outside the asset path
-    location ~ ^/javascripts/.*\.js(\?[0-9]+)?$ {
-       expires max;
-    }
-
-    # If the file exists as a static file serve it directly without
-    # running all the other rewrite tests on it
-    if (-f $request_filename) {
-      break;
-    }
-
-    <%= fetch(:nginx_extra_rules) unless fetch(:nginx_extra_rules).nil? %>
-
-    if (!-f $request_filename) {
-      proxy_pass http://<%= upstream_name %>;
-      break;
-    }
-  }
-
-  # Rails error pages
-  error_page 500 502 503 504 /500.html;
-  location = /500.html {
-    root   <%= fetch(:deploy_to) %>/current/public;
-  }
-}
-<% end %>
-
-<% if fetch(:nginx_uses_ssl) %>
-#
-# HTTPs server configuration
-#
-upstream <%= upstream_name_ssl %> {
-  server <%= fetch(:nginx_puma_server_url) %> <%= fetch(:nginx_puma_server_timeout) %>;
-}
-
-# This server is setup for ssl. Uncomment if
-# you are using ssl as well as port 80.
-server {
-  listen <%= fetch(:nginx_ssl_port) %>;
-  server_name <%= fetch(:server_names) %>;
-  ssl                     on;
-  ssl_certificate         <%= fetch(:nginx_ssl_public_crt) %>;
-  ssl_certificate_key     <%= fetch(:nginx_ssl_private_key) %>;
-  ssl_session_timeout     5m;
-  client_max_body_size    <%= fetch(:nginx_ssl_client_max_body_size) %>;
-
-  root <%= fetch(:deploy_to) %>/current/public;
-  access_log <%= fetch(:nginx_app_log_path) %>/<%= environment %>_ssl.access.log;
-  error_log  <%= fetch(:nginx_app_log_path) %>/<%= environment %>_ssl.error.log info;
-
-  # this rewrites all the requests to the maintenance.html
-  # page if it exists in the doc root. This is for capistrano's
-  # disable web task
-  if (-f $document_root/system/maintenance.html) {
-      rewrite  ^(.*)$  /system/maintenance.html last;
-      break;
-  }
-
-  location / {
-  <% if fetch(:nginx_ssl_use_simple_auth) %>
-    auth_basic "<%= fetch(:nginx_simple_auth_message) %>";
-    auth_basic_user_file <%= fetch(:nginx_remote_htpasswd) %>;
-  <% end %>
-
-    # needed to forward user's IP address to rails
-    proxy_set_header  X-Real-IP  $remote_addr;
-
-    # needed for HTTPS
-    proxy_set_header X_FORWARDED_PROTO https;
-
-    proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-    proxy_max_temp_file_size 0;
-
-    # if the request is for a static resource, nginx should serve it directly
-    # and add a far future expires header to it, making the browser
-    # cache the resource and navigate faster over the website.
-    location ~ ^/(assets)/.+-([0-9a-zA-Z])+\. {
-      gzip_static on;
-      expires max;
-      add_header Cache-Control public;
-    }
-
-    # Serve images outside the asset path
-    # Now this supposedly should work as it gets the filenames with querystrings that Rails provides.
-    # BUT there's a chance it could break the ajax calls.
-    location ~* \.(ico|css|gif|jpe?g|png)(\?[0-9]+)?$ {
-       expires max;
-    }
-
-    # Serve javascript outside the asset path
-    location ~ ^/javascripts/.*\.js(\?[0-9]+)?$ {
-       expires max;
-    }
-
-    # If the file exists as a static file serve it directly without
-    # running all the other rewite tests on it
-    if (-f $request_filename) {
-      break;
-    }
-
-    <%= fetch(:nginx_extra_rules_ssl) unless fetch(:nginx_extra_rules_ssl).nil? %>
-
-    if (!-f $request_filename) {
-      proxy_pass http://<%= upstream_name_ssl %>;
-      break;
-    }
-  }
-
-  error_page   500 502 503 504  /500.html;
-  location = /500.html {
-    root   <%= fetch(:deploy_to) %>/current/public;
-  }
-}
-<% end %>

data/templates/nginx/htpasswd.erb

@@ -1,6 +0,0 @@
-# Capistrano deployed htpasswd file
-#
-# Remember NOT to share your deployment file in case you have sensitive passwords stored in it.
-# You probably shouldn't use this in production in case your deploy.rb is visible on public sites.
-
-<%= fetch(:nginx_simple_auth_user) %>:<%= fetch(:nginx_simple_auth_password).crypt(fetch(:nginx_simple_auth_salt)) %>:Autogenerated user from capistrano deployment