fix #500 ido-pgsql db import fails on debian

voxpupuli · Nov 23, 2018 · 729261b · 729261b
1 parent 0e21436
commit 729261b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/files/debconf.cfg b/files/debconf.cfg
@@ -0,0 +1,5 @@
+icinga2-ido-pgsql	icinga2-ido-pgsql/dbconfig-install	boolean	false
+icinga2-ido-pgsql	icinga2-ido-pgsql/enable		boolean	false
+icinga2-ido-mysql	icinga2-ido-mysql/dbconfig-install	boolean	false
+icinga2-ido-mysql	icinga2-ido-mysql/enable		boolean	false
+
diff --git a/manifests/feature/idopgsql.pp b/manifests/feature/idopgsql.pp
@@ -135,6 +135,7 @@
   if $ido_pgsql_package and $manage_package {
     package { $ido_pgsql_package:
       ensure => installed,
+      responsefile => '/var/cache/debconf/icinga2.cfg',
       before => Icinga2::Feature['ido-pgsql'],
     }
     -> class { '::icinga2::debian::dbconfig':

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -25,7 +25,18 @@
   $repositoryd    = $::icinga2::repositoryd
 
   if $manage_package {
-    if $::osfamily == 'windows' { Package { provider => chocolatey, } }
+    case $::osfamily {
+      'debian': {
+        file { '/var/cache/debconf/icinga2.cfg':
+          ensure => file,
+          source => 'puppet:///modules/icinga2/debconf.cfg',
+        }
+        Package { responsefile => '/var/cache/debconf/icinga2.cfg', }
+      } # Debian
+      'windows': {
+        Package { provider => chocolatey, }
+      } # Windows
+    }
 
     package { $package:
       ensure => installed,