Skip to content

Commit

Permalink
Make splaylimit & runinterval types consistent
Browse files Browse the repository at this point in the history
Previously, `splaylimit` defaulted to a String and wouldn't accept
Integers.  `runinterval` defaulted to an Integer but wouldn't accept
Strings.
  • Loading branch information
alexjfisher authored and ekohl committed Aug 27, 2018
1 parent 1d15bd4 commit 4ef6b93
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -574,13 +574,13 @@
Array[String] $listen_to = $puppet::params::listen_to,
Boolean $pluginsync = $puppet::params::pluginsync,
Boolean $splay = $puppet::params::splay,
Pattern[/^\d+[smhdy]?$/] $splaylimit = $puppet::params::splaylimit,
Variant[Integer[0],Pattern[/^\d+[smhdy]?$/]] $splaylimit = $puppet::params::splaylimit,
Variant[Boolean, Stdlib::Absolutepath] $autosign = $puppet::params::autosign,
Array[String] $autosign_entries = $puppet::params::autosign_entries,
Pattern[/^[0-9]{3,4}$/] $autosign_mode = $puppet::params::autosign_mode,
Optional[String] $autosign_content = $puppet::params::autosign_content,
Optional[String] $autosign_source = $puppet::params::autosign_source,
Integer[0] $runinterval = $puppet::params::runinterval,
Variant[Integer[0],Pattern[/^\d+[smhdy]?$/]] $runinterval = $puppet::params::runinterval,
Boolean $usecacheonfailure = $puppet::params::usecacheonfailure,
Enum['cron', 'service', 'systemd.timer', 'none'] $runmode = $puppet::params::runmode,
Array[Enum['cron', 'service', 'systemd.timer', 'none']] $unavailable_runmodes = $puppet::params::unavailable_runmodes,
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
$listen_to = []
$pluginsync = true
$splay = false
$splaylimit = '1800'
$splaylimit = 1800
$runinterval = 1800
$runmode = 'service'
$report = true
Expand Down

0 comments on commit 4ef6b93

Please sign in to comment.