/[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

revision 2691 by davidg, Tue Mar 4 16:33:30 2014 UTC revision 2783 by davidg, Thu Apr 30 10:44:41 2015 UTC
# Line 70  $cnf->{_}->{path} and $ENV{"PATH"} = $cn Line 70  $cnf->{_}->{path} and $ENV{"PATH"} = $cn
70    
71  # set rcmode if present in config  # set rcmode if present in config
72  defined $cnf->{_}->{rcmode} and do {  defined $cnf->{_}->{rcmode} and do {
73    $::log->err("Invalid return code mode set (must be 0 or 1)")    $::log->verb(4,"Setting exit status mode to ".$cnf->{_}->{rcmode});
74      if ( $cnf->{_}->{rcmode} != 0 && $cnf->{_}->{rcmode} != 1 );    $::log->setrcmode($cnf->{_}->{rcmode}) or exit($log->exitstatus);
75    $::log->verb(2,"Exit status mode is set to ".$cnf->{_}->{rcmode});    $::log->verb(2,"Exit status mode is set to ".$cnf->{_}->{rcmode});
   $::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
# Line 101  $::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 132  sub init_configuration() { Line 131  sub init_configuration() {
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 144  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,      "V|version+" => \$showversion,
# Line 177  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 212  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

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

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