Merge pull request #850 from teluq-pbrideau/fix/db-schema

New path for database schema
voxpupuli · Nov 29, 2022 · feb57e9 · feb57e9
2 parents a122643 + 34f3bf6
commit feb57e9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/manifests/database/mysql.pp b/manifests/database/mysql.pp
@@ -24,7 +24,9 @@
   assert_private()
 
   if ($database_schema_path == false) or ($database_schema_path == '') {
-    if versioncmp($zabbix_version, '5.4') >= 0 {
+    if versioncmp($zabbix_version, '6.0') >= 0 {
+      $schema_path = '/usr/share/zabbix-sql-scripts/mysql/'
+    } elsif versioncmp($zabbix_version, '5.4') >= 0 {
       $schema_path = '/usr/share/doc/zabbix-sql-scripts/mysql/'
     } else {
       $schema_path = '/usr/share/doc/zabbix-*-mysql*'

diff --git a/manifests/database/postgresql.pp b/manifests/database/postgresql.pp
@@ -25,13 +25,17 @@
 
   if ($database_schema_path == false) or ($database_schema_path == '') {
     if member(['CentOS', 'RedHat', 'OracleLinux', 'VirtuozzoLinux'], $facts['os']['name']) {
-      if versioncmp($zabbix_version, '5.4') >= 0 {
+      if versioncmp($zabbix_version, '6.0') >= 0 {
+        $schema_path = '/usr/share/zabbix-sql-scripts/postgresql/'
+      } elsif versioncmp($zabbix_version, '5.4') >= 0 {
         $schema_path = '/usr/share/doc/zabbix-sql-scripts/postgresql/'
       } else {
         $schema_path = "/usr/share/doc/zabbix-*-pgsql-${zabbix_version}*/"
       }
     } else {
-      if versioncmp($zabbix_version, '5.4') >= 0 {
+      if versioncmp($zabbix_version, '6.0') >= 0 {
+        $schema_path = '/usr/share/zabbix-sql-scripts/postgresql/'
+      } elsif versioncmp($zabbix_version, '5.4') >= 0 {
         $schema_path = '/usr/share/doc/zabbix-sql-scripts/postgresql/'
       } else {
         $schema_path = '/usr/share/doc/zabbix-*-pgsql'

diff --git a/manifests/web.pp b/manifests/web.pp
@@ -407,25 +407,25 @@
       add_listen      => true,
       directories     => [
         merge(
-          merge( {
+          merge({
               path     => '/usr/share/zabbix',
               provider => 'directory',
           }, $directory_allow),
           $fcgi_filematch
         ),
-        merge( {
+        merge({
             path     => '/usr/share/zabbix/conf',
             provider => 'directory',
         }, $directory_deny),
-        merge( {
+        merge({
             path     => '/usr/share/zabbix/api',
             provider => 'directory',
         }, $directory_deny),
-        merge( {
+        merge({
             path     => '/usr/share/zabbix/include',
             provider => 'directory',
         }, $directory_deny),
-        merge( {
+        merge({
             path     => '/usr/share/zabbix/include/classes',
             provider => 'directory',
         }, $directory_deny),

diff --git a/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
@@ -27,7 +27,9 @@
 
       supported_versions.each do |zabbix_version|
         # path to sql files on Debian and RedHat
-        path = if Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
+        path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                 '/usr/share/zabbix-sql-scripts/mysql/'
+               elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
                  '/usr/share/doc/zabbix-sql-scripts/mysql/'
                else
                  '/usr/share/doc/zabbix-*-mysql*'

diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
@@ -23,14 +23,18 @@
         path = case facts[:os]['name']
                when 'CentOS', 'RedHat', 'OracleLinux', 'VirtuozzoLinux'
                  # Path on RedHat
-                 if Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
+                 if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                   '/usr/share/zabbix-sql-scripts/postgresql/'
+                 elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
                    '/usr/share/doc/zabbix-sql-scripts/postgresql/'
                  else
                    "/usr/share/doc/zabbix-*-pgsql-#{zabbix_version}*/"
                  end
                else
                  # Path on Debian
-                 if Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
+                 if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                   '/usr/share/zabbix-sql-scripts/postgresql/'
+                 elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
                    '/usr/share/doc/zabbix-sql-scripts/postgresql/'
                  else
                    '/usr/share/doc/zabbix-*-pgsql'