Merge pull request #890 from voxpupuli/more-5.4-cleanup

remove more Zabbix 5.4 special cases now that it's unsupported
voxpupuli · Oct 4, 2023 · 23a8236 · 23a8236
2 parents ed069e9 + 31a1f8a
commit 23a8236
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/manifests/database/mysql.pp b/manifests/database/mysql.pp
@@ -26,8 +26,6 @@
   if ($database_schema_path == false) or ($database_schema_path == '') {
     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
@@ -27,16 +27,12 @@
     if member(['CentOS', 'RedHat', 'OracleLinux', 'VirtuozzoLinux'], $facts['os']['name']) {
       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, '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/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
@@ -29,8 +29,6 @@
         # path to sql files on Debian and RedHat
         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*'
                end

diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
@@ -25,17 +25,13 @@
                  # Path on RedHat
                  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, '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'
                  end