capistrano-mb 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 88fdfaf1342d807f27c8f0e23b2b8ecd25dc5710
-  data.tar.gz: a9c1acf1815578c0aec59babf82f28a93db04560
+SHA256:
+  metadata.gz: 8d012ef97efa6109de978f625fdaf6d4aae4d78f333f422123b3d381f5a29307
+  data.tar.gz: '081b8e13f41d0a3aa9e53275f78e891bf5007788705ec8a4900c9878b0568c1a'
 SHA512:
-  metadata.gz: e041aa2192c955e1d92769232caac5536f26121fccad9a6abd92fdcae0403969aaef2c362ba9be71e13f081aea5c7d39a775f64b119a18a6b28525487da6b4ce
-  data.tar.gz: c95928fbb58a408d8a55403cb0f1bd98468cd3fcbc8216819daf109f0e57a2d54fe683472d0b6fb4b4a4a0a3ba46f956a77f9de2fbfa90948c6302982473857f
+  metadata.gz: 0be64b92ed0576bc6b599abdc65dff915b77b6951c1625f8b454eb8a697987a3e1a26fcd63fa620156cc03e7f02fe42bcf7366b3b79e29d9cbf42a791df996ef
+  data.tar.gz: ea3c1da247e09e60b954cdd08a2421f80626c9017f34c490372c9b6cfb7e0692965a66cdb402af86a0a0b26a5f9447dc4c6e8514397a8de23e7cab5be3ad7abe

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * Your contribution here!
 
+## [0.33.0][] (2017-12-29)
+
+* Remove the deprecated `fiftyfive` compatibility layer
+* Drop compatibility with older Ubuntu releases; now only Ubuntu 16.04 is supported via a single `provision` task
+* Remove dependencies on `ppa:pitti` and `ppa:chris-lea` for postgres and node.js, respectively; use the official Ubuntu releases instead
+* Replace init_d scripts with systemd configs
+* Completely remove delayed_job support
+
 ## [0.32.0][] (2017-05-26)
 
 * Add [immutable cache-control header](https://code.facebook.com/posts/557147474482256) to further boost performance of static assets
@@ -193,7 +201,8 @@ Flush console output after each line is printed. This allows deployment progress
 
 Initial Rubygems release!
 
-[Unreleased]: https://github.com/mattbrictson/capistrano-mb/compare/v0.32.0...HEAD
+[Unreleased]: https://github.com/mattbrictson/capistrano-mb/compare/v0.33.0...HEAD
+[0.33.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.32.0...v0.33.0
 [0.32.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.31.0...v0.32.0
 [0.31.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.30.0...v0.31.0
 [0.30.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.29.0...v0.30.0

data/README.md

@@ -1,6 +1,8 @@
 # capistrano-mb
 
-[![Gem Version](https://badge.fury.io/rb/capistrano-mb.svg)](http://badge.fury.io/rb/capistrano-mb)
+**An opinionated Capistrano task library for deploying Rails apps from scratch on Ubuntu 16.04 LTS.**
+
+[![Gem Version](https://badge.fury.io/rb/capistrano-mb.svg)](https://rubygems.org/gems/capistrano-mb)
 
 Capistrano is great for deploying Rails applications, but what about all the prerequisites, like Nginx and PostgreSQL? Do you have a firewall configured on your VPS? Have you installed the latest OS security updates? Is HTTPS working right?
 
@@ -17,9 +19,9 @@ The capistrano-mb gem adds a `cap <stage> provision` task to Capistrano that tak
 * Install `rbenv` and use `ruby-build` to compile the version of Ruby required by your app (by inspecting your `.ruby-version` file)
 * And more!
 
-The gem is named "capistrano-mb" because it is prescribes my ([@mattbrictson](https://github.com/mattbrictson)) personal preferences for automating deployments of Rails projects. I'm a freelance developer juggling lots of Rails codebases, so its important for me to have a good, consistent server configuration. You'll notice that capistrano-mb is opinionated and strictly uses the following stack:
+The gem is named "capistrano-mb" because it is prescribes my ([@mattbrictson](https://github.com/mattbrictson)) personal preferences for automating deployments of Rails projects. I've worked several years as a freelance developer juggling lots of Rails codebases, so its important for me to have a good, consistent server configuration. You'll notice that capistrano-mb is opinionated and strictly uses the following stack:
 
-* Ubuntu 14.04 LTS
+* Ubuntu 16.04 LTS
 * PostgreSQL
 * Unicorn
 * Nginx
@@ -30,14 +32,24 @@ In addition, capistrano-mb changes many of Capistrano's defaults, including the
 
 Not quite to your liking? Consider forking the project to meet your needs.
 
+## Roadmap
+
+I plan to continue maintaining this project for the benefit of deploying my own Rails apps for the foreseeable future. In practice, this means a new version of two per year. The behavior of capistrano-mb may change as I upgrade my apps to new versions of Rails. For example, at some point I might:
+
+* Replace Unicorn with Puma
+* Switch from dotenv to encrypted credentials
+* Add Let's Encrypt
+* Use a more robust database backup solution
+
+*Future changes in capistrano-mb are not guaranteed to have graceful migration paths, so I recommend pinning your Gemfile dependency to a specific version and upgrading with extreme care.*
 
 ## Quick start
 
 Please note that this project requires **Capistrano 3.x**, which is a complete rewrite of Capistrano 2.x. The two major versions are not compatible.
 
-### 1. Purchase an Ubuntu 14.04 VPS
+### 1. Purchase an Ubuntu 16.04 VPS
 
-To use capistrano-mb, you'll need a clean Ubuntu server to deploy to. The only special requirement is that your public SSH key must be installed on the server for the `root` user.
+To use capistrano-mb, you'll need a clean **Ubuntu 16.04** server to deploy to. The only special requirement is that your public SSH key must be installed on the server for the `root` user.
 
 Test that you can SSH to the server as `root` without being prompted for a password. If that works, capistrano-mb can take care of the rest. You're ready to proceed!
 
@@ -46,10 +58,10 @@ Test that you can SSH to the server as `root` without being prompted for a passw
 capistrano-mb needs to know the version of Ruby that your app requires, so that it can install Ruby during the provisioning process. Place a `.ruby-version` file in the root of your project containing the desired version, like this:
 
 ```
-2.2.3
+2.5.0
 ```
 
-*If you are using `rbenv`, just run `rbenv local 2.2.3` and it will create this file for you.*
+*If you are using `rbenv`, just run `rbenv local 2.5.0` and it will create this file for you.*
 
 ### 3. Gemfile
 
@@ -67,15 +79,15 @@ Then for the capistrano-mb tools themselves, add these gems to the development g
 group :development do
   gem "capistrano-bundler", :require => false
   gem "capistrano-rails", :require => false
-  gem "capistrano", "~> 3.4.0", :require => false
-  gem "capistrano-mb", :require => false
+  gem "capistrano", "~> 3.10", :require => false
+  gem "capistrano-mb", "~> 0.33.0" :require => false
 end
 ```
 
 And then execute:
 
 ```
-$ bundle
+$ bundle install
 ```
 
 ### 4. cap install
@@ -83,7 +95,7 @@ $ bundle
 If your project doesn't yet have a `Capfile`, run `cap install` with the list of desired stages (environments). For simplicity, this installation guide will assume a single production stage:
 
 ```
-cap install STAGES=production
+bundle exec cap install STAGES=production
 ```
 
 ### 5. Capfile
@@ -112,14 +124,14 @@ Modify `config/deploy/production.rb` to specify the IP address of your productio
 ```ruby
 server "my.production.ip",
        :user => "deployer",
-       :roles => %w(app backup cron db web)
+       :roles => %w[app backup cron db web]
 ```
 
 *Note that you must include the `backup` and `cron` roles if you want to make use of capistrano-mb's database backups and crontab features.*
 
 ### 8. secrets.yml
 
-By default, Rails 4.2 apps have a `config/secrets.yml` file that specifies the Rails secret key. capistrano-mb configures dotenv to provide this secret in a `RAILS_SECRET_KEY_BASE` environment variable. You'll therefore need to modify `secrets.yml` as follows:
+Your Rails apps may have a `config/secrets.yml` file that specifies the Rails secret key. capistrano-mb configures dotenv to provide this secret in a `RAILS_SECRET_KEY_BASE` environment variable. You'll therefore need to modify `secrets.yml` as follows:
 
 ```ruby
 production:
@@ -128,10 +140,10 @@ production:
 
 ### 9. Provision and deploy!
 
-Run capistrano-mb's `provision:14_04` task (named for Ubuntu 14.04). This will ask you a few questions, install Ruby, PostgreSQL, Nginx, etc., and set everything up. The entire process takes about 10 minutes (mostly due to compiling Ruby from source).
+Run capistrano-mb's `provision` task. This will ask you a few questions, install Ruby, PostgreSQL, Nginx, etc., and set everything up. The entire process takes about 10 minutes (mostly due to compiling Ruby from source).
 
 ```
-bundle exec cap production provision:14_04
+bundle exec cap production provision
 ```
 
 Once that's done, your app is now ready to deploy!
@@ -151,8 +163,9 @@ Most of the capistrano-mb recipes are designed to run automatically as part of `
 The following list will suffice for most out-of-the-box Rails apps. The order of the list is not important.
 
 ```ruby
-set :mb_recipes, %w(
+set :mb_recipes, %w[
   aptitude
+  bundler
   crontab
   dotenv
   logrotate
@@ -166,7 +179,7 @@ set :mb_recipes, %w(
   unicorn
   user
   version
-)
+]
 ```
 
 Even if you don't include a recipe in the auto-run list, you can still invoke the tasks of those recipes manually at your discretion. Run `bundle exec cap -T` to see the full list of tasks.
@@ -189,9 +202,9 @@ Check out my [rails-template][] project, which generates Rails applications with
 
 ## History
 
-This gem used to be called capistrano-fiftyfive, because it was initially built by [55 Minutes](http://55minutes.com) to automate its Rails deployments. I have since taken over ownership of the gem and renamed it to capistrano-mb to avoid any confusion.
+This gem used to be called `capistrano-fiftyfive`. If you are upgrading from capistrano-fiftyfive, refer to the [CHANGELOG entry for v0.22.0](CHANGELOG.md#0220-2015-06-22) for migration instructions.
 
-If you are upgrading from `capistrano-fiftyfive`, refer to the [CHANGELOG entry for v0.22.0](CHANGELOG.md#0220-2015-06-22) for migration instructions.
+As of 0.33.0, capistrano-mb no longer supports Ubuntu 12.04 or 14.04. If your server runs one of these older versions, use [capistrano-mb 0.32.0](https://github.com/mattbrictson/capistrano-mb/tree/v0.32.0).
 
 ## Contributing
 

data/capistrano-mb.gemspec

@@ -9,11 +9,10 @@ Gem::Specification.new do |spec|
   spec.author        = "Matt Brictson"
   spec.email         = "matt@mattbrictson.com"
   spec.description   = \
-    "Production-ready provisioning and deployment recipes for the full "\
-    "Rails 4 stack. Installs and configures Ruby, Nginx, Unicorn, "\
-    "PostgreSQL, dotenv, and more onto Ubuntu 14.04 LTS using Capistrano. "\
-    "(Note: this gem was formerly called capistrano-fiftyfive.)"
-  spec.summary       = "Additional Capistrano 3 recipes"
+    "Production-ready provisioning and deployment recipes for Rails 4 and "\
+    "Rails 5 stacks. Installs and configures Ruby, Nginx, Unicorn, "\
+    "PostgreSQL, dotenv, and more onto Ubuntu 16.04 LTS using Capistrano."
+  spec.summary       = "Deploy Rails apps from scratch on Ubuntu 16.04 LTS"
   spec.homepage      = "https://github.com/mattbrictson/capistrano-mb"
   spec.license       = "MIT"
 

data/lib/capistrano/mb.rb

@@ -16,7 +16,6 @@ load File.expand_path("../tasks/dotenv.rake", __FILE__)
 load File.expand_path("../tasks/postgresql.rake", __FILE__)
 load File.expand_path("../tasks/nginx.rake", __FILE__)
 load File.expand_path("../tasks/unicorn.rake", __FILE__)
-load File.expand_path("../tasks/delayed_job.rake", __FILE__)
 load File.expand_path("../tasks/crontab.rake", __FILE__)
 load File.expand_path("../tasks/logrotate.rake", __FILE__)
 load File.expand_path("../tasks/rbenv.rake", __FILE__)
@@ -27,4 +26,3 @@ load File.expand_path("../tasks/version.rake", __FILE__)
 load File.expand_path("../tasks/rake.rake", __FILE__)
 load File.expand_path("../tasks/sidekiq.rake", __FILE__)
 load File.expand_path("../tasks/bundler.rake", __FILE__)
-load File.expand_path("../tasks/fiftyfive.rake", __FILE__)

data/lib/capistrano/mb/dsl.rb

@@ -154,45 +154,3 @@ module Capistrano
     end
   end
 end
-
-require "capistrano/dsl/env"
-
-module Capistrano
-  module DSL
-    module Env
-      # Overrides capistrano's default `set` to assist developers that are
-      # migrating from the `fiftyfive_*` to `mb_*` variable names. This will
-      # be removed in a future version of capistrano-mb.
-      alias_method :_orig_capistrano_set, :set
-      def set(name, *args, &block)
-        if name.to_s =~ /^fiftyfive_/
-          mb_name = name.to_s.gsub(/^fiftyfive_/, "mb_")
-          compatibility_warning(
-            "Use `set :#{mb_name}` instead of `set :#{name}` to ensure "\
-            "compatibility with future versions of capistrano-mb. The "\
-            "fiftyfive_* names have been deprecated."
-          )
-          name = mb_name.intern
-        end
-        _orig_capistrano_set(name, *args, &block)
-      end
-
-      # Overrides capistrano's default `fetch` to assist developers that are
-      # migrating from the `fiftyfive_*` to `mb_*` variable names. This will
-      # be removed in a future version of capistrano-mb.
-      alias_method :_orig_capistrano_fetch, :fetch
-      def fetch(name, *args, &block)
-        if name.to_s =~ /^fiftyfive_/
-          mb_name = name.to_s.gsub(/^fiftyfive_/, "mb_")
-          compatibility_warning(
-            "Use `fetch :#{mb_name}` instead of `fetch :#{name}` to ensure "\
-            "compatibility with future versions of capistrano-mb. The "\
-            "fiftyfive_* names have been deprecated."
-          )
-          name = mb_name.intern
-        end
-        _orig_capistrano_fetch(name, *args, &block)
-      end
-    end
-  end
-end

data/lib/capistrano/mb/templates/sidekiq.service.erb

@@ -0,0 +1,20 @@
+[Unit]
+Description=sidekiq worker for <%= fetch(:application) %>
+After=syslog.target network.target
+
+[Service]
+Environment=RAILS_ENV=<%= fetch(:rails_env) %>
+ExecStart=/bin/bash -lc 'exec bin/sidekiq -e <%= fetch(:rails_env) %> -P tmp/pids/sidekiq.pid --concurrency <%= fetch(:mb_sidekiq_concurrency) %>'
+PIDFile=<%= current_path %>/tmp/pids/sidekiq.pid
+Restart=on-failure
+RestartSec=1
+StandardError=syslog
+StandardInput=null
+StandardOutput=syslog
+SyslogIdentifier=<%= application_basename %>-sidekiq
+TimeoutStopSec=5
+User=<%= sidekiq_user %>
+WorkingDirectory=<%= current_path %>
+
+[Install]
+WantedBy=multi-user.target

data/lib/capistrano/mb/templates/unicorn.service.erb

@@ -0,0 +1,21 @@
+[Unit]
+Description=unicorn for <%= fetch(:application) %>
+After=syslog.target network.target
+
+[Service]
+Environment=RAILS_ENV=<%= fetch(:rails_env) %>
+ExecReload=/usr/bin/kill -USR2 $MAINPID
+ExecStart=/bin/bash -lc 'exec bin/unicorn -c <%= fetch(:mb_unicorn_config) %> -E <%= fetch(:rails_env) %>'
+ExecStop=/usr/bin/kill -QUIT $MAINPID
+PIDFile=<%= fetch(:mb_unicorn_pid) %>
+Restart=always
+StandardError=syslog
+StandardInput=null
+StandardOutput=syslog
+SyslogIdentifier=<%= application_basename %>-unicorn
+TimeoutStopSec=5
+User=<%= unicorn_user %>
+WorkingDirectory=<%= current_path %>
+
+[Install]
+WantedBy=multi-user.target

data/lib/capistrano/mb/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MB
-    VERSION = "0.32.0".freeze
+    VERSION = "0.33.0".freeze
   end
 end

data/lib/capistrano/tasks/aptitude.rake

@@ -1,23 +1,30 @@
 mb_recipe :aptitude do
-  during :provision, %w(upgrade install)
-  before "provision:14_04", "mb:aptitude:install_software_properties"
-  before "provision:14_04", "mb:aptitude:install_postgres_repo"
-  before "provision:14_04", "mb:aptitude:change_postgres_packages"
+  during :provision, %w[check upgrade install]
 end
 
 namespace :mb do
   namespace :aptitude do
+    desc "Verify server is Ubuntu 16.04"
+    task :check do
+      privileged_on roles(:all) do
+        version = capture(:sudo, "lsb_release -a")[/^Release:\s+(\S+)$/, 1]
+        next if version == "16.04"
+
+        raise "Ubuntu version #{version || "unknown"} is not supported by "\
+              "capistrano-mb. Only Ubuntu 16.04 is supported. Downgrade "\
+              "capistrano-mb if you need to use an older version of Ubuntu."
+      end
+    end
 
-    desc "Run `aptitude update` and then run `aptitude safe-upgrade`"
+    desc "Run `apt update` and then run `apt upgrade`"
     task :upgrade do
-      privileged_on roles(:all) do |host|
+      privileged_on roles(:all) do
         _update
-        _safe_upgrade
+        _upgrade
       end
     end
 
-
-    desc "Run `aptitude install` for packages required by the roles of "\
+    desc "Run `apt install` for packages required by the roles of "\
          "each server."
     task :install do
       privileged_on roles(:all) do |host|
@@ -37,69 +44,39 @@ namespace :mb do
       end
     end
 
-    desc "Add the official apt repository for PostgreSQL"
-    task :install_postgres_repo do
-      privileged_on roles(:all) do |host|
-        _add_repository(
-          "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main",
-          :key => "https://www.postgresql.org/media/keys/ACCC4CF8.asc")
-      end
-    end
-
-    desc "Change 12.04 PostgreSQL package requirements to 14.04 versions"
-    task :change_postgres_packages do
-      packages = fetch(:mb_aptitude_packages, {})
-      packages = Hash[packages.map do |key, value|
-        [key.sub(/@ppa:pitti\/postgresql$/, ""), value]
-      end]
-      set(:mb_aptitude_packages, packages)
-    end
-
-    desc "Install package needed for apt-add-repository on 14.04"
-    task :install_software_properties do
-      privileged_on roles(:all) do |host|
-        unless _already_installed?("software-properties-common")
-          _install("software-properties-common")
-        end
-      end
-    end
-
     def _already_installed?(pkg)
-      test(:sudo, "dpkg", "-s", pkg, "2>/dev/null", "|", :grep, "-q 'ok installed'")
+      test(:sudo,
+           "dpkg", "-s", pkg,
+           "2>/dev/null", "|", :grep, "-q 'ok installed'")
     end
 
-    def _add_repository(repo, options={})
-      unless _already_installed?("python-software-properties")
-        _install("python-software-properties")
+    def _add_repository(repo)
+      unless _already_installed?("software-properties-common")
+        _install("software-properties-common")
       end
       execute :sudo, "apt-add-repository", "-y '#{repo}'"
-
-      if (key = options.fetch(:key, nil))
-        execute "wget --prefer-family=IPv4 --quiet -O - #{key} | sudo apt-key add -"
-      end
     end
 
     def _install(pkg)
-      with :debian_frontend => "noninteractive" do
-        execute :sudo, "aptitude", "-y -q install", pkg
-      end
+      execute :sudo, "DEBIAN_FRONTEND=noninteractive apt-get -y install", pkg
     end
 
     def _update
-      with :debian_frontend => "noninteractive" do
-        execute :sudo, "aptitude", "-q -q -y update"
-      end
+      execute :sudo, "DEBIAN_FRONTEND=noninteractive apt-get -y update"
     end
 
-    def _safe_upgrade
-      with :debian_frontend => "noninteractive" do
-        execute :sudo, "aptitude", "-q -q -y safe-upgrade"
-      end
+    def _upgrade
+      execute :sudo,
+              "DEBIAN_FRONTEND=noninteractive apt-get -y "\
+              '-o DPkg::options::="--force-confdef" '\
+              '-o DPkg::options::="--force-confold" '\
+              "upgrade"
     end
 
     def _each_package(host)
       return to_enum(:_each_package, host) unless block_given?
       hostname = host.hostname
+
       fetch(:mb_aptitude_packages).each do |package_spec, *role_list|
         next unless roles(*role_list.flatten).map(&:hostname).include?(hostname)
 

data/lib/capistrano/tasks/defaults.rake

@@ -22,32 +22,29 @@ namespace :load do
     set :mb_privileged_user, "root"
 
     set :mb_aptitude_packages,
-        "build-essential"                        => :all,
-        "curl"                                   => :all,
-        "debian-goodies"                         => :all,
-        "git-core"                               => :all,
-        "libpq-dev@ppa:pitti/postgresql"         => :all,
-        "libreadline-gplv2-dev"                  => :all,
-        "libssl-dev"                             => :all,
-        "libxml2"                                => :all,
-        "libxml2-dev"                            => :all,
-        "libxslt1-dev"                           => :all,
-        "nginx@ppa:nginx/stable"                 => :web,
-        "nodejs@ppa:chris-lea/node.js"           => :all,
-        "ntp"                                    => :all,
-        "postgresql-client@ppa:pitti/postgresql" => :all,
-        "postgresql@ppa:pitti/postgresql"        => :db,
-        "tklib"                                  => :all,
-        "ufw"                                    => :all,
-        "zlib1g-dev"                             => :all
+        "build-essential"        => :all,
+        "curl"                   => :all,
+        "debian-goodies"         => :all,
+        "git-core"               => :all,
+        "libpq-dev"              => :all,
+        "libreadline-gplv2-dev"  => :all,
+        "libssl-dev"             => :all,
+        "libxml2"                => :all,
+        "libxml2-dev"            => :all,
+        "libxslt1-dev"           => :all,
+        "nginx@ppa:nginx/stable" => :web,
+        "nodejs"                 => :all,
+        "ntp"                    => :all,
+        "postgresql"             => :db,
+        "postgresql-client"      => :all,
+        "tklib"                  => :all,
+        "ufw"                    => :all,
+        "zlib1g-dev"             => :all
 
     set :mb_bundler_lockfile, "Gemfile.lock"
     set :mb_bundler_gem_install_command,
         "gem install bundler --conservative --no-document"
 
-    set :mb_delayed_job_args, "-n 2"
-    set :mb_delayed_job_script, "bin/delayed_job"
-
     set :mb_dotenv_keys, %w(rails_secret_key_base postmark_api_key)
     set :mb_dotenv_filename, -> { ".env.#{fetch(:rails_env)}" }
 

data/lib/capistrano/tasks/sidekiq.rake

@@ -1,5 +1,5 @@
 mb_recipe :sidekiq do
-  during :provision, "init_d"
+  during :provision, "systemd"
   during "deploy:start", "start"
   during "deploy:stop", "stop"
   during "deploy:restart", "restart"
@@ -8,35 +8,38 @@ end
 
 namespace :mb do
   namespace :sidekiq do
-    desc "Install sidekiq service script"
-    task :init_d do
+    desc "Install sidekiq systemd config"
+    task :systemd do
       privileged_on roles(fetch(:mb_sidekiq_role)) do |host, user|
-        template "sidekiq_init.erb",
-                 "/etc/init.d/sidekiq_#{application_basename}",
+        sidekiq_user = fetch(:mb_sidekiq_user) || user
+
+        template "sidekiq.service.erb",
+                 "/etc/systemd/system/sidekiq_#{application_basename}.service",
                  :mode => "a+rx",
                  :binding => binding,
                  :sudo => true
 
-        execute "sudo update-rc.d -f sidekiq_#{application_basename} defaults"
+        execute :sudo, "systemctl daemon-reload"
+        execute :sudo, "systemctl enable sidekiq_#{application_basename}.service"
+
+        unless test(:sudo, "grep -qs sidekiq_#{application_basename}.service /etc/sudoers.d/#{user}")
+          execute :sudo, "touch -f /etc/sudoers.d/#{user}"
+          execute :sudo, "chmod u+w /etc/sudoers.d/#{user}"
+          execute :sudo, "echo '#{user} ALL=NOPASSWD: /bin/systemctl start sidekiq_#{application_basename}.service' >> /etc/sudoers.d/#{user}"
+          execute :sudo, "echo '#{user} ALL=NOPASSWD: /bin/systemctl stop sidekiq_#{application_basename}.service' >> /etc/sudoers.d/#{user}"
+          execute :sudo, "echo '#{user} ALL=NOPASSWD: /bin/systemctl restart sidekiq_#{application_basename}.service' >> /etc/sudoers.d/#{user}"
+          execute :sudo, "chmod 440 /etc/sudoers.d/#{user}"
+        end
       end
     end
 
-    %w[start stop].each do |command|
+    %w[start stop restart].each do |command|
       desc "#{command} sidekiq"
       task command do
         on roles(fetch(:mb_sidekiq_role)) do
-          execute "service sidekiq_#{application_basename} #{command}"
+          execute :sudo, "systemctl #{command} sidekiq_#{application_basename}.service"
         end
       end
     end
-
-    desc "restart sidekiq"
-    task :restart do
-      # Re-enable the "stop" task, just in case we called it once already
-      # (as would happen during deploy:migrate_and_restart).
-      Rake::Task["mb:sidekiq:stop"].reenable
-      invoke "mb:sidekiq:stop"
-      invoke "mb:sidekiq:start"
-    end
   end
 end

data/lib/capistrano/tasks/unicorn.rake

@@ -1,5 +1,5 @@
 mb_recipe :unicorn do
-  during :provision, %w(init_d config_rb)
+  during :provision, %w(systemd config_rb)
   during "deploy:start", "start"
   during "deploy:stop", "stop"
   during "deploy:restart", "restart"
@@ -8,18 +8,28 @@ end
 
 namespace :mb do
   namespace :unicorn do
-    desc "Install service script for unicorn"
-    task :init_d do
+    desc "Install unicorn systemd config"
+    task :systemd do
       privileged_on roles(:app) do |host, user|
         unicorn_user = fetch(:mb_unicorn_user) || user
 
-        template "unicorn_init.erb",
-                 "/etc/init.d/unicorn_#{application_basename}",
+        template "unicorn.service.erb",
+                 "/etc/systemd/system/unicorn_#{application_basename}.service",
                  :mode => "a+rx",
                  :binding => binding,
                  :sudo => true
 
-        execute "sudo update-rc.d -f unicorn_#{application_basename} defaults"
+        execute :sudo, "systemctl daemon-reload"
+        execute :sudo, "systemctl enable unicorn_#{application_basename}.service"
+
+        unless test(:sudo, "grep -qs unicorn_#{application_basename}.service /etc/sudoers.d/#{user}")
+          execute :sudo, "touch -f /etc/sudoers.d/#{user}"
+          execute :sudo, "chmod u+w /etc/sudoers.d/#{user}"
+          execute :sudo, "echo '#{user} ALL=NOPASSWD: /bin/systemctl start unicorn_#{application_basename}.service' >> /etc/sudoers.d/#{user}"
+          execute :sudo, "echo '#{user} ALL=NOPASSWD: /bin/systemctl stop unicorn_#{application_basename}.service' >> /etc/sudoers.d/#{user}"
+          execute :sudo, "echo '#{user} ALL=NOPASSWD: /bin/systemctl restart unicorn_#{application_basename}.service' >> /etc/sudoers.d/#{user}"
+          execute :sudo, "chmod 440 /etc/sudoers.d/#{user}"
+        end
       end
     end
 
@@ -34,7 +44,7 @@ namespace :mb do
       desc "#{command} unicorn"
       task command do
         on roles(:app) do
-          execute "service unicorn_#{application_basename} #{command}"
+          execute :sudo, "systemctl #{command} unicorn_#{application_basename}.service"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-mb
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -80,9 +80,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Production-ready provisioning and deployment recipes for the full Rails
-  4 stack. Installs and configures Ruby, Nginx, Unicorn, PostgreSQL, dotenv, and more
-  onto Ubuntu 14.04 LTS using Capistrano. (Note: this gem was formerly called capistrano-fiftyfive.)'
+description: Production-ready provisioning and deployment recipes for Rails 4 and
+  Rails 5 stacks. Installs and configures Ruby, Nginx, Unicorn, PostgreSQL, dotenv,
+  and more onto Ubuntu 16.04 LTS using Capistrano.
 email: matt@mattbrictson.com
 executables: []
 extensions: []
@@ -95,14 +95,12 @@ files:
 - README.md
 - Rakefile
 - capistrano-mb.gemspec
-- lib/capistrano/fiftyfive.rb
 - lib/capistrano/mb.rb
 - lib/capistrano/mb/compatibility.rb
 - lib/capistrano/mb/dsl.rb
 - lib/capistrano/mb/recipe.rb
 - lib/capistrano/mb/templates/crontab.erb
 - lib/capistrano/mb/templates/csr_config.erb
-- lib/capistrano/mb/templates/delayed_job_init.erb
 - lib/capistrano/mb/templates/logrotate.erb
 - lib/capistrano/mb/templates/maintenance.html.erb
 - lib/capistrano/mb/templates/nginx.erb
@@ -110,19 +108,17 @@ files:
 - lib/capistrano/mb/templates/pgpass.erb
 - lib/capistrano/mb/templates/postgresql-backup-logrotate.erb
 - lib/capistrano/mb/templates/rbenv_bashrc
-- lib/capistrano/mb/templates/sidekiq_init.erb
+- lib/capistrano/mb/templates/sidekiq.service.erb
 - lib/capistrano/mb/templates/ssl_setup
 - lib/capistrano/mb/templates/unicorn.rb.erb
-- lib/capistrano/mb/templates/unicorn_init.erb
+- lib/capistrano/mb/templates/unicorn.service.erb
 - lib/capistrano/mb/templates/version.rb.erb
 - lib/capistrano/mb/version.rb
 - lib/capistrano/tasks/aptitude.rake
 - lib/capistrano/tasks/bundler.rake
 - lib/capistrano/tasks/crontab.rake
 - lib/capistrano/tasks/defaults.rake
-- lib/capistrano/tasks/delayed_job.rake
 - lib/capistrano/tasks/dotenv.rake
-- lib/capistrano/tasks/fiftyfive.rake
 - lib/capistrano/tasks/logrotate.rake
 - lib/capistrano/tasks/maintenance.rake
 - lib/capistrano/tasks/migrate.rake
@@ -158,8 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Additional Capistrano 3 recipes
+summary: Deploy Rails apps from scratch on Ubuntu 16.04 LTS
 test_files: []

data/lib/capistrano/fiftyfive.rb

@@ -1,6 +0,0 @@
-require "capistrano/mb"
-
-compatibility_warning(
-  "The capistrano-fiftyfive gem has been renamed to capistrano-mb. "\
-  'Use `require "capistrano/mb"` to ensure compatibility with future versions.'
-)

data/lib/capistrano/mb/templates/delayed_job_init.erb

@@ -1,36 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          delayed_job
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Manage delayed_job worker
-# Description:       Start, stop, restart delayed_job workers for a specific application.
-### END INIT INFO
-set -e
-
-# Feel free to change any of the following variables for your app:
-CMD="cd <%= current_path %>; RAILS_ENV=<%= fetch(:rails_env) %> <%= fetch(:mb_delayed_job_script) %>"
-AS_USER=<%= fetch(:mb_delayed_job_user, user) %>
-set -u
-
-run () {
-  if [ "$(id -un)" = "$AS_USER" ]; then
-    eval $1
-  else
-    su -c "$1" - $AS_USER
-  fi
-}
-
-case "$1" in
-start)
-  run "$CMD start <%= fetch(:mb_delayed_job_args) %>"
-  ;;
-stop)
-  run "$CMD stop"
-  ;;
-restart)
-  run "$CMD restart <%= fetch(:mb_delayed_job_args) %>"
-  ;;
-esac

data/lib/capistrano/mb/templates/sidekiq_init.erb

@@ -1,100 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          sidekiq
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Manage sidekiq worker
-# Description:       Start, stop, restart sidekiq worker.
-### END INIT INFO
-
-APP_DIR="<%= current_path %>"
-LOG_FILE="$APP_DIR/log/sidekiq.log"
-PID_FILE="$APP_DIR/tmp/pids/sidekiq.pid"
-SIDEKIQ="sidekiq"
-SIDEKIQCTL="sidekiqctl"
-APP_ENV="<%= fetch(:rails_env) %>"
-BUNDLE="bundle"
-AS_USER=<%= fetch(:mb_sidekiq_user, user) %>
-CONCURRENCY=<%= fetch(:mb_sidekiq_concurrency) %>
-
-START_CMD="cd $APP_DIR; $BUNDLE exec $SIDEKIQ -d -e $APP_ENV -P $PID_FILE --concurrency $CONCURRENCY -L $LOG_FILE"
-CTL_CMD="cd $APP_DIR; $BUNDLE exec $SIDEKIQCTL"
-RETVAL=0
-
-
-run () {
-  if [ "$(id -un)" = "$AS_USER" ]; then
-    eval $1
-  else
-    su -c "$1" - $AS_USER
-  fi
-}
-
-start() {
-
-  status
-  if [ $? -eq 1 ]; then
-
-    [ -d $APP_DIR ] || (echo "$APP_DIR not found!.. Exiting"; exit 6)
-    echo "Starting $SIDEKIQ message processor .. "
-    run "$START_CMD"
-    RETVAL=$?
-    #Sleeping for 8 seconds for process to be precisely visible in process table - See status ()
-    sleep 8
-    return $RETVAL
-  else
-    echo "$SIDEKIQ message processor is already running .. "
-  fi
-
-
-}
-
-stop() {
-
-    status
-    if [ $? -eq 0 ]; then
-
-      echo "Stopping $SIDEKIQ message processor .."
-      run "$CTL_CMD stop $PID_FILE"
-      RETVAL=$?
-      return $RETVAL
-
-    else
-      echo "$SIDEKIQ message processor is already stopped .. "
-    fi
-
-}
-
-status() {
-
-  ps -ef | egrep 'sidekiq [0-9]+.[0-9]+.[0-9]+' | grep -v grep
-  return $?
-}
-
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    status)
-        status
-
-        if [ $? -eq 0 ]; then
-             echo "$SIDEKIQ message processor is running .."
-             RETVAL=0
-         else
-             echo "$SIDEKIQ message processor is stopped .."
-             RETVAL=1
-         fi
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status}"
-        exit 0
-        ;;
-esac
-exit $RETVAL

data/lib/capistrano/mb/templates/unicorn_init.erb

@@ -1,84 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          unicorn
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Manage unicorn server
-# Description:       Start, stop, restart unicorn server for a specific application.
-### END INIT INFO
-set -e
-
-# Feel free to change any of the following variables for your app:
-TIMEOUT=${TIMEOUT-60}
-APP_ROOT=<%= current_path %>
-PID=<%= fetch(:mb_unicorn_pid) %>
-CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= fetch(:mb_unicorn_config) %> -E <%= fetch(:rails_env) %>"
-AS_USER=<%= unicorn_user %>
-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"
-  ;;
-restart|reload)
-  sig USR2 && echo reloaded OK && exit 0
-  echo >&2 "Couldn't reload, starting '$CMD' instead"
-  run "$CMD"
-  ;;
-upgrade)
-  if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
-  then
-    n=$TIMEOUT
-    while test -s $OLD_PIN && test $n -ge 0
-    do
-      printf '.' && sleep 1 && n=$(( $n - 1 ))
-    done
-    echo
-
-    if test $n -lt 0 && test -s $OLD_PIN
-    then
-      echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
-      exit 1
-    fi
-    exit 0
-  fi
-  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
-  run "$CMD"
-  ;;
-reopen-logs)
-  sig USR1
-  ;;
-*)
-  echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
-  exit 1
-  ;;
-esac

data/lib/capistrano/tasks/delayed_job.rake

@@ -1,33 +0,0 @@
-mb_recipe :delayed_job do
-  during :provision, "init_d"
-  during "deploy:start", "start"
-  during "deploy:stop", "stop"
-  during "deploy:restart", "restart"
-  during "deploy:publishing", "restart"
-end
-
-namespace :mb do
-  namespace :delayed_job do
-    desc "Install delayed_job service script"
-    task :init_d do
-      privileged_on roles(:delayed_job) do |host, user|
-        template "delayed_job_init.erb",
-                 "/etc/init.d/delayed_job_#{application_basename}",
-                 :mode => "a+rx",
-                 :binding => binding,
-                 :sudo => true
-
-        execute "sudo update-rc.d -f delayed_job_#{application_basename} defaults"
-      end
-    end
-
-    %w[start stop restart].each do |command|
-      desc "#{command} delayed_job"
-      task command do
-        on roles(:delayed_job) do
-          execute "service delayed_job_#{application_basename} #{command}"
-        end
-      end
-    end
-  end
-end

data/lib/capistrano/tasks/fiftyfive.rake

@@ -1,59 +0,0 @@
-# Provides backward compatibility with the old "fiftyfive" task names.
-
-tasks = %w(
-  fiftyfive:aptitude:change_postgres_packages
-  fiftyfive:aptitude:install
-  fiftyfive:aptitude:install_postgres_repo
-  fiftyfive:aptitude:upgrade
-  fiftyfive:crontab
-  fiftyfive:delayed_job:init_d
-  fiftyfive:delayed_job:restart
-  fiftyfive:delayed_job:start
-  fiftyfive:delayed_job:stop
-  fiftyfive:dotenv:replace
-  fiftyfive:dotenv:update
-  fiftyfive:logrotate
-  fiftyfive:maintenance:disable
-  fiftyfive:maintenance:enable
-  fiftyfive:migrate:deploy
-  fiftyfive:nginx:configure
-  fiftyfive:nginx:restart
-  fiftyfive:nginx:start
-  fiftyfive:nginx:stop
-  fiftyfive:postgresql:create_database
-  fiftyfive:postgresql:create_user
-  fiftyfive:postgresql:database_yml
-  fiftyfive:postgresql:dump
-  fiftyfive:postgresql:logrotate_backup
-  fiftyfive:postgresql:pgpass
-  fiftyfive:postgresql:restore
-  fiftyfive:postgresql:tune
-  fiftyfive:rake
-  fiftyfive:rbenv:install
-  fiftyfive:rbenv:upgrade
-  fiftyfive:seed
-  fiftyfive:sidekiq:init_d
-  fiftyfive:sidekiq:restart
-  fiftyfive:sidekiq:start
-  fiftyfive:sidekiq:stop
-  fiftyfive:ssl:generate_csr
-  fiftyfive:ssl:generate_dh
-  fiftyfive:ssl:generate_self_signed_crt
-  fiftyfive:ufw:configure
-  fiftyfive:unicorn:config_rb
-  fiftyfive:unicorn:init_d
-  fiftyfive:unicorn:restart
-  fiftyfive:unicorn:start
-  fiftyfive:unicorn:stop
-  fiftyfive:user:add
-  fiftyfive:user:install_public_key
-  fiftyfive:version:write_initializer
-)
-
-tasks.each do |name|
-  task(name) do
-    mb_name = name.gsub(/^fiftyfive:/, "mb:")
-    compatibility_warning("The #{name} task has been renamed to #{mb_name}.")
-    invoke(mb_name)
-  end
-end