<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -4,27 +4,29 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :network do
             
       set(:network_number_of_ports) { 
-        Capistrano::CLI.ui.ask &quot;Number of network ports&quot; do |q|
+        Capistrano::CLI.ui.ask &quot;Number of network interfaces&quot; do |q|
           q.default = 1
         end 
       }
       
+      default_network = ''
       set(:network_interfaces) {
-        foo = {}
-        network_number_of_ports.to_i.times do |port|
-          foo[port] = {}
-          foo[port][:address] = Capistrano::CLI.ui.ask &quot;address&quot; do |q|
-            q.default = &quot;192.168.#{port+1}.10&quot;
+        result = {}
+        network_number_of_ports.to_i.times do |iface|
+          default_network = &quot;192.168.#{iface+1}&quot;
+          result[iface] = {}
+          result[iface][:address] = Capistrano::CLI.ui.ask &quot;address&quot; do |q|
+            q.default = &quot;#{default_network}.10&quot;
           end
-          foo[port][:netmask] = Capistrano::CLI.ui.ask &quot;netmask&quot; do |q|
-            q.default = '255.255.255.0'
+          default_network = result[iface][:address].split('.').slice(0,3).join('.')
+          result[iface][:netmask] = Capistrano::CLI.ui.ask &quot;netmask&quot; do |q|
+            q.default = &quot;255.255.255.0&quot;
           end
-          foo[port][:broadcast] = Capistrano::CLI.ui.ask &quot;broadcast&quot; do |q|
-            q.default = &quot;192.168.#{port+1}.255&quot;
+          result[iface][:broadcast] = Capistrano::CLI.ui.ask &quot;broadcast&quot; do |q|
+            q.default = &quot;#{default_network}.255&quot;
           end
-
         end
-        foo
+        result
       }
       set(:network_hostname) { 
         Capistrano::CLI.ui.ask &quot;hostname&quot; do |q|
@@ -33,7 +35,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       } 
       set(:network_gateway) { 
         Capistrano::CLI.ui.ask &quot;default gateway&quot; do |q|
-          q.default = '192.168.1.1'
+          q.default = &quot;#{default_network}.1&quot;
         end 
       }
       set(:network_dns_nameservers) { 
@@ -41,6 +43,11 @@ Capistrano::Configuration.instance(:must_exist).load do
           q.default = '203.8.183.1 4.2.2.1'
         end 
       }
+      set(:network_dns_search_path) { 
+        Capistrano::CLI.ui.ask &quot;dns search domains (separated by spaces)&quot; do |q|
+          q.default = nil
+        end 
+      }
       
       SYSTEM_CONFIG_FILES[:network] = [
 
@@ -57,6 +64,11 @@ Capistrano::Configuration.instance(:must_exist).load do
         {:template =&gt; &quot;hostname.erb&quot;,
          :path =&gt; '/etc/hostname',
          :mode =&gt; 0644,
+         :owner =&gt; 'root:root'},
+         
+        {:template =&gt; &quot;resolv.conf.erb&quot;,
+         :path =&gt; '/etc/resolv.conf',
+         :mode =&gt; 0644,
          :owner =&gt; 'root:root'}
     
        ]</diff>
      <filename>lib/deprec/recipes/network.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>b5aeed67ba3d64fc26c511f8b89a30a8522e2649</id>
    </parent>
  </parents>
  <author>
    <name>Mike Bailey</name>
    <email>mike@bailey.net.au</email>
  </author>
  <url>http://github.com/mbailey/deprec/commit/488a54059e028028899fed7957ce6e77a526a01e</url>
  <id>488a54059e028028899fed7957ce6e77a526a01e</id>
  <committed-date>2008-10-29T20:11:05-07:00</committed-date>
  <authored-date>2008-10-29T20:11:05-07:00</authored-date>
  <message>Update the default options for network settings based on
value provided for ip address.</message>
  <tree>736e1f78b5a3676b972930cce92d55bbc8b8f5c0</tree>
  <committer>
    <name>Mike Bailey</name>
    <email>mike@bailey.net.au</email>
  </committer>
</commit>
