capistrano-monit_runit 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705f5e797d5a2516fb2900e85ae3252d732119bc
-  data.tar.gz: 0d0b76890fb55a86ab800ccd445c97ed28d78d1b
+  metadata.gz: 8d99cd3e4764b444da5342e877f62b6d84d2fcd5
+  data.tar.gz: 48ba994ea84122c81668d642103a33f66528abca
 SHA512:
-  metadata.gz: 21406a6ee4f05b0df8bf3bd766eda7bd1fd052d73b3d6c82193ff353700a1ccf9839bedc41088513d564d0455aaa38c0bcf061bc3182679d8ebc32e97bacebca
-  data.tar.gz: 64b1200212abc514a4f7755aa07772e91b7d44c3701bcf43ec1c7949c55cf2881ab482965c003384f27bf8d55a33eb09515f20eb90811855f3c8dcd095b360b0
+  metadata.gz: 0cd9646a68f5b3aacba56b4cd89f956e86acd345038bf6445ed37f7496e3aeb315749096015caae946040208c4272e461838670a005a14bf0314ceb34308af37
+  data.tar.gz: 08d39d78a5fe06176a1f98f7de46015985e599204ee9bd4fee280f2e51581b7398635373b902d082b723ad66bac81f2912abf3586985bdd5d5125904b246fb35

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'capistrano', '~> 3.4'
+gem 'activesupport', '>= 3.0'
 group :development do
   gem 'bundler', '~> 1.7'
   gem 'jeweler', '~> 2.0'

data/Gemfile.lock

@@ -1,6 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (4.2.0)
+      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)
     builder (3.2.2)
     capistrano (3.4.0)
@@ -33,8 +39,10 @@ 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)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -57,11 +65,14 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 3.0)
   bundler (~> 1.7)
   capistrano (~> 3.4)
   jeweler (~> 2.0)

data/README.md

@@ -6,32 +6,38 @@ Note: This has been updated to support Capistrano >= 3.4. If you still use Capis
 
 ## Versioning
 
-This gem stays at 3.x for capistrano 3, as it seems logical.
+Use 3.x for capistrano 3
 
-## Sudoing
+For capistrano2, see the capistrano2 branch (will not be updated)
 
-The setup process requires sudo on some files and folders upon creation.
+## Usage
+
+You are unlikely to require this library without any of the libraries
+depending on it.
 
-You must either do the job manually or add this to the sudoers file:
+But if you do require only Runit and Monit capistrano helpers, add this to your Gemfile in the development section.
 
+```ruby
+gem 'capistrano-runit_monit', require: false
 ```
-Cmnd_Alias RUNITCAPISTRANO = ,
-deploy  ALL=NOPASSWD: /bin/chmod u+x /etc/sv/*
-deploy  ALL=NOPASSWD: /bin/chmod g+x /etc/sv/*
-deploy  ALL=NOPASSWD: /bin/chown deploy\:root /etc/sv/*
-deploy  ALL=NOPASSWD: /bin/chown -R deploy\:root /etc/sv/*
-deploy  ALL=NOPASSWD: /bin/chown -R deploy\:root /etc/service/*
-deploy  ALL=NOPASSWD: /bin/chown -R syslog\:syslog /var/log/service*
-deploy  ALL=NOPASSWD: /bin/mkdir -p /etc/service/*
-deploy  ALL=NOPASSWD: /bin/mkdir /etc/service/*
-deploy  ALL=NOPASSWD: /bin/mkdir -p /var/log/service*
-deploy  ALL=NOPASSWD: /bin/mkdir -p /etc/sv/*
-deploy  ALL=NOPASSWD: /bin/mkdir /etc/sv/*
-deploy  ALL=NOPASSWD: /bin/rm -rf /etc/service/*
 
+In your Capfile:
+
+```ruby
+require 'capistrano/monit'
+require 'capistrano/runit'
 ```
-,/bin/chown myuser:mygroup /var/www/html/*,/bin/chmod 755 /var/www/html2/myapp/*.txt
 
+## Sudoing
+
+The setup process requires sudo on some files and folders upon creation.
+
+You should run the following commands to get the proper list for entries to be created in /etc/sudoers.d
+
+```
+cap production runit:sudoers
+cap production monit:sudoers
+```
 
 ## Services for Monit and Runit
 
@@ -75,8 +81,8 @@ You can add this to deploy.rb or env.rb in order to automatically monitor/unmoni
 It is important to unmonitor tasks while deploying as they can trigger stops/restarts to the app that monit thinks are "crashes"
 
 ```ruby
-before "deploy:started",  "monit:unmonitor"
-after  "deploy:finished", "monit:monitor"
+before 'deploy:updating', 'monit:unmonitor'
+after 'deploy:finished', 'monit:monitor'
 ```
 
 If you want monit to automatically start/stop runit instead of triggering seperately
@@ -105,8 +111,15 @@ cap runit:stop                  # Stop all runit services for current applicatio
 You can add this to deploy.rb or env.rb in order to automatically start/stop tasks
 
 ```ruby
-before "deploy", "runit:stop"
-after  "deploy", "runit:start"
+before "deploy:updating", "runit:stop"
+after  "deploy:finished", "runit:start"
+```
+
+Or just before finishing the update:
+
+```ruby
+before "deploy:finished", "runit:stop"
+after  "deploy:finished", "runit:start"
 ```
 
 See each gem if you want to start/stop each service separate instead of together.

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/capistrano-monit_runit.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano-monit_runit 3.0.0 ruby lib
+# stub: capistrano-monit_runit 3.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-monit_runit"
-  s.version = "3.0.0"
+  s.version = "3.0.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-03-13"
+  s.date = "2015-03-26"
   s.description = "Helpers for capistrano recipes using runit/monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
@@ -54,15 +54,18 @@ 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_development_dependency(%q<bundler>, ["~> 1.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
       s.add_dependency(%q<capistrano>, ["~> 3.4"])
+      s.add_dependency(%q<activesupport>, [">= 3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.7"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
     end
   else
     s.add_dependency(%q<capistrano>, ["~> 3.4"])
+    s.add_dependency(%q<activesupport>, [">= 3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.7"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end

data/lib/capistrano/helpers/base.rb

@@ -1,60 +1,66 @@
-module Capistrano
-  module Helpers
-    ##
-    # Helper functions for both runit and monit
-    module Base
-      def user_app_env_underscore
-        "#{fetch(:user)}_#{fetch(:application)}_#{environment}"
-      end
-
-      def user_app_env_underscore_short
-        "#{fetch(:user)[0...1]}_#{environment[0...1]}_#{fetch(:application)}"
-      end
-
-      def user_app_env_underscore_short_char_safe
-        user_app_env_underscore_short.gsub!('-', '_')
-      end
-
-      ##
-      # Automatically sets the environment based on presence of
-      # :stage (multistage)
-      # :rails_env
-      # RAILS_ENV variable;
-      #
-      # Defaults to "production" if not found
-      #
-      def environment # rubocop:disable Metrics/MethodLength
-        if !fetch(:rails_env).nil?
-          fetch(:rails_env)
-        elsif !fetch(:rack_env).nil?
-          fetch(:rack_env)
-        elsif !fetch(:stage).nil?
-          fetch(:stage)
-        else
-          info '---------------------------------------------------------------'
-          info '- Stage, rack or rails environment isn\'t set in               -'
-          info '- :stage, :rails_env or :rack_env, defaulting to \'production\' -'
-          info '---------------------------------------------------------------'
-          'production'
-        end
-      end
-
-      def template_to_s_io(template_file)
-        fail "Cannot find templte #{template_file}" unless File.exist?(template_file)
-        StringIO.new(ERB.new(File.read(template_file)).result(binding))
-      end
-
-      ##
-      # Execute a rake taske using the proper env.
-      # run_rake db:migrate
-      #
-      def run_rake(task)
-        within(current_path) do
-          with rails_env: fetch(:rails_env) do
-            execute :rake, "#{task}"
-          end
-        end
-      end
-    end
-  end
-end
+require 'active_support'
+require 'active_support/core_ext/string/filters'
+module Capistrano
+  module Helpers
+    ##
+    # Helper functions for both runit and monit
+    module Base
+      def user_app_env_underscore
+        "#{fetch(:user)}_#{fetch(:application)}_#{environment}".squish.downcase.gsub(/[\s|-]/, '_')
+      end
+
+      def user_app_env_underscore_short
+        "#{fetch(:user)[0...1]}_#{environment[0...1]}_#{fetch(:application)}".squish.downcase.gsub(/[\s|-]/, '_')
+      end
+
+      def user_app_env_underscore_short_char_safe
+        user_app_env_underscore_short.squish.downcase.gsub(/[\s|-]/, '_')
+      end
+
+      def app_env_underscore
+        "#{fetch(:application)}_#{environment}".squish.downcase.gsub(/[\s|-]/, '_')
+      end
+
+      ##
+      # Automatically sets the environment based on presence of
+      # :stage (multistage)
+      # :rails_env
+      # RAILS_ENV variable;
+      #
+      # Defaults to "production" if not found
+      #
+      def environment # rubocop:disable Metrics/MethodLength
+        if !fetch(:rails_env).nil?
+          fetch(:rails_env)
+        elsif !fetch(:rack_env).nil?
+          fetch(:rack_env)
+        elsif !fetch(:stage).nil?
+          fetch(:stage)
+        else
+          info '---------------------------------------------------------------'
+          info '- Stage, rack or rails environment isn\'t set in               -'
+          info '- :stage, :rails_env or :rack_env, defaulting to \'production\' -'
+          info '---------------------------------------------------------------'
+          'production'
+        end
+      end
+
+      def template_to_s_io(template_file)
+        fail "Cannot find template #{template_file}" unless File.exist?(template_file)
+        StringIO.new(ERB.new(File.read(template_file)).result(binding))
+      end
+
+      ##
+      # Execute a rake taske using the proper env.
+      # run_rake db:migrate
+      #
+      def run_rake(task)
+        within(current_path) do
+          with rails_env: fetch(:rails_env) do
+            execute :rake, "#{task}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/helpers/monit.rb

@@ -34,13 +34,13 @@ module Capistrano
       #
       # This will symlink the service to enabled service, but not start or reload monit configuration
       #
-      def enable_service(service_conf_filename)
-        return unless test("[ -h #{File.join(c.fetch(:monit_enabled_path), service_conf_filename)} ]")
-        execute :ln, "-sf #{File.join(c.fetch(:monit_available_path), service_conf_filename)} #{File.join(c.fetch(:monit_enabled_path), service_conf_filename)}" # rubocop:disable Metrics/LineLength:
+      def enable_monitor(service_conf_filename)
+        return unless test("[ ! -h #{File.join(fetch(:monit_enabled_path), service_conf_filename)} ]")
+        execute :ln, "-sf #{File.join(fetch(:monit_available_path), service_conf_filename)} #{File.join(fetch(:monit_enabled_path), service_conf_filename)}" # rubocop:disable Metrics/LineLength:
       end
 
-      def disable_service(service_conf_filename)
-        execute :rm, "-f #{File.join(c.fetch(:monit_enabled_path), service_conf_filename)}"
+      def disable_monitor(service_conf_filename)
+        execute :rm, "-f #{File.join(fetch(:monit_enabled_path), service_conf_filename)}"
       end
     end
   end

data/lib/capistrano/helpers/runit.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Runit
       # Any command sent to this function controls _all_ services related to the app
       def runit_app_services_control(command)
-        return unless test("[ ! -h #{runit_etc_service_app_symlink_name} ]")
+        return unless test("[ -h '#{runit_etc_service_app_symlink_name}' ]")
         execute :sudo, :sv, "#{command} #{runit_etc_service_app_symlink_name}"
       end
 
@@ -25,8 +25,8 @@ module Capistrano
       #   control_service(service_name, "restart")
       # end
 
-      def control_service(service_name, command, arguments, _ignore_error = false)
-        return unless test "[ ! -h #{runit_service_path(service_name)}/run ]"
+      def control_service(service_name, command, arguments = '', _ignore_error = false)
+        return unless test "[ -h '#{runit_service_path(service_name)}/run' ]"
         execute :sv, "#{arguments} #{command} #{runit_service_path(service_name)}"
       end
 
@@ -36,17 +36,20 @@ module Capistrano
       end
 
       def disable_service(service_name)
-        force_control_service(service_name, 'force-stop', '', true) # force-stop the service before disabling it
+        begin
+          force_control_service(service_name, 'force-stop', '', true) # force-stop the service before disabling it
+        rescue
+        end
         within(runit_service_path(service_name)) do
-          execute :rm, '-f ./run' if test '[ ! -h ./run ]'
-          execute :rm, '-f ./finish' if test '[ ! -h ./finish ]'
+          execute :rm, '-f ./run' if test "[ -h '#{runit_service_run_file(service_name)}' ]"
+          execute :rm, '-f ./finish' if test "[ -h '#{runit_service_finish_file(service_name)}' ]"
         end
       end
 
       def enable_service(service_name)
         within(runit_service_path(service_name)) do
-          execute :ln, "-sf #{runit_service_run_config_file} ./run" if test '[ -h ./run ]'
-          execute :ln, "-sf #{runit_service_finish_config_file} ./finish" if test '[ -h ./finish ]'
+          execute :ln, "-sf #{runit_service_run_config_file(service_name)} ./run" if test "[ ! -h '#{runit_service_run_file(service_name)}' ]"
+          execute :ln, "-sf #{runit_service_finish_config_file(service_name)} ./finish" if test "[ ! -h '#{runit_service_finish_file(service_name)}' ]"
         end
       end
 
@@ -55,21 +58,19 @@ module Capistrano
       end
 
       def runit_set_executable_files(service_name) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        if test("[ -f '#{runit_service_run_config_file(service_name)}']")
+        if test("[ -f '#{runit_service_run_config_file(service_name)}' ]")
           execute :chmod, "775 #{runit_service_run_config_file(service_name)}"
         end
-        if test("[ -f '#{runit_service_finish_config_file(service_name)}']")
-          execute :chmod, "775 #{runit_service_finish_config_file(service_name)}"
+        if test("[ -f '#{runit_service_finish_config_file(service_name)}' ]")
+          execute :chmod, "775 #{runit_service_finish_config_file (service_name)}"
         end
 
-        if test("[ -f '#{runit_service_log_run_file(service_name)}']")
+        if test("[ -f '#{runit_service_log_run_file(service_name)}' ]")
           execute :chmod, "775 #{runit_service_log_run_file(service_name)}"
         end
 
-        if test("[ -d '#{runit_service_control_path(service_name)}']") # rubocop:disable Style/GuardClause
+        if test("[ -d '#{runit_service_control_path(service_name)}' ]") # rubocop:disable Style/GuardClause
           execute :chmod, "775 -R #{runit_service_control_path(service_name)}"
-          # execute :chmod, 'u+x -R runit_service_control_path(service_name)'
-          # execute :chmod, 'g+x -R runit_service_control_path(service_name)'
         end
       end
 

data/lib/capistrano/tasks/monit.rake

@@ -7,6 +7,11 @@
 # Let monit monitor any long-running processes to ensure they keep
 # within the limits set by you.
 
+require 'capistrano/dsl/base_paths'
+require 'capistrano/dsl/monit_paths'
+require 'capistrano/helpers/base'
+require 'capistrano/helpers/monit'
+
 include Capistrano::DSL::BasePaths
 include Capistrano::DSL::MonitPaths
 include Capistrano::Helpers::Base
@@ -28,37 +33,24 @@ namespace :load do
     set :monit_httpd_signature,     'enable' # or enable
     set :monit_httpd_port,          '2812'
 
-    set :monit_daemon_time,         '60'
-    set :monit_start_delay,         '60'
+    set :monit_daemon_time,         '30'
+    set :monit_start_delay,         '30'
 
     set :monit_monitrc_template,           File.join(File.expand_path(File.join(File.dirname(__FILE__), '../../../templates', 'monit')), 'monitrc.erb')  # rubocop:disable Metrics/LineLength:
     set :monit_application_conf_template,  File.join(File.expand_path(File.join(File.dirname(__FILE__), '../../../templates', 'monit')), 'app_include.conf.erb')  # rubocop:disable Metrics/LineLength:
 
     set :monit_application_conf_file, proc { File.join(fetch(:monit_dir), 'monit.conf') }
+
+    set :monit_event_dir, File.join('/var', 'run', 'monit')
   end
 end
 
 namespace :monit do
-  desc 'Setup monit for the application'
-  task :setup do
-    on roles(:app) do |host|
-      info "MONIT: Setting up initial monit configuration on #{host}"
-      if test "[ ! -d #{fetch(:monit_dir)} ]"
-        execute :mkdir, "-p #{fetch(:monit_dir)}"
-      end
-      if test "[ ! -d #{fetch(:monit_available_path)} ]"
-        execute :mkdir, "-p #{fetch(:monit_available_path)}"
-      end
-      if test "[ ! -d #{fetch(:monit_enabled_path)} ]"
-        execute :mkdir, "-p #{fetch(:monit_enabled_path)}"
-      end
-    end
-  end
-
   desc 'Get the config needed to add to sudoers'
   task :sudoers do
     run_locally do
       info '---------------ENTRIES FOR SUDOERS (Monit)---------------------'
+      puts "# Sudo monit entries for #{fetch(:application)}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 0700 #{monit_monitrc_file}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 0775 #{monit_etc_path}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 0700 #{monit_etc_path}"
@@ -70,22 +62,43 @@ namespace :monit do
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown root\\:root #{monit_monitrc_file}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /usr/bin/monit *"
       puts "#{fetch(:user)} ALL=NOPASSWD: /usr/sbin/service monit *"
+      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{fetch(:monit_event_dir)}"
       info '---------------------------------------------------------------'
     end
     # info "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy:root #{monit_monitrc_file}"
   end
 
+  desc 'Setup monit for the application'
+  task :setup do
+    on roles(:app) do |host|
+      info "MONIT: Setting up initial monit configuration on #{host}"
+      if test "[ ! -d #{fetch(:monit_dir)} ]"
+        execute :mkdir, "-p #{fetch(:monit_dir)}"
+      end
+      if test "[ ! -d #{fetch(:monit_available_path)} ]"
+        execute :mkdir, "-p #{fetch(:monit_available_path)}"
+      end
+      if test "[ ! -d #{fetch(:monit_enabled_path)} ]"
+        execute :mkdir, "-p #{fetch(:monit_enabled_path)}"
+      end
+
+      if test("[ ! -d #{monit_etc_conf_d_path} ]")
+        execute :sudo, :mkdir, "-p #{monit_etc_conf_d_path}"
+      end
+      execute :sudo, :chmod, "6775 #{monit_etc_conf_d_path}"
+      execute :sudo, :chown, "#{fetch(:user)}:root #{monit_etc_conf_d_path}"
+
+      # Upload application global monit include file
+      upload! template_to_s_io(fetch(:monit_application_conf_template)), fetch(:monit_application_conf_file)
+    end
+  end
+
   desc 'Setup main monit config file (/etc/monit/monitrc)'
   task :main_config do
     on roles(:app) do |host|
       set :createmonitrc, ask("Create #{monit_monitrc_file} [Y/n]", 'Y')
       if fetch(:createmonitrc) == 'Y'
         info "MONIT: Creating #{monit_monitrc_file} on #{host}"
-        if test("[ ! -d #{monit_etc_conf_d_path} ]")
-          execute :sudo, :mkdir, "-p #{monit_etc_conf_d_path}"
-          execute :sudo, :chmod, "6775 #{monit_etc_conf_d_path}"
-          execute :sudo, :chown, "#{fetch(:user)}:root #{monit_etc_conf_d_path}"
-        end
         execute :sudo, :chown, "#{fetch(:user)}:root #{monit_etc_path}"
         execute :sudo, :chmod, "0775 #{monit_etc_path}"
         execute :sudo, :chown, "#{fetch(:user)}:root #{monit_monitrc_file}"
@@ -93,6 +106,7 @@ namespace :monit do
         execute :sudo, :chmod, "0700 #{monit_monitrc_file}"
         execute :sudo, :chown, "root:root #{monit_monitrc_file}"
         execute :sudo, :service, 'monit restart'
+        execute :sudo, :mkdir, "-p #{fetch(:monit_event_dir)}"
         info "MONIT: Sleeping for #{fetch(:monit_start_delay).to_i} seconds to wait for monit to be ready"
         sleep(fetch(:monit_start_delay).to_i)
       end

data/lib/capistrano/tasks/runit.rake

@@ -36,6 +36,7 @@ namespace :runit do
   task :sudoers do
     run_locally do
       info '---------------ENTRIES FOR SUDOERS (Runit)---------------------'
+      puts "# Sudo runit entries for #{fetch(:application)}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{runit_user_base_path}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{runit_user_base_path}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 6775 #{runit_user_base_path}"
@@ -71,16 +72,13 @@ namespace :runit do
       on roles(:app) do |host|
         # set :pw, ask("Sudo password", '')
         # execute :echo, "#{fetch(:pw)} | sudo -S ls /"
-        if test("[ ! -d '#{runit_user_base_path}' ]")
-          execute :sudo, :mkdir, "-p '#{runit_user_base_path}'"
-          execute :sudo, :chown, "#{fetch(:user)}:root '#{runit_user_base_path}'"
-          execute :sudo, :chmod, "6775 '#{runit_user_base_path}'"
-        end
-        if test("[ ! -d '#{runit_etc_service_path}' ]")
-          execute :sudo, :mkdir, "-p '#{runit_etc_service_path}'"
-          execute :sudo, :chown, "#{fetch(:user)}:root '#{runit_etc_service_path}'"
-          execute :sudo, :chmod, "6775 '#{runit_etc_service_path}'"
-        end
+        execute :sudo, :mkdir, "-p '#{runit_user_base_path}'" if test("[ ! -d '#{runit_user_base_path}' ]")
+        execute :sudo, :chown, "#{fetch(:user)}:root '#{runit_user_base_path}'"
+        execute :sudo, :chmod, "6775 '#{runit_user_base_path}'"
+
+        execute :sudo, :mkdir, "-p '#{runit_etc_service_path}'" if test("[ ! -d '#{runit_etc_service_path}' ]")
+        execute :sudo, :chown, "#{fetch(:user)}:root '#{runit_etc_service_path}'"
+        execute :sudo, :chmod, "6775 '#{runit_etc_service_path}'"
         within("#{runit_user_base_path}") do
           execute :mkdir, "-p #{app_env_folder}"
         end
@@ -113,6 +111,13 @@ namespace :runit do
         info "RUNIT: Created inital runit log services in #{runit_base_log_path} for #{fetch(:application)} on #{host}"
       end
     end
+    # '[INTERNAL] create /etc/sv folders and upload base templates needed'
+    task :runit_ensure_shared_sockets_and_pids_folders do
+      on roles(:app) do |host|
+        execute :mkdir, fetch(:pids_path) if test("[ ! -d #{fetch(:pids_path)} ]")
+        execute :mkdir, fetch(:sockets_path) if test("[ ! -d #{fetch(:sockets_path)} ]")
+      end
+    end
   end
 
   desc 'Disable runit services for application'
@@ -148,19 +153,14 @@ namespace :runit do
     end
   end
 
-  desc 'Stop all runit services for current application'
-  task :stop do
-    runit_app_services_control('stop')
-  end
-
-  desc 'Start all runit services for current application'
-  task :start do
-    runit_app_services_control('start')
-  end
-
-  desc 'Only start services once. Will not restart if they fail.'
-  task :once do
-    runit_app_services_control('once')
+  %w(stop start once restart).each do |single_cmd|
+    desc "#{single_cmd} runit services for application"
+    task single_cmd.to_sym do
+      on roles(:app) do |host|
+        info "RUNIT: #{single_cmd} on #{host}"
+        runit_app_services_control(single_cmd)
+      end
+    end
   end
 end
 
@@ -170,3 +170,4 @@ after 'deploy:updated',   'runit:enable'
 # after 'deploy:setup',     'runit:setup'
 after 'runit:setup',      'runit:setup:runit_create_app_services'
 after 'runit:setup:runit_create_app_services', 'runit:setup:runit_create_app_log_services'
+after 'runit:setup:runit_create_app_services', 'runit:setup:runit_ensure_shared_sockets_and_pids_folders'

data/templates/monit/monitrc.erb

@@ -8,8 +8,8 @@ set statefile /var/lib/monit/state
 set idfile /var/lib/monit/id
 
 set eventqueue
-    basedir /var/monit  # set the base directory where events will be stored
-    slots 100           # optionaly limit the queue size
+    basedir <%= fetch(:monit_event_dir) %>  # set the base directory where events will be stored
+    slots 100                               # optionaly limit the queue size
 
 <%= fetch(:mail_alert_settings) %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-monit_runit
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement