fix #500 ido-pgsql db import fails on debian

Icinga · Nov 29, 2018 · db192f3 · db192f3
1 parent 0e21436
commit db192f3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 99 deletions.
diff --git a/manifests/debian/dbconfig.pp b/manifests/debian/dbconfig.pp
diff --git a/manifests/feature/idomysql.pp b/manifests/feature/idomysql.pp
@@ -316,18 +316,20 @@
 
   # install additional package
   if $ido_mysql_package and $manage_package {
+    if $::osfamily == 'debian' {
+      ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory } })
+      file { "/etc/dbconfig-common/${ido_mysql_package}.conf":
+        ensure  => file,
+        content => "dbc_install='false'\ndbc_upgrade='false'\ndbc_remove='false'\n",
+        mode    => '0600',
+        before  => Package[$ido_mysql_package],
+      }
+    } # Debian
+
     package { $ido_mysql_package:
       ensure => installed,
       before => Icinga2::Feature['ido-mysql'],
     }
-    -> class { '::icinga2::debian::dbconfig':
-      dbtype   => 'mysql',
-      dbserver => $host,
-      dbport   => $port,
-      dbname   => $database,
-      dbuser   => $user,
-      dbpass   => $password,
-    }
   }
 
   # import db schema

diff --git a/manifests/feature/idopgsql.pp b/manifests/feature/idopgsql.pp
@@ -133,18 +133,20 @@
 
   # install additional package
   if $ido_pgsql_package and $manage_package {
+    if $::osfamily == 'debian' {
+      ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory } })
+      file { "/etc/dbconfig-common/${ido_pgsql_package}.conf":
+        ensure  => file,
+        content => "dbc_install='false'\ndbc_upgrade='false'\ndbc_remove='false'\n",
+        mode    => '0600',
+        before  => Package[$ido_pgsql_package],
+      }
+    } # Debian
+
     package { $ido_pgsql_package:
       ensure => installed,
       before => Icinga2::Feature['ido-pgsql'],
     }
-    -> class { '::icinga2::debian::dbconfig':
-      dbtype   => 'pgsql',
-      dbserver => $host,
-      dbport   => $port,
-      dbname   => $database,
-      dbuser   => $user,
-      dbpass   => $password,
-    }
   }
 
   # import db schema