Merge branch 'main' into enhancement/ubuntu-24.04-support

voxpupuli · Aug 15, 2024 · afac5ab · afac5ab
2 parents 82dae04 + f9b9a12
commit afac5ab
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 60 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -135,7 +135,7 @@ Default value: `6380`
 
 ##### <a name="-icingadb--redis_password"></a>`redis_password`
 
-Data type: `Optional[Variant[String, Sensitive[String]]]`
+Data type: `Optional[Icinga::Secret]`
 
 Passwort to login into redis.
 
@@ -159,7 +159,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--redis_tls_cert"></a>`redis_tls_cert`
 
-Data type: `Optional[String]`
+Data type: `Optional[String[1]]`
 
 Client certificate in PEM format. Only valid if `redis_use_tls` is turned on.
 
@@ -175,7 +175,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--redis_tls_key"></a>`redis_tls_key`
 
-Data type: `Optional[Variant[String, Sensitive[String]]]`
+Data type: `Optional[Icinga::Secret]`
 
 Client private key in PEM format. Only valid if `redis_use_tls` is turned on.
 
@@ -191,7 +191,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--redis_tls_cacert"></a>`redis_tls_cacert`
 
-Data type: `Optional[String]`
+Data type: `Optional[String[1]]`
 
 CA root certificate in PEM format. Only valid if `redis_use_tls` is turned on.
 
@@ -231,23 +231,23 @@ Default value: `undef`
 
 ##### <a name="-icingadb--db_name"></a>`db_name`
 
-Data type: `String`
+Data type: `String[1]`
 
 The IcingaDB database.
 
 Default value: `'icingadb'`
 
 ##### <a name="-icingadb--db_username"></a>`db_username`
 
-Data type: `String`
+Data type: `String[1]`
 
 User that is used to connect the database.
 
 Default value: `'icingadb'`
 
 ##### <a name="-icingadb--db_password"></a>`db_password`
 
-Data type: `Variant[String, Sensitive[String]]`
+Data type: `Icinga::Secret`
 
 Passwort to login into database.
 
@@ -279,7 +279,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--db_tls_cert"></a>`db_tls_cert`
 
-Data type: `Optional[String]`
+Data type: `Optional[String[1]]`
 
 Client certificate in PEM format. Only valid if `db_use_tls` is turned on.
 
@@ -295,7 +295,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--db_tls_key"></a>`db_tls_key`
 
-Data type: `Optional[Variant[String, Sensitive[String]]]`
+Data type: `Optional[Icinga::Secret]`
 
 Client private key in PEM format. Only valid if `db_use_tls` is turned on.
 
@@ -311,7 +311,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--db_tls_cacert"></a>`db_tls_cacert`
 
-Data type: `Optional[String]`
+Data type: `Optional[String[1]]`
 
 CA root certificate in PEM format. Only valid if `db_use_tls` is turned on.
 
@@ -418,25 +418,25 @@ The following parameters are available in the `icingadb::globals` class:
 
 ##### <a name="-icingadb--globals--package_name"></a>`package_name`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
 ##### <a name="-icingadb--globals--service_name"></a>`service_name`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
 ##### <a name="-icingadb--globals--user"></a>`user`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
 ##### <a name="-icingadb--globals--group"></a>`group`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
@@ -579,7 +579,7 @@ Default value: `true`
 
 ##### <a name="-icingadb--redis--requirepass"></a>`requirepass`
 
-Data type: `Optional[Variant[String, Sensitive[String]]]`
+Data type: `Optional[Icinga::Secret]`
 
 Require clients to issue AUTH <PASSWORD> before processing
 any other commands.
@@ -604,23 +604,23 @@ Default value: `6381`
 
 ##### <a name="-icingadb--redis--tls_cert"></a>`tls_cert`
 
-Data type: `Optional[String]`
+Data type: `Optional[String[1]]`
 
 Certificate in PEM format. Only valid if `use_tls` is turned on.
 
 Default value: `undef`
 
 ##### <a name="-icingadb--redis--tls_key"></a>`tls_key`
 
-Data type: `Optional[Variant[String, Sensitive[String]]]`
+Data type: `Optional[Icinga::Secret]`
 
 Private key in PEM format. Only valid if `use_tls` is turned on.
 
 Default value: `undef`
 
 ##### <a name="-icingadb--redis--tls_cacert"></a>`tls_cacert`
 
-Data type: `Optional[String]`
+Data type: `Optional[String[1]]`
 
 The CA root certificate in PEM format. Only valid if `use_tls` is turned on.
 
@@ -661,7 +661,7 @@ Default value: `undef`
 
 ##### <a name="-icingadb--redis--config"></a>`config`
 
-Data type: `Hash[String, Any]`
+Data type: `Hash[String[1], Any]`
 
 Other parameters that can be set, see redis::instance.
 
@@ -687,25 +687,25 @@ The following parameters are available in the `icingadb::redis::globals` class:
 
 ##### <a name="-icingadb--redis--globals--package_name"></a>`package_name`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
 ##### <a name="-icingadb--redis--globals--service_name"></a>`service_name`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
 ##### <a name="-icingadb--redis--globals--user"></a>`user`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 
 ##### <a name="-icingadb--redis--globals--group"></a>`group`
 
-Data type: `String`
+Data type: `String[1]`
 
 
 

diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -16,10 +16,10 @@
 # @param pgsql_db_schema
 #
 class icingadb::globals (
-  String               $package_name,
-  String               $service_name,
-  String               $user,
-  String               $group,
+  String[1]            $package_name,
+  String[1]            $service_name,
+  String[1]            $user,
+  String[1]            $group,
   Stdlib::Absolutepath $conf_dir,
   Stdlib::Absolutepath $mysql_db_schema,
   Stdlib::Absolutepath $pgsql_db_schema,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -126,33 +126,33 @@
 #   that has been configured in `retention_history_data`.
 #
 class icingadb (
-  Variant[String, Sensitive[String]]             $db_password,
+  Icinga::Secret                                 $db_password,
   Enum['running', 'stopped']                     $ensure                 = 'running',
   Boolean                                        $enable                 = true,
   Boolean                                        $manage_repos           = false,
   Boolean                                        $manage_packages        = true,
   Enum['mysql','pgsql']                          $db_type                = 'mysql',
   Stdlib::Host                                   $db_host                = 'localhost',
   Optional[Stdlib::Port]                         $db_port                = undef,
-  String                                         $db_name                = 'icingadb',
-  String                                         $db_username            = 'icingadb',
+  String[1]                                      $db_name                = 'icingadb',
+  String[1]                                      $db_username            = 'icingadb',
   Variant[Boolean, Enum['mariadb', 'mysql']]     $import_schema          = false,
   Optional[Boolean]                              $db_use_tls             = undef,
   Optional[Boolean]                              $db_tls_insecure        = undef,
-  Optional[String]                               $db_tls_cert            = undef,
-  Optional[Variant[String, Sensitive[String]]]   $db_tls_key             = undef,
-  Optional[String]                               $db_tls_cacert          = undef,
+  Optional[String[1]]                            $db_tls_cert            = undef,
+  Optional[Icinga::Secret]                       $db_tls_key             = 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,
   Stdlib::Host                                   $redis_host             = 'localhost',
   Stdlib::Port                                   $redis_port             = 6380,
-  Optional[Variant[String, Sensitive[String]]]   $redis_password         = undef,
+  Optional[Icinga::Secret]                       $redis_password         = undef,
   Optional[Boolean]                              $redis_use_tls          = undef,
   Optional[Boolean]                              $redis_tls_insecure     = undef,
-  Optional[String]                               $redis_tls_cert         = undef,
-  Optional[Variant[String, Sensitive[String]]]   $redis_tls_key          = undef,
-  Optional[String]                               $redis_tls_cacert       = undef,
+  Optional[String[1]]                            $redis_tls_cert         = undef,
+  Optional[Icinga::Secret]                       $redis_tls_key          = 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/redis.pp b/manifests/redis.pp
@@ -99,17 +99,17 @@
   Boolean                                      $manage_packages  = true,
   Variant[Stdlib::Host,Array[Stdlib::Host]]    $bind             = ['127.0.0.1', '::1'],
   Stdlib::Port                                 $port             = 6380,
-  Optional[Variant[String, Sensitive[String]]] $requirepass      = undef,
+  Optional[Icinga::Secret]                     $requirepass      = undef,
   Optional[Boolean]                            $use_tls          = undef,
   Stdlib::Port                                 $tls_port         = 6381,
-  Optional[String]                             $tls_cert         = undef,
-  Optional[Variant[String, Sensitive[String]]] $tls_key          = undef,
-  Optional[String]                             $tls_cacert       = undef,
+  Optional[String[1]]                          $tls_cert         = undef,
+  Optional[Icinga::Secret]                     $tls_key          = undef,
+  Optional[String[1]]                          $tls_cacert       = undef,
   Optional[Stdlib::Absolutepath]               $tls_cert_file    = undef,
   Optional[Stdlib::Absolutepath]               $tls_key_file     = undef,
   Optional[Stdlib::Absolutepath]               $tls_cacert_file  = undef,
   Optional[Enum['yes', 'no', 'optional']]      $tls_auth_clients = undef,
-  Hash[String, Any]                            $config           = {},
+  Hash[String[1], Any]                         $config           = {},
 ) {
   require icingadb::redis::globals
 

diff --git a/manifests/redis/globals.pp b/manifests/redis/globals.pp
@@ -20,10 +20,10 @@
 # @param log_dir
 #
 class icingadb::redis::globals (
-  String               $package_name,
-  String               $service_name,
-  String               $user,
-  String               $group,
+  String[1]            $package_name,
+  String[1]            $service_name,
+  String[1]            $user,
+  String[1]            $group,
   Stdlib::Absolutepath $redis_bin,
   Stdlib::Absolutepath $conf_dir,
   Stdlib::Absolutepath $work_dir,

diff --git a/metadata.json b/metadata.json
@@ -14,44 +14,34 @@
     },
     {
       "name": "icinga/icinga",
-      "version_requirement": ">= 2.9.0 < 6.0.0"
+      "version_requirement": ">= 3.0.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]
@@ -67,9 +57,8 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "35",
-        "36",
-        "37"
+        "39",
+        "40"
       ]
     }
   ],