dust-deploy 0.7.5 → 0.7.6

data/bin/dust

@@ -185,7 +185,7 @@ module  Dust
         exit
       end
 
-      yaml_files.each do |file|
+      yaml_files.to_array.each do |file|
         node = YAML.load_file(file)
 
         # if the file is empty, just skip it
@@ -208,8 +208,7 @@ module  Dust
 
         # if more than one hostname is specified, create a node
         # with the same settings for each hostname
-        node['hostname'] = [ node['hostname'] ] unless node['hostname'].is_a? Enumerable
-        node['hostname'].each do |hostname|
+        node['hostname'].to_array.each do |hostname|
           n = node.clone
 
           # overwrite hostname with single hostname (in case there are multiple)

data/changelog.md

@@ -1,6 +1,18 @@
 Changelog
 =============
 
+0.7.6
+------------
+
+-  further improvement of ruby1.9 support
+-  problem in nginx recipe fixed when using multiple sites
+-  adds sysctl recipe
+
+    recipes:
+      sysctl:
+        net.ipv4.tcp_max_syn_backlog: 1024
+
+
 0.7.5
 ------------
 

data/lib/dust/helper.rb

@@ -1,3 +1,12 @@
+class Object
+  # turns an object into an array
+  # this is needed, since 1.9 doesnt support "string".to_a and "string".each anymore
+  def to_array
+    return [ self ] unless self.is_a? Enumerable
+    return self
+  end
+end
+
 # combines two arrays
 # stolen from Juan Matias (jmrepetti) from stackoverflow.com
 class Array

data/lib/dust/recipes/iptables.rb

@@ -203,7 +203,7 @@ class Iptables < Recipe
     sorted = []
     rule.each do |r|
       # sort rules so it makes sense
-      r = r.sort_by do |x|
+      r = r.to_array.sort_by do |x|
         if x.include? '--match'
           -1
           elsif x.include? '--protocol'

data/lib/dust/recipes/nginx.rb

@@ -11,14 +11,15 @@ class Nginx < Recipe
     @node.rm '/etc/nginx/sites-*/*', :quiet => true
     ::Dust.print_ok
 
-    @config.each do |state, site|
-      
-      @node.deploy_file "#{@template_path}/sites/#{site}", "/etc/nginx/sites-available/#{site}", :binding => binding
+    @config.each do |state, sites|
+      sites.to_array.each do |site|
+        @node.deploy_file "#{@template_path}/sites/#{site}", "/etc/nginx/sites-available/#{site}", :binding => binding
     
-      # symlink to sites-enabled if this is listed as an enabled site
-      if state == 'sites-enabled'
-        ::Dust.print_msg "enabling #{site}", :indent => 2
-        ::Dust.print_result @node.exec("cd /etc/nginx/sites-enabled && ln -s ../sites-available/#{site} #{site}")[:exit_code]
+        # symlink to sites-enabled if this is listed as an enabled site
+        if state == 'sites-enabled'
+          ::Dust.print_msg "enabling #{site}", :indent => 2
+          ::Dust.print_result @node.exec("cd /etc/nginx/sites-enabled && ln -s ../sites-available/#{site} #{site}")[:exit_code]
+        end
       end
     end
 

data/lib/dust/recipes/rc_local.rb

@@ -6,9 +6,7 @@ class RcLocal < Recipe
       ::Dust.print_msg "configuring custom startup script\n"
 
       rc = ''
-      @config = [ @config ] unless @config.is_a? Enumerable
-
-      @config.each do |cmd|
+      @config.to_array.each do |cmd|
         ::Dust.print_msg "adding command: #{cmd}", :indent => 2
         rc += "#{cmd}\n"
         ::Dust.print_ok

data/lib/dust/recipes/ssh_authorized_keys.rb

@@ -21,7 +21,7 @@ class SshAuthorizedKeys < Recipe
     authorized_keys = ''
     
     # create the authorized_keys hash for this user
-    ssh_users.each do |ssh_user|
+    ssh_users.to_array.each do |ssh_user|
       users[ssh_user]['name'] ||= ssh_user
       ::Dust.print_msg "adding user #{users[ssh_user]['name']}", :indent => 2
       users[ssh_user]['keys'].each do |key|

data/lib/dust/recipes/sysctl.rb

@@ -0,0 +1,20 @@
+class Sysctl < Recipe
+  desc 'sysctl:deploy', 'configures sysctl'
+  def deploy
+    # only debian derivatives are supported at the moment, since we need support for /etc/sysctl.d/
+    return ::Dust.print_warning 'sysctl configuration not supported for your linux distribution' unless @node.uses_apt?
+    
+    ::Dust.print_msg "setting sysctl keys\n"
+    
+    sysctl_conf = ''
+    @config.each do |key, value|
+      ::Dust.print_msg "setting #{key} to: #{value}", :indent => 2
+      ::Dust.print_result @node.exec("sysctl -w #{key}=#{value}")[:exit_code]
+      
+      sysctl_conf.concat "#{key} = #{value}\n"
+    end
+    
+    ::Dust.print_msg 'saving settings to /etc/sysctl.d/10-dust.conf', :indent => 2
+    ::Dust.print_result @node.write("/etc/sysctl.d/10-dust.conf", sysctl_conf, :quiet => true)
+  end
+end

data/lib/dust/server.rb

@@ -304,6 +304,10 @@ module Dust
         ret = exec 'emerge --sync', options
       elsif uses_rpm?
         ret = exec 'yum check-update', options
+
+        # yum returns != 0 if packages that need to be updated are found
+        # we don't want that this is producing an error
+        ret[:exit_code] = 0 if ret[:exit_code] == 100
       else
         return Dust.print_failed '', options
       end
@@ -390,36 +394,42 @@ module Dust
     def is_debian? options = {}
       options = default_options(:quiet => true).merge options
 
+      return false unless uses_apt?
       is_os? ['debian'], options
     end
   
     def is_ubuntu? options = {}
       options = default_options(:quiet => true).merge options
 
+      return false unless uses_apt?
       is_os? ['ubuntu'], options
     end
   
     def is_gentoo? options = {}
       options = default_options(:quiet => true).merge options
 
+      return false unless uses_emerge?
       is_os? ['gentoo'], options
     end
   
     def is_centos? options = {}
       options = default_options(:quiet => true).merge options
 
+      return false unless uses_rpm?
       is_os? ['centos'], options
     end
   
     def is_scientific? options = {}
       options = default_options(:quiet => true).merge options
 
+      return false unless uses_rpm?
       is_os? ['scientific'], options
     end
 
     def is_fedora? options = {}
       options = default_options(:quiet => true).merge options
 
+      return false unless uses_rpm?
       is_os? ['fedora'], options
     end
   

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 +01:00
+date: 2012-02-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,6 +147,7 @@ files:
 - lib/dust/recipes/ssh_authorized_keys.rb
 - lib/dust/recipes/sshd.rb
 - lib/dust/recipes/sudoers.rb
+- lib/dust/recipes/sysctl.rb
 - lib/dust/recipes/unattended_upgrades.rb
 - lib/dust/recipes/zabbix_agent.rb
 - lib/dust/server.rb