Skip to content

Commit 73283d3

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 3520635 commit 73283d3

File tree

2 files changed

+9
-40
lines changed

2 files changed

+9
-40
lines changed

manifests/params.pp

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,7 @@
9797
$python_package_name = pick($python_package_name, 'python-psycopg2')
9898
}
9999

100-
if $postgresql::globals::postgis_package_name {
101-
$postgis_package_name = $postgresql::globals::postgis_package_name
102-
} elsif $facts['os']['release']['major'] == '5' {
103-
$postgis_package_name = 'postgis'
104-
} elsif $postgis_version and versioncmp($postgis_version, '2') < 0 {
105-
$postgis_package_name = "postgis${package_version}"
106-
} else {
107-
$postgis_package_name = "postgis2_${package_version}"
108-
}
100+
$postgis_package_name = pick($postgresql::globals::postgis_package_name, "postgis2_${package_version}")
109101
}
110102

111103
'Archlinux': {
@@ -164,13 +156,8 @@
164156
$bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
165157
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
166158
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
167-
if pick($service_provider, $facts['service_provider']) == 'systemd' {
168-
$service_reload = "systemctl reload ${service_name}"
169-
$service_status = pick($service_status, "systemctl status ${service_name}")
170-
} else {
171-
$service_reload = "service ${service_name} reload"
172-
$service_status = pick($service_status, "service ${service_name} status")
173-
}
159+
$service_reload = "systemctl reload ${service_name}"
160+
$service_status = pick($service_status, "systemctl status ${service_name}")
174161
$psql_path = pick($psql_path, '/usr/bin/psql')
175162
$postgresql_conf_mode = pick($postgresql_conf_mode, '0644')
176163
}
@@ -199,18 +186,9 @@
199186
}
200187

201188
'FreeBSD': {
202-
case $version {
203-
'94', '95': {
204-
$user = pick($user, 'pgsql')
205-
$group = pick($group, 'pgsql')
206-
$datadir = pick($datadir, '/usr/local/pgsql/data')
207-
}
208-
default: {
209-
$user = pick($user, 'postgres')
210-
$group = pick($group, 'postgres')
211-
$datadir = pick($datadir, "/var/db/postgres/data${version}")
212-
}
213-
}
189+
$user = pick($user, 'postgres')
190+
$group = pick($group, 'postgres')
191+
$datadir = pick($datadir, "/var/db/postgres/data${version}")
214192

215193
$link_pg_config = true
216194
$client_package_name = pick($client_package_name, "databases/postgresql${version}-client")
@@ -274,13 +252,8 @@
274252
$bindir = pick($bindir, "/usr/lib/postgresql${version}/bin")
275253
$datadir = pick($datadir, '/var/lib/pgsql/data')
276254
$confdir = pick($confdir, $datadir)
277-
if $facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['full'], '11.4') <= 0 {
278-
$service_status = pick($service_status, "/etc/init.d/${service_name} status")
279-
$service_reload = "/etc/init.d/${service_name} reload"
280-
} else {
281-
$service_status = pick($service_status, "systemctl status ${service_name}")
282-
$service_reload = "systemctl reload ${service_name}"
283-
}
255+
$service_status = pick($service_status, "systemctl status ${service_name}")
256+
$service_reload = "systemctl reload ${service_name}"
284257
$psql_path = pick($psql_path, "${bindir}/psql")
285258

286259
$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)