File tree Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -1198,12 +1198,13 @@ def self.initialize_default_settings!(settings)
1198
1198
#{ AS_DURATION } " ,
1199
1199
} ,
1200
1200
:crl_refresh_interval => {
1201
+ :default => "1d" ,
1201
1202
:type => :duration ,
1202
1203
:desc => "How often the Puppet agent refreshes its local CRL. By
1203
- default the CRL is only downloaded once, and never refreshed . If a
1204
- duration is specified, then the agent will refresh its CRL whenever it
1205
- next runs and the elapsed time since the CRL was last refreshed exceeds
1206
- the duration.
1204
+ default the CRL is refreshed once every 24 hours . If a different
1205
+ duration is specified, then the agent will refresh its CRL whenever
1206
+ it next runs and the elapsed time since the CRL was last refreshed
1207
+ exceeds the duration.
1207
1208
1208
1209
In general, the duration should be greater than the `runinterval`.
1209
1210
Setting it to an equal or lesser value will cause the CRL to be
Original file line number Diff line number Diff line change 30
30
Puppet [ :daemonize ] = false
31
31
Puppet [ :ssl_lockfile ] = tmpfile ( 'ssllock' )
32
32
allow ( Kernel ) . to receive ( :sleep )
33
+ allow_any_instance_of ( Puppet ::X509 ::CertProvider ) . to receive ( :crl_last_update ) . and_return ( Time . now + ( 5 * 60 ) )
33
34
end
34
35
35
36
def expected_digest ( name , content )
@@ -526,12 +527,6 @@ def expect_lockfile_to_contain(pid)
526
527
expect ( File ) . to_not exist ( Puppet [ :hostcrl ] )
527
528
end
528
529
529
- it 'skips CRL refresh by default' do
530
- allow_any_instance_of ( Puppet ::X509 ::CertProvider ) . to receive ( :load_crls ) . and_return ( crls )
531
-
532
- state . next_state
533
- end
534
-
535
530
it 'skips CRL refresh if it has not expired' do
536
531
Puppet [ :crl_refresh_interval ] = '1y'
537
532
Puppet ::FileSystem . touch ( Puppet [ :hostcrl ] , mtime : Time . now )
You can’t perform that action at this time.
0 commit comments