Skip to content

Commit 5e75618

Browse files
committed
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.
1 parent 55faf08 commit 5e75618

File tree

2 files changed

+11
-47
lines changed

2 files changed

+11
-47
lines changed

manifests/params.pp

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,8 @@
8585
$postgresql_conf_mode = pick($postgresql_conf_mode, '0600')
8686
}
8787

88-
if pick($service_provider, $facts['service_provider']) == 'systemd' {
89-
$service_reload = "systemctl reload ${service_name}"
90-
$service_status = pick($service_status, "systemctl status ${service_name}")
91-
} else {
92-
$service_reload = "service ${service_name} reload"
93-
$service_status = pick($service_status, "service ${service_name} status")
94-
}
88+
$service_reload = "systemctl reload ${service_name}"
89+
$service_status = pick($service_status, "systemctl status ${service_name}")
9590

9691
$psql_path = pick($psql_path, "${bindir}/psql")
9792

@@ -102,15 +97,7 @@
10297
$python_package_name = pick($python_package_name, 'python-psycopg2')
10398
}
10499

105-
if $postgresql::globals::postgis_package_name {
106-
$postgis_package_name = $postgresql::globals::postgis_package_name
107-
} elsif $facts['os']['release']['major'] == '5' {
108-
$postgis_package_name = 'postgis'
109-
} elsif $postgis_version and versioncmp($postgis_version, '2') < 0 {
110-
$postgis_package_name = "postgis${package_version}"
111-
} else {
112-
$postgis_package_name = "postgis2_${package_version}"
113-
}
100+
$postgis_package_name = pick($postgresql::globals::postgis_package_name, "postgis2_${package_version}")
114101
}
115102

116103
'Archlinux': {
@@ -169,13 +156,8 @@
169156
$bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
170157
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
171158
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
172-
if pick($service_provider, $facts['service_provider']) == 'systemd' {
173-
$service_reload = "systemctl reload ${service_name}"
174-
$service_status = pick($service_status, "systemctl status ${service_name}")
175-
} else {
176-
$service_reload = "service ${service_name} reload"
177-
$service_status = pick($service_status, "service ${service_name} status")
178-
}
159+
$service_reload = "systemctl reload ${service_name}"
160+
$service_status = pick($service_status, "systemctl status ${service_name}")
179161
$psql_path = pick($psql_path, '/usr/bin/psql')
180162
$postgresql_conf_mode = pick($postgresql_conf_mode, '0644')
181163
}
@@ -204,18 +186,9 @@
204186
}
205187

206188
'FreeBSD': {
207-
case $version {
208-
'94', '95': {
209-
$user = pick($user, 'pgsql')
210-
$group = pick($group, 'pgsql')
211-
$datadir = pick($datadir, '/usr/local/pgsql/data')
212-
}
213-
default: {
214-
$user = pick($user, 'postgres')
215-
$group = pick($group, 'postgres')
216-
$datadir = pick($datadir, "/var/db/postgres/data${version}")
217-
}
218-
}
189+
$user = pick($user, 'postgres')
190+
$group = pick($group, 'postgres')
191+
$datadir = pick($datadir, "/var/db/postgres/data${version}")
219192

220193
$link_pg_config = true
221194
$client_package_name = pick($client_package_name, "databases/postgresql${version}-client")
@@ -279,13 +252,8 @@
279252
$bindir = pick($bindir, "/usr/lib/postgresql${version}/bin")
280253
$datadir = pick($datadir, '/var/lib/pgsql/data')
281254
$confdir = pick($confdir, $datadir)
282-
if $facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['full'], '11.4') <= 0 {
283-
$service_status = pick($service_status, "/etc/init.d/${service_name} status")
284-
$service_reload = "/etc/init.d/${service_name} reload"
285-
} else {
286-
$service_status = pick($service_status, "systemctl status ${service_name}")
287-
$service_reload = "systemctl reload ${service_name}"
288-
}
255+
$service_status = pick($service_status, "systemctl status ${service_name}")
256+
$service_reload = "systemctl reload ${service_name}"
289257
$psql_path = pick($psql_path, "${bindir}/psql")
290258

291259
$needs_initdb = pick($needs_initdb, true)

spec/spec_helper_local.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def param(type, title, param)
155155
# See https://github.com/voxpupuli/voxpupuli-test/blob/master/lib/voxpupuli/test/facts.rb
156156
add_custom_fact :service_provider, ->(_os, facts) do
157157
case facts[:osfamily].downcase
158-
when 'archlinux', 'debian'
158+
when 'archlinux', 'debian', 'redhat', 'suse'
159159
'systemd'
160160
when 'darwin'
161161
'launchd'
@@ -165,10 +165,6 @@ def param(type, title, param)
165165
'openrc'
166166
when 'openbsd'
167167
'openbsd'
168-
when 'redhat'
169-
(facts[:operatingsystemrelease].to_i >= 7) ? 'systemd' : 'redhat'
170-
when 'suse'
171-
(facts[:operatingsystemmajrelease].to_i >= 12) ? 'systemd' : 'redhat'
172168
when 'windows'
173169
'windows'
174170
else

0 commit comments

Comments
 (0)