capistrano-generals 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b9088cc96674dce692f1d35bbe6c7e402ef8d7
-  data.tar.gz: e0c51c91fbaa60908ec4fa6f28acad18d7145f2f
+  metadata.gz: ce4edad6fe2a55d648cc2d1cd94efb7990d316ba
+  data.tar.gz: 4f583f9e7c648daafc2d38b57af1f82b5d2e409a
 SHA512:
-  metadata.gz: 908f1e6c07c640d16f262a68bde17787d54a7d3a4fc428bc6df889e291ebd0223da58d634f5c7b08faf28785a47e8a48167b33bf7b036af7070697c96e011c8d
-  data.tar.gz: d9333ace8a8bec85752d387168a89a065caa5b7e71adb5f1161a9965e00052d59fcc26be10a47424d699f66b2db42788538f013020826e67d980a3d386b96bfe
+  metadata.gz: c4996378b3e7964dae3ca0d761e29d6f53e6cc27cfee034de5d8e3bf75c19cc6bae6cb81b86c50913d1c457b51a1811dfd0d2b8fc5257ead6f7933b368749551
+  data.tar.gz: 73628d76d1b34286d780fcb4ac5be17504fd9f2a14082c78a8d2dbd08d8c99b8e0b59fb54ed9e6f4a143c9dcc161cbc6a121b879e5cd9f78b8753384829fe634

data/README.md

@@ -86,4 +86,6 @@ This will upgrade the unicorn workers and restart nginx.
 
 
 ## Disclaimer
-With ideas from: https://github.com/capistrano-plugins/capistrano-unicorn-nginx
+With ideas from:
+* https://github.com/capistrano-plugins/capistrano-unicorn-nginx
+* https://exceptiontrap.com/blog/11-create-and-install-ssl-certificates-with-ease-capistrano-recipe

data/lib/capistrano/dsl/nginx_paths.rb

@@ -14,19 +14,6 @@ module Capistrano
         "#{fetch(:nginx_location)}/sites-enabled/#{fetch(:app_config_name)}"
       end
 
-      # ssl related files
-      def nginx_ssl_cert_file
-        "/etc/ssl/certs/#{fetch(:nginx_ssl_cert)}"
-      end
-
-      def nginx_ssl_cert_key_file
-        "/etc/ssl/private/#{fetch(:nginx_ssl_cert_key)}"
-      end
-
-      def nginx_ssl_dhparam_file
-        "/etc/ssl/certs/#{fetch(:nginx_ssl_dhparam)}"
-      end
-
     end
   end
 end

data/lib/capistrano/dsl/puma_paths.rb

@@ -0,0 +1,22 @@
+module Capistrano
+  module DSL
+    module PumaPaths
+
+      def puma_service
+        "puma_#{fetch(:app_config_name)}"
+      end
+
+      def puma_initd_file
+        "/etc/init.d/#{puma_service}"
+      end
+
+      def puma_default_config_file
+        shared_path.join('config/puma.rb')
+      end
+
+      def puma_default_pid_file
+        shared_path.join('tmp/pids/puma.pid')
+      end
+    end
+  end
+end

data/lib/capistrano/dsl/ssl_paths.rb

@@ -0,0 +1,47 @@
+module Capistrano
+  module DSL
+    module SSLPaths
+
+      # Get the full path of a certificate file
+      def certificate_file_for(filename)
+        File.expand_path(filename, fetch(:local_certs_folder))
+      end
+
+      def existing_certificate_file_for(filename)
+        filename = certificate_file_for filename
+        unless File.exists? filename
+          abort red "Could not find #{filename}"
+        end
+        filename
+      end
+
+      def new_certificate_file_for(filename)
+        filename = certificate_file_for filename
+        if File.exists? filename
+          abort red "File #{filename} already exists"
+        end
+        execute :mkdir, '-pv', fetch(:local_certs_folder)
+        filename
+      end
+
+      def chained_certificate
+        c1 = File.read(existing_certificate_file_for(fetch(:ssl_cert)))
+        c2 = File.read(existing_certificate_file_for(fetch(:ssl_cert_intermediate)))
+        StringIO.new(c1.rstrip + "\n" + c2)
+      end
+
+      # ssl related files
+      def remote_ssl_cert_chained_file
+        "#{fetch(:remote_certs_folder)}/certs/#{fetch(:ssl_cert_chain)}"
+      end
+
+      def remote_ssl_cert_key_file
+        "#{fetch(:remote_certs_folder)}/private/#{fetch(:ssl_cert_key)}"
+      end
+
+      def remote_ssl_dhparam_file
+        "#{fetch(:remote_certs_folder)}/certs/#{fetch(:ssl_dhparam)}"
+      end
+    end
+  end
+end

data/lib/capistrano/generals/helpers.rb

@@ -10,6 +10,10 @@ module Capistrano
         SSHKit::Command.new(:bundle, :exec, :sidekiq, args).to_command
       end
 
+      def bundle_puma(*args)
+        SSHKit::Command.new(:bundle, :exec, :puma, args).to_command
+      end
+
       def red text
         "\033[31m#{text}\033[0m"
       end

data/lib/capistrano/generals/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Generals
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/capistrano/tasks/defaults.rake

@@ -13,30 +13,51 @@ namespace :load do
     set :nginx_location, '/etc/nginx'
     set :nginx_redirect_www, true
     set :nginx_fail_timeout, 0
+    set :nginx_x_frame_options, 'DENY'
+    set :ngingx_strict_transport_security, true
+    set :nginx_respond_to_subdomains, false
 
-    # SSL Settings
+    # Nginx ssl settings
     set :nginx_use_ssl, false
     set :nginx_ssl_stapling, true
     set :nginx_ssl_ciphers, 'AES128+EECDH:AES128+EDH:!aNULL'
     set :nginx_ssl_protocols, 'TLSv1 TLSv1.1 TLSv1.2'
     set :nginx_ssl_session_cache, 'shared:SSL:10m'
-    set :nginx_ssl_cert, -> { "#{fetch(:server_domain)}.crt" }
-    set :nginx_ssl_cert_key, -> { "#{fetch(:server_domain)}.key" }
-    set :nginx_ssl_dhparam, 'dhparam.pem'
-    set :nginx_server_ciphers, false
-    set :nginx_server_ciphers_path, '/etc/ssl/certs/dhparam.pem'
+
+    # SSL Settings
+    set :local_certs_folder, 'config/deploy/certs'
+    set :remote_certs_folder, '/etc/ssl'
+    set :ssl_csr, -> { "#{fetch(:server_domain)}.csr" }
+    set :ssl_cert, -> { "#{fetch(:server_domain)}.crt" }
+    set :ssl_cert_intermediate, -> { "#{fetch(:server_domain)}-intermediate.crt" }
+    set :ssl_cert_chain, -> { "#{fetch(:server_domain)}-chained.crt" }
+    set :ssl_cert_key, -> { "#{fetch(:server_domain)}.key" }
+    set :ssl_server_ciphers, false
+    set :ssl_dhparam, 'dhparam.pem'
 
     # General Unicorn settings
     set :unicorn_pid, -> { unicorn_default_pid_file } # shared_path/tmp/pids/unicorn.pid
     set :unicorn_config, -> { unicorn_default_config_file } # shared_path/config/unicorn.rb
     set :unicorn_workers, 2
     set :unicorn_worker_timeout, 30
-    set :unicorn_log, 'unicorn.stdout.log'
-    set :unicorn_error_log, 'unicorn.stderr.log'
+    set :unicorn_log, 'unicorn.log'
+    set :unicorn_error_log, 'unicorn.log'
     set :unicorn_user, -> { fetch(:deploy_user) }
     set :unicorn_env, ''
     set :unicorn_app_env, -> { fetch(:rails_env) || fetch(:rack_env) || fetch(:stage) }
 
+    # General Puma settings
+    set :puma_preload_app, true
+    set :puma_pid, -> { puma_default_pid_file } # shared_path/tmp/pids/puma.pid
+    set :puma_config, -> { puma_default_config_file } # shared_path/config/puma.rb
+    set :puma_workers, 2
+    set :puma_worker_timeout, 30
+    set :puma_min_threads, 0
+    set :puma_max_threads, 16
+    set :puma_user, -> { fetch(:deploy_user) }
+    set :puma_env, ''
+    set :puma_app_env, -> { fetch(:rails_env) || fetch(:rack_env) || fetch(:stage) }
+
     # General Sidekiq settings
     set :sidekiq_workers, 3
     set :sidekiq_user, -> { fetch(:deploy_user) }

data/lib/capistrano/tasks/nginx.rake

@@ -1,5 +1,7 @@
 require 'capistrano/dsl/nginx_paths'
 include Capistrano::DSL::NginxPaths
+require 'capistrano/dsl/ssl_paths'
+include Capistrano::DSL::SSLPaths
 
 namespace :nginx do
 
@@ -52,7 +54,7 @@ namespace :nginx do
 end
 
 namespace :deploy do
-  after :publishing, 'nginx:reload'
+  after :publishing, 'nginx:restart'
 end
 
 desc 'Server setup tasks'

data/lib/capistrano/tasks/puma.rake

@@ -0,0 +1,81 @@
+require 'capistrano/dsl/puma_paths'
+include Capistrano::DSL::PumaPaths
+
+namespace :puma do
+
+  desc 'Test capistrano config setup'
+  task :capistrano_config_test do
+    raise 'Use puma is not set as the application runner' unless fetch(:use_puma)
+    raise 'Unicorn is also set as application runner' if fetch(:use_unicorn)
+    raise 'Set the puma_user, which is default the deploy_user' unless fetch(:puma_user)
+    raise 'Set server_domain variable to setup nginx' unless fetch(:server_domain)
+  end
+
+  desc 'Setup Puma initializer'
+  task :setup_initializer do
+    on roles :app do
+      sudo_upload! template('puma_init.sh'), puma_initd_file
+      execute :chmod, '+x', puma_initd_file
+      sudo 'update-rc.d', '-f', puma_service, 'defaults'
+    end
+  end
+  before :setup_initializer, :capistrano_config_test
+
+  desc 'Setup puma app configuration'
+  task :setup_app_config do
+    on roles :app do
+      execute :mkdir, '-pv', File.dirname(fetch(:puma_config).to_s)
+      upload! template('puma.rb'), fetch(:puma_config).to_s
+    end
+  end
+  before :setup_app_config, :capistrano_config_test
+
+  desc 'Setup puma'
+  task :setup do
+    if fetch :use_puma
+      invoke 'puma:setup_initializer'
+      invoke 'puma:setup_app_config'
+    end
+  end
+
+  desc 'Start puma'
+  task :start do
+    on roles :app do
+      sudo puma_initd_file, 'start'
+    end
+  end
+  before :start, :capistrano_config_test
+
+  desc 'Stop puma'
+  task :stop do
+    on roles :app do
+      execute puma_initd_file, 'stop'
+      sleep 3
+    end
+  end
+  before :stop, :capistrano_config_test
+
+  desc 'Restart puma'
+  task :restart do
+    invoke 'puma:stop'
+    invoke 'puma:start'
+  end
+  before :restart, :capistrano_config_test
+
+  desc 'Restarts puma if puma enabled'
+  task :after_publishing do
+    if fetch :use_puma
+      invoke 'puma:restart'
+    end
+  end
+
+end
+
+namespace :deploy do
+  after :publishing, 'puma:after_publishing'
+end
+
+desc 'Server setup tasks'
+task :setup do
+  invoke 'puma:setup'
+end

data/lib/capistrano/tasks/sidekiq.rake

@@ -13,43 +13,56 @@ namespace :sidekiq do
     on roles :app do
       sudo_upload! template('sidekiq_init.sh'), sidekiq_initd_file
       execute :chmod, '+x', sidekiq_initd_file
-      sudo 'update-rc.d', '-f', unicorn_service, 'defaults'
+      sudo 'update-rc.d', '-f', sidekiq_service, 'defaults'
     end
   end
   before :setup_initializer, :capistrano_config_test
 
+  desc 'Setup Sidekiq'
+  task :setup do
+    if fetch :use_sidekiq
+      invoke 'sidekiq:setup_initializer'
+    end
+  end
+
   desc 'Start sidekiq'
   task :start do
-    on roles(:app) do
-      execute "sudo /etc/init.d/sidekiq_#{fetch(:application)}_#{fetch(:stage)} start"
+    on roles :app do
+      sudo sidekiq_initd_file, 'start'
     end
   end
+  before :start, :capistrano_config_test
 
   desc 'Stop sidekiq'
   task :stop do
-    on roles(:app) do
-      execute "sudo /etc/init.d/sidekiq_#{fetch(:application)}_#{fetch(:stage)} stop"
+    on roles :app do
+      sudo sidekiq_initd_file, 'stop'
       sleep 8
     end
   end
+  before :stop, :capistrano_config_test
 
   desc 'Restart sidekiq'
   task :restart do
     invoke 'sidekiq:stop'
     invoke 'sidekiq:start'
   end
+  before :restart, :capistrano_config_test
+
+  desc 'Restarts sidekiq if sidekiq enabled'
+  task :after_publishing do
+    if fetch :use_sidekiq
+      invoke 'sidekiq:restart'
+    end
+  end
 
 end
 
 namespace :deploy do
-  if fetch(:use_sidekiq)
-    after :publishing, 'sidekiq:restart'
-  end
+  after :publishing, 'sidekiq:after_publishing'
 end
 
 desc 'Server setup tasks'
 task :setup do
-  if fetch(:use_sidekiq)
-    invoke 'unicorn:setup_initializer'
-  end
+  invoke 'sidekiq:setup'
 end

data/lib/capistrano/tasks/ssl.rake

@@ -0,0 +1,41 @@
+require 'capistrano/dsl/ssl_paths'
+include Capistrano::DSL::SSLPaths
+
+namespace :ssl do
+  # If you intend to secure the URL https://www.yourdomain.com, then your CSR's common name must be www.yourdomain.com. If you plan on getting a wildcard certificate make sure to prefix your domain with an asterisk, example: *.domain.com.
+  desc 'Generate Private Key and CSR files'
+  task :generate_private_key_and_csr do
+    run_locally do
+      `openssl req -nodes -newkey rsa:2048 -sha256 -keyout #{new_certificate_file_for(fetch(:ssl_cert_key))} -out #{new_certificate_file_for(fetch(:ssl_csr))}`
+    end
+  end
+
+  desc 'Generate dhparam file'
+  task :generate_dhparam do
+    run_locally do
+      `openssl dhparam -out #{new_certificate_file_for(fetch(:ssl_dhparam))} 4096`
+    end
+  end
+
+  desc 'Send certificate and key to server'
+  task :upload do
+    on roles :web do
+      # Upload chained certificate
+      sudo_upload! chained_certificate, remote_ssl_cert_chained_file
+      sudo :chown, 'root', remote_ssl_cert_chained_file
+      sudo :chmod, '644', remote_ssl_cert_chained_file
+
+      # Upload key
+      sudo_upload! existing_certificate_file_for(fetch(:ssl_cert_key)), remote_ssl_cert_key_file
+      sudo :chown, 'root:ssl-cert', remote_ssl_cert_key_file
+      sudo :chmod, '640', remote_ssl_cert_key_file
+
+      # Upload dhparam
+      if File.exists? certificate_file_for(fetch(:ssl_dhparam))
+        sudo_upload! certificate_file_for(fetch(:ssl_dhparam)), remote_ssl_dhparam_file
+        sudo :chown, 'root', remote_ssl_dhparam_file
+        sudo :chmod, '644', remote_ssl_dhparam_file
+      end
+    end
+  end
+end

data/lib/capistrano/tasks/unicorn.rake

@@ -30,12 +30,21 @@ namespace :unicorn do
   end
   before :setup_app_config, :capistrano_config_test
 
+  desc 'Setup unicorn'
+  task :setup do
+    if fetch :use_unicorn
+      invoke 'unicorn:setup_app_config'
+      invoke 'unicorn:setup_initializer'
+    end
+  end
+
   desc 'Start unicorn'
   task :start do
     on roles :app do
       sudo unicorn_initd_file, 'start'
     end
   end
+  before :start, :capistrano_config_test
 
   desc 'Stop unicorn'
   task :stop do
@@ -44,25 +53,29 @@ namespace :unicorn do
       sleep 3
     end
   end
+  before :stop, :capistrano_config_test
 
   desc 'Restart unicorn'
   task :restart do
     invoke 'unicorn:stop'
     invoke 'unicorn:start'
   end
+  before :restart, :capistrano_config_test
+
+  desc 'Restarts unicorn if puma enabled'
+  task :after_publishing do
+    if fetch :use_unicorn
+      invoke 'unicorn:restart'
+    end
+  end
 
 end
 
 namespace :deploy do
-  if fetch(:use_unicorn)
-    after :publishing, 'unicorn:restart'
-  end
+  after :publishing, 'unicorn:after_publishing'
 end
 
 desc 'Server setup tasks'
 task :setup do
-  if fetch(:use_unicorn)
-    invoke 'unicorn:setup_app_config'
-    invoke 'unicorn:setup_initializer'
-  end
+  invoke 'unicorn:setup'
 end

data/lib/generators/capistrano/generals/puma_generator.rb

@@ -0,0 +1,18 @@
+module Capistrano
+  module Generals
+    module Generators
+      class PumaGenerator < Rails::Generators::Base
+        desc 'Create local puma configuration files for customization'
+        source_root File.expand_path('../templates', __FILE__)
+        argument :templates_path, type: :string,
+          default: 'config/deploy/templates',
+          banner: 'path to templates'
+
+        def copy_template
+          copy_file 'puma.rb.erb', "#{templates_path}/puma.rb.erb"
+          copy_file 'puma_init.sh.erb', "#{templates_path}/puma_init.sh.erb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/capistrano/generals/sidekiq_generator.rb

@@ -0,0 +1,17 @@
+module Capistrano
+  module Generals
+    module Generators
+      class SidekiqGenerator < Rails::Generators::Base
+        desc 'Create local sidekiq configuration file for customization'
+        source_root File.expand_path('../templates', __FILE__)
+        argument :templates_path, type: :string,
+          default: 'config/deploy/templates',
+          banner: 'path to templates'
+
+        def copy_template
+          copy_file 'sidekiq_init.sh.erb', "#{templates_path}/sidekiq_init.sh.erb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/capistrano/generals/templates/nginx.conf.erb

@@ -24,7 +24,7 @@ server {
 <% if fetch(:nginx_use_ssl) %>
 server {
   listen 80;
-  server_name <%= fetch(:server_domain) %>;
+  server_name <%= "*.#{fetch(:server_domain)}" if fetch(:nginx_respond_to_subdomains) %> <%= fetch(:server_domain) %>;
   rewrite ^(.*) https://$host$1 permanent;
 }
 <% end %>
@@ -32,7 +32,7 @@ server {
 #          Server
 ##############################
 server {
-  server_name <%= fetch(:server_domain) %>;
+  server_name <%= "*.#{fetch(:server_domain)}" if fetch(:nginx_respond_to_subdomains) %> <%= fetch(:server_domain) %>;
   root <%= current_path %>/public;
 
   client_max_body_size 4G;
@@ -40,11 +40,11 @@ server {
 
   error_page 500 502 504 /500.html;
 
-  # SSL Settings
   <% if fetch(:nginx_use_ssl) %>
+  # SSL Settings
   listen 443 ssl;
-  ssl_certificate <%= nginx_ssl_cert_file %>;
-  ssl_certificate_key <%= nginx_ssl_cert_key_file %>;
+  ssl_certificate <%= remote_ssl_cert_chained_file %>;
+  ssl_certificate_key <%= remote_ssl_cert_key_file %>;
 
   ssl_ciphers <%= fetch(:nginx_ssl_ciphers) %>;
   ssl_protocols <%= fetch(:nginx_ssl_protocols) %>;
@@ -57,15 +57,22 @@ server {
   resolver_timeout 10s;
   <% end %>
 
-  <% if fetch(:nginx_server_ciphers) %>
+  <% if fetch(:ssl_server_ciphers) %>
   ssl_prefer_server_ciphers on;
-  ssl_dhparam <%= nginx_ssl_dhparam_file %>;
+  ssl_dhparam <%= remote_ssl_dhparam_file %>;
   <% end %>
 
   <% else %>
   listen 80;
   <% end %>
 
+  <% if fetch(:ngingx_strict_transport_security) %>
+  add_header Strict-Transport-Security max-age=63072000;
+  add_header X-Content-Type-Options nosniff;
+  <% end %>
+  add_header X-Frame-Options <%= fetch(:nginx_x_frame_options) %>;
+
+
   <% # FILE HANDLING %>
   <% if fetch(:use_unicorn) %>
   try_files $uri/index.html $uri @unicorn_<%= fetch(:app_config_name) %>;
@@ -84,7 +91,7 @@ server {
   <% if fetch(:use_puma) %>
   try_files $uri/index.html $uri @puma_<%= fetch(:app_config_name) %>;
 
-  location @unicorn_<%= fetch(:app_config_name) %> {
+  location @puma_<%= fetch(:app_config_name) %> {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
@@ -92,7 +99,7 @@ server {
     proxy_set_header X-Forwarded-Proto https;
     <% end %>
     proxy_pass http://puma_<%= fetch(:app_config_name) %>;
-    }
+  }
   <% end %>
 
   location ~* ^/assets/ {

data/lib/generators/capistrano/generals/templates/puma.rb.erb

@@ -0,0 +1,22 @@
+<%= template_to_s('_head').to_s %>
+environment "<%= fetch(:puma_app_env) %>"
+bind "unix:///tmp/puma.<%= fetch(:app_config_name) %>.sock"
+
+threads <%= fetch(:puma_min_threads) %>, <%= fetch(:puma_max_threads) %>
+workers <%= fetch(:puma_workers) %>
+
+<% if fetch(:puma_preload_app) %>
+preload_app!
+<% end %>
+
+worker_timeout <%= fetch(:puma_worker_timeout) %>
+
+on_worker_boot do
+  if defined? ActiveSupport
+    ActiveSupport.on_load(:active_record) do
+      if defined? ActiveRecord::Base
+        ActiveRecord::Base.establish_connection
+      end
+    end
+  end
+end

data/lib/generators/capistrano/generals/templates/puma_init.sh.erb

@@ -0,0 +1,58 @@
+#! /bin/sh
+<%= template_to_s('_head').to_s %>
+### BEGIN INIT INFO
+# Provides:          puma
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage puma
+# Description:       Starts and Stops puma
+### END INIT INFO
+set -e
+
+# Feel free to change any of the following variables for your app:
+APP_ROOT=<%= current_path %>
+PID=<%= fetch(:puma_pid) %>
+AS_USER=<%= fetch(:puma_user) %>
+PUMA_ENV="<%= fetch(:puma_env) %>"
+CMD="export HOME; true "${HOME:=$(getent passwd "$AS_USER" | cut -d: -f6;)}"; cd $APP_ROOT && $PUMA_ENV <%= bundle_puma('-d -C', fetch(:puma_config)) %>"
+
+set -u
+
+OLD_PIN="$PID.oldbin"
+
+sig () {
+  test -s "$PID" && kill -$1 `cat $PID`
+}
+
+oldsig () {
+  test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
+}
+
+run () {
+  if [ "$(id -un)" = "$AS_USER" ]; then
+    eval $1
+  else
+    su -c "$1" - $AS_USER
+  fi
+}
+
+case "$1" in
+start)
+  sig 0 && echo >&2 "Already running" && exit 0
+  run "$CMD"
+  ;;
+stop)
+  sig QUIT && exit 0
+  echo >&2 "Not running"
+  ;;
+force-stop)
+  sig TERM && exit 0
+  echo >&2 "Not running"
+  ;;
+*)
+  echo >&2 "Usage: $0 <start|stop|force-stop>"
+  exit 1
+  ;;
+esac

data/lib/generators/capistrano/generals/templates/sidekiq_init.sh.erb

@@ -7,7 +7,7 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Manage sidekiq workers
-# Description:       tarts and Stops Sidekiq message processor for Stratus application.
+# Description:       Starts and Stops Sidekiq message processor for Stratus application.
 ### END INIT INFO
 
 # User-specified exit parameters used in this script:

data/lib/generators/capistrano/generals/unicorn_generator.rb

@@ -2,7 +2,7 @@ module Capistrano
   module Generals
     module Generators
       class UnicornGenerator < Rails::Generators::Base
-        desc 'Create local unicorn configuration file for customization'
+        desc 'Create local unicorn configuration files for customization'
         source_root File.expand_path('../templates', __FILE__)
         argument :templates_path, type: :string,
           default: 'config/deploy/templates',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-generals
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Stef Schenkelaars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -67,7 +67,9 @@ files:
 - capistrano-generals.gemspec
 - lib/capistrano-generals.rb
 - lib/capistrano/dsl/nginx_paths.rb
+- lib/capistrano/dsl/puma_paths.rb
 - lib/capistrano/dsl/sidekiq_paths.rb
+- lib/capistrano/dsl/ssl_paths.rb
 - lib/capistrano/dsl/unicorn_paths.rb
 - lib/capistrano/generals.rb
 - lib/capistrano/generals/helpers.rb
@@ -76,12 +78,17 @@ files:
 - lib/capistrano/tasks/deploy/symlink.rake
 - lib/capistrano/tasks/git.rake
 - lib/capistrano/tasks/nginx.rake
-- lib/capistrano/tasks/setup.rake
+- lib/capistrano/tasks/puma.rake
 - lib/capistrano/tasks/sidekiq.rake
+- lib/capistrano/tasks/ssl.rake
 - lib/capistrano/tasks/unicorn.rake
 - lib/generators/capistrano/generals/nginx_generator.rb
+- lib/generators/capistrano/generals/puma_generator.rb
+- lib/generators/capistrano/generals/sidekiq_generator.rb
 - lib/generators/capistrano/generals/templates/_head.erb
 - lib/generators/capistrano/generals/templates/nginx.conf.erb
+- lib/generators/capistrano/generals/templates/puma.rb.erb
+- lib/generators/capistrano/generals/templates/puma_init.sh.erb
 - lib/generators/capistrano/generals/templates/sidekiq_init.sh.erb
 - lib/generators/capistrano/generals/templates/unicorn.rb.erb
 - lib/generators/capistrano/generals/templates/unicorn_init.sh.erb

data/lib/capistrano/tasks/setup.rake

@@ -1,41 +0,0 @@
-namespace :setup do
-#
-#   namespace :symlink do
-#
-#     desc 'Symlink config file for nginx'
-#     task :nginx do
-#       on roles :app do
-#         # Find stage specific config file
-#         file_name = File.join current_path, 'config/nginx.conf'
-#         file_name = get_config_file(file_name, fetch(:stage).to_s)
-#         execute "ln -nfs #{file_name} /etc/nginx/sites-enabled/#{fetch(:application)}_#{fetch(:stage)}"
-#       end
-#     end
-#
-#     desc 'Symlink config file for unicorn'
-#     task :unicorn do
-#       on roles :app do
-#         # Find stage specific config file
-#         file_name = File.join current_path, 'config/unicorn_init.sh'
-#         file_name = get_config_file(file_name, fetch(:stage).to_s)
-#         execute "ln -nfs #{file_name} /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)}"
-#         # Start unicorn at startup
-#         execute "sudo update-rc.d unicorn_#{fetch(:application)}_#{fetch(:stage)} defaults"
-#       end
-#     end
-#
-#     desc 'Symlink config file for sidekiq'
-#     task :sidekiq do
-#       on roles :app do
-#         # Find stage specific config file
-#         file_name = File.join current_path, 'config/sidekiq_init.sh'
-#         file_name = get_config_file(file_name, fetch(:stage).to_s)
-#         execute "ln -nfs #{file_name} /etc/init.d/sidekiq_#{fetch(:application)}_#{fetch(:stage)}"
-#         # Start unicorn at startup
-#         execute "sudo update-rc.d sidekiq_#{fetch(:application)}_#{fetch(:stage)} defaults"
-#       end
-#     end
-#
-#   end
-#
-end