/[pdpsoft]/nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl.cin
ViewVC logotype

Diff of /nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl.cin

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl revision 2305 by davidg, Sun Jun 12 20:59:58 2011 UTC nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl.cin revision 2690 by davidg, Tue Mar 4 16:26:06 2014 UTC
# Line 25  use Getopt::Long qw(:config no_ignore_ca Line 25  use Getopt::Long qw(:config no_ignore_ca
25  use POSIX;  use POSIX;
26  eval { require LWP or die; }; $@ and die "Please install libwww-perl (LWP)\n";  eval { require LWP or die; }; $@ and die "Please install libwww-perl (LWP)\n";
27    
28    my $sccsid = '@(#)$Id$';
29    
30  # import modules that are needed but still external  # import modules that are needed but still external
31  # (the installed version may have these packages embedded in-line)  # (the installed version may have these packages embedded in-line)
32  #  #
# Line 46  use vars qw/ $log $cnf /; Line 48  use vars qw/ $log $cnf /;
48  #  #
49  ($cnf,$log) = &init_configuration();  ($cnf,$log) = &init_configuration();
50    
51    # use Net::INET6Glue if so requested (is not a default module)
52    if ( $cnf->{_}->{inet6glue} ) {
53      eval { require Net::INET6Glue::INET_is_INET6 or die; };
54      $@ and die "Please install Net::INET6Glue before enabling inet6glue config\n";
55    }
56    
57  # verify local installation sanity for loaded modules  # verify local installation sanity for loaded modules
58  $::log->getverbose > 6 and ! $use_DataDumper and  $::log->getverbose > 6 and ! $use_DataDumper and
59    $::log->err("Cannot set verbosity higher than 6 without Data::Dumper") and    $::log->err("Cannot set verbosity higher than 6 without Data::Dumper") and
# Line 59  $use_DataDumper and $::log->verb(7,Data: Line 67  $use_DataDumper and $::log->verb(7,Data:
67  # set safe path if so requested  # set safe path if so requested
68  $cnf->{_}->{path} and $ENV{"PATH"} = $cnf->{_}->{path} and  $cnf->{_}->{path} and $ENV{"PATH"} = $cnf->{_}->{path} and
69    $::log->verb(5,"Set PATH to",$ENV{"PATH"});    $::log->verb(5,"Set PATH to",$ENV{"PATH"});
70    
71    # set rcmode if present in config
72    $cnf->{_}->{rcmode} and do {
73      $::log->err("Invalid return code mode set (must be 0 or 1)")
74        if ( $cnf->{_}->{rcmode} != 0 && $cnf->{_}->{rcmode} != 1 );
75      $::log->setrcmode($cnf->{_}->{rcmode});
76    };
77        
78  # wait up to randomwait seconds to spread download load  # wait up to randomwait seconds to spread download load
79  $cnf->{_}->{randomwait} and do {  $cnf->{_}->{randomwait} and do {
# Line 109  sub init_configuration() { Line 124  sub init_configuration() {
124    my $verbosity;    my $verbosity;
125    my $quiet=0;    my $quiet=0;
126    my $help=0;    my $help=0;
127      my $showversion=0;
128    my $debuglevel;    my $debuglevel;
129    my $parallelism=0;    my $parallelism=0;
130    my $randomwait;    my $randomwait;
131    my $nosymlinks;    my $nosymlinks;
132    my $cfgdir;    my $cfgdir;
133      my $inet6glue=0;
134    
135    $log = FCLog->new("qualified");    $log = FCLog->new("qualified");
136    
# Line 128  sub init_configuration() { Line 145  sub init_configuration() {
145      "format=s@" => \@formats,      "format=s@" => \@formats,
146      "v|verbose+" => \$verbosity,      "v|verbose+" => \$verbosity,
147      "h|help+" => \$help,      "h|help+" => \$help,
148        "V|version+" => \$showversion,
149      "q|quiet+" => \$quiet,      "q|quiet+" => \$quiet,
150      "d|debug+" => \$debuglevel,      "d|debug+" => \$debuglevel,
151      "p|parallelism=i" => \$parallelism,      "p|parallelism=i" => \$parallelism,
152      "nosymlinks+" => \$nosymlinks,      "nosymlinks+" => \$nosymlinks,
153      "a|agingtolerance=i" => \$agingtolerance,      "a|agingtolerance=i" => \$agingtolerance,
154      "r|randomwait=i" => \$randomwait,      "r|randomwait=i" => \$randomwait,
155        "inet6glue+" => \$inet6glue,
156      ) or &help and exit(1);      ) or &help and exit(1);
157    
158    $help and &help and exit(0);    $help and &help and exit(0);
159      $showversion and &showversion and exit(0);
160    
161    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );
162    $configfile ||= ( -e "/etc/fetch-crl.cnf" and "/etc/fetch-crl.cnf" );    $configfile ||= ( -e "/etc/fetch-crl.cnf" and "/etc/fetch-crl.cnf" );
   ($quiet > 0) and $verbosity = -$quiet;  
163    
164    $cnf = ConfigTiny->new();    $cnf = ConfigTiny->new();
165    $configfile and    $configfile and
# Line 170  sub init_configuration() { Line 189  sub init_configuration() {
189    $cnf->{_}->{parallelism}    = $parallelism if $parallelism;    $cnf->{_}->{parallelism}    = $parallelism if $parallelism;
190    $cnf->{_}->{randomwait}     = $randomwait if defined $randomwait;    $cnf->{_}->{randomwait}     = $randomwait if defined $randomwait;
191    $cnf->{_}->{nosymlinks}     = $nosymlinks if defined $nosymlinks;    $cnf->{_}->{nosymlinks}     = $nosymlinks if defined $nosymlinks;
192      $cnf->{_}->{inet6glue}      = $inet6glue if $inet6glue;
193    
194      # deal with interaction of verbosity in logfile and quiet option
195      # since a noquiet config option can cancel it
196      if ( not defined $cnf->{_}->{noquiet} ) {
197        if ( $quiet == 1) { $cnf->{_}->{verbosity} = -1; }
198      } else {
199        if ( $quiet >= 2) { $cnf->{_}->{verbosity} = -1; }
200      }
201    
202    # key default values    # key default values
203    defined $cnf->{_}->{version}  or $cnf->{_}->{version}    = "3+";    defined $cnf->{_}->{version}  or $cnf->{_}->{version}    = "3+";
# Line 196  sub init_configuration() { Line 224  sub init_configuration() {
224    $cnf->{_}->{nosymlinks}     ||= 0;    $cnf->{_}->{nosymlinks}     ||= 0;
225    $cnf->{_}->{verbosity}      ||= 0;    $cnf->{_}->{verbosity}      ||= 0;
226    $cnf->{_}->{debuglevel}     ||= 0;    $cnf->{_}->{debuglevel}     ||= 0;
227      $cnf->{_}->{inet6glue}      ||= 0;
228    
229    $cnf->{_}->{stateless} and delete $cnf->{_}->{statedir};    $cnf->{_}->{stateless} and delete $cnf->{_}->{statedir};
230    
# Line 227  sub init_configuration() { Line 256  sub init_configuration() {
256  # ###########################################################################  # ###########################################################################
257  #  #
258  #  #
259    sub showversion() {
260      (my $name = $0) =~ s/.*\///;
261      print "$name version @VERSION@\n";
262      return 1;
263    }
264    
265  sub help() {  sub help() {
266    (my $name = $0) =~ s/.*\///;    (my $name = $0) =~ s/.*\///;
267  print <<EOHELP;  print <<EOHELP;
# Line 273  Options: Line 308  Options:
308   -h | --help   -h | --help
309          This help text          This help text
310    
311    Version: @VERSION@
312  EOHELP  EOHELP
313    
314    return 1;    return 1;
# Line 289  sub process_metafiles(@) { Line 325  sub process_metafiles(@) {
325        $cnf->{_}->{"infodir"} and $ta->setInfodir($cnf->{_}->{"infodir"});        $cnf->{_}->{"infodir"} and $ta->setInfodir($cnf->{_}->{"infodir"});
326        $ta->loadAnchor($f) or next;        $ta->loadAnchor($f) or next;
327        $ta->saveLogMode() and $ta->setLogMode();        $ta->saveLogMode() and $ta->setLogMode();
       $ta->loadCAfiles() or next;  
328        $ta->loadState() or next;        $ta->loadState() or next;
329        $ta->retrieve or next;  
330          # using the HASH in the CA filename templates requires the CRL
331          # is retrieved first to determinte the hash
332          if ( $cnf->{_}->{"catemplate"} =~ /\@HASH\@/ ) {
333            $ta->retrieve or next;
334            $ta->loadCAfiles() or next;
335          } else {
336            $ta->loadCAfiles() or next;
337            $ta->retrieve or next;
338          }
339    
340        $ta->verifyAndConvertCRLs or next;        $ta->verifyAndConvertCRLs or next;
341            
342        my $writer = CRLWriter->new($ta);        my $writer = CRLWriter->new($ta);

Legend:
Removed from v.2305  
changed lines
  Added in v.2690

grid.support@nikhef.nl
ViewVC Help
Powered by ViewVC 1.1.28