Move debconf item names to titles

1 files changed, 16 insertions, 24 deletions

diff --git a/sitemodules/profiles/manifests/icinga2_master.pp b/sitemodules/profiles/manifests/icinga2_master.pp
index fa5fbfa..1825e58 100644
--- a/sitemodules/profiles/manifests/icinga2_master.pp
+++ b/sitemodules/profiles/manifests/icinga2_master.pp
@@ -42,58 +42,50 @@ class profiles::icinga2_master (
   String $web2_database_password,
   String $icinga2_ticket_salt,
 ) {
-  debconf { 'icinga2-ido-pgsql-password':
+  debconf { 'icinga2-ido-pgsql/pgsql/app-pass':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/pgsql/app-pass',
     type    => 'password',
     value   => $ido_database_password,
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-password-confirm':
+  debconf { 'icinga2-ido-pgsql/app-password-confirm':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/app-password-confirm',
     type    => 'password',
     value   => $ido_database_password,
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-host':
+  debconf { 'icinga2-ido-pgsql/remote/host':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/remote/host',
     value   => 'localhost',
     type    => 'string',
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-dbname':
+  debconf { 'icinga2-ido-pgsql/db/dbname':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/db/dbname',
     value   => $ido_database_name,
     type    => 'string',
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-dbuser':
+  debconf { 'icinga2-ido-pgsql/db/app-user':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/db/app-user',
     value   => "${ido_database_user}@localhost",
     type    => 'string',
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-enable':
+  debconf { 'icinga2-ido-pgsql/enable':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/enable',
     type    => 'boolean',
     value   => 'true', # lint:ignore:quoted_booleans
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-dbconfig-reinstall':
+  debconf { 'icinga2-ido-pgsql/dbconfig-reinstall':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/dbconfig-reinstall',
     type    => 'boolean',
     value   => 'false', # lint:ignore:quoted_booleans
     seen    => true,
   }
-  debconf { 'icinga2-ido-pgsql-dbconfig-install':
+  debconf { 'icinga2-ido-pgsql/dbconfig-install':
     package => 'icinga2-ido-pgsql',
-    item    => 'icinga2-ido-pgsql/dbconfig-install',
     type    => 'boolean',
     value   => 'true', # lint:ignore:quoted_booleans
     seen    => true,
@@ -101,14 +93,14 @@ class profiles::icinga2_master (
   package { ['icinga2', 'icinga2-ido-pgsql']:
     ensure  => installed,
     require => [
-      Debconf['icinga2-ido-pgsql-password'],
-      Debconf['icinga2-ido-pgsql-password-confirm'],
-      Debconf['icinga2-ido-pgsql-host'],
-      Debconf['icinga2-ido-pgsql-dbname'],
-      Debconf['icinga2-ido-pgsql-dbuser'],
-      Debconf['icinga2-ido-pgsql-enable'],
-      Debconf['icinga2-ido-pgsql-dbconfig-install'],
-      Debconf['icinga2-ido-pgsql-dbconfig-reinstall'],
+      Debconf['icinga2-ido-pgsql/pgsql/app-pass'],
+      Debconf['icinga2-ido-pgsql/app-password-confirm'],
+      Debconf['icinga2-ido-pgsql/remote/host'],
+      Debconf['icinga2-ido-pgsql/db/dbname'],
+      Debconf['icinga2-ido-pgsql/db/app-user'],
+      Debconf['icinga2-ido-pgsql/enable'],
+      Debconf['icinga2-ido-pgsql/dbconfig-reinstall'],
+      Debconf['icinga2-ido-pgsql/dbconfig-install'],
     ],
   }
 }