/[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 2305 by davidg, Sun Jun 12 20:59:58 2011 UTC revision 2597 by davidg, Wed Jan 30 08:22:08 2013 UTC
# Line 140  sub init_configuration() { Line 140  sub init_configuration() {
140    
141    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );
142    $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;  
143    
144    $cnf = ConfigTiny->new();    $cnf = ConfigTiny->new();
145    $configfile and    $configfile and
# Line 171  sub init_configuration() { Line 170  sub init_configuration() {
170    $cnf->{_}->{randomwait}     = $randomwait if defined $randomwait;    $cnf->{_}->{randomwait}     = $randomwait if defined $randomwait;
171    $cnf->{_}->{nosymlinks}     = $nosymlinks if defined $nosymlinks;    $cnf->{_}->{nosymlinks}     = $nosymlinks if defined $nosymlinks;
172    
173      # deal with interaction of verbosity in logfile and quiet option
174      # since a noquiet config option can cancel it
175      if ( not defined $cnf->{_}->{noquiet} ) {
176        if ( $quiet == 1) { $cnf->{_}->{verbosity} = -1; }
177      } else {
178        if ( $quiet >= 2) { $cnf->{_}->{verbosity} = -1; }
179      }
180    
181    # key default values    # key default values
182    defined $cnf->{_}->{version}  or $cnf->{_}->{version}    = "3+";    defined $cnf->{_}->{version}  or $cnf->{_}->{version}    = "3+";
183    defined $cnf->{_}->{packager} or $cnf->{_}->{packager}   = "EUGridPMA";    defined $cnf->{_}->{packager} or $cnf->{_}->{packager}   = "EUGridPMA";
# Line 289  sub process_metafiles(@) { Line 296  sub process_metafiles(@) {
296        $cnf->{_}->{"infodir"} and $ta->setInfodir($cnf->{_}->{"infodir"});        $cnf->{_}->{"infodir"} and $ta->setInfodir($cnf->{_}->{"infodir"});
297        $ta->loadAnchor($f) or next;        $ta->loadAnchor($f) or next;
298        $ta->saveLogMode() and $ta->setLogMode();        $ta->saveLogMode() and $ta->setLogMode();
       $ta->loadCAfiles() or next;  
299        $ta->loadState() or next;        $ta->loadState() or next;
300        $ta->retrieve or next;  
301          # using the HASH in the CA filename templates requires the CRL
302          # is retrieved first to determinte the hash
303          if ( $cnf->{_}->{"catemplate"} =~ /\@HASH\@/ ) {
304            $ta->retrieve or next;
305            $ta->loadCAfiles() or next;
306          } else {
307            $ta->loadCAfiles() or next;
308            $ta->retrieve or next;
309          }
310    
311        $ta->verifyAndConvertCRLs or next;        $ta->verifyAndConvertCRLs or next;
312            
313        my $writer = CRLWriter->new($ta);        my $writer = CRLWriter->new($ta);

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

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