Skip to content

Commit e54adc9

Browse files
bastelfreaksmortex
andcommitted
params.pp: Cleanup service_reload command
Co-authored-by: Romain Tartière <romain@blogreen.org>
1 parent 1bbeeb0 commit e54adc9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

manifests/params.pp

Lines changed: 8 additions & 8 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 is-active --quiet ${service_name}")
9089

9190
$psql_path = pick($psql_path, "${bindir}/psql")
@@ -129,9 +128,7 @@
129128
$datadir = pick($datadir, '/var/lib/postgres/data')
130129
$confdir = pick($confdir, $datadir)
131130
$psql_path = pick($psql_path, "${bindir}/psql")
132-
133131
$service_status = pick($service_status, "systemctl is-active --quiet ${service_name}")
134-
$service_reload = "systemctl reload ${service_name}"
135132
$python_package_name = pick($python_package_name, 'python-psycopg2')
136133
# Archlinux does not have a perl::DBD::Pg package
137134
$perl_package_name = pick($perl_package_name, 'undef')
@@ -172,7 +169,6 @@
172169
$bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
173170
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
174171
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
175-
$service_reload = "systemctl reload ${service_name}"
176172
$service_status = pick($service_status, "systemctl is-active --quiet ${service_name}")
177173
$psql_path = pick($psql_path, '/usr/bin/psql')
178174
$postgresql_conf_mode = pick($postgresql_conf_mode, '0644')
@@ -195,7 +191,6 @@
195191
$datadir = pick($datadir, "/var/lib/postgresql/${version}_data")
196192
$confdir = pick($confdir, "/etc/postgresql-${version}")
197193
$service_status = pick($service_status, "systemctl is-active --quiet ${service_name}")
198-
$service_reload = "systemctl reload ${service_name}"
199194
$psql_path = pick($psql_path, "${bindir}/psql")
200195

201196
$needs_initdb = pick($needs_initdb, true)
@@ -219,7 +214,6 @@
219214
$bindir = pick($bindir, '/usr/local/bin')
220215
$confdir = pick($confdir, $datadir)
221216
$service_status = pick($service_status, "/usr/local/etc/rc.d/${service_name} onestatus")
222-
$service_reload = "service ${service_name} reload"
223217
$psql_path = pick($psql_path, "${bindir}/psql")
224218

225219
$needs_initdb = pick($needs_initdb, true)
@@ -243,7 +237,6 @@
243237
$datadir = pick($datadir, '/var/postgresql/data')
244238
$confdir = pick($confdir, $datadir)
245239
$service_status = pick($service_status, "/etc/rc.d/${service_name} check")
246-
$service_reload = "/etc/rc.d/${service_name} reload"
247240
$psql_path = pick($psql_path, "${bindir}/psql")
248241

249242
$needs_initdb = pick($needs_initdb, true)
@@ -268,7 +261,6 @@
268261
$datadir = pick($datadir, '/var/lib/pgsql/data')
269262
$confdir = pick($confdir, $datadir)
270263
$service_status = pick($service_status, "systemctl is-active --quiet ${service_name}")
271-
$service_reload = "systemctl reload ${service_name}"
272264
$psql_path = pick($psql_path, "${bindir}/psql")
273265

274266
$needs_initdb = pick($needs_initdb, true)
@@ -304,4 +296,12 @@
304296
$postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf")
305297
$recovery_conf_path = pick($recovery_conf_path, "${datadir}/recovery.conf")
306298
$default_database = pick($default_database, 'postgres')
299+
300+
$service_reload = if $facts['service_provider'] == 'systemd' {
301+
"systemctl reload ${service_name}"
302+
} elsif $facts['service_provider'] == 'openbsd' {
303+
"rcctl reload ${service_name}"
304+
} else {
305+
"service ${service_name} reload"
306+
}
307307
}

0 commit comments

Comments
 (0)