fix merge conflicts

Lennart Betz · Lennart Betz · commit f834deef3c83 · 2024-04-27T10:27:21.000+02:00
diff --git a/examples/director-mysql.pp b/examples/director-mysql.pp
@@ -17,7 +17,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/director-pgsql.pp b/examples/director-pgsql.pp
@@ -15,7 +15,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/examples/icingadb-mysql.pp b/examples/icingadb-mysql.pp
@@ -14,7 +14,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/icingadb-pgsql.pp b/examples/icingadb-pgsql.pp
@@ -25,7 +25,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/examples/icingaweb2-mysql.pp b/examples/icingaweb2-mysql.pp
@@ -14,7 +14,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/icingaweb2-pgsql.pp b/examples/icingaweb2-pgsql.pp
@@ -25,7 +25,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/examples/idoreports-mysql.pp b/examples/idoreports-mysql.pp
@@ -29,7 +29,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/idoreports-pgsql.pp b/examples/idoreports-pgsql.pp
@@ -27,7 +27,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/examples/monitoring-mysql.pp b/examples/monitoring-mysql.pp
@@ -14,7 +14,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/monitoring-pgsql.pp b/examples/monitoring-pgsql.pp
@@ -25,7 +25,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/examples/reporting-mysql.pp b/examples/reporting-mysql.pp
@@ -29,7 +29,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/reporting-pgsql.pp b/examples/reporting-pgsql.pp
@@ -27,7 +27,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/examples/x509-mysql.pp b/examples/x509-mysql.pp
@@ -14,7 +14,6 @@
   db_type                => 'mysql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Mysql::Db['icingaweb2'],
diff --git a/examples/x509-pgsql.pp b/examples/x509-pgsql.pp
@@ -12,7 +12,6 @@
   db_type                => 'pgsql',
   db_password            => $db_password,
   import_schema          => true,
-  config_backend         => 'db',
   default_admin_username => 'icingaadmin',
   default_admin_password => 'icinga',
   require                => Postgresql::Server::Db['icingaweb2'],
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
