capistrano-monit_runit 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27269284e6f19230ddb34330f0ff8fcf9d2dd02
-  data.tar.gz: 26242b79240ccdc9ce867e2556e51c82f3a93b58
+  metadata.gz: 0bcd6203961b40ae0cfa713bbc3105332cd2cb85
+  data.tar.gz: 9d6427177068ae51e113421e032a556588926da5
 SHA512:
-  metadata.gz: a6908383a8a67b5c20973b87e86f2608aefccd2943ee3280a3c2e2626d8c4bfad71b8c9381f8f1b115f48b280272d74b6755aa79347899029af45353fb5fd047
-  data.tar.gz: 1c869465901e70fcde02e3c29a9f63807dab042e9dd18e50eea8c650a8140ca6c02044bcbdc982e1b6fe6fb8a7005f2a7147783bc1e565fad302d9d8ef54cfb9
+  metadata.gz: 4aedb53a0a200122e3447408d00b915f388511d103fd102b14b258095cb4ca4b50fc90534dca94e3153ffbed329c24545216b7f91f1c0c1e5bd65e278ad30970
+  data.tar.gz: fefc7a15721f86db524240560e565f7ed42b181fb7d8409ff5b24fd21727d61dc3187cf7a5e283d9b1cc30b54a54890e320ee8b7d6f5e12276f080ad010b17d3

data/Gemfile

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

data/Gemfile.lock

@@ -72,7 +72,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0)
+  activesupport (>= 4.0)
   bundler (~> 1.7)
   capistrano (~> 3.4)
   jeweler (~> 2.0)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -30,14 +30,10 @@ require 'capistrano/runit'
 
 ## Sudoing
 
-The setup process requires sudo on some files and folders upon creation.
+You should setup sudoers to allow control over monit and runit from the deployment user in either Salt, puppet, chef or
+other form for infrastructure setup
 
-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
-```
+The cap tasks for creating a sudoers list has been deprecated, as it does not belong to deployment of an app
 
 ## Services for Monit and Runit
 
@@ -143,4 +139,3 @@ The following variables must be set
 ## Copyright
 
 (c) 2013-2015 Leif Ringstad. See LICENSE.txt for details
-

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.1.0

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.4 ruby lib
+# stub: capistrano-monit_runit 3.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-monit_runit"
-  s.version = "3.0.4"
+  s.version = "3.1.0"
 
   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-08-13"
+  s.date = "2016-03-17"
   s.description = "Helpers for capistrano recipes using runit/monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
     "lib/capistrano/tasks/monit.rake",
     "lib/capistrano/tasks/runit.rake",
     "templates/monit/app_include.conf.erb",
-    "templates/monit/monitrc.erb",
     "templates/runit/finish.erb",
     "templates/runit/log_run.erb",
     "templates/runit/run.erb"
@@ -55,18 +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_runtime_dependency(%q<activesupport>, [">= 4.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<activesupport>, [">= 4.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<activesupport>, [">= 4.0"])
     s.add_dependency(%q<bundler>, ["~> 1.7"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end

data/lib/capistrano/tasks/base.rake

@@ -4,10 +4,3 @@ 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

@@ -24,19 +24,6 @@ namespace :load do
     set :monit_enabled_path,   proc { File.join(fetch(:monit_dir), 'enabled') }
     set :monit_application_group_name,  proc { user_app_env_underscore }
 
-    set :monit_mailserver,          'localhost'
-    set :monit_mail_sender,         'monit@$HOST'
-    set :monit_mail_reciever,       nil # if this is nil, alerts are disabled
-    set :monit_use_httpd,           'true'
-    set :monit_httpd_bind_address,  'localhost'
-    set :monit_httpd_allow_address, 'localhost'
-    set :monit_httpd_signature,     'enable' # or enable
-    set :monit_httpd_port,          '2812'
-
-    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') }
@@ -46,29 +33,6 @@ namespace :load do
 end
 
 namespace :monit do
-  desc 'Get the config needed to add to sudoers'
-  task :sudoers do
-    run_locally do
-      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}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 0700 #{monit_etc_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{monit_etc_conf_d_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 6775 #{monit_etc_conf_d_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{monit_etc_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{monit_etc_conf_d_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{monit_monitrc_file}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown root\\:root #{monit_monitrc_file}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy\\:deploy #{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)}"
-      puts '# -----------------------------------------------------------------------------------------'
-    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|
@@ -83,42 +47,11 @@ namespace :monit do
         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}"
-        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}"
-        if test("[ -e #{monit_monitrc_file} ]")
-          execute :sudo, :chown, "deploy:deploy #{monit_monitrc_file}"
-          execute :rm, "-f #{monit_monitrc_file}"
-        end
-
-        upload! template_to_s_io(fetch(:monit_monitrc_template)), monit_monitrc_file
-        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
-    end
-  end
-
   desc 'Enable monit services for application'
   task :enable do
     on roles(:app) do |host|
@@ -225,21 +158,9 @@ namespace :monit do
   end
 end
 
-# after 'deploy:update', 'monit:enable'
-# after 'deploy:setup', 'monit:setup'
-before 'monit:setup',  'monit:main_config'
-# after 'monit:setup', 'monit:enable'
 after 'monit:enable', 'monit:reload'
 
-# This should be done in the app, as the sequence of restarting services can be specific
-# must trigger monitor after deploy
-# after 'deploy', 'monit:monitor'
-# must trigger unmonitor before deploy
-# before 'deploy', 'monit:unmonitor'
-
 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

@@ -32,27 +32,6 @@ namespace :load do
 end
 
 namespace :runit do
-  desc 'Get the config needed to add to sudoers for all commands'
-  task :sudoers do
-    run_locally do
-      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}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 6775 #{runit_user_base_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{runit_etc_service_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{runit_etc_service_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chmod 6775 #{runit_etc_service_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{runit_var_log_service_path}"
-      puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{runit_var_log_service_path}"
-      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 *"
-      puts '# -----------------------------------------------------------------------------------------'
-    end
-    # info "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy:root #{monit_monitrc_file}"
-  end
-
   desc 'Setup runit for the application'
   task :setup do
     on roles(:app) do |host|
@@ -70,15 +49,6 @@ namespace :runit do
     # '[INTERNAL] create /etc/sv folders and upload base templates needed'
     task :runit_create_app_services do
       on roles(:app) do |host|
-        # set :pw, ask("Sudo password", '')
-        # execute :echo, "#{fetch(:pw)} | sudo -S ls /"
-        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
@@ -86,7 +56,6 @@ namespace :runit do
         upload! template_to_s_io(fetch(:runit_run_template)), runit_run_file
         upload! template_to_s_io(fetch(:runit_finish_template)), runit_finish_file
 
-        # Should now work without sudo... ?
         execute :chmod, "0775 '#{runit_run_file}'"
         execute :chmod, "0775 '#{runit_finish_file}'"
         info "RUNIT: Created inital runit services in #{runit_base_path} for #{fetch(:application)} on #{host}"
@@ -100,11 +69,6 @@ namespace :runit do
           execute :mkdir, '-p log'
         end
         upload! template_to_s_io(fetch(:runit_log_run_template)), runit_log_run_file
-        if test("[ ! -d #{runit_var_log_service_path} ]")
-          execute :sudo, :mkdir, "-p '#{runit_var_log_service_path}'"
-          execute :sudo, :chmod, "6775 '#{runit_var_log_service_path}'"
-          execute :sudo, :chown, "-R #{fetch(:user)}:#{fetch(:runit_log_group)} '#{runit_var_log_service_path}'" # rubocop:disable Metrics/LineLength:
-        end
         execute :mkdir, "-p #{runit_var_log_service_runit_path}" if test("[ ! -d #{runit_var_log_service_runit_path} ]")
         execute :chmod, "775 '#{runit_log_run_file}'"
 
@@ -171,4 +135,3 @@ 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.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,6 @@ files:
 - lib/capistrano/tasks/monit.rake
 - lib/capistrano/tasks/runit.rake
 - templates/monit/app_include.conf.erb
-- templates/monit/monitrc.erb
 - templates/runit/finish.erb
 - templates/runit/log_run.erb
 - templates/runit/run.erb

data/templates/monit/monitrc.erb

@@ -1,23 +0,0 @@
-set daemon <%= fetch(:monit_daemon_time) %>
-  with start delay <%= fetch(:monit_start_delay) %>
-
-set logfile syslog facility log_daemon
-
-set statefile /var/lib/monit/state
-
-set idfile /var/lib/monit/id
-
-set eventqueue
-    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) %>
-
-<% unless fetch(:monit_use_httpd) == "false" %>
-set httpd port <%= fetch(:monit_httpd_port) %>
-  <%= "use address #{fetch(:monit_httpd_bind_address, "localhost")}" unless fetch(:monit_httpd_bind_address).nil? %>
-  <%= "allow #{fetch(:monit_httpd_allow_address)}" unless fetch(:monit_httpd_allow_address).nil? %>
-  <%= "signature #{fetch(:monit_httpd_signature)}" %>
-<% end %>
-
-include /etc/monit/conf.d/*.conf