pf-tools commit: r785 [ccaillet-guest] - in /branches/next-gen: debian/changelog debian/compat debian/control lib/PFTools/Net.pm

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Tue Jul 27 09:30:22 2010
New Revision: 785

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=785
Log:
  - adding __Chk_section_struct for checking the content of sections
  (basic checks) this function is also used for old syntax files
  - adding __Translate_old2new_host for translating Parser_pftools result
  to Parser_ini hash result with new syntax file
* debian/control
  - deps update according to usage of NetAddr::IP and Net::DNS
  - uploaders and maintainers update
* debian/compat
  - update level for avoiding warning during package build

Modified:
    branches/next-gen/debian/changelog
    branches/next-gen/debian/compat
    branches/next-gen/debian/control
    branches/next-gen/lib/PFTools/Net.pm

Modified: branches/next-gen/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/debian/changelog?rev=785&op=diff
==============================================================================
--- branches/next-gen/debian/changelog (original)
+++ branches/next-gen/debian/changelog Tue Jul 27 09:30:22 2010
@@ -10,12 +10,12 @@
     ini parser and new syntax
     - adding __Merge_conf_new for merging include part or model part from
     configuration files
-    - adding __Chk_section_struct for checking the content of sections (basic checks)
-    this function is also used for old syntax files
+    - adding __Chk_section_struct for checking the content of sections
+    (basic checks) this function is also used for old syntax files
     - modifying Load_conf as a wrapper for old or new parsing method
     - using PFTools::Parser and PFTools::Logger
-    - adding __Translate_old2new_host for translating Parser_pftools result hash to
-    hash Parser_ini hash result with new syntax file
+    - adding __Translate_old2new_host for translating Parser_pftools result
+    to Parser_ini hash result with new syntax file
     - Init_GLOBAL_NETCONFIG : similar to old function Init_lib_net
     - Init_PF_CONFIG : function for parsing new style pf-tools.conf
   * lib/PFTools/Parser.pm
@@ -48,8 +48,13 @@
   Getopt::Long for handling command line option(s)
   * sbin/mk_sitezone : rewrite from mk_privatezone according to global structure
   and site definition
-
- -- Christophe Caillet <quadchris at free.fr>  Mon, 26 Jul 2010 14:21:12 +0200
+  * debian/control
+    - deps update according to usage of NetAddr::IP and Net::DNS
+    - uploaders and maintainers update
+  * debian/compat
+    - update level for avoiding warning during package build
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 27 Jul 2010 11:26:23 +0200
 
 pf-tools (0.34.0-0WIP) unstable; urgency=low
 

Modified: branches/next-gen/debian/compat
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/debian/compat?rev=785&op=diff
==============================================================================
--- branches/next-gen/debian/compat (original)
+++ branches/next-gen/debian/compat Tue Jul 27 09:30:22 2010
@@ -1,1 +1,1 @@
-4
+7

Modified: branches/next-gen/debian/control
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/debian/control?rev=785&op=diff
==============================================================================
--- branches/next-gen/debian/control (original)
+++ branches/next-gen/debian/control Tue Jul 27 09:30:22 2010
@@ -1,14 +1,14 @@
 Source: pf-tools
 Section: perl
 Priority: optional
-Maintainer: Damien Clermonte <damien at sitadelle.com>
-Uploaders: Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+Maintainer: Christophe Caillet <quadchris at free.fr>
+Uploaders: Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>, Christophe Caillet <quadchris at free.fr>
 Build-Depends-Indep: perl
 Standards-Version: 3.0.1
 
 Package: pf-tools
 Architecture: all
-Depends: perl, perl (>= 5.10.0) | libmd5-perl, cvs, ssh, iproute, debconf, psmisc
+Depends: perl, perl (>= 5.10.0) | libmd5-perl, libnetaddr-ip-perl, libnet-dns-perl, cvs, ssh, iproute, debconf, psmisc
 Description: Outils de gestion de la plateforme
  Mise a jour automatique et generation de conf.
  Deploiement de machines.

Modified: branches/next-gen/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Net.pm?rev=785&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Net.pm (original)
+++ branches/next-gen/lib/PFTools/Net.pm Tue Jul 27 09:30:22 2010
@@ -1692,6 +1692,7 @@
 					$host_part->{$hostname}->{'deployment'}->{$key} = $value;
 				}
 				$host_part->{$hostname}->{'deployment'}->{'hostname_model'} = $host2add->{'hostgroup'}->{'hostname'};
+				$host_part->{$hostname}->{'dns'}->{'resolver'} = $host2add->{'dns'}->{'resolver.'.$host_number} || $host2add->{'dns'}->{'resolver'};
 				# Check interfaces
 				my @if_list = __Get_host_interfaces ($host2add);
 				foreach my $iface ( @if_list ) {
@@ -1717,13 +1718,6 @@
 						my $zone_part	= $global_config->{$zone_key}->{'BY_NAME'}->{$zone}->{'BY_SITE'}->{$site};
 						my $dhcp_part	= $global_config->{$dhcp_key}->{'BY_SITE'}->{$site};
 						$site_part->{'HOST'}->{$addr_key}->{$if2add->{$ip_type}} = $hostname.'.'.$if2add->{'vlan'};
-# 						if ( defined $if2add->{'@route'.$suffix} ) {
-# 							foreach my $route ( @{$if2add->{'@route'.$suffix}} ) {
-# 								$route =~ /^([^\s]+)\s*(via ([^\s]+))?$/;
-# 								my $dest = $1;
-# 								push ( @{$host_part->{$hostname}->{'routes'}->{$dest}}, $iface_name." ".$route );
-# 							}
-# 						}
 						if ( ! defined $zone_part->{$hostclass} ) {
 							$zone_part->{$hostclass} = {};
 							push ( @{$global_config->{$zone_key}->{'BY_NAME'}->{$zone}->{'__hostclass_order'}->{$site}}, $hostclass );