dust-deploy 0.3.2 → 0.3.3

data/bin/dust

@@ -5,6 +5,7 @@ require 'thor/runner'
 require 'thor/util'
 require 'yaml'
 require 'fileutils'
+require 'ipaddress'
 require 'dust'
 
 module  Dust
@@ -216,7 +217,12 @@ module  Dust
 
           # create a new field with the fully qualified domain name
           n['fqdn'] = hostname
-          n['fqdn'] += '.' + n['domain'] if n['domain']
+
+          # if hostname is a valid ip address, don't add domain
+          # so we can connect via ip address only
+          unless IPAddress.valid? hostname and n['domain']
+            n['fqdn'] += '.' + n['domain']
+          end
 
           # pass command line proxy option
           n['proxy'] = options[:proxy] if options[:proxy]

data/changelog.md

@@ -1,6 +1,14 @@
 Changelog
 =============
 
+0.3.3
+------------
+
+-  fixes iptables bug, DENY policy target only allowed for filter table
+-  if hostname is an ip, domain will be ignored while connecting.
+   this fixes a conncetion issue, when hostname is an ip address and domain is specified nonetheless
+
+
 0.3.2
 ------------
 

data/lib/dust/recipes/iptables.rb

@@ -111,6 +111,8 @@ class Iptables < Thor
   # returns DROP if chain and table is specified in config file
   # ACCEPT if not
   def get_chain_policy table, chain
+    # only filter table supports DENY target
+    return 'ACCEPT' unless table == 'filter'
     return 'ACCEPT' unless @rules[chain.downcase]
 
     @rules[chain.downcase].values.each do |rule|

data/lib/dust/server.rb

@@ -10,10 +10,6 @@ module Dust
     def initialize attr
       @attr = attr
   
-      # store fully qualified domain name
-      @attr['fqdn'] = @attr['hostname']
-      @attr['fqdn'] += '.' + @attr['domain'] if @attr['domain']
-  
       @attr['user'] ||= 'root'
       @attr['port'] ||= 22
       @attr['password'] ||= ''
@@ -35,7 +31,7 @@ module Dust
                                 :port => @attr['port'],
                                 :proxy => proxy }
       rescue Exception
-        error_message = " - coudln't connect to #{@attr['fqdn']}"
+        error_message = "coudln't connect to #{@attr['fqdn']}"
         error_message += " (via socks5 proxy #{@attr['proxy']})" if proxy
         Dust.print_failed error_message
         return false

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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