Skip to content

Commit 31a1f8a

Browse files
committed
remove more Zabbix 5.4 special cases now that it's unsupported
1 parent ed069e9 commit 31a1f8a

File tree

4 files changed

+0
-12
lines changed

4 files changed

+0
-12
lines changed

manifests/database/mysql.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
if ($database_schema_path == false) or ($database_schema_path == '') {
2727
if versioncmp($zabbix_version, '6.0') >= 0 {
2828
$schema_path = '/usr/share/zabbix-sql-scripts/mysql/'
29-
} elsif versioncmp($zabbix_version, '5.4') >= 0 {
30-
$schema_path = '/usr/share/doc/zabbix-sql-scripts/mysql/'
3129
} else {
3230
$schema_path = '/usr/share/doc/zabbix-*-mysql*'
3331
}

manifests/database/postgresql.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,12 @@
2727
if member(['CentOS', 'RedHat', 'OracleLinux', 'VirtuozzoLinux'], $facts['os']['name']) {
2828
if versioncmp($zabbix_version, '6.0') >= 0 {
2929
$schema_path = '/usr/share/zabbix-sql-scripts/postgresql/'
30-
} elsif versioncmp($zabbix_version, '5.4') >= 0 {
31-
$schema_path = '/usr/share/doc/zabbix-sql-scripts/postgresql/'
3230
} else {
3331
$schema_path = "/usr/share/doc/zabbix-*-pgsql-${zabbix_version}*/"
3432
}
3533
} else {
3634
if versioncmp($zabbix_version, '6.0') >= 0 {
3735
$schema_path = '/usr/share/zabbix-sql-scripts/postgresql/'
38-
} elsif versioncmp($zabbix_version, '5.4') >= 0 {
39-
$schema_path = '/usr/share/doc/zabbix-sql-scripts/postgresql/'
4036
} else {
4137
$schema_path = '/usr/share/doc/zabbix-*-pgsql'
4238
}

spec/classes/database_mysql_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
# path to sql files on Debian and RedHat
3030
path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
3131
'/usr/share/zabbix-sql-scripts/mysql/'
32-
elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
33-
'/usr/share/doc/zabbix-sql-scripts/mysql/'
3432
else
3533
'/usr/share/doc/zabbix-*-mysql*'
3634
end

spec/classes/database_postgresql_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@
2525
# Path on RedHat
2626
if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
2727
'/usr/share/zabbix-sql-scripts/postgresql/'
28-
elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
29-
'/usr/share/doc/zabbix-sql-scripts/postgresql/'
3028
else
3129
"/usr/share/doc/zabbix-*-pgsql-#{zabbix_version}*/"
3230
end
3331
else
3432
# Path on Debian
3533
if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
3634
'/usr/share/zabbix-sql-scripts/postgresql/'
37-
elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
38-
'/usr/share/doc/zabbix-sql-scripts/postgresql/'
3935
else
4036
'/usr/share/doc/zabbix-*-pgsql'
4137
end

0 commit comments

Comments
 (0)