Skip to content
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.

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

puppetlabs/stdlib: Require 9.x #1449

Merged
merged 3 commits into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions manifests/backup/pg_dump.pp
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@
) {
# Install required packages
if $package_name {
ensure_packages($package_name)
stdlib::ensure_packages($package_name)
}
if $install_cron {
if $facts['os']['family'] == 'RedHat' {
ensure_packages('cronie')
stdlib::ensure_packages('cronie')
} elsif $facts['os']['family'] != 'FreeBSD' {
ensure_packages('cron')
stdlib::ensure_packages('cron')
}
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/server/extension.pp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
default => $package_ensure,
}

ensure_packages($package_name, {
stdlib::ensure_packages($package_name, {
ensure => $_package_ensure,
tag => 'puppetlabs-postgresql',
})
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/instance/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
}
}

ensure_packages([$package_name])
stdlib::ensure_packages([$package_name])

$exec_command = ['/usr/sbin/semanage', 'port', '-a', '-t', 'postgresql_port_t', '-p', 'tcp', $port]
$exec_unless = "/usr/sbin/semanage port -l | grep -qw ${port}"
Expand Down
4 changes: 2 additions & 2 deletions manifests/server/instance/passwd.pp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# psql will default to connecting as $user if you don't specify name
$_datbase_user_same = $database == $user
$_dboption = $_datbase_user_same ? {
false => " --dbname ${shell_escape($database)}",
false => " --dbname ${stdlib::shell_escape($database)}",
default => ''
}

Expand All @@ -37,7 +37,7 @@
# without specifying a password ('ident' or 'trust' security). This is
# the default for pg_hba.conf.
$escaped = postgresql::postgresql_escape($real_postgres_password)
$exec_command = "${shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
$exec_command = "${stdlib::shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${stdlib::shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
exec { 'set_postgres_postgrespw':
# This command works w/no password because we run it as postgres system
# user
Expand Down
6 changes: 3 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 5.2.0 < 10.0.0"
"version_requirement": ">= 9.0.0 < 10.0.0"
},
{
"name": "puppetlabs/apt",
"version_requirement": ">= 2.0.0 < 10.0.0"
},
{
"name": "puppet/systemd",
"version_requirement": ">= 4.0.1 < 5.0.0"
"version_requirement": ">= 4.0.1 < 6.0.0"
},
{
"name": "puppetlabs/concat",
"version_requirement": ">= 4.1.0 < 9.0.0"
"version_requirement": ">= 4.1.0 < 10.0.0"
}
],
"operatingsystem_support": [
Expand Down
Loading