diff --git a/manifests/globals.pp b/manifests/globals.pp index 97304f69..fad60bd1 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -67,7 +67,7 @@ # Path to `icingacli' comand line tool. # class icingaweb2::globals ( - String $package_name, + String[1] $package_name, Stdlib::Absolutepath $conf_dir, Stdlib::Absolutepath $state_dir, Stdlib::Absolutepath $data_dir, @@ -86,7 +86,7 @@ Stdlib::Absolutepath $pgsql_idoreports_sla_percent, Stdlib::Absolutepath $mysql_x509_schema, Stdlib::Absolutepath $pgsql_x509_schema, - String $gettext_package_name, + String[1] $gettext_package_name, Stdlib::Absolutepath $icingacli_bin, ) { $stdlib_version = load_module_metadata('stdlib')['version'] diff --git a/manifests/inisection.pp b/manifests/inisection.pp index 9d6e4c3c..60d08644 100644 --- a/manifests/inisection.pp +++ b/manifests/inisection.pp @@ -29,11 +29,11 @@ # } # define icingaweb2::inisection ( - Stdlib::Absolutepath $target, - String $section_name = $title, - Hash $settings = {}, - Variant[String, Integer] $order = '01', - Boolean $replace = true, + Stdlib::Absolutepath $target, + String[1] $section_name = $title, + Hash $settings = {}, + Variant[String[1], Integer[1]] $order = '01', + Boolean $replace = true, ) { $conf_user = $icingaweb2::conf_user $conf_group = $icingaweb2::conf_group diff --git a/manifests/init.pp b/manifests/init.pp index b9f519b8..dd14cff0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -214,29 +214,29 @@ # class icingaweb2 ( Stdlib::Absolutepath $logging_file, - String $conf_user, - String $conf_group, + String[1] $conf_user, + String[1] $conf_group, Enum['mysql', 'pgsql'] $db_type, Variant[Icingaweb2::AdminRole, Boolean[false]] $admin_role, - String $default_admin_username, + String[1] $default_admin_username, Icingaweb2::Secret $default_admin_password, Enum['file', 'syslog', 'php', 'none'] $logging, Enum['ERROR', 'WARNING', 'INFO', 'DEBUG'] $logging_level, Pattern[/user|local[0-7]/] $logging_facility, - String $logging_application, + String[1] $logging_application, Boolean $show_stacktraces, - String $theme, + String[1] $theme, Boolean $theme_disabled, Boolean $manage_repos, Boolean $manage_package, - Hash[String, Hash[String, Any]] $resources, - Variant[String, Boolean[false]] $default_auth_backend, - Hash[String, Hash[String, Any]] $user_backends, - Hash[String, Hash[String, Any]] $group_backends, - String $db_resource_name, + Hash[String[1], Hash[String[1], Any]] $resources, + Variant[String[1], Boolean[false]] $default_auth_backend, + Hash[String[1], Hash[String[1], Any]] $user_backends, + Hash[String[1], Hash[String[1], Any]] $group_backends, + String[1] $db_resource_name, Stdlib::Host $db_host, - String $db_name, - String $db_username, + String[1] $db_name, + String[1] $db_username, Optional[Icingaweb2::Secret] $db_password = undef, Optional[Stdlib::Port] $db_port = undef, Optional[Icingaweb2::ImportSchema] $import_schema = undef, @@ -246,14 +246,14 @@ Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, Optional[Stdlib::Absolutepath] $tls_capath = undef, Optional[Icingaweb2::Secret] $tls_key = undef, - Optional[String] $tls_cert = undef, - Optional[String] $tls_cacert = undef, + Optional[String[1]] $tls_cert = undef, + Optional[String[1]] $tls_cacert = undef, Optional[Boolean] $tls_noverify = undef, - Optional[String] $tls_cipher = undef, + Optional[String[1]] $tls_cipher = undef, Optional[Variant[Stdlib::Absolutepath, Array[Stdlib::Absolutepath]]] $module_path = undef, - Optional[Array[String]] $extra_packages = undef, - Optional[String] $default_domain = undef, + Optional[Array[String[1]]] $extra_packages = undef, + Optional[String[1]] $default_domain = undef, Optional[Stdlib::Absolutepath] $cookie_path = undef, ) { require icingaweb2::globals diff --git a/manifests/module.pp b/manifests/module.pp index b969a15f..98232b85 100644 --- a/manifests/module.pp +++ b/manifests/module.pp @@ -51,13 +51,13 @@ # define icingaweb2::module ( Enum['absent', 'present'] $ensure = 'present', - String $module = $title, + String[1] $module = $title, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/${title}", Enum['git', 'none', 'package'] $install_method = 'git', - Optional[String] $git_repository = undef, + Optional[String[1]] $git_repository = undef, String $git_revision = 'master', - Optional[String] $package_name = undef, - Hash $settings = {}, + Optional[String[1]] $package_name = undef, + Hash[String[1], Any] $settings = {}, ) { require icingaweb2 diff --git a/manifests/module/audit.pp b/manifests/module/audit.pp index f7e43cdc..0b7a8575 100644 --- a/manifests/module/audit.pp +++ b/manifests/module/audit.pp @@ -49,8 +49,8 @@ class icingaweb2::module::audit ( Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, - String $package_name, Enum['git', 'none', 'package'] $install_method, + String[1] $package_name, Enum['file', 'syslog', 'none'] $log_type, Variant[ Enum['auth', 'user', 'authpriv'], @@ -61,7 +61,7 @@ Optional[Stdlib::Absolutepath] $log_file = undef, Optional[String] $log_ident = undef, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/audit", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { require icingaweb2 diff --git a/manifests/module/businessprocess.pp b/manifests/module/businessprocess.pp index cd3306d0..e0f030f8 100644 --- a/manifests/module/businessprocess.pp +++ b/manifests/module/businessprocess.pp @@ -31,10 +31,10 @@ class icingaweb2::module::businessprocess ( Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Enum['git', 'none', 'package'] $install_method, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/businessprocess", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { require icingaweb2 diff --git a/manifests/module/cube.pp b/manifests/module/cube.pp index 475bd985..d454c81f 100644 --- a/manifests/module/cube.pp +++ b/manifests/module/cube.pp @@ -29,10 +29,10 @@ class icingaweb2::module::cube ( Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Enum['git', 'none', 'package'] $install_method, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/cube", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { require icingaweb2 diff --git a/manifests/module/director.pp b/manifests/module/director.pp index 36aef01c..55dd1ecc 100644 --- a/manifests/module/director.pp +++ b/manifests/module/director.pp @@ -131,37 +131,37 @@ Enum['absent', 'present'] $ensure, Enum['git', 'package', 'none'] $install_method, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Boolean $manage_service, Stdlib::Ensure::Service $service_ensure, Boolean $service_enable, - String $service_user, + String[1] $service_user, Stdlib::Host $api_host, Stdlib::Port $api_port, Boolean $kickstart, Enum['mysql', 'pgsql'] $db_type, - String $db_resource_name, + String[1] $db_resource_name, Stdlib::Host $db_host, - String $db_name, - String $db_username, + String[1] $db_name, + String[1] $db_username, Optional[Stdlib::Port] $db_port = undef, Optional[Icingaweb2::Secret] $db_password = undef, - Optional[String] $db_charset = undef, + Optional[String[1]] $db_charset = undef, Optional[Boolean] $import_schema = undef, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/director", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Boolean] $use_tls = undef, Optional[Stdlib::Absolutepath] $tls_key_file = undef, Optional[Stdlib::Absolutepath] $tls_cert_file = undef, Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, Optional[Stdlib::Absolutepath] $tls_capath = undef, Optional[Icingaweb2::Secret] $tls_key = undef, - Optional[String] $tls_cert = undef, - Optional[String] $tls_cacert = undef, + Optional[String[1]] $tls_cert = undef, + Optional[String[1]] $tls_cacert = undef, Optional[Boolean] $tls_noverify = undef, - Optional[String] $tls_cipher = undef, - Optional[String] $endpoint = undef, - Optional[String] $api_username = undef, + Optional[String[1]] $tls_cipher = undef, + Optional[String[1]] $endpoint = undef, + Optional[String[1]] $api_username = undef, Optional[Icingaweb2::Secret] $api_password = undef, ) { require icingaweb2 diff --git a/manifests/module/elasticsearch.pp b/manifests/module/elasticsearch.pp index 50f6f20e..215c0ceb 100644 --- a/manifests/module/elasticsearch.pp +++ b/manifests/module/elasticsearch.pp @@ -53,9 +53,9 @@ Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, Enum['git', 'none', 'package'] $install_method, - String $package_name, + String[1] $package_name, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/elasticsearch", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Hash] $instances = undef, Optional[Hash] $eventtypes = undef, ) { diff --git a/manifests/module/elasticsearch/eventtype.pp b/manifests/module/elasticsearch/eventtype.pp index 83b5be9d..ba8be31c 100644 --- a/manifests/module/elasticsearch/eventtype.pp +++ b/manifests/module/elasticsearch/eventtype.pp @@ -21,11 +21,11 @@ # @api private # define icingaweb2::module::elasticsearch::eventtype ( - String $eventtype_name = $title, - Optional[String] $instance = undef, - Optional[String] $index = undef, - Optional[String] $filter = undef, - Optional[String] $fields = undef, + String[1] $eventtype_name = $title, + Optional[String[1]] $instance = undef, + Optional[String[1]] $index = undef, + Optional[String[1]] $filter = undef, + Optional[String[1]] $fields = undef, ) { assert_private("You're not supposed to use this defined type manually.") diff --git a/manifests/module/elasticsearch/instance.pp b/manifests/module/elasticsearch/instance.pp index 6dc14811..60773aa3 100644 --- a/manifests/module/elasticsearch/instance.pp +++ b/manifests/module/elasticsearch/instance.pp @@ -26,9 +26,9 @@ # @api private # define icingaweb2::module::elasticsearch::instance ( - String $instance_name = $title, - String $uri = undef, - Optional[String] $user = undef, + String[1] $instance_name = $title, + Optional[String[1]] $uri = undef, + Optional[String[1]] $user = undef, Optional[Icingaweb2::Secret] $password = undef, Optional[Stdlib::Absolutepath] $ca = undef, Optional[Stdlib::Absolutepath] $client_certificate = undef, diff --git a/manifests/module/fileshipper.pp b/manifests/module/fileshipper.pp index 06b2fa94..aa65214e 100644 --- a/manifests/module/fileshipper.pp +++ b/manifests/module/fileshipper.pp @@ -49,11 +49,11 @@ Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, Enum['git', 'none', 'package'] $install_method, - String $package_name, + String[1] $package_name, Hash $base_directories, Hash $directories, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/fileshipper", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { require icingaweb2 diff --git a/manifests/module/fileshipper/basedir.pp b/manifests/module/fileshipper/basedir.pp index 081eb50d..36dac7fd 100644 --- a/manifests/module/fileshipper/basedir.pp +++ b/manifests/module/fileshipper/basedir.pp @@ -10,7 +10,7 @@ # @api private # define icingaweb2::module::fileshipper::basedir ( - String $identifier = $title, + String[1] $identifier = $title, Optional[Stdlib::Absolutepath] $basedir = undef, ) { assert_private("You're not supposed to use this defined type manually.") diff --git a/manifests/module/fileshipper/directory.pp b/manifests/module/fileshipper/directory.pp index bd2b6663..40a3e318 100644 --- a/manifests/module/fileshipper/directory.pp +++ b/manifests/module/fileshipper/directory.pp @@ -16,10 +16,10 @@ # @api private # define icingaweb2::module::fileshipper::directory ( - String $identifier = $title, + String[1] $identifier = $title, Optional[Stdlib::Absolutepath] $source = undef, Optional[Stdlib::Absolutepath] $target = undef, - String $extensions = '.conf', + String[1] $extensions = '.conf', ) { assert_private("You're not supposed to use this defined type manually.") diff --git a/manifests/module/generictts.pp b/manifests/module/generictts.pp index bb020359..8b36ceb1 100644 --- a/manifests/module/generictts.pp +++ b/manifests/module/generictts.pp @@ -41,10 +41,10 @@ Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, Enum['git', 'none', 'package'] $install_method, - String $package_name, + String[1] $package_name, Hash $ticketsystems, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/generictts", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { require icingaweb2 diff --git a/manifests/module/generictts/ticketsystem.pp b/manifests/module/generictts/ticketsystem.pp index 503152bb..9d7fd4ba 100644 --- a/manifests/module/generictts/ticketsystem.pp +++ b/manifests/module/generictts/ticketsystem.pp @@ -13,8 +13,8 @@ # @api private # define icingaweb2::module::generictts::ticketsystem ( - String $ticketsystem = $title, - Optional[String] $pattern = undef, + String[1] $ticketsystem = $title, + Optional[String[1]] $pattern = undef, Optional[Stdlib::HTTPUrl] $url = undef, ) { assert_private("You're not supposed to use this defined type manually.") diff --git a/manifests/module/graphite.pp b/manifests/module/graphite.pp index c5f437b9..8f2849be 100644 --- a/manifests/module/graphite.pp +++ b/manifests/module/graphite.pp @@ -63,16 +63,16 @@ Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, Enum['git', 'none', 'package'] $install_method, - String $package_name, + String[1] $package_name, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/graphite", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Stdlib::HTTPUrl] $url = undef, Optional[Boolean] $insecure = undef, - Optional[String] $user = undef, + Optional[String[1]] $user = undef, Optional[Icingaweb2::Secret] $password = undef, - Optional[String] $graphite_writer_host_name_template = undef, - Optional[String] $graphite_writer_service_name_template = undef, - Optional[String] $customvar_obscured_check_command = undef, + Optional[String[1]] $graphite_writer_host_name_template = undef, + Optional[String[1]] $graphite_writer_service_name_template = undef, + Optional[String[1]] $customvar_obscured_check_command = undef, Optional[Enum[ 'minutes', 'hours', 'days', 'weeks', 'months', 'years' diff --git a/manifests/module/icingadb.pp b/manifests/module/icingadb.pp index d5ebf742..2599d40b 100644 --- a/manifests/module/icingadb.pp +++ b/manifests/module/icingadb.pp @@ -124,28 +124,28 @@ # class icingaweb2::module::icingadb ( Enum['absent', 'present'] $ensure, - String $package_name, + String[1] $package_name, Stdlib::Host $redis_host, - Hash[String, Hash] $commandtransports, - Hash[String, Any] $settings, + Hash[String[1], Hash] $commandtransports, + Hash[String[1], Any] $settings, Enum['mysql', 'pgsql'] $db_type, - String $db_resource_name, + String[1] $db_resource_name, Stdlib::Host $db_host, - String $db_name, - String $db_username, + String[1] $db_name, + String[1] $db_username, Optional[Stdlib::Port] $db_port = undef, Optional[Icingaweb2::Secret] $db_password = undef, - Optional[String] $db_charset = undef, + Optional[String[1]] $db_charset = undef, Optional[Boolean] $db_use_tls = undef, Optional[String] $db_tls_cert = undef, Optional[Icingaweb2::Secret] $db_tls_key = undef, - Optional[String] $db_tls_cacert = undef, + Optional[String[1]] $db_tls_cacert = undef, Optional[Stdlib::Absolutepath] $db_tls_cert_file = undef, Optional[Stdlib::Absolutepath] $db_tls_key_file = undef, Optional[Stdlib::Absolutepath] $db_tls_cacert_file = undef, Optional[Stdlib::Absolutepath] $db_tls_capath = undef, Optional[Boolean] $db_tls_noverify = undef, - Optional[String] $db_tls_cipher = undef, + Optional[String[1]] $db_tls_cipher = undef, Optional[Stdlib::Port] $redis_port = undef, Optional[Icingaweb2::Secret] $redis_password = undef, Stdlib::Host $redis_primary_host = $redis_host, @@ -155,9 +155,9 @@ Optional[Stdlib::Port] $redis_secondary_port = undef, Optional[Icingaweb2::Secret] $redis_secondary_password = undef, Optional[Boolean] $redis_use_tls = undef, - Optional[String] $redis_tls_cert = undef, + Optional[String[1]] $redis_tls_cert = undef, Optional[Icingaweb2::Secret] $redis_tls_key = undef, - Optional[String] $redis_tls_cacert = undef, + Optional[String[1]] $redis_tls_cacert = undef, Optional[Stdlib::Absolutepath] $redis_tls_cert_file = undef, Optional[Stdlib::Absolutepath] $redis_tls_key_file = undef, Optional[Stdlib::Absolutepath] $redis_tls_cacert_file = undef, diff --git a/manifests/module/icingadb/commandtransport.pp b/manifests/module/icingadb/commandtransport.pp index 8d5a4894..2fe9e6ac 100644 --- a/manifests/module/icingadb/commandtransport.pp +++ b/manifests/module/icingadb/commandtransport.pp @@ -19,9 +19,9 @@ # Password for the transport. # define icingaweb2::module::icingadb::commandtransport ( - String $username, + String[1] $username, Icingaweb2::Secret $password, - String $commandtransport = $title, + String[1] $commandtransport = $title, Stdlib::Host $host = 'localhost', Stdlib::Port $port = 5665, ) { diff --git a/manifests/module/idoreports.pp b/manifests/module/idoreports.pp index 480eb0fd..21b44e99 100644 --- a/manifests/module/idoreports.pp +++ b/manifests/module/idoreports.pp @@ -35,10 +35,10 @@ Enum['absent', 'present'] $ensure, Enum['git', 'none', 'package'] $install_method, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/idoreports", Optional[Icingaweb2::ImportSchema] $import_schema = undef, - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { unless defined(Class['icingaweb2::module::monitoring']) { fail('You must declare the icingaweb2::module::monitoring class before using icingaweb2::module::idoreports!') diff --git a/manifests/module/monitoring.pp b/manifests/module/monitoring.pp index e91892b3..77e99c85 100644 --- a/manifests/module/monitoring.pp +++ b/manifests/module/monitoring.pp @@ -95,28 +95,28 @@ # } # class icingaweb2::module::monitoring ( - Enum['absent', 'present'] $ensure, - Variant[String, Array[String]] $protected_customvars, - Hash $commandtransports, - Hash[String,Any] $settings, - Enum['mysql', 'pgsql'] $ido_type, - Stdlib::Host $ido_host, - String $ido_resource_name, - String $ido_db_name, - String $ido_db_username, - Optional[Stdlib::Port] $ido_port = undef, - Optional[Icingaweb2::Secret] $ido_db_password = undef, - Optional[String] $ido_db_charset = undef, - Optional[Boolean] $use_tls = undef, - Optional[Stdlib::Absolutepath] $tls_key_file = undef, - Optional[Stdlib::Absolutepath] $tls_cert_file = undef, - Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, - Optional[Stdlib::Absolutepath] $tls_capath = undef, - Optional[Icingaweb2::Secret] $tls_key = undef, - Optional[String] $tls_cert = undef, - Optional[String] $tls_cacert = undef, - Optional[Boolean] $tls_noverify = undef, - Optional[String] $tls_cipher = undef, + Enum['absent', 'present'] $ensure, + Variant[String[1], Array[String[1]]] $protected_customvars, + Hash $commandtransports, + Hash[String[1], Any] $settings, + Enum['mysql', 'pgsql'] $ido_type, + Stdlib::Host $ido_host, + String $ido_resource_name, + String $ido_db_name, + String $ido_db_username, + Optional[Stdlib::Port] $ido_port = undef, + Optional[Icingaweb2::Secret] $ido_db_password = undef, + Optional[String[1]] $ido_db_charset = undef, + Optional[Boolean] $use_tls = undef, + Optional[Stdlib::Absolutepath] $tls_key_file = undef, + Optional[Stdlib::Absolutepath] $tls_cert_file = undef, + Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, + Optional[Stdlib::Absolutepath] $tls_capath = undef, + Optional[Icingaweb2::Secret] $tls_key = undef, + Optional[String[1]] $tls_cert = undef, + Optional[String[1]] $tls_cacert = undef, + Optional[Boolean] $tls_noverify = undef, + Optional[String[1]] $tls_cipher = undef, ) { require icingaweb2 diff --git a/manifests/module/monitoring/commandtransport.pp b/manifests/module/monitoring/commandtransport.pp index 80e66671..a8a048de 100644 --- a/manifests/module/monitoring/commandtransport.pp +++ b/manifests/module/monitoring/commandtransport.pp @@ -25,11 +25,11 @@ # @api private # define icingaweb2::module::monitoring::commandtransport ( - String $commandtransport = $title, + String[1] $commandtransport = $title, Enum['api', 'local'] $transport = 'api', Stdlib::Host $host = 'localhost', Stdlib::Port $port = 5665, - Optional[String] $username = undef, + Optional[String[1]] $username = undef, Optional[Icingaweb2::Secret] $password = undef, Stdlib::Absolutepath $path = '/var/run/icinga2/cmd/icinga2.cmd', ) { diff --git a/manifests/module/pdfexport.pp b/manifests/module/pdfexport.pp index b2a53083..43b74a05 100644 --- a/manifests/module/pdfexport.pp +++ b/manifests/module/pdfexport.pp @@ -42,10 +42,10 @@ class icingaweb2::module::pdfexport ( Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Enum['git', 'none', 'package'] $install_method, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/pdfexport", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Stdlib::Absolutepath] $chrome_binary = undef, Optional[Boolean] $force_temp_storage = undef, Optional[Stdlib::Host] $remote_host = undef, diff --git a/manifests/module/puppetdb.pp b/manifests/module/puppetdb.pp index 75ac113d..741e3fb5 100644 --- a/manifests/module/puppetdb.pp +++ b/manifests/module/puppetdb.pp @@ -61,12 +61,12 @@ Enum['absent', 'present'] $ensure, Stdlib::HTTPUrl $git_repository, Enum['git', 'none', 'package'] $install_method, - String $package_name, + String[1] $package_name, Enum['none', 'puppet'] $ssl, Hash $certificates, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/puppetdb", Optional[Stdlib::Host] $host = undef, - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, ) { require icingaweb2 diff --git a/manifests/module/puppetdb/certificate.pp b/manifests/module/puppetdb/certificate.pp index fe117fa9..6dbf0297 100644 --- a/manifests/module/puppetdb/certificate.pp +++ b/manifests/module/puppetdb/certificate.pp @@ -21,8 +21,8 @@ # @api private # define icingaweb2::module::puppetdb::certificate ( - String $ssl_key, - String $ssl_cacert, + String[1] $ssl_key, + String[1] $ssl_cacert, Enum['absent', 'present'] $ensure = 'present', ) { assert_private("You're not supposed to use this defined type manually.") diff --git a/manifests/module/reporting.pp b/manifests/module/reporting.pp index a80fc4b2..ee1272d4 100644 --- a/manifests/module/reporting.pp +++ b/manifests/module/reporting.pp @@ -108,33 +108,33 @@ Enum['absent', 'present'] $ensure, Enum['git', 'none', 'package'] $install_method, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Boolean $manage_service, Stdlib::Ensure::Service $service_ensure, Boolean $service_enable, - String $service_user, + String[1] $service_user, Enum['mysql', 'pgsql'] $db_type, - String $db_resource_name, + String[1] $db_resource_name, Stdlib::Host $db_host, - String $db_name, - String $db_username, + String[1] $db_name, + String[1] $db_username, Optional[Stdlib::Port] $db_port = undef, Optional[Icingaweb2::Secret] $db_password = undef, - Optional[String] $db_charset = undef, + Optional[String[1]] $db_charset = undef, Optional[Icingaweb2::ImportSchema] $import_schema = undef, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/reporting", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Boolean] $use_tls = undef, Optional[Stdlib::Absolutepath] $tls_key_file = undef, Optional[Stdlib::Absolutepath] $tls_cert_file = undef, Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, Optional[Stdlib::Absolutepath] $tls_capath = undef, Optional[Icingaweb2::Secret] $tls_key = undef, - Optional[String] $tls_cert = undef, - Optional[String] $tls_cacert = undef, + Optional[String[1]] $tls_cert = undef, + Optional[String[1]] $tls_cacert = undef, Optional[Boolean] $tls_noverify = undef, - Optional[String] $tls_cipher = undef, - Optional[String] $mail = undef, + Optional[String[1]] $tls_cipher = undef, + Optional[String[1]] $mail = undef, ) { require icingaweb2 diff --git a/manifests/module/vspheredb.pp b/manifests/module/vspheredb.pp index a039366a..b93f440c 100644 --- a/manifests/module/vspheredb.pp +++ b/manifests/module/vspheredb.pp @@ -105,32 +105,32 @@ Enum['absent', 'present'] $ensure, Enum['git', 'none', 'package'] $install_method, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Boolean $manage_service, Stdlib::Ensure::Service $service_ensure, Boolean $service_enable, - String $service_user, + String[1] $service_user, Enum['mysql'] $db_type, - String $db_resource_name, + String[1] $db_resource_name, Stdlib::Host $db_host, - String $db_name, - String $db_username, + String[1] $db_name, + String[1] $db_username, Optional[Icingaweb2::Secret] $db_password = undef, Optional[Stdlib::Port] $db_port = undef, - Optional[String] $db_charset = undef, + Optional[String[1]] $db_charset = undef, Optional[Icingaweb2::ImportSchema] $import_schema = undef, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/vspheredb", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Boolean] $use_tls = undef, Optional[Stdlib::Absolutepath] $tls_key_file = undef, Optional[Stdlib::Absolutepath] $tls_cert_file = undef, Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, Optional[Stdlib::Absolutepath] $tls_capath = undef, Optional[Icingaweb2::Secret] $tls_key = undef, - Optional[String] $tls_cert = undef, - Optional[String] $tls_cacert = undef, + Optional[String[1]] $tls_cert = undef, + Optional[String[1]] $tls_cacert = undef, Optional[Boolean] $tls_noverify = undef, - Optional[String] $tls_cipher = undef, + Optional[String[1]] $tls_cipher = undef, ) { require icingaweb2 diff --git a/manifests/module/x509.pp b/manifests/module/x509.pp index a71c7327..61586357 100644 --- a/manifests/module/x509.pp +++ b/manifests/module/x509.pp @@ -105,32 +105,32 @@ Enum['absent', 'present'] $ensure, Enum['git', 'none', 'package'] $install_method, Stdlib::HTTPUrl $git_repository, - String $package_name, + String[1] $package_name, Boolean $manage_service, Stdlib::Ensure::Service $service_ensure, Boolean $service_enable, - String $service_user, + String[1] $service_user, Enum['mysql', 'pgsql'] $db_type, - String $db_resource_name, + String[1] $db_resource_name, Stdlib::Host $db_host, - String $db_name, - String $db_username, + String[1] $db_name, + String[1] $db_username, Optional[Icingaweb2::Secret] $db_password = undef, Optional[Stdlib::Port] $db_port = undef, - Optional[String] $db_charset = undef, + Optional[String[1]] $db_charset = undef, Optional[Icingaweb2::ImportSchema] $import_schema = undef, Stdlib::Absolutepath $module_dir = "${icingaweb2::globals::default_module_path}/x509", - Optional[String] $git_revision = undef, + Optional[String[1]] $git_revision = undef, Optional[Boolean] $use_tls = undef, Optional[Stdlib::Absolutepath] $tls_key_file = undef, Optional[Stdlib::Absolutepath] $tls_cert_file = undef, Optional[Stdlib::Absolutepath] $tls_cacert_file = undef, Optional[Stdlib::Absolutepath] $tls_capath = undef, Optional[Icingaweb2::Secret] $tls_key = undef, - Optional[String] $tls_cert = undef, - Optional[String] $tls_cacert = undef, + Optional[String[1]] $tls_cert = undef, + Optional[String[1]] $tls_cacert = undef, Optional[Boolean] $tls_noverify = undef, - Optional[String] $tls_cipher = undef, + Optional[String[1]] $tls_cipher = undef, ) { require icingaweb2 diff --git a/manifests/resource/database.pp b/manifests/resource/database.pp index 353762c4..f016053c 100644 --- a/manifests/resource/database.pp +++ b/manifests/resource/database.pp @@ -62,20 +62,20 @@ define icingaweb2::resource::database ( Enum['mysql', 'pgsql', 'mssql', 'oci', 'oracle', 'ibm', 'sqlite'] $type, - String $database, - String $resource_name = $title, + String[1] $database, + String[1] $resource_name = $title, Optional[Stdlib::Host] $host = undef, Optional[Stdlib::Port] $port = undef, - Optional[String] $username = undef, + Optional[String[1]] $username = undef, Optional[Icingaweb2::Secret] $password = undef, - Optional[String] $charset = undef, + Optional[String[1]] $charset = undef, Optional[Boolean] $use_tls = undef, Optional[Boolean] $tls_noverify = undef, Optional[Stdlib::Absolutepath] $tls_key = undef, Optional[Stdlib::Absolutepath] $tls_cert = undef, Optional[Stdlib::Absolutepath] $tls_cacert = undef, Optional[Stdlib::Absolutepath] $tls_capath = undef, - Optional[String] $tls_cipher = undef, + Optional[String[1]] $tls_cipher = undef, ) { $conf_dir = $icingaweb2::globals::conf_dir diff --git a/manifests/resource/ldap.pp b/manifests/resource/ldap.pp index 80de2618..79099706 100644 --- a/manifests/resource/ldap.pp +++ b/manifests/resource/ldap.pp @@ -37,11 +37,11 @@ # } # define icingaweb2::resource::ldap ( - String $resource_name = $title, - String $host = 'localhost', + String[1] $resource_name = $title, + String[1] $host = 'localhost', Optional[Stdlib::Port] $port = undef, - Optional[String] $root_dn = undef, - Optional[String] $bind_dn = undef, + Optional[String[1]] $root_dn = undef, + Optional[String[1]] $bind_dn = undef, Optional[Icingaweb2::Secret] $bind_pw = undef, Enum['none', 'starttls', 'ldaps'] $encryption = 'none', Integer $timeout = 5, diff --git a/types/adminrole.pp b/types/adminrole.pp index 401195bd..9f4695e8 100644 --- a/types/adminrole.pp +++ b/types/adminrole.pp @@ -1,6 +1,6 @@ # A strict type for the default admin role type Icingaweb2::AdminRole = Struct[{ name => String, - users => Optional[Array[String]], - groups => Optional[Array[String]], + users => Optional[Array[String[1]]], + groups => Optional[Array[String[1]]], }]