dust-deploy 0.7.0 → 0.7.1

data/bin/dust

@@ -147,7 +147,7 @@ module  Dust
         next unless options[:recipes].include?(recipe) if options[:recipes]
       
         # skip disabled recipes
-        next if config == 'disabled'
+        next if config == 'disabled' or config.is_a? FalseClass
       
         # check if method and thor task actually exist
         k = Thor::Util.find_by_namespace recipe

data/changelog.md

@@ -1,6 +1,19 @@
 Changelog
 =============
 
+0.7.1
+------------
+
+-  adds logrotate recipe
+-  you can now enable recipes using default configuration:
+   
+    recipes:
+      recipe1: true
+      recipe2: enabled
+      recipe3: false
+      recipe4: disabled
+
+
 0.7.0
 ------------
 

data/lib/dust/recipe.rb

@@ -6,9 +6,16 @@ class Recipe < Thor
     # prepare class variables
     @template_path = "./templates/#{recipe}"
     @node = node
-    @config = config
     @options = options
 
+    # if this recipe just was defined as true, yes or 'enabled', 
+    # continue with empty @config, so defaults get used
+    if config.is_a? TrueClass or config == 'enabled'
+      @config = {}
+    else
+      @config = config
+    end
+
     # run task
     send context
   end

data/lib/dust/recipes/aliases.rb

@@ -17,4 +17,3 @@ class Aliases < Recipe
     ::Dust.print_ret ret
   end
 end
-

data/lib/dust/recipes/basic_setup.rb

@@ -30,4 +30,3 @@ class BasicSetup < Recipe
 
   end
 end
-

data/lib/dust/recipes/cups_client.rb

@@ -31,4 +31,3 @@ class CupsClient < Recipe
     true
   end
 end
-

data/lib/dust/recipes/debsecan.rb

@@ -43,4 +43,3 @@ class Debsecan < Recipe
     end
   end
 end
-

data/lib/dust/recipes/duplicity.rb

@@ -8,11 +8,11 @@ class Duplicity < Recipe
 
     # return if config simply says 'remove'
     return if @config == 'remove'
-    
+
     @config.each do |scenario, c|
       # cloning is necessary if we have configurations with multiple hostnames
       config = c.clone
-      
+
       # if directory config options is not given, use hostname-scenario
       config['directory'] ||= "#{@node['hostname']}-#{scenario}"
 
@@ -22,14 +22,14 @@ class Duplicity < Recipe
         next
       end
 
-      # check if interval is correct   
+      # check if interval is correct
       unless [ 'monthly', 'weekly', 'daily', 'hourly' ].include? config['interval']
         return ::Dust.print_failed "invalid interval: '#{config['interval']}'"
       end
 
       # check whether we need ncftp
       @node.install_package 'ncftp' if config['backend'].include? 'ftp://'
-      
+
       # scp backend on centos needs python-pexpect (not needed anymore for newer systems)
       # @node.install_package 'python-pexpect' if config['backend'].include? 'scp://' and @node.uses_rpm?
 
@@ -46,11 +46,11 @@ class Duplicity < Recipe
       cronjob_path = "/etc/cron.#{config['interval']}/duplicity-#{scenario}"
 
       # adjust and upload cronjob
-      ::Dust.print_msg "adjusting and deploying cronjob (scenario: #{scenario}, interval: #{config['interval']})\n"      
+      ::Dust.print_msg "adjusting and deploying cronjob (scenario: #{scenario}, interval: #{config['interval']})\n"
       config['options'].each { |option| ::Dust.print_ok "adding option: #{option}", :indent => 2 }
-      
+
       @node.deploy_file "#{@template_path}/cronjob", cronjob_path, :binding => binding
-      
+
       # making cronjob executeable
       @node.chmod '0700', cronjob_path
       puts
@@ -76,7 +76,7 @@ class Duplicity < Recipe
       cmd = "nice -n #{config['nice']} duplicity collection-status " +
             "--archive-dir #{config['archive']} " +
             "#{File.join(config['backend'], config['directory'])}"
-  
+
       cmd += " |tail -n3 |head -n1" unless options.long?
 
       ret = @node.exec cmd
@@ -103,4 +103,3 @@ class Duplicity < Recipe
   end
 
 end
-

data/lib/dust/recipes/etc_hosts.rb

@@ -18,4 +18,3 @@ class EtcHosts < Recipe
     ::Dust.print_ret ret
   end
 end
-

data/lib/dust/recipes/iptables.rb

@@ -294,4 +294,3 @@ class Iptables < Recipe
   end
 
 end
-

data/lib/dust/recipes/locale.rb

@@ -34,4 +34,3 @@ class Locale < Recipe
     ::Dust.print_ret ret
   end  
 end
-

data/lib/dust/recipes/logrotate.rb

@@ -0,0 +1,53 @@
+class Logrotate < Recipe
+  desc 'logrotate:deploy', 'installs logrotate rules'
+  def deploy 
+    return unless @node.install_package 'logrotate'
+    
+    @config.each do |name, rule|
+      ::Dust.print_msg "deploying logrotate entry for '#{name}'\n"
+
+      unless rule['path']
+        ::Dust.print_failed 'path not specified', :indent => 2
+        next
+      end
+      
+      file = "#{rule['path']} {\n"
+      
+      rule['args'] ||= default_args
+      rule['args'].each { |arg| file.concat "    #{arg}\n" }
+
+      rule['scripts'] ||= {}
+      rule['scripts'].each do |script, commands|
+        file.concat "    #{script}\n"
+        commands.each { |cmd| file.concat "        #{cmd}\n" }
+      end
+        
+      file.concat "}\n"
+      deploy_rule name, file
+    end
+    
+  end
+
+  desc 'logrotate:status', 'displays filenames of installed logrotate rules'
+  def status
+    ::Dust.print_ret @node.exec('ls /etc/logrotate.d/*')
+  end
+
+
+  private
+
+  def default_args
+    [ 'rotate 7', 'daily', 'missingok', 'notifempty', 'copytruncate', 'compress' ]
+  end
+
+  def remove_rules
+    @node.rm '/etc/logrotate.d/*'
+  end
+  
+  def deploy_rule name, file
+    @node.write "/etc/logrotate.d/#{name}", file, :indent => 2
+    @node.chmod '0644', "/etc/logrotate.d/#{name}", :indent => 2
+    @node.chown 'root:root', "/etc/logrotate.d/#{name}", :indent => 2    
+  end
+
+end

data/lib/dust/recipes/mysql.rb

@@ -156,4 +156,3 @@ class Mysql < Recipe
     end
   end
 end
-

data/lib/dust/recipes/nginx.rb

@@ -38,4 +38,3 @@ class Nginx < Recipe
     @node.print_service_status 'nginx'
   end  
 end
-

data/lib/dust/recipes/packages.rb

@@ -6,4 +6,3 @@ class Packages < Recipe
     end
   end
 end
-

data/lib/dust/recipes/rc_local.rb

@@ -29,4 +29,3 @@ class RcLocal < Recipe
     ::Dust.print_ret ret
   end
 end
-

data/lib/dust/recipes/remove_packages.rb

@@ -6,4 +6,3 @@ class RemovePackages < Recipe
     end
   end
 end
-

data/lib/dust/recipes/repositories.rb

@@ -106,4 +106,3 @@ class Repositories < Recipe
     end
   end
 end
-

data/lib/dust/recipes/resolv_conf.rb

@@ -47,4 +47,3 @@ class ResolvConf < Recipe
     ::Dust.print_ret ret
   end  
 end
-

data/lib/dust/recipes/sudoers.rb

@@ -43,4 +43,3 @@ class Sudoers < Recipe
     @node.chown 'root:root', "/etc/sudoers.d/#{name}", :indent => 2    
   end
 end
-

data/lib/dust/recipes/unattended_upgrades.rb

@@ -24,4 +24,3 @@ class UnattendedUpgrades < Recipe
     @node.write '/etc/apt/apt.conf.d/02periodic', periodic      
   end
 end
-

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 +01:00
+date: 2012-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,7 @@ files:
 - lib/dust/recipes/hash_check.rb
 - lib/dust/recipes/iptables.rb
 - lib/dust/recipes/locale.rb
+- lib/dust/recipes/logrotate.rb
 - lib/dust/recipes/memory_limit.rb
 - lib/dust/recipes/motd.rb
 - lib/dust/recipes/mysql.rb