dust-deploy 0.2.2 → 0.2.3

data/changelog.md

@@ -1,6 +1,12 @@
 Changelog
 =============
 
+0.2.3
+------------
+
+-  improved iptables rule sorting, several minor improvements
+
+
 0.2.2
 ------------
 

data/lib/dust/recipes/debsecan.rb

@@ -7,7 +7,7 @@ class Debsecan < Thor
       ::Dust.print_msg 'configuring debsecan'
 
       # if config is simply set to "true", use defaults
-      config = {} unless config.class == Hash
+      config = {} unless config.is_a? Hash
 
       # setting default config variables (unless already set)
       config['report'] ||= false

data/lib/dust/recipes/iptables.rb

@@ -63,7 +63,7 @@ class Iptables < Thor
           rule['protocol'] ||= ['tcp'] if rule['dport'] or rule['sport']
 
           # convert non-array variables to array, so we won't get hickups when using .each and .combine
-          rule.each { |k, v| rule[k] = [ rule[k] ] if rule[k].class != Array }
+          rule.each { |k, v| rule[k] = [ rule[k] ] unless rule[k].is_a? Array }
 
           next unless check_ipversion rule, ipv
 
@@ -164,17 +164,30 @@ class Iptables < Thor
     # make sure the options are sorted in a way that works.
     sorted = []
     result.each do |r|
-      # bring to the front
-      r = r.sort_by { |x| if x.include? '--match' then -1 else 1 end }
-      r = r.sort_by { |x| if x.include? '--protocol' then -1 else 1 end }
-      # shift to the end
-      r = r.sort_by { |x| if x.include? '--jump' then 1 else -1 end }
-      r = r.sort_by { |x| if x.include? '--to-port' then 1 else -1 end }
-      r = r.sort_by { |x| if x.include? '--to-destination' then 1 else -1 end }
-      r = r.sort_by { |x| if x.include? '--to-source' then 1 else -1 end }
-      r = r.sort_by { |x| if x.include? '--ttl-set' then 1 else -1 end }
-      r = r.sort_by { |x| if x.include? '--clamp-mss-to-pmtu' then 1 else -1 end }
-      r = r.sort_by { |x| if x.include? '--reject-with' then 1 else -1 end }
+      # sort rules so it makes sense
+      r = r.sort_by do |x|
+        if x.include? '--match'
+          -1
+        elsif x.include? '--protocol'
+          -2
+        elsif x.include? '--jump'
+          1
+        elsif x.include? '--to-port'
+          2
+        elsif x.include? '--to-destination'
+          3
+        elsif x.include? '--to-source'
+          4
+        elsif x.include? '--ttl-set'
+          5
+        elsif x.include? '--clamp-mss-to-pmtu'
+          6
+        elsif x.include? '--reject-with'
+          7
+        else
+          0
+        end
+      end
       sorted.push r
     end
 

data/lib/dust/recipes/repositories.rb

@@ -11,7 +11,7 @@ class Repositories < Thor
         puts
 
         # if repo is present but not a hash use defaults
-        repo = {} unless repo.class == Hash
+        repo = {} unless repo.is_a? Hash
 
         # setting defaults
         repo['url'] ||= 'http://ftp.debian.org/debian/' if node.is_debian? true

data/lib/dust/recipes/resolv_conf.rb

@@ -4,7 +4,7 @@ class ResolvConf < Thor
     ::Dust.print_msg "configuring resolv.conf\n"
 
     # if config is just true, create empty hash and use defaults
-    config = {} unless config.class == Hash
+    config = {} unless config.is_a? Hash
 
     # setting default config variables (unless already set)
     config['nameservers'] ||= [ '208.67.222.222', '208.67.220.220' ] # opendns

data/lib/dust/recipes/unattended_upgrades.rb

@@ -6,7 +6,7 @@ class UnattendedUpgrades < Thor
     return unless node.uses_apt? 
     node.install_package 'unattended-upgrades'
 
-    config = {} unless config.class == Hash
+    config = {} unless config.is_a? Hash
 
     # set defaults for non-set config
     config['enable'] ||= 1

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 +01:00
+date: 2012-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency