Merge pull request #401 from Icinga/release/v5.0.0

Release/v5.0.0

Author: Lennart Betz

REFERENCE.md

@@ -77,13 +77,9 @@ that store groups.
 * `icingaweb2::module::icingadb::commandtransport`: Manages commandtransport configuration for the icingadb module.
 * `icingaweb2::module::monitoring::commandtransport`: Manages commandtransport configuration for the monitoring module.
 * `icingaweb2::module::puppetdb::certificate`: Installs a certificate for the Icinga Web 2 puppetdb module.
-* `icingaweb2::tls::client`: A class to generate tls key, cert and cacert paths.
 
 ### Functions
 
-* [`icingaweb2::cert::files`](#icingaweb2--cert--files): Choose the path of tls key, cert and ca file.
-* [`icingaweb2::db::connect`](#icingaweb2--db--connect): This function returns a string to connect databases
-with or without TLS information.
 * [`icingaweb2::pick`](#icingaweb2--pick): This function returns first parameter if set.
 * [`icingaweb2::unwrap`](#icingaweb2--unwrap): This function returns an unwrap string if necessary.
 
@@ -4387,115 +4383,6 @@ Default value: `5`
 
 ## Functions
 
-### <a name="icingaweb2--cert--files"></a>`icingaweb2::cert::files`
-
-Type: Puppet Language
-
-Choose the path of tls key, cert and ca file.
-
-#### `icingaweb2::cert::files(String $name, Optional[Stdlib::Absolutepath] $default_dir, Optional[Stdlib::Absolutepath] $key_file = undef, Optional[Stdlib::Absolutepath] $cert_file = undef, Optional[Stdlib::Absolutepath] $cacert_file = undef, Optional[Icingaweb2::Secret] $key = undef, Optional[String] $cert = undef, Optional[String] $cacert = undef)`
-
-The icingaweb2::cert::files function.
-
-Returns: `Hash` Returned hash includes all paths and the key, cert and cacert.
-
-##### `name`
-
-Data type: `String`
-
-
-
-##### `default_dir`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `key_file`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `cert_file`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `cacert_file`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `key`
-
-Data type: `Optional[Icingaweb2::Secret]`
-
-
-
-##### `cert`
-
-Data type: `Optional[String]`
-
-
-
-##### `cacert`
-
-Data type: `Optional[String]`
-
-
-
-### <a name="icingaweb2--db--connect"></a>`icingaweb2::db::connect`
-
-Type: Puppet Language
-
-This function returns a string to connect databases
-with or without TLS information.
-
-#### `icingaweb2::db::connect(Struct[{
-      type => Enum['pgsql','mysql','mariadb'],
-      host => Stdlib::Host,
-      port => Stdlib::Port,
-      name => String,
-      user => String,
-      pass => Optional[Icingaweb2::Secret],
-  }] $db, Hash[String, Any] $tls, Optional[Boolean] $use_tls = undef)`
-
-The icingaweb2::db::connect function.
-
-Returns: `String` Connection string to connect database.
-
-##### `db`
-
-Data type:
-
-```puppet
-Struct[{
-      type => Enum['pgsql','mysql','mariadb'],
-      host => Stdlib::Host,
-      port => Stdlib::Port,
-      name => String,
-      user => String,
-      pass => Optional[Icingaweb2::Secret],
-  }]
-```
-
-
-
-##### `tls`
-
-Data type: `Hash[String, Any]`
-
-
-
-##### `use_tls`
-
-Data type: `Optional[Boolean]`
-
-
-
 ### <a name="icingaweb2--pick"></a>`icingaweb2::pick`
 
 Type: Puppet Language

functions/cert/files.pp

@@ -35,7 +35,7 @@
   $default_domain       = $icingaweb2::default_domain
   $admin_role           = $icingaweb2::admin_role
   $admin_username       = $icingaweb2::default_admin_username
-  $admin_password       = icingaweb2::unwrap($icingaweb2::default_admin_password)
+  $admin_password       = unwrap($icingaweb2::default_admin_password)
 
   $use_tls              = $icingaweb2::use_tls
   $tls                  = $icingaweb2::tls + {
@@ -194,7 +194,7 @@
         }
       }
       'pgsql': {
-        $_db_password = icingaweb2::unwrap($db['password'])
+        $_db_password = unwrap($db['password'])
 
         exec { 'import schema':
           environment => ["PGPASSWORD=${_db_password}"],

functions/db/connect.pp

@@ -72,24 +72,6 @@
     'absent'
   }
 
-  file {
-    default:
-      owner => $conf_user,
-      group => $conf_group,
-      ;
-    "${conf_dir}/enabledModules/${module}":
-      ensure => $enable_module,
-      target => $module_dir,
-      ;
-    ["${conf_dir}/modules/${module}", "${state_dir}/${module}"]:
-      ensure => directory,
-      owner  => 'root',
-      mode   => '2770',
-      ;
-  }
-
-  create_resources('icingaweb2::inisection', $settings)
-
   case $install_method {
     'none': {}
     'git': {
@@ -109,4 +91,22 @@
       fail('The installation method you provided is not supported.')
     }
   }
+
+  file {
+    default:
+      owner => $conf_user,
+      group => $conf_group,
+      ;
+    "${conf_dir}/enabledModules/${module}":
+      ensure => $enable_module,
+      target => $module_dir,
+      ;
+    ["${conf_dir}/modules/${module}", "${state_dir}/${module}"]:
+      ensure => directory,
+      owner  => 'root',
+      mode   => '2770',
+      ;
+  }
+
+  create_resources('icingaweb2::inisection', $settings)
 }

manifests/config.pp

@@ -209,7 +209,7 @@
           'host'       => $api_host,
           'port'       => $api_port,
           'username'   => $api_username,
-          'password'   => icingaweb2::unwrap($api_password),
+          'password'   => unwrap($api_password),
         },
       },
     }

manifests/module.pp

@@ -42,7 +42,7 @@
   $instance_settings = {
     'uri'                => $uri,
     'user'               => $user,
-    'password'           => icingaweb2::unwrap($password),
+    'password'           => unwrap($password),
     'ca'                 => $ca,
     'client_certificate' => $client_certificate,
     'client_private_key' => $client_private_key,

manifests/module/director.pp

@@ -88,7 +88,7 @@
   $graphite_settings = {
     'url'      => $url,
     'user'     => $user,
-    'password' => icingaweb2::unwrap($password),
+    'password' => unwrap($password),
     'insecure' => $insecure,
   }
 

manifests/module/elasticsearch/instance.pp

@@ -33,7 +33,7 @@
     host      => $host,
     port      => $port,
     username  => $username,
-    password  => icingaweb2::unwrap($password),
+    password  => unwrap($password),
   }
 
   icingaweb2::inisection { "icingadb-commandtransport-${commandtransport}":