capistrano-base_helper 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/capistrano-base_helper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-base_helper"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Ringstad"]

data/lib/capistrano/base_helper/monit_base.rb

@@ -24,6 +24,12 @@ Capistrano::Configuration.instance(true).load do
   _cset :monit_daemon_time, "60"
   _cset :monit_start_delay, "60"
 
+  _cset :monit_local_monitrc,     File.join(File.expand_path(File.join(File.dirname(__FILE__),"../../../templates", "monit")), "monitrc.erb")
+  _cset :monit_local_application_conf, File.join(File.expand_path(File.join(File.dirname(__FILE__),"../../../templates", "monit")), "app_include.conf.erb")
+
+  _cset :monit_remote_monitrc, File.join("/etc","monit","monitrc")
+  _cset :monit_remote_application_conf, File.join(fetch(:monit_dir), "monit.conf")
+
   #after "deploy:update", "monit:enable"
   after "deploy:setup", "monit:setup"
   before "monit:setup",  "monit:main_config"
@@ -53,20 +59,15 @@ Capistrano::Configuration.instance(true).load do
       run "[ -d #{fetch(:monit_enabled_path)} ] || mkdir -p #{fetch(:monit_enabled_path)}"
 
       # create include configuration (used when booting the system)
-      local_config  = File.join(File.expand_path(File.join(File.dirname(__FILE__),"../templates", "monit")), "app_include.conf.erb")
-      remote_config = File.join(fetch(:monit_dir), "monit.conf")
 
-      Capistrano::BaseHelper::generate_and_upload_config(local_config, remote_config)
+      Capistrano::BaseHelper::generate_and_upload_config(fetch(:monit_local_application_conf), fetch(:monit_remote_application_conf))
     end
 
     desc "Setup main monit config file (/etc/monit/monitrc)"
     task :main_config, :roles => [:app, :db, :web] do
       if Capistrano::CLI.ui.agree("Setup /etc/monit/monitrc ?")
          # create monitrc file
-        local_config  = File.join(File.expand_path(File.join(File.dirname(__FILE__),"../templates", "monit")), "monitrc.erb")
-        remote_config = File.join("/etc","monit","monitrc")
-
-        Capistrano::BaseHelper::generate_and_upload_config(local_config, remote_config, true)
+        Capistrano::BaseHelper::generate_and_upload_config(fetch(:monit_local_monitrc), fetch(:monit_remote_monitrc), true)
 
         commands = []
         commands << "sudo chmod 700 /etc/monit/monitrc"

data/lib/capistrano/base_helper/runit_base.rb

@@ -1,8 +1,8 @@
 Capistrano::Configuration.instance(true).load do
   _cset :runit_dir, defer { "#{shared_path}/runit" }
-  _cset :runit_local_run,     File.join(File.expand_path(File.join(File.dirname(__FILE__),"../templates")), "runit",  "run.erb")
-  _cset :runit_local_finish,  File.join(File.expand_path(File.join(File.dirname(__FILE__),"../templates")), "runit",  "finish.erb")
-  _cset :runit_local_log_run, File.join(File.expand_path(File.join(File.dirname(__FILE__),"../templates")), "runit",  "log_run.erb")
+  _cset :runit_local_run,     File.join(File.expand_path(File.join(File.dirname(__FILE__),"../../../templates")), "runit",  "run.erb")
+  _cset :runit_local_finish,  File.join(File.expand_path(File.join(File.dirname(__FILE__),"../../../templates")), "runit",  "finish.erb")
+  _cset :runit_local_log_run, File.join(File.expand_path(File.join(File.dirname(__FILE__),"../../../templates")), "runit",  "log_run.erb")
   _cset :runit_remote_run,     defer {File.join("/etc", "sv", Capistrano::BaseHelper.user_app_env_path, "run")}
   _cset :runit_remote_finish,  defer {File.join("/etc", "sv", Capistrano::BaseHelper.user_app_env_path, "finish")}
   _cset :runit_remote_log_run, defer {File.join("/etc", "sv", Capistrano::BaseHelper.user_app_env_path, "log", "run")}
@@ -83,7 +83,7 @@ module Capistrano
       commands << "sudo chown -R #{c.fetch(:runit_log_user)}:#{c.fetch(:runit_log_group)} '#{File.join("/var", "log", "service", Capistrano::BaseHelper.user_app_env_path, "runit")}'"
 
       c.run(commands.join(" && "))
-      Capistrano::BaseHelper.generate_and_upload_config( Capistrano::BaseHelper::get_capistrano_instance.fetch(:runit_local_log_run), Capistrano::BaseHelper::get_capistrano_instance.fetch(:runit_remote_log_run), true )
+      Capistrano::BaseHelper.generate_and_upload_config( c.fetch(:runit_local_log_run), c.fetch(:runit_remote_log_run), true )
       commands = []
       commands << "sudo chmod u+x '#{File.join("/etc", "sv", Capistrano::BaseHelper.user_app_env_path, "log", "run")}'"
       commands << "sudo chmod g+x '#{File.join("/etc", "sv", Capistrano::BaseHelper.user_app_env_path, "log", "run")}'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-base_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2573387590493266997
+      hash: -2866187985074734245
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: