Rely on Bacula::Time where applicable

voxpupuli · Aug 30, 2023 · ed08cdd · ed08cdd
1 parent 03ed88e
commit ed08cdd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -1161,7 +1161,7 @@ The following parameters are available in the `bacula::director::pool` defined t
 
 ##### <a name="-bacula--director--pool--volret"></a>`volret`
 
-Data type: `Optional[String]`
+Data type: `Optional[Bacula::Time]`
 
 Bacula pool configuration option "Volume Retention"
 
@@ -1201,7 +1201,7 @@ Default value: `undef`
 
 ##### <a name="-bacula--director--pool--voluseduration"></a>`voluseduration`
 
-Data type: `Optional[String]`
+Data type: `Optional[Bacula::Time]`
 
 Bacula pool configuration option "Volume Use Duration"
 
@@ -1605,7 +1605,7 @@ Default value: `undef`
 
 ##### <a name="-bacula--job--max_full_interval"></a>`max_full_interval`
 
-Data type: `Optional[String]`
+Data type: `Optional[Bacula::Time]`
 
 The time specifies the maximum allowed age (counting from start time) of the most recent successful Full backup that is required in order to run Incremental or Differential backup jobs. f the most recent Full backup is older than this interval, Incremental and Differential backups will be upgraded to Full backups automatically.
 
@@ -1749,7 +1749,7 @@ Default value: `undef`
 
 ##### <a name="-bacula--jobdefs--max_full_interval"></a>`max_full_interval`
 
-Data type: `Optional[String]`
+Data type: `Optional[Bacula::Time]`
 
 The time specifies the maximum allowed age (counting from start time) of the most recent successful Full backup that is required in order to run Incremental or Differential backup jobs. f the most recent Full backup is older than this interval, Incremental and Differential backups will be upgraded to Full backups automatically.
 

diff --git a/manifests/director/pool.pp b/manifests/director/pool.pp
@@ -29,12 +29,12 @@
 #   }
 #
 define bacula::director::pool (
-  Optional[String]                     $volret         = undef,
+  Optional[Bacula::Time]               $volret         = undef,
   Optional[Variant[String,Integer[1]]] $maxvoljobs     = undef, # FIXME: Remove String
   Optional[Bacula::Size]               $maxvolbytes    = undef,
   Optional[Variant[String,Integer[1]]] $maxvols        = undef, # FIXME: Remove String
   Optional[String]                     $label          = undef,
-  Optional[String]                     $voluseduration = undef,
+  Optional[Bacula::Time]               $voluseduration = undef,
   String                               $storage        = $bacula::director::storage,
   String                               $pooltype       = 'Backup',
   Bacula::Yesno                        $recycle        = true,

diff --git a/manifests/job.pp b/manifests/job.pp
@@ -68,7 +68,7 @@
   Optional[String]            $selection_pattern   = undef,
   Integer[1]                  $max_concurrent_jobs = 1,
   Optional[String]            $write_bootstrap     = undef,
-  Optional[String]            $max_full_interval   = undef,
+  Optional[Bacula::Time]      $max_full_interval   = undef,
 ) {
   include bacula
   include bacula::client

diff --git a/manifests/jobdefs.pp b/manifests/jobdefs.pp
@@ -19,21 +19,21 @@
 # @param max_full_interval        The time specifies the maximum allowed age (counting from start time) of the most recent successful Full backup that is required in order to run Incremental or Differential backup jobs. f the most recent Full backup is older than this interval, Incremental and Differential backups will be upgraded to Full backups automatically. 
 #
 define bacula::jobdefs (
-  Bacula::JobType  $jobtype                  = 'Backup',
-  String           $sched                    = 'Default',
-  String           $messages                 = 'Standard',
-  Integer          $priority                 = 10,
-  String           $pool                     = 'Default',
-  Optional[String] $full_backup_pool         = undef,
-  Optional[String] $differential_backup_pool = undef,
-  Optional[String] $level                    = undef,
-  Bacula::Yesno    $accurate                 = false,
-  Bacula::Yesno    $reschedule_on_error      = false,
-  Bacula::Time     $reschedule_interval      = '1 hour',
-  Integer          $reschedule_times         = 10,
-  Integer[1]       $max_concurrent_jobs      = 1,
-  Optional[String] $write_bootstrap          = undef,
-  Optional[String] $max_full_interval        = undef,
+  Bacula::JobType        $jobtype                  = 'Backup',
+  String                 $sched                    = 'Default',
+  String                 $messages                 = 'Standard',
+  Integer                $priority                 = 10,
+  String                 $pool                     = 'Default',
+  Optional[String]       $full_backup_pool         = undef,
+  Optional[String]       $differential_backup_pool = undef,
+  Optional[String]       $level                    = undef,
+  Bacula::Yesno          $accurate                 = false,
+  Bacula::Yesno          $reschedule_on_error      = false,
+  Bacula::Time           $reschedule_interval      = '1 hour',
+  Integer                $reschedule_times         = 10,
+  Integer[1]             $max_concurrent_jobs      = 1,
+  Optional[String]       $write_bootstrap          = undef,
+  Optional[Bacula::Time] $max_full_interval        = undef,
 ) {
   include bacula
   $conf_dir = $bacula::conf_dir