From 587d9d9e46df1545a114294891144cfa96cadbe7 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 7 Sep 2023 14:25:40 +0200 Subject: [PATCH] Drop code for linux without systemd & FreeBSD 9.4/9.5 FreeBSD 9.4/9.5 are EoL since ages and not listed as supported in metadata.json. Also no linux operating system without Systemd is supported, so we can drop the old code. --- manifests/params.pp | 44 ++++++++------------------------------- spec/spec_helper_local.rb | 6 +----- 2 files changed, 10 insertions(+), 40 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 3a64384fe9..45c2004707 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -85,13 +85,8 @@ $postgresql_conf_mode = pick($postgresql_conf_mode, '0600') } - if pick($service_provider, $facts['service_provider']) == 'systemd' { - $service_reload = "systemctl reload ${service_name}" - $service_status = pick($service_status, "systemctl status ${service_name}") - } else { - $service_reload = "service ${service_name} reload" - $service_status = pick($service_status, "service ${service_name} status") - } + $service_reload = "systemctl reload ${service_name}" + $service_status = pick($service_status, "systemctl status ${service_name}") $psql_path = pick($psql_path, "${bindir}/psql") @@ -104,8 +99,6 @@ if $postgresql::globals::postgis_package_name { $postgis_package_name = $postgresql::globals::postgis_package_name - } elsif $facts['os']['release']['major'] == '5' { - $postgis_package_name = 'postgis' } elsif $postgis_version and versioncmp($postgis_version, '2') < 0 { $postgis_package_name = "postgis${package_version}" } else { @@ -169,13 +162,8 @@ $bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin") $datadir = pick($datadir, "/var/lib/postgresql/${version}/main") $confdir = pick($confdir, "/etc/postgresql/${version}/main") - if pick($service_provider, $facts['service_provider']) == 'systemd' { - $service_reload = "systemctl reload ${service_name}" - $service_status = pick($service_status, "systemctl status ${service_name}") - } else { - $service_reload = "service ${service_name} reload" - $service_status = pick($service_status, "service ${service_name} status") - } + $service_reload = "systemctl reload ${service_name}" + $service_status = pick($service_status, "systemctl status ${service_name}") $psql_path = pick($psql_path, '/usr/bin/psql') $postgresql_conf_mode = pick($postgresql_conf_mode, '0644') } @@ -204,18 +192,9 @@ } 'FreeBSD': { - case $version { - '94', '95': { - $user = pick($user, 'pgsql') - $group = pick($group, 'pgsql') - $datadir = pick($datadir, '/usr/local/pgsql/data') - } - default: { - $user = pick($user, 'postgres') - $group = pick($group, 'postgres') - $datadir = pick($datadir, "/var/db/postgres/data${version}") - } - } + $user = pick($user, 'postgres') + $group = pick($group, 'postgres') + $datadir = pick($datadir, "/var/db/postgres/data${version}") $link_pg_config = true $client_package_name = pick($client_package_name, "databases/postgresql${version}-client") @@ -279,13 +258,8 @@ $bindir = pick($bindir, "/usr/lib/postgresql${version}/bin") $datadir = pick($datadir, '/var/lib/pgsql/data') $confdir = pick($confdir, $datadir) - if $facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['full'], '11.4') <= 0 { - $service_status = pick($service_status, "/etc/init.d/${service_name} status") - $service_reload = "/etc/init.d/${service_name} reload" - } else { - $service_status = pick($service_status, "systemctl status ${service_name}") - $service_reload = "systemctl reload ${service_name}" - } + $service_status = pick($service_status, "systemctl status ${service_name}") + $service_reload = "systemctl reload ${service_name}" $psql_path = pick($psql_path, "${bindir}/psql") $needs_initdb = pick($needs_initdb, true) diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb index c9603be72a..4f8a91491c 100644 --- a/spec/spec_helper_local.rb +++ b/spec/spec_helper_local.rb @@ -155,7 +155,7 @@ def param(type, title, param) # See https://github.com/voxpupuli/voxpupuli-test/blob/master/lib/voxpupuli/test/facts.rb add_custom_fact :service_provider, ->(_os, facts) do case facts[:osfamily].downcase - when 'archlinux', 'debian' + when 'archlinux', 'debian', 'redhat', 'suse' 'systemd' when 'darwin' 'launchd' @@ -165,10 +165,6 @@ def param(type, title, param) 'openrc' when 'openbsd' 'openbsd' - when 'redhat' - (facts[:operatingsystemrelease].to_i >= 7) ? 'systemd' : 'redhat' - when 'suse' - (facts[:operatingsystemmajrelease].to_i >= 12) ? 'systemd' : 'redhat' when 'windows' 'windows' else