remove more Zabbix 5.4 special cases now that it's unsupported

voxpupuli · Oct 4, 2023 · d6d969e · d6d969e
1 parent ed069e9
commit d6d969e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 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'
       }