Skip to content

params.pp: Cleanup service_reload command #1644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

params.pp: Cleanup service_reload command #1644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
$postgresql_conf_mode = pick($postgresql_conf_mode, '0600')
}

$service_reload = "systemctl reload ${service_name}"
$service_status = pick($service_status, "systemctl status ${service_name}")

$psql_path = pick($psql_path, "${bindir}/psql")
Expand Down Expand Up @@ -131,7 +130,6 @@
$psql_path = pick($psql_path, "${bindir}/psql")

$service_status = pick($service_status, "systemctl status ${service_name}")
$service_reload = "systemctl reload ${service_name}"
$python_package_name = pick($python_package_name, 'python-psycopg2')
# Archlinux does not have a perl::DBD::Pg package
$perl_package_name = pick($perl_package_name, 'undef')
Expand Down Expand Up @@ -172,7 +170,6 @@
$bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
$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')
Expand All @@ -195,7 +192,6 @@
$datadir = pick($datadir, "/var/lib/postgresql/${version}_data")
$confdir = pick($confdir, "/etc/postgresql-${version}")
$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)
Expand All @@ -219,7 +215,6 @@
$bindir = pick($bindir, '/usr/local/bin')
$confdir = pick($confdir, $datadir)
$service_status = pick($service_status, "/usr/local/etc/rc.d/${service_name} onestatus")
$service_reload = "service ${service_name} reload"
$psql_path = pick($psql_path, "${bindir}/psql")

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

$needs_initdb = pick($needs_initdb, true)
Expand All @@ -268,7 +262,6 @@
$datadir = pick($datadir, '/var/lib/pgsql/data')
$confdir = pick($confdir, $datadir)
$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)
Expand Down Expand Up @@ -304,4 +297,10 @@
$postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf")
$recovery_conf_path = pick($recovery_conf_path, "${datadir}/recovery.conf")
$default_database = pick($default_database, 'postgres')

$service_reload = if $facts['service_provider'] == 'systemd' {
"systemctl reload ${service_name}"
} else {
"rcctl reload ${service_name}"
}
}
Loading