capistrano-monit_runit 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d99cd3e4764b444da5342e877f62b6d84d2fcd5
-  data.tar.gz: 48ba994ea84122c81668d642103a33f66528abca
+  metadata.gz: af366a54fe948e1ff0f9251eab5e160f72941836
+  data.tar.gz: 01f7636c123d304351bfeada4d3368ff5aa95e0b
 SHA512:
-  metadata.gz: 0cd9646a68f5b3aacba56b4cd89f956e86acd345038bf6445ed37f7496e3aeb315749096015caae946040208c4272e461838670a005a14bf0314ceb34308af37
-  data.tar.gz: 08d39d78a5fe06176a1f98f7de46015985e599204ee9bd4fee280f2e51581b7398635373b902d082b723ad66bac81f2912abf3586985bdd5d5125904b246fb35
+  metadata.gz: d59f73f6cceeba51f72d5e123449c365be685ff83cfb727c01fb8db5e455d9eb56fd40c794a02b35fa855b0f225fb5b682c847cf7cfa4c380775681fb7e9f5e3
+  data.tar.gz: 5e7edebfd571c7808e30fe44b4d0288382445c3c02de22245a2ad7460c43e579f9570eb131d50c532d5aa16bc22820cd1e2f31b5601fdefc97d850613c8717a5

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

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.1 ruby lib
+# stub: capistrano-monit_runit 3.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-monit_runit"
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   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-26"
+  s.date = "2015-08-06"
   s.description = "Helpers for capistrano recipes using runit/monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "capistrano-monit_runit.gemspec",
+    "lib/capistrano/base.rb",
     "lib/capistrano/capistrano-monit_runit.rb",
     "lib/capistrano/dsl/base_paths.rb",
     "lib/capistrano/dsl/monit_paths.rb",

data/lib/capistrano/base.rb

@@ -0,0 +1 @@
+load File.expand_path('../tasks/base.rake', __FILE__)

data/lib/capistrano/monit.rb

@@ -8,5 +8,5 @@ try_require 'capistrano/dsl/base_paths'
 try_require 'capistrano/dsl/monit_paths'
 try_require 'capistrano/helpers/base'
 try_require 'capistrano/helpers/monit'
-load File.expand_path('../tasks/base.rake', __FILE__)
+try_require 'capistrano/base'
 load File.expand_path('../tasks/monit.rake', __FILE__)

data/lib/capistrano/runit.rb

@@ -8,5 +8,5 @@ try_require 'capistrano/dsl/base_paths'
 try_require 'capistrano/dsl/runit_paths'
 try_require 'capistrano/helpers/base'
 try_require 'capistrano/helpers/runit'
-load File.expand_path('../tasks/base.rake', __FILE__)
+try_require 'capistrano/base'
 load File.expand_path('../tasks/runit.rake', __FILE__)

data/lib/capistrano/tasks/base.rake

@@ -4,3 +4,10 @@ namespace :load do
     set :sockets_path, proc { shared_path.join('sockets') }
   end
 end
+
+desc 'Get a list over Sudoers entries to add to a file in sudoers.d'
+task :sudoers do
+  run_locally do
+    info '--- Copy the information below into a a file in sudoers.d ---'
+  end
+end

data/lib/capistrano/tasks/monit.rake

@@ -49,7 +49,7 @@ namespace :monit do
   desc 'Get the config needed to add to sudoers'
   task :sudoers do
     run_locally do
-      info '---------------ENTRIES FOR SUDOERS (Monit)---------------------'
+      puts '# -----------------------------------------------------------------------------------------'
       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}"
@@ -63,7 +63,7 @@ namespace :monit do
       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 '---------------------------------------------------------------'
+      puts '# -----------------------------------------------------------------------------------------'
     end
     # info "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy:root #{monit_monitrc_file}"
   end
@@ -235,3 +235,5 @@ before 'monit:disable', 'monit:unmonitor'
 after 'monit:disable', 'monit:reload'
 
 before 'monit:purge', 'monit:unmonitor'
+
+after 'sudoers', 'monit:sudoers'

data/lib/capistrano/tasks/runit.rake

@@ -35,7 +35,7 @@ namespace :runit do
   desc 'Get the config needed to add to sudoers for all commands'
   task :sudoers do
     run_locally do
-      info '---------------ENTRIES FOR SUDOERS (Runit)---------------------'
+      puts '# -----------------------------------------------------------------------------------------'
       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}"
@@ -48,7 +48,7 @@ namespace :runit do
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown -R #{fetch(:user)}\\:#{fetch(:runit_log_group)} #{runit_var_log_service_path}" # rubocop:disable Metrics/LineLength:
       puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 6775 #{runit_var_log_service_path}"
       puts "#{fetch(:user)} ALL=NOPASSWD: /usr/bin/sv *"
-      info '---------------------------------------------------------------'
+      puts '# -----------------------------------------------------------------------------------------'
     end
     # info "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy:root #{monit_monitrc_file}"
   end
@@ -171,3 +171,4 @@ after 'deploy:updated',   'runit:enable'
 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'
+after 'sudoers', 'runit:sudoers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-monit_runit
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - VERSION
 - capistrano-monit_runit.gemspec
+- lib/capistrano/base.rb
 - lib/capistrano/capistrano-monit_runit.rb
 - lib/capistrano/dsl/base_paths.rb
 - lib/capistrano/dsl/monit_paths.rb