appeasement

manifests/client.pp

@@ -7,7 +7,7 @@
 class bareos::client (
   Boolean $manage_service = $bareos::manage_service,
   Boolean $manage_package = $bareos::manage_package,
-  String $package_name = $bareos::client_package_name,
+  Variant[String, Array[String]] $package_name = $bareos::client_package_name,
   String $package_ensure = $bareos::package_ensure,
   String $service_name = $bareos::client_service_name,
   String $service_ensure = $bareos::service_ensure,

manifests/client/client.pp

@@ -286,7 +286,9 @@
 #   Required: false
 #
 # [*tls_dh_file*]
-#   Tls Dh File: Path to PEM encoded Diffie-Hellman parameter file. If this directive is specified, DH key exchange will be used for the ephemeral keying, allowing for forward secrecy of communications.
+#   Tls Dh File: Path to PEM encoded Diffie-Hellman parameter file. If this
+#   directive is specified, DH key exchange will be used for the ephemeral
+#   keying, allowing for forward secrecy of communications.
 #
 #   Bareos Datatype: directory
 #   Bareos Default: Not set
@@ -307,14 +309,17 @@
 #   Required: false
 #
 # [*tls_require*]
-#   Tls Require: Without setting this to yes, Bareos can fall back to use unencryption connections. Enabling this implicietly sets "TLS Enable = yes".
+#   Tls Require: Without setting this to yes, Bareos can fall back to use
+#   unencryption connections. Enabling this implicietly sets "TLS Enable = yes".
 #
 #   Bareos Datatype: boolean
 #   Bareos Default: false
 #   Required: false
 #
 # [*tls_verify_peer*]
-#   Tls Verify Peer: If disabled, all certificates signed by a known CA will be accepted. If enabled, the CN of a certificate must the Address or in the "TLS Allowed CN" list.
+#   Tls Verify Peer: If disabled, all certificates signed by a known CA will be
+#   accepted. If enabled, the CN of a certificate must the Address or in the
+#   "TLS Allowed CN" list.
 #
 #   Bareos Datatype: boolean
 #   Bareos Default: true
@@ -335,6 +340,7 @@
 #   Required: false
 #
 class bareos::client::client (
+  Bareos::Resource $name_client = 'bareos-fd',
   Bareos::Module::Ensure $ensure = present,
   Optional[Integer[0]] $absolute_job_timeout = undef,
   Optional[Boolean] $allow_bandwidth_bursting = undef,
@@ -355,7 +361,6 @@
   Optional[Integer[0]] $maximum_connections = undef,
   Optional[Integer[0]] $maximum_network_buffer_size = undef,
   Optional[Bareos::Resource] $messages = undef,
-  Optional[Bareos::Resource] $name_client = 'bareos-fd',
   Optional[Stdlib::AbsolutePath] $pid_directory = undef,
   Optional[Bareos::EncryptionCipher] $pki_cipher = undef,
   Optional[Bareos::Boolean] $pki_encryption = undef,

manifests/console.pp

@@ -6,7 +6,7 @@
 # It is not intended to be used directly by external resources like node definitions or other modules.
 class bareos::console (
   Boolean $manage_package = $bareos::manage_package,
-  String $package_name   = $bareos::console_package_name,
+  Variant[String, Array[String]] $package_name   = $bareos::console_package_name,
   String $package_ensure = $bareos::package_ensure,
   Stdlib::AbsolutePath $config_dir     = "${bareos::config_dir}/bconsole.d"
 ) inherits bareos {

manifests/director.pp

@@ -8,7 +8,7 @@
   Boolean $manage_service = $bareos::manage_service,
   Boolean $manage_package = $bareos::manage_package,
   Boolean $manage_database = $bareos::manage_database,
-  String $package_name = $bareos::director_package_name,
+  Variant[String, Array[String]] $package_name = $bareos::director_package_name,
   String $package_ensure = $bareos::package_ensure,
   String $service_name = $bareos::director_service_name,
   Boolean $service_allow_restart = $bareos::director_service_allow_restart,

manifests/init.pp

@@ -50,16 +50,16 @@
   Boolean $service_enable = true,
   Boolean $manage_repo = true,
   Boolean $manage_user = true,
-  String $package_name = 'bareos-common',
-  String $console_package_name = $bareos::params::console_package_name,
-  String $monitor_package_name = $bareos::params::monitor_package_name,
-  String $director_package_name = $bareos::params::director_package_name,
+  Variant[String, Array[String]] $package_name = 'bareos-common',
+  Variant[String, Array[String]] $console_package_name = $bareos::params::console_package_name,
+  Variant[String, Array[String]] $monitor_package_name = $bareos::params::monitor_package_name,
+  Variant[String, Array[String]] $director_package_name = $bareos::params::director_package_name,
   String $director_service_name = $bareos::params::director_service_name,
   Boolean $director_service_allow_restart = false,
-  Array[Stdlib::AbsolutePath] $director_managed_dirs = $bareos::params::director_managed_dirs,
-  String $client_package_name = $bareos::params::client_package_name,
+  Array[String] $director_managed_dirs = $bareos::params::director_managed_dirs,
+  Variant[String, Array[String]] $client_package_name = $bareos::params::client_package_name,
   String $client_service_name = $bareos::params::client_service_name,
-  String $storage_package_name = $bareos::params::storage_package_name,
+  Variant[String, Array[String]] $storage_package_name = $bareos::params::storage_package_name,
   String $storage_service_name = $bareos::params::storage_service_name,
 ) inherits bareos::params {
   if $manage_repo {

manifests/monitor.pp

@@ -6,7 +6,7 @@
 # It is not intended to be used directly by external resources like node definitions or other modules.
 class bareos::monitor (
   Boolean $manage_package = $bareos::manage_package,
-  String $package_name = $bareos::monitor_package_name,
+  Variant[String, Array[String]] $package_name = $bareos::monitor_package_name,
   String $package_ensure = $bareos::package_ensure,
   Stdlib::AbsolutePath $config_dir = "${bareos::config_dir}/tray-monitor.d"
 ) inherits bareos {

manifests/storage.pp

@@ -7,7 +7,7 @@
 class bareos::storage (
   Boolean $manage_service = $bareos::manage_service,
   Boolean $manage_package = $bareos::manage_package,
-  String $package_name = $bareos::storage_package_name,
+  Variant[String, Array[String]] $package_name = $bareos::storage_package_name,
   String $package_ensure = $bareos::package_ensure,
   String $service_name = $bareos::storage_service_name,
   String $service_ensure = $bareos::service_ensure,

manifests/webui.pp

@@ -5,12 +5,12 @@
 class bareos::webui (
   Stdlib::AbsolutePath $config_dir = $bareos::config_dir_webui,
   Hash $directors = {},
-  String $label_pooltype = '',
+  Optional[String] $label_pooltype = undef,
   Boolean $manage_local_dir = true, # setup local bareos director
   Boolean $manage_package = $bareos::manage_package,
   Boolean $manage_service = $bareos::manage_service,
   String $package_ensure = $bareos::package_ensure,
-  String $package_name = $bareos::webui_package_name,
+  Variant[String, Array[String]] $package_name = $bareos::webui_package_name,
   Integer $pagination_default_value = 25,
   String $pagination_values = '10,25,50,100',
   Boolean $save_previous_state = false,

types/addresses.pp

@@ -1,15 +1,21 @@
 # @summary The weird, weird Bareos director addresses format
 # @author Tobias @towo Wolter <tobias.wolter+voxpupuli@b1-systems.de>
 # @see https://docs.bareos.org/Configuration/CustomizingTheConfiguration.html#datatypenetaddresses
-type Profile::Addresses = Hash[
+type Bareos::Addresses = Hash[
   Enum['ip', 'ipv4', 'ipv6'], Variant[
-    Struct[{
-      addr           => Stdlib::Host,
-      Optional[port] => Stdlib::Port,
-    }],
-    Array[Struct[{
-      addr           => Stdlib::Host,
-      Optional[port] => Stdlib::Port,
-    }]]
+    Struct[
+      {
+        addr           => Stdlib::Host,
+        Optional[port] => Stdlib::Port,
+      }
+    ],
+    Array[
+      Struct[
+        {
+          addr           => Stdlib::Host,
+          Optional[port] => Stdlib::Port,
+        }
+      ]
+    ]
   ]
 ]

types/job/level.pp

@@ -1,13 +1,13 @@
 # @summary Backup job level
 # @author Tobias @towo Wolter <towo+voxpupuli@b1-systems.de>
 # @see https://docs.bareos.org/Configuration/CustomizingTheConfiguration.html#datatype-backup_level
-type Profile::Job::Level = Enum[
+type Bareos::Job::Level = Enum[
   'Full',
   'Differential',
   'Incremental',
   'VirtualFull',
   'InitCatalog',
   'Catalog',
   'VolumeToCatalog',
-  'DiskToCatalog'
+  'DiskToCatalog',
 ]