/[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 2604 by davidg, Mon Feb 25 11:59:39 2013 UTC nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl.cin revision 2783 by davidg, Thu Apr 30 10:44:41 2015 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 48  use vars qw/ $log $cnf /; Line 50  use vars qw/ $log $cnf /;
50    
51  # use Net::INET6Glue if so requested (is not a default module)  # use Net::INET6Glue if so requested (is not a default module)
52  if ( $cnf->{_}->{inet6glue} ) {  if ( $cnf->{_}->{inet6glue} ) {
53    eval { require Net::INET6Glue or die; };    eval { require Net::INET6Glue::INET_is_INET6 or die; };
54    $@ and die "Please install Net::INET6Glue before enabling inet6glue config\n";    $@ and die "Please install Net::INET6Glue before enabling inet6glue config\n";
55  }  }
56    
# Line 65  $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    defined $cnf->{_}->{rcmode} and do {
73      $::log->verb(4,"Setting exit status mode to ".$cnf->{_}->{rcmode});
74      $::log->setrcmode($cnf->{_}->{rcmode}) or exit($log->exitstatus);
75      $::log->verb(2,"Exit status mode is set to ".$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 91  $::cnf->{_}->{"infodir"} and do { Line 100  $::cnf->{_}->{"infodir"} and do {
100  };  };
101    
102  @metafiles or  @metafiles or
103    $log->err("No trust anchors to process") and exit($log->exitstatus);    $log->warn("No trust anchors to process") and exit($log->exitstatus);
104    
105  if ( $::cnf->{_}->{parallelism} ) {  if ( $::cnf->{_}->{parallelism} ) {
106    &parallel_metafiles($::cnf->{_}->{parallelism}, @metafiles);    &parallel_metafiles($::cnf->{_}->{parallelism}, @metafiles);
# Line 115  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;    my $inet6glue=0;
134      my %directives;
135    
136    $log = FCLog->new("qualified");    $log = FCLog->new("qualified");
137    
# Line 133  sub init_configuration() { Line 144  sub init_configuration() {
144      "T|httptimeout=i" => \$httptimeout,      "T|httptimeout=i" => \$httptimeout,
145      "o|output=s" => \$output,      "o|output=s" => \$output,
146      "format=s@" => \@formats,      "format=s@" => \@formats,
147        "define=s" => \%directives,
148      "v|verbose+" => \$verbosity,      "v|verbose+" => \$verbosity,
149      "h|help+" => \$help,      "h|help+" => \$help,
150        "V|version+" => \$showversion,
151      "q|quiet+" => \$quiet,      "q|quiet+" => \$quiet,
152      "d|debug+" => \$debuglevel,      "d|debug+" => \$debuglevel,
153      "p|parallelism=i" => \$parallelism,      "p|parallelism=i" => \$parallelism,
# Line 145  sub init_configuration() { Line 158  sub init_configuration() {
158      ) or &help and exit(1);      ) or &help and exit(1);
159    
160    $help and &help and exit(0);    $help and &help and exit(0);
161      $showversion and &showversion and exit(0);
162    
163    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );
164    $configfile ||= ( -e "/etc/fetch-crl.cnf" and "/etc/fetch-crl.cnf" );    $configfile ||= ( -e "/etc/fetch-crl.cnf" and "/etc/fetch-crl.cnf" );
# Line 164  sub init_configuration() { Line 178  sub init_configuration() {
178      close $dh;      close $dh;
179    }    }
180    
181      # add defined from the command line to the configuration, to the
182      # main section _ thereof unless there is a colon in the key
183      foreach my $k ( keys %directives ) {
184        my $section ="_";
185        my $dvalue = $directives{$k};
186        if ( $k =~ m/(\w+):(.*)/ ) {
187          $section = $1;
188          $k=$2;
189        }
190        $cnf->{$section}->{$k} = $dvalue;
191      }
192    
193    # command-line option overrides    # command-line option overrides
194    $cnf->{_}->{agingtolerance} = $agingtolerance if defined $agingtolerance;    $cnf->{_}->{agingtolerance} = $agingtolerance if defined $agingtolerance;
195    $cnf->{_}->{infodir}        = $infodir if defined $infodir;    $cnf->{_}->{infodir}        = $infodir if defined $infodir;
# Line 199  sub init_configuration() { Line 225  sub init_configuration() {
225    defined $cnf->{_}->{formats}  or $cnf->{_}->{formats}    = "openssl";    defined $cnf->{_}->{formats}  or $cnf->{_}->{formats}    = "openssl";
226    defined $cnf->{_}->{opensslmode} or $cnf->{_}->{opensslmode} = "dual";    defined $cnf->{_}->{opensslmode} or $cnf->{_}->{opensslmode} = "dual";
227    defined $cnf->{_}->{httptimeout} or $cnf->{_}->{httptimeout} = 120;    defined $cnf->{_}->{httptimeout} or $cnf->{_}->{httptimeout} = 120;
228      defined $cnf->{_}->{expirestolerance} or $cnf->{_}->{expirestolerance} = (7*60*60); # at least 7 hrs should nextUpdate be beyond the cache FreshUntil
229      defined $cnf->{_}->{maxcachetime} or $cnf->{_}->{maxcachetime} = (4*24*60*60); # arbitrarily set it at 4 days
230    defined $cnf->{_}->{nametemplate_der} or    defined $cnf->{_}->{nametemplate_der} or
231      $cnf->{_}->{nametemplate_der} = "\@ANCHORNAME\@.\@R\@.crl";      $cnf->{_}->{nametemplate_der} = "\@ANCHORNAME\@.\@R\@.crl";
232    defined $cnf->{_}->{nametemplate_pem} or    defined $cnf->{_}->{nametemplate_pem} or
# Line 244  sub init_configuration() { Line 272  sub init_configuration() {
272  # ###########################################################################  # ###########################################################################
273  #  #
274  #  #
275    sub showversion() {
276      (my $name = $0) =~ s/.*\///;
277      print "$name version @VERSION@\n";
278      return 1;
279    }
280    
281  sub help() {  sub help() {
282    (my $name = $0) =~ s/.*\///;    (my $name = $0) =~ s/.*\///;
283  print <<EOHELP;  print <<EOHELP;
# Line 290  Options: Line 324  Options:
324   -h | --help   -h | --help
325          This help text          This help text
326    
327    Version: @VERSION@
328  EOHELP  EOHELP
329    
330    return 1;    return 1;

Legend:
Removed from v.2604  
changed lines
  Added in v.2783

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