syncwrap 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8747b0974cbb0b64ec21384e0e9f76edce077a6
-  data.tar.gz: df3d730eaa4ba91b3fc70ea80a9a74efd0f509e8
+  metadata.gz: b61d21a9dbd121278e72c2c97471eac0d5ccb1ff
+  data.tar.gz: d91d9ac9856658122583990d638bdf67ce9369e4
 SHA512:
-  metadata.gz: 26144f170e5a161982eec15e0f7b8b901c4b5a3eb2c73a36991aae6eab7a16476a9d0304d6ebf8b72ddd8fab214729563046f259f05b7a00c355a128f00dc1dd
-  data.tar.gz: 11f3c42c8f174332aaed9391228c8d97efe19734c67b2023c2a4164e32734a311c42a9b8cac9a5d80c10f0362c435ed7e582f1686624cf1223b42720339065d9
+  metadata.gz: 1ab6c7a098c66a0b5d0bb9e8affad2008608e93fd6586a91ef95c36e6ef09ce378578a7447cf546cd7da0de31a1c22b2b99415f3c42b5f37349915f6a115a3cf
+  data.tar.gz: 2d0bb9f3230bf8c917e9794a90c9a268b8152ef90a6264dccf53e2b07a739257b31523e0bbf35e359fb868e6eb22c391ffd09a64fd83028f37418506ca8eb6c0

data/History.rdoc

@@ -1,3 +1,6 @@
+=== 2.1.2 (2014-4-21)
+* Fix Network.dns_search (alias dns_domain) to resolve.conf support
+
 === 2.1.1 (2014-4-15)
 * Use 'syncwrap-' as tmpdir prefix.
 * Fix Users, RunUser use of useradd, adding -s and -m options, for

data/lib/syncwrap/base.rb

@@ -15,7 +15,7 @@
 #++
 
 module SyncWrap
-  VERSION='2.1.1'
+  VERSION='2.1.2'
 
   GEM_ROOT = File.dirname(File.dirname(File.dirname(__FILE__))) # :nodoc:
 end

data/lib/syncwrap/components/network.rb

@@ -27,12 +27,16 @@ module SyncWrap
   # Host component dependencies: <Distro>
   class Network < Component
 
-    # A default DNS domain name to use for name search, for addition
-    # to /etc/resolver.conf, etc. (default: nil)
-    attr_accessor :dns_domain
+    # A dns search list (a single domain or space delimited list of
+    # domains) for addition to the resolv.conf search option,
+    # etc. (default: nil)
+    attr_accessor :dns_search
+
+    alias :dns_domain  :dns_search
+    alias :dns_domain= :dns_search=
 
     def initialize( opts = {} )
-      @dns_domain = nil
+      @dns_search = nil
       super
     end
 
@@ -67,33 +71,52 @@ module SyncWrap
     end
 
     def update_resolver
-      if dns_domain
-        # (Temporary) inclusion direct to resolver.conf
-        sudo <<-SH
-          if ! grep -q 'search.* #{dns_domain}' /etc/resolver.conf; then
-            cp -f /etc/resolver.conf /etc/resolver.conf~
-            sed -i '/^search/d' /etc/resolver.conf
-            echo 'search #{dns_domain}' >> /etc/resolver.conf
-          fi
-        SH
-
+      if dns_search
         case distro
         when RHEL
-          # FIXME:
-          warn "Network: not sure if resolver.conf change is permanent?"
+          update_resolv_conf
+
+          f='/etc/sysconfig/network-scripts/ifcfg-eth0'
+          sudo <<-SH
+            if ! grep -q '^SEARCH=.*#{dns_search}' #{f}; then
+              cp -f #{f} #{f}~
+              sed -i '/^SEARCH=/d' #{f}
+              echo 'SEARCH="#{dns_search}"' >> #{f}
+            fi
+          SH
+
         when Ubuntu
+          # As of 12.04 - Precise; /etc/resolv.conf is a symlink that
+          # should not be lost.
+          update_resolv_conf( '/run/resolvconf/resolv.conf' )
+
           f='/etc/network/interfaces'
           sudo <<-SH
-            if ! grep -E -q '^\\s*dns-domain #{dns_domain}' #{f}; then
+            if ! grep -E -q '^\\s*dns-search #{dns_search}' #{f}; then
               cp -f #{f} #{f}~
-              sed -r -i '/^\\s*dns-domain/d' #{f}
-              echo '     dns-domain #{dns_domain}' >> #{f}
+              sed -r -i '/^\\s*dns-search/d' #{f}
+              echo '     dns-search #{dns_search}' >> #{f}
             fi
           SH
+
         end
       end
     end
 
+    protected
+
+    # Make a temporary adjustment to search domains directly to the
+    # resolv.conf file.
+    def update_resolv_conf( f = '/etc/resolv.conf' )
+      sudo <<-SH
+        if ! grep -q '^search.* #{dns_search}' #{f}; then
+          cp -f #{f} #{f}~
+          sed -i '/^search/d' #{f}
+          echo 'search #{dns_search}' >> #{f}
+        fi
+      SH
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor