Skip to content

Commit af2899f

Browse files
committed
params.pp: Cleanup service_reload command
Every BSD supports (and uses by default) rcctl. The rest uses systemd.
1 parent 0c6f4f1 commit af2899f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

manifests/params.pp

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

88-
$service_reload = "systemctl reload ${service_name}"
8988
$service_status = pick($service_status, "systemctl status ${service_name}")
9089

9190
$psql_path = pick($psql_path, "${bindir}/psql")
@@ -131,7 +130,6 @@
131130
$psql_path = pick($psql_path, "${bindir}/psql")
132131

133132
$service_status = pick($service_status, "systemctl status ${service_name}")
134-
$service_reload = "systemctl reload ${service_name}"
135133
$python_package_name = pick($python_package_name, 'python-psycopg2')
136134
# Archlinux does not have a perl::DBD::Pg package
137135
$perl_package_name = pick($perl_package_name, 'undef')
@@ -172,7 +170,6 @@
172170
$bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
173171
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
174172
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
175-
$service_reload = "systemctl reload ${service_name}"
176173
$service_status = pick($service_status, "systemctl status ${service_name}")
177174
$psql_path = pick($psql_path, '/usr/bin/psql')
178175
$postgresql_conf_mode = pick($postgresql_conf_mode, '0644')
@@ -195,7 +192,6 @@
195192
$datadir = pick($datadir, "/var/lib/postgresql/${version}_data")
196193
$confdir = pick($confdir, "/etc/postgresql-${version}")
197194
$service_status = pick($service_status, "systemctl status ${service_name}")
198-
$service_reload = "systemctl reload ${service_name}"
199195
$psql_path = pick($psql_path, "${bindir}/psql")
200196

201197
$needs_initdb = pick($needs_initdb, true)
@@ -219,7 +215,6 @@
219215
$bindir = pick($bindir, '/usr/local/bin')
220216
$confdir = pick($confdir, $datadir)
221217
$service_status = pick($service_status, "/usr/local/etc/rc.d/${service_name} onestatus")
222-
$service_reload = "service ${service_name} reload"
223218
$psql_path = pick($psql_path, "${bindir}/psql")
224219

225220
$needs_initdb = pick($needs_initdb, true)
@@ -243,7 +238,6 @@
243238
$datadir = pick($datadir, '/var/postgresql/data')
244239
$confdir = pick($confdir, $datadir)
245240
$service_status = pick($service_status, "/etc/rc.d/${service_name} check")
246-
$service_reload = "/etc/rc.d/${service_name} reload"
247241
$psql_path = pick($psql_path, "${bindir}/psql")
248242

249243
$needs_initdb = pick($needs_initdb, true)
@@ -268,7 +262,6 @@
268262
$datadir = pick($datadir, '/var/lib/pgsql/data')
269263
$confdir = pick($confdir, $datadir)
270264
$service_status = pick($service_status, "systemctl status ${service_name}")
271-
$service_reload = "systemctl reload ${service_name}"
272265
$psql_path = pick($psql_path, "${bindir}/psql")
273266

274267
$needs_initdb = pick($needs_initdb, true)
@@ -304,4 +297,10 @@
304297
$postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf")
305298
$recovery_conf_path = pick($recovery_conf_path, "${datadir}/recovery.conf")
306299
$default_database = pick($default_database, 'postgres')
300+
301+
$service_reload = if $facts['service_provider'] == 'systemd' {
302+
"systemctl reload ${service_name}"
303+
} else {
304+
"rcctl reload ${service_name}"
305+
}
307306
}

0 commit comments

Comments
 (0)