pf-tools/pf-tools: 2 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Tue Dec 23 13:22:49 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/6561e4ff3448
changeset: 1416:6561e4ff3448
user: shad
date: Tue Dec 23 10:54:50 2014 +0100
description:
use fakeroot directly for make test
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/3add457e9eb0
changeset: 1417:3add457e9eb0
user: shad
date: Tue Dec 23 14:22:42 2014 +0100
description:
tidy + update file's copyright + version bump
diffstat:
Makefile | 9 +-----
debian/changelog | 22 ++++++++++++--
filters/filter_distrib | 2 +
filters/filter_privateresolve | 2 +
filters/filter_vlan2if | 2 +
lib/PFTools.pm | 3 +-
lib/PFTools/Bridge.pm | 18 ++++++-----
lib/PFTools/Compat/Parser.pm | 3 +-
lib/PFTools/Compat/Translation.pm | 11 +++----
lib/PFTools/Conf.pm | 44 +++++++++++++++++------------
lib/PFTools/Conf/Config.pm | 2 +
lib/PFTools/Conf/Host.pm | 58 ++++++++++++++++++++++----------------
lib/PFTools/Conf/Network.pm | 11 +++++--
lib/PFTools/Conf/Syntax.pm | 41 ++++++++++++++++----------
lib/PFTools/Disk.pm | 4 ++-
lib/PFTools/Logger.pm | 4 +-
lib/PFTools/Net.pm | 12 ++++---
lib/PFTools/Packages.pm | 2 +
lib/PFTools/Packages/DEB.pm | 2 +
lib/PFTools/Parser.pm | 2 +
lib/PFTools/Raid.pm | 1 +
lib/PFTools/Structqueries.pm | 3 +-
lib/PFTools/Update.pm | 1 +
lib/PFTools/Update/ADDFILE.pm | 8 ++++-
lib/PFTools/Update/ADDMOUNT.pm | 4 ++
lib/PFTools/Update/CREATEFILE.pm | 1 +
lib/PFTools/Update/Common.pm | 54 ++++++++++++++++++++++-------------
lib/PFTools/Update/IGNORE.pm | 2 +-
lib/PFTools/Update/INSTALLPKG.pm | 8 ++++-
lib/PFTools/Update/PURGEPKG.pm | 1 +
lib/PFTools/Update/REMOVEDIR.pm | 1 +
lib/PFTools/Update/REMOVEFILE.pm | 1 +
lib/PFTools/Utils.pm | 15 +++++++--
lib/PFTools/VCS.pm | 6 ++-
lib/PFTools/VCS/CVS.pm | 2 +
lib/PFTools/VCS/HG.pm | 1 +
lib/PFTools/VCS/SVN.pm | 2 +
sbin/fix_hosts | 2 +
sbin/mk_dhcp | 2 +
sbin/mk_grubopt | 2 +
sbin/mk_interfaces | 2 +
sbin/mk_pxelinuxcfg | 4 ++-
sbin/mk_resolvconf | 2 +
sbin/mk_sitezone | 2 +
sbin/mk_sourceslist | 2 +
sbin/update-config | 3 ++
tools/Display_IP_config | 2 +-
tools/Translate_old_config | 14 +++++----
48 files changed, 264 insertions(+), 138 deletions(-)
diffs (1215 lines):
diff -r 15375eecb0bb -r 3add457e9eb0 Makefile
--- a/Makefile Mon Dec 22 15:14:41 2014 +0100
+++ b/Makefile Tue Dec 23 14:22:42 2014 +0100
@@ -34,14 +34,7 @@
# rien pour l'instant
test:
- prove -lr
- @echo "if you want to run all tests, you must either use 'sudo make test'"
- @echo "or 'make alltest' (which will require you to be in sudoers)"
- @echo "or 'fakeroot make test' (which won't require sudo privileges)"
- @echo "(this is used to realize the chown/chmod tests)"
-
-alltest:
- sudo prove -lr
+ fakeroot prove -lr
install: install_tools install_host
diff -r 15375eecb0bb -r 3add457e9eb0 debian/changelog
--- a/debian/changelog Mon Dec 22 15:14:41 2014 +0100
+++ b/debian/changelog Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,4 @@
-pf-tools (1.0.1-0~WIP) UNRELEASED; urgency=low
-
- * WORK IN PROGRESS, DO NOT RELEASE!
+pf-tools (1.0.1-1) unstable; urgency=low
[ Thomas Parmelan ]
* debian/changelog: use native versioning, since we maintain the debian/
@@ -46,7 +44,23 @@
* Use of the new syntax [link::] instead of [interface::]
* Use mode option for bonding in options link
- -- Richard Phan <richard.phan.prestataire at sfr.com> Wed, 17 Jul 2013 10:06:07 +0200
+ [Jérôme Bourgeois]
+ * add several useful shorcuts including AUTO
+ * new option --section allowing a partial update with all dependencies of
+ the section
+ * bugfixes and refactoring
+ * begin of IPv6
+
+ [ Stéphane Pontier ]
+ * fix compiling and misc bugs
+ * tidy, critic, lintian and doc
+ * adding color to output
+ * fix and harmonize error and warnings
+ * update translation and dumpiplist scripts
+ * fix and update tests
+ * removing WIP tag
+
+ -- Stéphane Pontier <shad at sitadelle.com> Tue, 23 Dec 2014 10:59:23 +0100
pf-tools (1.0-1) unstable; urgency=low
diff -r 15375eecb0bb -r 3add457e9eb0 filters/filter_distrib
--- a/filters/filter_distrib Mon Dec 22 15:14:41 2014 +0100
+++ b/filters/filter_distrib Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 filters/filter_privateresolve
--- a/filters/filter_privateresolve Mon Dec 22 15:14:41 2014 +0100
+++ b/filters/filter_privateresolve Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 filters/filter_vlan2if
--- a/filters/filter_vlan2if Mon Dec 22 15:14:41 2014 +0100
+++ b/filters/filter_vlan2if Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools.pm
--- a/lib/PFTools.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,7 +6,8 @@
=head1 LICENSE AND COPYRIGHT
- Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+ Copyright (C) 2010-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Bridge.pm
--- a/lib/PFTools/Bridge.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Bridge.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Bridge;
#
-# Copyright (C) 2008 Christophe Caillet <quadchris at free.fr>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+# Copyright (C) 2008-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -151,7 +152,8 @@
}
# Setting spanning tree on bridge off
- print "Setting up sapnning tree off for primary bridge " . $primary . "\n"
+ print "Setting up sapnning tree off for primary bridge "
+ . $primary . "\n"
if ($DEBUG);
if ( !Sysexec( $brctl_cmd . " stp " . $primary . " off " ) ) {
warn "Unable to deactivate spanning tree protocol on " . $primary
@@ -163,7 +165,7 @@
if ($DEBUG);
foreach my $act ( 'setfd', 'sethello' ) {
if ( !Sysexec( $brctl_cmd . " " . $act . " " . $primary . " 1" ) ) {
- warn "Unablr to set timeout for action "
+ warn "Unablr to set timeout for action "
. $act
. " on bridge "
. $primary . "\n";
@@ -175,13 +177,13 @@
if ( !Sysexec( $vconf_cmd . "set_name_type DEV_PLUS_VID_NO_PAD" ) ) {
warn "Unable to set_name_type for vconfig creation\n";
}
- print "Adding vlan tagged as "
+ print "Adding vlan tagged as "
. $tag
. " on trunk interface "
. $ETHTRUNK . "\n"
if ($DEBUG);
if ( !Sysexec( $vconf_cmd . " add " . $ETHTRUNK . " " . $tag ) ) {
- warn "Unable to add vlan tagged as "
+ warn "Unable to add vlan tagged as "
. $tag . " on "
. $ETHTRUNK . "\n";
return 0;
@@ -218,7 +220,7 @@
return 0;
}
}
- print "Attaching primary bridge "
+ print "Attaching primary bridge "
. $primary . " to "
. $ETHTRUNK . "."
. $tag . "\n"
@@ -246,7 +248,7 @@
}
foreach my $iface ( @{ $ref_brlist->{$primary} } ) {
if ( !Detach_host_bridge( $iface, $primary ) ) {
- warn "Unable to detach interface "
+ warn "Unable to detach interface "
. $iface
. " from primary bridge "
. $primary
@@ -269,7 +271,7 @@
sub Attach_host_bridge ($$) {
my ( $br_name, $primary ) = @_;
- print "Attaching bridge "
+ print "Attaching bridge "
. $br_name
. " to primary bridge "
. $primary . "\n"
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Compat/Parser.pm
--- a/lib/PFTools/Compat/Parser.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Compat/Parser.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Compat::Parser;
#
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
@@ -218,7 +219,7 @@
. $fic_conf
. " deja inclus ligne "
. $LOCATION->{'include'}->{$fic_conf}
- ->{'line'}
+ ->{'line'}
. " dans "
. $LOCATION->{'include'}->{$fic_conf}
->{'source'} );
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Compat/Translation.pm
--- a/lib/PFTools/Compat/Translation.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Compat/Translation.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
package PFTools::Compat::Translation;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
@@ -111,16 +113,13 @@
=~ s/fix_hosts -d (\S+) --host (\S+)/fix_hosts -h $2 -o $1/;
}
elsif ( $new_conf->{$section}->{$key} =~ /GLOBAL:/ ) {
- $new_conf->{$section}->{$key}
- =~ s/GLOBAL:/COMMON:/;
+ $new_conf->{$section}->{$key} =~ s/GLOBAL:/COMMON:/;
}
elsif ( $new_conf->{$section}->{$key} =~ /CONFIG:GLOBAL/ ) {
- $new_conf->{$section}->{$key}
- =~ s/CONFIG:GLOBAL/COMMON:/;
+ $new_conf->{$section}->{$key} =~ s/CONFIG:GLOBAL/COMMON:/;
}
elsif ( $new_conf->{$section}->{$key} =~ /CONFIG:/ ) {
- $new_conf->{$section}->{$key}
- =~ s/CONFIG:/FILE:/;
+ $new_conf->{$section}->{$key} =~ s/CONFIG:/FILE:/;
}
}
}
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Conf.pm
--- a/lib/PFTools/Conf.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Conf.pm Tue Dec 23 14:22:42 2014 +0100
@@ -11,8 +11,10 @@
=head1 LICENSE AND COPYRIGHT
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
- Copyright (C) 2005-2007 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2005-2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
@@ -192,7 +194,7 @@
sub subst_vars {
my ( $text, $variables_ref ) = @_;
- return if !defined $text;
+ return if !defined $text;
return $text if !$text;
return $text if ref $variables_ref ne 'HASH';
@@ -302,17 +304,17 @@
HOSTNODEINDEX => $LAST_PAREN_MATCH{HOSTNODEINDEX} || q{},
HOSTCLUSTER => $LAST_PAREN_MATCH{HOSTDIGITS}
. $LAST_PAREN_MATCH{HOSTNODEINDEX},
- POPNAME => $LAST_PAREN_MATCH{POPNAME} || q{},
+ POPNAME => $LAST_PAREN_MATCH{POPNAME} || q{},
OS_RELEASE => $os_release,
HOSTMINUTE => $hostnum % 60,
HOSTHOUR => $hostnum % 24,
SHORTHOSTTYPE => $LAST_PAREN_MATCH{SHORTHOSTTYPE} || q{},
- SHORTHOSTNAME => {},
+ SHORTHOSTNAME => {},
};
- if ($ref_subst->{SHORTHOSTTYPE}) {
- $ref_subst->{SHORTHOSTNAME} = $ref_subst->{SHORTHOSTTYPE}
- . $ref_subst->{HOSTDIGITS};
+ if ( $ref_subst->{SHORTHOSTTYPE} ) {
+ $ref_subst->{SHORTHOSTNAME}
+ = $ref_subst->{SHORTHOSTTYPE} . $ref_subst->{HOSTDIGITS};
}
return $ref_subst;
@@ -360,11 +362,11 @@
my $module = $pf_config->{'vcs'}->{'module'}
or croak q{ERROR: Undefined configuration parameter: vcs.module};
- my $result = $source;
- my $root_dir = qq{$vcs_work_dir/$module};
- my $site_dir = qq{$root_dir/SITE};
- my $config_dir = qq{$root_dir/CONFIG};
- my $files_dir = qq{$root_dir/FILE};
+ my $result = $source;
+ my $root_dir = qq{$vcs_work_dir/$module};
+ my $site_dir = qq{$root_dir/SITE};
+ my $config_dir = qq{$root_dir/CONFIG};
+ my $files_dir = qq{$root_dir/FILE};
$result =~ s{ \A CONFIG [:] }{$config_dir/}xms;
$result =~ s{ \A CONFIGSITE [:] }{$site_dir/%POPNAME%/CONFIG/}xms;
@@ -375,16 +377,22 @@
$result =~ s{ \A FILESITE_([^:]+) [:] }{$site_dir/$1/FILE/}xms;
$result =~ s{ \A HOST [:] }{$files_dir/%HOSTTYPE%/}xms;
$result =~ s{ \A HOSTNAME [:] }{$files_dir/%HOSTNAME%/}xms;
- $result =~ s{ \A HOSTNAMESITE [:] }{$site_dir/%POPNAME%/FILE/%HOSTNAME%/}xms;
- $result =~ s{ \A HOSTNAMESITE_([^:]+) [:] }{$site_dir/$1/FILE/%HOSTNAME%/}xms;
+ $result
+ =~ s{ \A HOSTNAMESITE [:] }{$site_dir/%POPNAME%/FILE/%HOSTNAME%/}xms;
+ $result
+ =~ s{ \A HOSTNAMESITE_([^:]+) [:] }{$site_dir/$1/FILE/%HOSTNAME%/}xms;
$result =~ s{ \A HOSTSITE [:] }{$site_dir/%POPNAME%/FILE/%HOSTTYPE%/}xms;
$result =~ s{ \A HOSTSITE_([^:]+) [:] }{$site_dir/$1/FILE/%HOSTTYPE%/}xms;
$result =~ s{ \A SHORTHOST [:] }{$files_dir/%SHORTHOSTTYPE%/}xms;
- $result =~ s{ \A SHORTHOSTSITE [:] }{$site_dir/%POPNAME%/FILE/%SHORTHOSTTYPE%/}xms;
- $result =~ s{ \A SHORTHOSTSITE_([^:]+) [:] }{$site_dir/$1/FILE/%SHORTHOSTTYPE%/}xms;
+ $result
+ =~ s{ \A SHORTHOSTSITE [:] }{$site_dir/%POPNAME%/FILE/%SHORTHOSTTYPE%/}xms;
+ $result
+ =~ s{ \A SHORTHOSTSITE_([^:]+) [:] }{$site_dir/$1/FILE/%SHORTHOSTTYPE%/}xms;
$result =~ s{ \A SHORTHOSTNAME [:] }{$files_dir/%SHORTHOSTNAME%/}xms;
- $result =~ s{ \A SHORTHOSTNAMESITE [:] }{$site_dir/%POPNAME%/FILE/%SHORTHOSTNAME%/}xms;
- $result =~ s{ \A SHORTHOSTNAMESITE_([^:]+) [:] }{$site_dir/$1/FILE/%SHORTHOSTNAME%/}xms;
+ $result
+ =~ s{ \A SHORTHOSTNAMESITE [:] }{$site_dir/%POPNAME%/FILE/%SHORTHOSTNAME%/}xms;
+ $result
+ =~ s{ \A SHORTHOSTNAMESITE_([^:]+) [:] }{$site_dir/$1/FILE/%SHORTHOSTNAME%/}xms;
$result =~ s{ \A MODEL [:] }{$root_dir/MODEL/}xms;
$result =~ s{ \A MODELSITE [:] }{$site_dir/%POPNAME%/MODEL/}xms;
$result =~ s{ \A MODELSITE_([^:]+) [:] }{$site_dir/$1/MODEL/}xms;
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Conf/Config.pm
--- a/lib/PFTools/Conf/Config.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Conf/Config.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
package PFTools::Conf::Config;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Conf/Host.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,8 +6,11 @@
=head1 LICENSE AND COPYRIGHT
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.fr>
- Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
+ Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2010-2012 Christophe Caillet <quadchris at free.fr>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -139,7 +142,8 @@
|| $site_part_ref->{'dhcpvlan'};
if ( !$site_part_ref->{'NETWORK'}->{'BY_NAME'}->{$dhcpvlan} ) {
- croak qq{ERROR: Unknown DHCP vlan $dhcpvlan for $hostname on site $site};
+ croak
+ qq{ERROR: Unknown DHCP vlan $dhcpvlan for $hostname on site $site};
}
$host_part_ref->{$hostname}->{'deployment'}
@@ -177,14 +181,14 @@
next;
}
my $new_iface_ref = __build_iface_entry(
- { link_name => $link,
- hostname => $hostname,
- hostnum => $hostnum,
- hostnode => $hostnode,
- host_ref => $host_ref,
- site_name => $site,
- site_ref => $site_part_ref,
- pf_config => $pf_config,
+ { link_name => $link,
+ hostname => $hostname,
+ hostnum => $hostnum,
+ hostnode => $hostnode,
+ host_ref => $host_ref,
+ site_name => $site,
+ site_ref => $site_part_ref,
+ pf_config => $pf_config,
}
);
@@ -629,18 +633,18 @@
croak
qq{ERROR: Invalid IP with prefix='$prefix' and ipstart='$ipstart'};
}
- }
- elsif ($subnet_ref->{isv6}) {
+ }
+ elsif ( $subnet_ref->{isv6} ) {
my @subnet_oct = split /:/, $subnet_ref->addr;
- my @last_oct = split /:/, $ipstart;
+ my @last_oct = split /:/, $ipstart;
my $index = -1;
- while (my $oct = pop @last_oct) {
+ while ( my $oct = pop @last_oct ) {
$subnet_oct[$index] = $oct;
- $index --;
+ $index--;
}
my $ip_v6 = join ':', @subnet_oct;
- $ip_address = NetAddr::IP->new( $ip_v6, $subnet_ref->mask());
+ $ip_address = NetAddr::IP->new( $ip_v6, $subnet_ref->mask() );
}
if ($hostnum) {
@@ -715,8 +719,10 @@
if ( $key_type =~ m{ \A ipv }xms ) {
my $suffix = $hostnum ? qq{\.$hostnum} : q{};
- $result->{qq{link::$spec}}->{qq{dev$suffix}} = qq{eth$iface_index};
- $result->{qq{link::$spec}}->{qq{${key_type}${suffix}}} = $server_ref->{$key};
+ $result->{qq{link::$spec}}->{qq{dev$suffix}}
+ = qq{eth$iface_index};
+ $result->{qq{link::$spec}}->{qq{${key_type}${suffix}}}
+ = $server_ref->{$key};
$iface_index++;
next;
}
@@ -772,9 +778,8 @@
hostnode host_ref site_name
site_ref pf_config
);
- my ($link_name, $hostname, $hostnum,
- $hostnode, $host_ref,
- $site_name, $site_ref, $pf_config
+ my ($link_name, $hostname, $hostnum, $hostnode,
+ $host_ref, $site_name, $site_ref, $pf_config
) = @{$arguments_ref}{@argument_names};
my $net_site_ref = $site_ref->{'NETWORK'}->{'BY_NAME'};
@@ -880,6 +885,7 @@
}
my $ip_found = 0;
+
# Check address and route values
foreach my $ip_type (qw( ipv4 ipv6 )) {
next if not $pf_config->{'features'}->{$ip_type};
@@ -902,8 +908,9 @@
);
};
if ($EVAL_ERROR) {
- #print $EVAL_ERROR; # not beautiful but we get why ip attribution failed
- next
+
+ #print $EVAL_ERROR; # not beautiful but we get why ip attribution failed
+ next;
}
$ip_found = 1;
@@ -935,8 +942,9 @@
}
}
- if (!$ip_found) {
- croak qq{ERROR: No ip defined for $hostname on $iface_name (vlan: $vlan_name)};
+ if ( !$ip_found ) {
+ croak
+ qq{ERROR: No ip defined for $hostname on $iface_name (vlan: $vlan_name)};
}
return $result;
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Conf/Network.pm
--- a/lib/PFTools/Conf/Network.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Conf/Network.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,8 +6,10 @@
=head1 LICENSE AND COPYRIGHT
- Copyright (C) 2007-2009 Christophe Caillet <quadchris at free.fr>
- Copyright (C) 2005-2007 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+ Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
+ Copyright (C) 2005-2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
@@ -287,7 +289,10 @@
foreach my $site ( @{$site_list} ) {
my $net_part = $site_part->{'BY_NAME'}->{$site}->{'NETWORK'};
- if ( $tag and $net_part->{'BY_TAG'}->{$tag} and $net_part->{'BY_TAG'}->{$tag} ne $section_name ) {
+ if ( $tag
+ and $net_part->{'BY_TAG'}->{$tag}
+ and $net_part->{'BY_TAG'}->{$tag} ne $section_name )
+ {
croak
qq{ERROR: File $start_file section $section_name: duplicate tag $tag};
}
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Conf/Syntax.pm
--- a/lib/PFTools/Conf/Syntax.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Conf/Syntax.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,8 +6,11 @@
=head1 LICENSE AND COPYRIGHT
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.fr>
- Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
+ Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2010-2012 Christophe Caillet <quadchris at free.fr>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -253,17 +256,18 @@
},
'config' => {
'addfile' => {
+
#'MANDATORY_KEYS' => ['source'],
- 'depends' => 'undefined',
- 'source' => 'undefined',
- 'filter' => 'undefined',
- 'owner' => '(\d+|[a-z\d-]+)',
- 'group' => '(\d+|[a-z\d-]+)',
- 'mode' => '[0-7]?[0-7]{3}',
- 'on_config' => 'undefined',
- 'before_change' => 'undefined',
- 'on_noaction' => 'undefined',
- 'after_change' => 'undefined',
+ 'depends' => 'undefined',
+ 'source' => 'undefined',
+ 'filter' => 'undefined',
+ 'owner' => '(\d+|[a-z\d-]+)',
+ 'group' => '(\d+|[a-z\d-]+)',
+ 'mode' => '[0-7]?[0-7]{3}',
+ 'on_config' => 'undefined',
+ 'before_change' => 'undefined',
+ 'on_noaction' => 'undefined',
+ 'after_change' => 'undefined',
},
'createfile' => {
'depends' => 'undefined',
@@ -403,7 +407,12 @@
: [ $section_hash->{$key} ];
eval {
- if (!__check_key_value_from_definition($value, $definition->{$def_key}, $section_hash)) {
+ if (!__check_key_value_from_definition(
+ $value, $definition->{$def_key},
+ $section_hash
+ )
+ )
+ {
croak
qq{ERROR: file $file, section $section_name, key $key, value '$value' is not valid};
}
@@ -452,13 +461,13 @@
# Remove surrounding whitespace
$value =~ s{ \A \s* (\S*) \s* \z }{$1}xms;
my $check_type = ref $check;
- if ($check_type eq q{CODE}) {
- if (!$check->($value, $section)) {
+ if ( $check_type eq q{CODE} ) {
+ if ( !$check->( $value, $section ) ) {
return 0;
}
}
- elsif ($check_type eq q{Regexp}) {
- if ($value !~ $check) {
+ elsif ( $check_type eq q{Regexp} ) {
+ if ( $value !~ $check ) {
return 0;
}
}
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Disk.pm
--- a/lib/PFTools/Disk.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Disk.pm Tue Dec 23 14:22:42 2014 +0100
@@ -11,7 +11,9 @@
=head1 LICENSE AND COPYRIGHT
- Copyright (C) 2007 Christophe Caillet <quadchris at free.fr>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+ Copyright (C) 2005-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Logger.pm
--- a/lib/PFTools/Logger.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Logger.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,6 @@
package PFTools::Logger;
#
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
@@ -63,7 +64,7 @@
'DUPLICATE_VALUE' => 21,
};
-my $basename = basename $PROGRAM_NAME;
+my $basename = basename $PROGRAM_NAME;
my $log_is_deferred = 0;
my $sortie;
@@ -265,6 +266,5 @@
exit $err;
}
-
1;
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Net.pm
--- a/lib/PFTools/Net.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Net.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,10 +6,12 @@
=head1 LICENSE AND COPYRIGHT
- Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
- Copyright (C) 2005-2007 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
- Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
- Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+ Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
+ Copyright (C) 2005-2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
+ Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -73,7 +75,7 @@
croak q{ERROR: non-ref 'net-hash' parameter};
}
- my $suffix = get_suffix_from_ip_type($type);
+ my $suffix = get_suffix_from_ip_type($type);
return if !$net_hash->{"network$suffix"};
my $net_def = $net_hash->{"network$suffix"};
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Packages.pm
--- a/lib/PFTools/Packages.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Packages.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
package PFTools::Packages;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2009-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Packages/DEB.pm
--- a/lib/PFTools/Packages/DEB.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Packages/DEB.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,7 +1,9 @@
package PFTools::Packages::DEB;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.com>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2009 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Parser.pm
--- a/lib/PFTools/Parser.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Parser.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
package PFTools::Parser;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010-2014 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Raid.pm
--- a/lib/PFTools/Raid.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Raid.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Raid;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2007 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Structqueries.pm
--- a/lib/PFTools/Structqueries.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Structqueries.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,9 +6,10 @@
=head1 LICENSE AND COPYRIGHT
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.com>
Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
- Copyright (C) 2005-2007 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+ Copyright (C) 2005-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update.pm
--- a/lib/PFTools/Update.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Update;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2007-2009 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2004-2007 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2004 Gonéri Le Bouder <goneri at sitadelle.com>
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/ADDFILE.pm
--- a/lib/PFTools/Update/ADDFILE.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/ADDFILE.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,10 @@
package PFTools::Update::ADDFILE;
#
+# Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.fr>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
@@ -122,7 +126,7 @@
SPLITSOURCE:
foreach my $splitsource ( split q{ }, $ref_section->{'source'} ) {
- if ( $splitsource =~ m{\AAUTO:(.*)\z}xms ) {
+ if ( $splitsource =~ m{\A(?:AUTO|LYCOS):(.*)\z}xms ) {
$splitsource
= __find_source( $options, $hash_subst, [$1] );
@@ -153,7 +157,7 @@
}
}
}
- elsif ($ref_section->{'source'} =~ m{\AAUTO:(.*)\z}xms ) {
+ elsif ( $ref_section->{'source'} =~ m{\A(?:AUTO|LYCOS):(.*)\z}xms ) {
$source = __find_source( $options, $hash_subst, [$1] );
}
else {
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/ADDMOUNT.pm
--- a/lib/PFTools/Update/ADDMOUNT.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/ADDMOUNT.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,10 @@
package PFTools::Update::ADDMOUNT;
#
+# Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.fr>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/CREATEFILE.pm
--- a/lib/PFTools/Update/CREATEFILE.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/CREATEFILE.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Update::CREATEFILE;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/Common.pm
--- a/lib/PFTools/Update/Common.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/Common.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,10 @@
package PFTools::Update::Common;
#
+# Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.fr>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
@@ -208,8 +212,10 @@
my ($cmd) = @_;
if ( deferredlogsystem($cmd) ) {
- carp colored( qq{ERROR: Unable to execute [$cmd]},
- q{bold bright_white on_red} );
+ carp colored(
+ qq{ERROR: Unable to execute [$cmd]},
+ q{bold bright_white on_red}
+ );
return;
}
return 1;
@@ -218,40 +224,46 @@
sub do_on_config {
my ( $ref_section, $options, $hash_subst ) = @_;
- return __do_trigger_action (q{on_config}, $ref_section, $options, $hash_subst);
+ return __do_trigger_action( q{on_config}, $ref_section, $options,
+ $hash_subst );
}
sub do_before_change {
my ( $ref_section, $options, $hash_subst ) = @_;
- return __do_trigger_action (q{before_change}, $ref_section, $options, $hash_subst, { not_if => [ q{on_noaction} ] } );
+ return __do_trigger_action( q{before_change}, $ref_section, $options,
+ $hash_subst, { not_if => [q{on_noaction}] } );
}
sub do_after_change {
my ( $ref_section, $options, $hash_subst ) = @_;
- return __do_trigger_action (q{after_change}, $ref_section, $options, $hash_subst, { not_if => [ q{on_noaction} ] } );
+ return __do_trigger_action( q{after_change}, $ref_section, $options,
+ $hash_subst, { not_if => [q{on_noaction}] } );
}
sub do_on_noaction {
my ( $ref_section, $options, $hash_subst ) = @_;
- return __do_trigger_action (q{on_noaction}, $ref_section, $options, $hash_subst, { only_if => [ q{on_noaction} ] } );
+ return __do_trigger_action( q{on_noaction}, $ref_section, $options,
+ $hash_subst, { only_if => [q{on_noaction}] } );
}
sub __do_trigger_action {
- my ( $trigger_name, $ref_section, $options, $hash_subst, $depends_trigger ) = @_;
+ my ($trigger_name, $ref_section, $options,
+ $hash_subst, $depends_trigger
+ ) = @_;
- if (!$depends_trigger->{not_if}) {
- push @{$depends_trigger->{not_if}}, 'simul';
+ if ( !$depends_trigger->{not_if} ) {
+ push @{ $depends_trigger->{not_if} }, 'simul';
}
- if (ref $depends_trigger->{not_if} ne 'ARRAY') {
+ if ( ref $depends_trigger->{not_if} ne 'ARRAY' ) {
croak q{ERROR: 'not_if' must be an array ref};
}
- if (!grep { m{ \A simul \z }xms } @{$depends_trigger->{not_if}}) {
- push @{$depends_trigger->{not_if}}, 'simul';
+ if ( !grep {m{ \A simul \z }xms} @{ $depends_trigger->{not_if} } ) {
+ push @{ $depends_trigger->{not_if} }, 'simul';
}
if ( $ref_section->{'actiongroup'} ) {
@@ -260,24 +272,26 @@
}
return 1;
}
-
+
if ( defined $ref_section->{$trigger_name} ) {
print qq{$trigger_name ...\n};
-
- foreach my $depend_trigger ( @{$depends_trigger->{not_if}} ) {
+
+ foreach my $depend_trigger ( @{ $depends_trigger->{not_if} } ) {
return 1 if $options->{$depend_trigger};
}
-
- if ( defined $depends_trigger->{only_if} and ref @{$depends_trigger->{only_if}} eq 'ARRAY' ) {
- foreach my $depend_trigger ( @{$depends_trigger->{only_if}} ) {
+
+ if ( defined $depends_trigger->{only_if}
+ and ref @{ $depends_trigger->{only_if} } eq 'ARRAY' )
+ {
+ foreach my $depend_trigger ( @{ $depends_trigger->{only_if} } ) {
return if !$options->{$depend_trigger};
}
}
-
+
return exec_cmd(
subst_vars( $ref_section->{$trigger_name}, $hash_subst ) );
}
-
+
return 1;
}
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/IGNORE.pm
--- a/lib/PFTools/Update/IGNORE.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/IGNORE.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,7 +1,7 @@
package PFTools::Update::IGNORE;
#
-# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/INSTALLPKG.pm
--- a/lib/PFTools/Update/INSTALLPKG.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/INSTALLPKG.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
package PFTools::Update::INSTALLPKG;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
@@ -193,8 +195,10 @@
)
)
{
- carp colored( qq{ERROR: Unable to install $dest},
- q{bold bright_white on_red} );
+ carp colored(
+ qq{ERROR: Unable to install $dest},
+ q{bold bright_white on_red}
+ );
return;
}
}
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/PURGEPKG.pm
--- a/lib/PFTools/Update/PURGEPKG.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/PURGEPKG.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Update::PURGEPKG;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/REMOVEDIR.pm
--- a/lib/PFTools/Update/REMOVEDIR.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/REMOVEDIR.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Update::REMOVEDIR;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Update/REMOVEFILE.pm
--- a/lib/PFTools/Update/REMOVEFILE.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Update/REMOVEFILE.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::Update::REMOVEFILE;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/Utils.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,6 +6,10 @@
=head1 LICENSE AND COPYRIGHT
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+ Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.com>
+ Copyright (C) 2010-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
This program is free software; you can redistribute it and/or
@@ -1051,8 +1055,10 @@
);
};
if ( $EVAL_ERROR || !$resolved_ref ) {
- carp colored( qq{WARNING: Unable to resolve $match2},
- q{bold black on_bright_yellow} );
+ carp colored(
+ qq{WARNING: Unable to resolve $match2},
+ q{bold black on_bright_yellow}
+ );
}
elsif ( @{$resolved_ref} ) {
if ( $separator eq q{DUPLICATE} ) {
@@ -1489,14 +1495,15 @@
next if not $if_part->{$ip_type};
my $ip = NetAddr::IP->new( $if_part->{$ip_type} );
- if ($ip->{isv6}) {
+ if ( $ip->{isv6} ) {
my $cidr = $ip->cidr();
$cidr =~ s/\/(.*)$/$1/;
push @iface_lines,
qq{\taddress\t\t} . $ip->addr(),
qq{\tnetmask\t\t} . $ip->cidr(),
qq{\tnetwork\t\t} . $ip->network()->addr();
- } else {
+ }
+ else {
push @iface_lines,
qq{\taddress\t\t} . $ip->addr(),
qq{\tnetmask\t\t} . $ip->mask(),
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/VCS.pm
--- a/lib/PFTools/VCS.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/VCS.pm Tue Dec 23 14:22:42 2014 +0100
@@ -6,6 +6,9 @@
=head1 LICENSE AND COPYRIGHT
+ Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+ Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+ Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
This program is free software; you can redistribute it and/or
@@ -75,8 +78,7 @@
if ($EVAL_ERROR) {
print "$EVAL_ERROR\n";
- croak
- qq{ERROR: Unable to load VCS module '$module_name'};
+ croak qq{ERROR: Unable to load VCS module '$module_name'};
}
$module->import();
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/VCS/CVS.pm
--- a/lib/PFTools/VCS/CVS.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/VCS/CVS.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
package PFTools::VCS::CVS;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/VCS/HG.pm
--- a/lib/PFTools/VCS/HG.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/VCS/HG.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,7 @@
package PFTools::VCS::HG;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.fr>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
diff -r 15375eecb0bb -r 3add457e9eb0 lib/PFTools/VCS/SVN.pm
--- a/lib/PFTools/VCS/SVN.pm Mon Dec 22 15:14:41 2014 +0100
+++ b/lib/PFTools/VCS/SVN.pm Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
package PFTools::VCS::SVN;
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/fix_hosts
--- a/sbin/fix_hosts Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/fix_hosts Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_dhcp
--- a/sbin/mk_dhcp Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_dhcp Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2008 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_grubopt
--- a/sbin/mk_grubopt Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_grubopt Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010-2011 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_interfaces
--- a/sbin/mk_interfaces Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_interfaces Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_pxelinuxcfg
--- a/sbin/mk_pxelinuxcfg Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_pxelinuxcfg Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,8 @@
#!/usr/bin/perl
#
-# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
+# Copyright (C) 2007-2011 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
#
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_resolvconf
--- a/sbin/mk_resolvconf Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_resolvconf Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_sitezone
--- a/sbin/mk_sitezone Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_sitezone Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/mk_sourceslist
--- a/sbin/mk_sourceslist Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/mk_sourceslist Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 sbin/update-config
--- a/sbin/update-config Mon Dec 22 15:14:41 2014 +0100
+++ b/sbin/update-config Tue Dec 23 14:22:42 2014 +0100
@@ -1,5 +1,8 @@
#!/usr/bin/perl
#
+# Copyright (C) 2014 Jérôme Bourgeois <melkor at sitadelle.eu.org>
+# Copyright (C) 2014 Stéphane Pontier <shad at sitadelle.eu.org>
+# Copyright (C) 2010 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
# Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
# Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
# Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
diff -r 15375eecb0bb -r 3add457e9eb0 tools/Display_IP_config
--- a/tools/Display_IP_config Mon Dec 22 15:14:41 2014 +0100
+++ b/tools/Display_IP_config Tue Dec 23 14:22:42 2014 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# Copyright (C) 2004-2014 Stephane Pontier <shad at sitadelle.com>
+# Copyright (C) 2004-2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2008-2010 Christophe Caillet <quadchris at free.fr>
#
# This program is free software; you can redistribute it and/or
diff -r 15375eecb0bb -r 3add457e9eb0 tools/Translate_old_config
--- a/tools/Translate_old_config Mon Dec 22 15:14:41 2014 +0100
+++ b/tools/Translate_old_config Tue Dec 23 14:22:42 2014 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/perl
#
+# Copyright (C) 2004-2014 Stéphane Pontier <shad at sitadelle.eu.org>
# Copyright (C) 2008-2010 Christophe Caillet <quadchris at free.fr>
-# Copyright (C) 2004 Stephane Pontier <shad at sitadelle.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -347,15 +347,16 @@
}
else {
if ( $hostkey eq 'site' ) {
- $trans->{$section}->{$hostdef}->{$hostsection}
- ->{$hostkey} = $options->{'site'};
+ $trans->{$section}->{$hostdef}
+ ->{$hostsection}->{$hostkey}
+ = $options->{'site'};
}
$host_output_fh->print(
"\t$hostkey\t= $trans->{$section}->{$hostdef}->{$hostsection}->{$hostkey}"
);
- if ( $comments->{'inline'}->{$hostdef}
- ->{$hostkey} )
+ if ( $comments->{'inline'}->{$hostdef}->{$hostkey}
+ )
{
$host_output_fh->print(
" $comments->{'inline'}->{$hostdef}->{$hostkey}"
@@ -385,7 +386,8 @@
);
$output_fh->print("\tsite\t= $site\n");
$output_fh->print(
- "\t\@host\t= CONFIGSITE_$site:/hostfile-$cleanhostname\n");
+ "\t\@host\t= CONFIGSITE_$site:/hostfile-$cleanhostname\n"
+ );
$output_fh->print("\n");
}
}
More information about the pf-tools-commits
mailing list