Merge pull request #604 from Icinga/debian10-support

Debian10 support

manifests/feature/idomysql.pp

@@ -297,10 +297,12 @@
   # install additional package
   if $ido_mysql_package_name and $manage_package {
     if $::osfamily == 'debian' {
-      ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory } })
+      ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory, owner => 'root', group => 'root' } })
       file { "/etc/dbconfig-common/${ido_mysql_package_name}.conf":
         ensure  => file,
         content => "dbc_install='false'\ndbc_upgrade='false'\ndbc_remove='false'\n",
+        owner   => 'root',
+        group   => 'root',
         mode    => '0600',
         before  => Package[$ido_mysql_package_name],
       }

manifests/feature/idopgsql.pp

@@ -119,10 +119,12 @@
   # install additional package
   if $ido_pgsql_package_name and $manage_package {
     if $::osfamily == 'debian' {
-      ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory } })
+      ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory, owner => 'root', group => 'root' } })
       file { "/etc/dbconfig-common/${ido_pgsql_package_name}.conf":
         ensure  => file,
         content => "dbc_install='false'\ndbc_upgrade='false'\ndbc_remove='false'\n",
+        owner   => 'root',
+        group   => 'root',
         mode    => '0600',
         before  => Package[$ido_pgsql_package_name],
       }

metadata.json

@@ -65,7 +65,8 @@
       "operatingsystemrelease": [
         "7",
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {

spec/acceptance/nodesets/debian-buster-amd.yml

@@ -0,0 +1,12 @@
+---
+HOSTS:
+  i2debian10:
+    roles:
+      - agent
+      - default
+    platform: debian-buster-amd
+    hypervisor: vagrant
+    box: bento/debian-10
+    vagrant_memsize: 1024
+CONFIG:
+  type: aio

spec/acceptance/nodesets/debian-stretch-amd.yml

@@ -0,0 +1,12 @@
+---
+HOSTS:
+  i2debian9:
+    roles:
+      - agent
+      - default
+    platform: debian-stretch-amd
+    hypervisor: vagrant
+    box: bento/debian-9
+    vagrant_memsize: 1024
+CONFIG:
+  type: aio

spec/classes/idomysql_spec.rb

@@ -69,6 +69,15 @@
           it { is_expected.to contain_package('icinga2-ido-mysql').with({ 'ensure' => 'installed' }) }
         end
 
+        if facts[:osfamily] == 'Debian'
+          it { is_expected.to contain_file('/etc/dbconfig-common/icinga2-ido-mysql.conf')
+            .with({
+              'ensure' => 'file',
+              'owner'  => 'root',
+              'group'  => 'root', })
+          }
+        end
+
         it { is_expected.to contain_icinga2__feature('ido-mysql').with({'ensure' => 'present'}) }
 
         it { is_expected.to contain_icinga2__object('icinga2::object::IdoMysqlConnection::ido-mysql')

spec/classes/idopgsql_spec.rb

@@ -56,6 +56,15 @@
           it { is_expected.to contain_package('icinga2-ido-pgsql').with({ 'ensure' => 'installed' }) }
         end
 
+        if facts[:osfamily] == 'Debian'
+          it { is_expected.to contain_file('/etc/dbconfig-common/icinga2-ido-pgsql.conf')
+            .with({
+              'ensure' => 'file',
+              'owner'  => 'root',
+              'group'  => 'root', })
+          }
+        end
+
         it { is_expected.to contain_icinga2__feature('ido-pgsql').with({'ensure' => 'present'}) }
 
         it { is_expected.to contain_concat__fragment('icinga2::object::IdoPgsqlConnection::ido-pgsql')