pf-tools/pf-tools: 3 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Mon Apr 7 17:09:49 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/28690f24ec27
changeset: 1250:28690f24ec27
user: shad
date: Mon Apr 07 10:31:53 2014 +0200
description:
les tests passent meme si la machine à un hostname en majuscule
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/140ff2f2f732
changeset: 1251:140ff2f2f732
user: shad
date: Mon Apr 07 12:49:27 2014 +0200
description:
comment et number dans la zone
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/dd0a607c75ff
changeset: 1252:dd0a607c75ff
user: shad
date: Mon Apr 07 17:07:57 2014 +0200
description:
les hostclass public doivent aussi pouvoir etre résolus
diffstat:
lib/PFTools/Conf.pm | 2 +-
lib/PFTools/Conf/Host.pm | 17 ++++++++++++-----
lib/PFTools/Utils.pm | 2 ++
t/13.conf.t | 28 ++++++++++++++++++++++------
t/20.files.t | 14 +++++++++-----
templates/zone.tpl | 1 +
6 files changed, 47 insertions(+), 17 deletions(-)
diffs (248 lines):
diff -r 1af4f9bb4d64 -r dd0a607c75ff lib/PFTools/Conf.pm
--- a/lib/PFTools/Conf.pm Fri Apr 04 18:09:15 2014 +0200
+++ b/lib/PFTools/Conf.pm Mon Apr 07 17:07:57 2014 +0200
@@ -269,7 +269,7 @@
sub Init_SUBST {
my ( $hostname, $hosttype, $pf_config, $domainname ) = @_;
- $hostname ||= hostname;
+ $hostname ||= lc hostname;
if ( $pf_config and ref $pf_config ne 'HASH' ) {
croak q{ERROR: Invalid non-href $pf_config};
diff -r 1af4f9bb4d64 -r dd0a607c75ff lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm Fri Apr 04 18:09:15 2014 +0200
+++ b/lib/PFTools/Conf/Host.pm Mon Apr 07 17:07:57 2014 +0200
@@ -241,6 +241,9 @@
'site' => $site,
'dns_def_ref' => $host_ref->{'dns'},
'index' => $index,
+ 'number' => $host_ref->{'hostgroup'}->{'number'},
+ 'comment' =>
+ $host_ref->{'hostgroup'}->{'comment'},
'global_config' => $global_config,
}
);
@@ -278,6 +281,9 @@
$global_config->{'PUBLIC_NETWORK'}
->{ $new_iface_ref->{'vlan'} }->{$hostname}
= $site;
+ $global_config->{'PUBLIC_NETWORK'}
+ ->{ $new_iface_ref->{'vlan'} }->{$hostclass}
+ = $site;
}
}
}
@@ -1226,12 +1232,12 @@
hostname hostclass host_number host_part_ref
iface_def zone_part_ref dns_def_ref ip_type
zone_name shortname site global_config
- index
+ index number comment
);
my ($hostname, $hostclass, $host_number, $host_part_ref,
$iface_def, $zone_part_ref, $dns_def_ref, $ip_type,
$zone_name, $shortname, $site, $global_config,
- $index
+ $index, $number, $comment
) = @{$arguments_ref}{@argument_names};
if ( !$hostname ) {
@@ -1266,13 +1272,14 @@
if ( !$shortname_vlan ) {
croak qq{ERROR: hostname $hostname: shortname is mandatory};
}
-
+ $zone_entry->{$hostclass}->{'comment'} = $comment;
+ $zone_entry->{$hostclass}->{'number'} = $number;
if ( $shortname ne $hostname and $shortname_vlan eq $vlan ) {
if ( not $zone_entry->{$hostclass}->{"$shortname\.$vlan"} ) {
$zone_entry->{$hostclass}->{"$shortname\.$vlan"}
= [ "A\t$zone_ip", ];
- $zone_entry->{$hostclass}->{"$hostname"}
+ $zone_entry->{$hostclass}->{$hostname}
= qq{CNAME\t$hostname.$vlan};
}
else {
@@ -1281,7 +1288,7 @@
$zone_entry->{$hostclass}->{$shortname}
= qq{CNAME\t$shortname.$vlan};
- $zone_entry->{$hostclass}->{"$hostname"}
+ $zone_entry->{$hostclass}->{$hostname}
= qq{CNAME\t$hostname.$vlan};
}
}
diff -r 1af4f9bb4d64 -r dd0a607c75ff lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm Fri Apr 04 18:09:15 2014 +0200
+++ b/lib/PFTools/Utils.pm Mon Apr 07 17:07:57 2014 +0200
@@ -1668,11 +1668,13 @@
my $server_ref = {
name => $server,
comment => $merged_zone_ref->{$server}->{'comment'},
+ number => $merged_zone_ref->{$server}->{'number'},
};
my @records = ();
foreach my $field ( sort keys %{ $merged_zone_ref->{$server} } ) {
next if $field eq 'comment';
+ next if $field eq 'number';
if ( ref $merged_zone_ref->{$server}->{$field} eq 'ARRAY' ) {
foreach my $elt ( @{ $merged_zone_ref->{$server}->{$field} } )
diff -r 1af4f9bb4d64 -r dd0a607c75ff t/13.conf.t
--- a/t/13.conf.t Fri Apr 04 18:09:15 2014 +0200
+++ b/t/13.conf.t Mon Apr 07 17:07:57 2014 +0200
@@ -449,7 +449,7 @@
my $cwd = getcwd;
my $test_config_dir = qq{$cwd/t/13.conf.cfg1};
-my $test_hostname = hostname;
+my $test_hostname = lc hostname;
my $test_hash_subst
= Init_SUBST( $test_hostname, undef, $test_pf_config, 'private' );
@@ -1288,9 +1288,13 @@
'cbv4-spawn' => {
'cbv4-spawn01.vlan-pfds-ext' => 'A 192.168.1.98',
'cbv4-spawn00.vlan-pfds-ext' => 'A 192.168.1.97',
+ 'number' => 2,
+ 'comment' => 'Spawning server',
},
'vip-spawn' => {
- 'vip-spawn.vlan-pfds-ext' => 'A 192.168.1.99',
+ 'vip-spawn.vlan-pfds-ext' => 'A 192.168.1.99',
+ 'number' => 1,
+ 'comment' => 'VIP for spawn services',
},
'vlan-pfds-ext' => {
'comment' => 'something really interesting',
@@ -1308,6 +1312,8 @@
'cbv4-rdeploy' => {
'cbv4-rdeploy00.vlan-public' => 'A 80.125.163.42',
'cbv4-rdeploy01.vlan-public' => 'A 80.125.163.43',
+ 'number' => 2,
+ 'comment' => 'Rdeploy server',
},
},
'BY_SITE' => {
@@ -1337,7 +1343,9 @@
'mirrors' => 'CNAME vip-spawn.vlan-systeme',
'vip-spawn.vlan-systeme' => 'A 10.1.1.254',
'nsprivate' => 'CNAME vip-spawn.vlan-systeme',
- 'cvs' => 'CNAME vip-spawn.vlan-systeme'
+ 'cvs' => 'CNAME vip-spawn.vlan-systeme',
+ 'number' => 1,
+ 'comment' => 'VIP for spawn services',
},
'cbv4-spawn' => {
'cbv4-spawn00' => 'CNAME cbv4-spawn00.vlan-systeme',
@@ -1354,17 +1362,21 @@
'cbv4-spawn' => 'CNAME cbv4-spawn.vlan-systeme',
'cbv4-spawn.vlan-systeme' => [
'A 10.1.167.0',
- 'A 10.1.167.1'
+ 'A 10.1.167.1',
],
'spawn01' => 'CNAME cbv4-spawn01.vlan-systeme',
'cbv4-spawn01.vlan-systeme' => 'A 10.1.167.1',
'cbv4-spawn00.vlan-pfds-int' => 'A 10.2.167.0',
'cbv4-spawn01.vlan-pfds-int' => 'A 10.2.167.1',
- 'spawn' => 'CNAME cbv4-spawn.vlan-systeme'
+ 'spawn' => 'CNAME cbv4-spawn.vlan-systeme',
+ 'number' => 2,
+ 'comment' => 'Spawning server',
},
'cbv4-pfds-filer' => {
'cbv4-pfds-filer00.vlan-systeme' => 'A 10.1.2.0',
- 'cbv4-pfds-filer01.vlan-systeme' => 'A 10.1.2.1'
+ 'cbv4-pfds-filer01.vlan-systeme' => 'A 10.1.2.1',
+ 'number' => 2,
+ 'comment' => 'NAS for CBV4-PFDS site',
},
'vlan-systeme' => {
'broadcast' => 'A 10.1.255.255',
@@ -1422,6 +1434,8 @@
'A 10.1.167.1'
],
'cbv4-rdeploy01.vlan-systeme' => 'A 10.1.167.1',
+ 'number' => 2,
+ 'comment' => 'Rdeploy server',
},
},
},
@@ -1457,11 +1471,13 @@
'vlan-pfds-ext' => {
'cbv4-spawn00' => 'cbv4-pfds',
'cbv4-spawn01' => 'cbv4-pfds',
+ 'cbv4-spawn' => 'cbv4-pfds',
'vip-spawn' => 'cbv4-pfds'
},
'vlan-public' => {
'cbv4-rdeploy00' => 'cbv4',
'cbv4-rdeploy01' => 'cbv4',
+ 'cbv4-rdeploy' => 'cbv4',
},
}
};
diff -r 1af4f9bb4d64 -r dd0a607c75ff t/20.files.t
--- a/t/20.files.t Fri Apr 04 18:09:15 2014 +0200
+++ b/t/20.files.t Mon Apr 07 17:07:57 2014 +0200
@@ -21,7 +21,7 @@
my $config_file = 't/13.conf.cfg1/etc/pf-tools.1.conf';
my $pf_config = Init_PF_CONFIG($config_file); # already tested OK in 13.conf.t
-my $hostname = hostname;
+my $hostname = lc hostname;
my $hash_subst = Init_SUBST( $hostname, undef, $pf_config, 'private' );
my $global_config = Init_GLOBAL_NETCONFIG( q{COMMON:private-network}, $hash_subst );
@@ -173,7 +173,8 @@
q{;; Servers},
q{;;============================================================================},
q{},
- q{; vip-spawn},
+ q{; vip-spawn: VIP for spawn services},
+ q{; number: 1},
q{;----------------------------------------------------------------------------},
qq{cvs\tIN CNAME\tvip-spawn.vlan-systeme},
qq{mf\tIN CNAME\tvip-spawn.vlan-systeme},
@@ -184,12 +185,14 @@
qq{vip-spawn.vlan-pfds-ext\tIN A\t192.168.1.99},
qq{vip-spawn.vlan-systeme\tIN A\t10.1.1.254},
q{},
- q{; cbv4-pfds-filer},
+ q{; cbv4-pfds-filer: NAS for CBV4-PFDS site},
+ q{; number: 2},
q{;----------------------------------------------------------------------------},
qq{cbv4-pfds-filer00.vlan-systeme\tIN A\t10.1.2.0},
qq{cbv4-pfds-filer01.vlan-systeme\tIN A\t10.1.2.1},
q{},
- q{; cbv4-spawn},
+ q{; cbv4-spawn: Spawning server},
+ q{; number: 2},
q{;----------------------------------------------------------------------------},
qq{cbv4-spawn\tIN CNAME\tcbv4-spawn.vlan-systeme},
qq{cbv4-spawn.vlan-systeme\tIN A\t10.1.167.0},
@@ -213,7 +216,8 @@
qq{spawn00\tIN CNAME\tcbv4-spawn00.vlan-systeme},
qq{spawn01\tIN CNAME\tcbv4-spawn01.vlan-systeme},
q{},
- q{; cbv4-rdeploy},
+ q{; cbv4-rdeploy: Rdeploy server},
+ q{; number: 2},
q{;----------------------------------------------------------------------------},
qq{cbv4-rdeploy00.vlan-public\tIN A\t80.125.163.42},
qq{cbv4-rdeploy01.vlan-public\tIN A\t80.125.163.43},
diff -r 1af4f9bb4d64 -r dd0a607c75ff templates/zone.tpl
--- a/templates/zone.tpl Fri Apr 04 18:09:15 2014 +0200
+++ b/templates/zone.tpl Mon Apr 07 17:07:57 2014 +0200
@@ -43,6 +43,7 @@
[% FOREACH server IN servers -%]
; [% server.name %][% IF server.comment %]: [% server.comment %][% END %]
+; number: [% server.number %]
;----------------------------------------------------------------------------
[% FOREACH rr IN server.records -%]
[% rr.name %] IN [% rr.value %]
More information about the pf-tools-commits
mailing list