itrigga-cap_deploy 0.1.7 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.2

data/lib/itrigga/cap_deploy/cap_tasks.rb

@@ -4,14 +4,23 @@ configuration = Capistrano::Configuration.respond_to?(:instance) ?
 
 configuration.load do
   def with_role(role, &block)
-    original, ENV['HOSTS'] = ENV['HOSTS'], find_servers(:roles =>role).map{|d| d.host}.join(",")
-    begin
-      yield
-    ensure
-      ENV['HOSTS'] = original 
+    if role_defined?(role)
+      original, ENV['HOSTS'] = ENV['HOSTS'], find_servers(:roles =>role).map{|d| d.host}.join(",")
+      begin
+        yield
+      ensure
+        ENV['HOSTS'] = original 
+      end
     end
   end
   
+  #
+  # Returns true if at least 1 server has been assigned to the role
+  #
+  def role_defined?(role)
+    find_servers(:roles => role).count > 0
+  end
+  
   task :symlink_init_d_script do
     puts "ensuring init_d script is symlinked"
     run "test -L  /etc/init.d/#{application_stub} || #{sudo} ln -s #{script_path}/init_d /etc/init.d/#{application_stub}"
@@ -73,22 +82,28 @@ configuration.load do
     symlink_dir("#{shared_dir}/cache","#{web_dir}/tmp/cache")
   
   end
-
+  
   task :regenerate_monit do
     puts "regenerating monit config file(s)"
-    remove_dir_if_exists("#{web_dir}/config/monit")
-    run "mkdir -p #{web_dir}/config/monit"
-    run "cd #{web_dir} && ruby script/generate monit"
+    run "test -d #{shared_dir}/templates || mkdir -p #{shared_dir}/templates"
+
+    run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=monit TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=`readlink /etc/#{config_file_name}` BASE_DIR=#{shared_dir}"
     puts "setting permissions & ownership on monit config files"
-    set_permissions_on_files_in_dir( :dir=>"#{web_dir}/config/monit", :ownership=>"root", :permissions=>"0700")
+    set_permissions_on_files_in_dir( :dir=>"#{shared_dir}/templates", :ownership=>"root", :permissions=>"0700")
+
   end
 
-  task :resymlink_monit do  
-    monit_file = "#{web_dir}/config/monit/monit.`readlink /etc/itrigga_config_file`.config"
-    std_monit_file = "/etc/monit/conf.d/#{application_stub}"
-    puts "re-symlinking monit config"
-    run "(test -L #{std_monit_file} && #{sudo} rm #{std_monit_file}) || echo 'no existing link'"
-    run "#{sudo} ln -s #{monit_file} #{std_monit_file} "  
+  task :resymlink_monit do
+    remove_dir_if_exists("/etc/monit/conf.d/#{application_stub}") 
+    sudo "mkdir /etc/monit/conf.d/#{application_stub}"
+    puts "re-symlinking monit config files"
+    symlink_files_in_dir_by_regex("#{shared_dir}/templates","/etc/monit/conf.d/#{application_stub}",".*monit$")
+    
+    # overwrite the default monit monitrc file to just have the includes for the conf.d dir
+    run "(test -f /etc/monit/monitrc && #{sudo} rm -f /etc/monit/monitrc) || echo no existing monitrc file"
+    sudo "echo \"echo 'include /etc/monit/conf.d/**/*' > /etc/monit/monitrc\" | #{sudo} bash"
+    run "#{sudo} chown root:root /etc/monit/monitrc && #{sudo} chmod 0700 /etc/monit/monitrc"
+    
   end
 
   task :reload_monit do
@@ -97,14 +112,15 @@ configuration.load do
 
   task :regenerate_logrotate do
     puts "regenerating logrotate config file"
-    remove_dir_if_exists( "#{web_dir}/config/log_rotate" )
-    run "cd #{web_dir} && ruby script/generate logrotate"
+    run "test -d #{shared_dir}/templates || mkdir -p #{shared_dir}/templates"
+    
+    run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=logrotate TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false BASE_DIR=#{shared_dir}"
     puts "setting permissions & ownership on logrotate config files"
-    set_permissions_on_files_in_dir( :dir=>"#{web_dir}/config/log_rotate", :ownership=>"root", :permissions=>"0700" )
+    set_permissions_on_files_in_dir( :dir=>"#{shared_dir}/templates", :ownership=>"root", :permissions=>"0700" )
   end
 
   task :resymlink_logrotate do
-    logrotate_config_file = "#{web_dir}/config/log_rotate/log_rotate.`readlink /etc/itrigga_config_file`.config"
+    logrotate_config_file = "#{shared_dir}/templates/logrotate"
     std_logrotate_file = "/etc/logrotate.d/#{application_stub}"
     puts "re-symlinking logrotate config"
     run "(test -L #{std_logrotate_file} && #{sudo} rm #{std_logrotate_file}) || echo nothing to remove"
@@ -118,39 +134,47 @@ configuration.load do
   
   task :regenerate_db_scripts do
     puts "regenerating db scripts"
-    
-    remove_dir_if_exists( "#{web_dir}/script/db" )
-    run "cd #{web_dir} && ruby script/generate db"
-    
-    puts "setting permissions & ownership on cron and db scripts"
-    set_permissions_on_files_in_dir( :dir=>"#{web_dir}/script/db", :ownership=>"root", :permissions=>"0700" )
   end
   
   task :regenerate_cron_scripts do
     puts "regenerating cron scripts"
+    run "test -d #{shared_dir}/templates || mkdir -p #{shared_dir}/templates"
     
-    remove_dir_if_exists( "#{web_dir}/script/cron" )
-    run "cd #{web_dir} && ruby script/generate cron"
+    with_role :solr do
+      solr_lockfile_script_path = File.join(shared_dir,"templates","solr_lockfile_check.script")
+      run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=solr_lockfile_check.cron TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false SOLR_LOCKFILE_SCRIPT_PATH=#{solr_lockfile_script_path}"
+    end
     
     puts "setting permissions & ownership on cron scripts"
-    run "test -d #{web_dir}/script/cron && #{sudo} find #{web_dir}/script/cron -type f -print | xargs -I{} #{sudo} chown root {} "
+    set_permissions_on_files_in_dir( :dir=>"#{shared_dir}/templates", :ownership=>"root", :permissions=>"0700" )
   end
   
-  task :regenerate_monitoring_scripts do
-    puts "regenerating monitoring scripts"
-    run "cd #{web_dir} && ruby script/generate scripting -f"
+  task :symlink_cron_scripts do
+    puts "symlinking any cron scripts in scripts/cron into /etc/cron.d/"
     
-    puts "setting permissions and ownership for solr_lockfile check script"
-    run "#{sudo} chmod 0700 #{web_dir}/script/monitoring/solr_lockfile_check && #{sudo} chown root #{web_dir}/script/monitoring/solr_lockfile_check"
+    sudo "rm -f /etc/cron.d/solr_lockfile_check"
+    symlink_files_in_dir_by_regex("#{shared_dir}/templates","/etc/cron.d",".*cron$")
+     
+    # because cron is stupid any symlinks in /etc/cron.d/ that end in .cron will *not* be run. Not at all. So lets fix those up
+    # removes the .cron from the end of any symlinks on /etc/cron.d/
+    run "echo 'for f in `find /etc/cron.d/ -type l -name '*.cron'`;do ln -s `readlink $f` ${f/.cron/} && rm $f; done' | #{sudo} bash"
     
+    # give cron a kick to pick up the new changes    
+    sudo "service cron reload"
   end
   
- task :symlink_cron_scripts do
-    puts "symlinking any cron scripts in scripts/cron into /etc/cron.d/"
+  task :regenerate_monitoring_scripts do
+    puts "regenerating monitoring scripts"
+    run "test -d #{shared_dir}/templates || mkdir -p #{shared_dir}/templates"
     
-    symlink_files_in_dir("#{web_dir}/script/cron","/etc/cron.d")
-     
-    # give cron a kick to pick up the new changes    
-    run "#{sudo} service cron reload"
+    with_role :solr do
+      solr_lockfile_path = File.join(shared_dir,"solr","data","index","*.lock")
+      run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=solr_lockfile_check.script TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false SOLR_LOCKFILE_PATH=#{solr_lockfile_path} SOLR_TIMEOUT=900"
+    end
+    
+    puts "setting permissions and ownership for solr_lockfile check script"
+    set_permissions_on_files_in_dir( :dir=>"#{shared_dir}/templates", :ownership=>"root", :permissions=>"0700" )
   end
+  
+  
 end

data/lib/itrigga/cap_deploy/filesystem_utils.rb

@@ -12,6 +12,15 @@
   
           run "(#{sudo} test -d #{from_dir} && ( find #{from_dir}/ -mindepth 1  -print | xargs --verbose #{sudo} ln -s -f -t #{to_dir} ) ) || echo 'nothing to link'"
         end
+        
+        #
+        # Symlinks the files in from_dir matching the regex into the to_dir
+        #
+        def symlink_files_in_dir_by_regex(from_dir,to_dir,regex)  
+          delete_files_from_dir1_which_exist_in_dir2(to_dir, from_dir)
+  
+          run "(#{sudo} test -d #{from_dir} && ( find #{from_dir}/ -mindepth 1 -regex '#{regex}' -print | xargs --verbose #{sudo} ln -s -f -t #{to_dir} ) ) || echo 'nothing to link'"
+        end
 
         def mkdir_unless_exists( dir )
           run "test -d #{dir} || #{sudo} mkdir -p #{dir}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-cap_deploy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Al Davidson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +01:00
+date: 2011-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency