pf-tools/pf-tools: les serveurs sans %% ont aussi droit a leur s...

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/024855a2858e
changeset: 1253:024855a2858e
user:      shad
date:      Mon Apr 07 19:15:02 2014 +0200
description:
les serveurs sans %% ont aussi droit a leur shortname dans la zone

diffstat:

 lib/PFTools/Conf/Host.pm |  5 +++++
 t/13.conf.t              |  2 ++
 t/20.files.t             |  1 +
 3 files changed, 8 insertions(+), 0 deletions(-)

diffs (38 lines):

diff -r dd0a607c75ff -r 024855a2858e lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm	Mon Apr 07 17:07:57 2014 +0200
+++ b/lib/PFTools/Conf/Host.pm	Mon Apr 07 19:15:02 2014 +0200
@@ -1274,6 +1274,11 @@
     }
     $zone_entry->{$hostclass}->{'comment'} = $comment;
     $zone_entry->{$hostclass}->{'number'}  = $number;
+
+    # host without %% where hostname is always eq shortname
+    if ( $shortname eq $hostname and $shortname_vlan eq $vlan ) {
+        $zone_entry->{$hostclass}->{$hostname} = qq{CNAME\t$hostname.$vlan};
+    }
     if ( $shortname ne $hostname and $shortname_vlan eq $vlan ) {
         if ( not $zone_entry->{$hostclass}->{"$shortname\.$vlan"} ) {
             $zone_entry->{$hostclass}->{"$shortname\.$vlan"}
diff -r dd0a607c75ff -r 024855a2858e t/13.conf.t
--- a/t/13.conf.t	Mon Apr 07 17:07:57 2014 +0200
+++ b/t/13.conf.t	Mon Apr 07 19:15:02 2014 +0200
@@ -1346,6 +1346,8 @@
                             'cvs'       => 'CNAME	vip-spawn.vlan-systeme',
                             'number'    => 1,
                             'comment'   => 'VIP for spawn services',
+                            'vip-spawn' => 'CNAME	vip-spawn.vlan-systeme',
+                            'number'    => 1,
                         },
                         'cbv4-spawn' => {
                             'cbv4-spawn00' => 'CNAME	cbv4-spawn00.vlan-systeme',
diff -r dd0a607c75ff -r 024855a2858e t/20.files.t
--- a/t/20.files.t	Mon Apr 07 17:07:57 2014 +0200
+++ b/t/20.files.t	Mon Apr 07 19:15:02 2014 +0200
@@ -182,6 +182,7 @@
     qq{nscache\tIN CNAME\tvip-spawn.vlan-systeme},
     qq{nsprivate\tIN CNAME\tvip-spawn.vlan-systeme},
     qq{vip-deploy\tIN CNAME\tvip-spawn.vlan-systeme},
+    qq{vip-spawn\tIN CNAME\tvip-spawn.vlan-systeme},
     qq{vip-spawn.vlan-pfds-ext\tIN A\t192.168.1.99},
     qq{vip-spawn.vlan-systeme\tIN A\t10.1.1.254},
     q{},