Skip to content

Commit 08d4db4

Browse files
committed
puppetlabs/stdlib: Require 9.x
1 parent 8a64280 commit 08d4db4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

manifests/backup/pg_dump.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@
6868
) {
6969
# Install required packages
7070
if $package_name {
71-
ensure_packages($package_name)
71+
stdlib::ensure_packages($package_name)
7272
}
7373
if $install_cron {
7474
if $facts['os']['family'] == 'RedHat' {
75-
ensure_packages('cronie')
75+
stdlib::ensure_packages('cronie')
7676
} elsif $facts['os']['family'] != 'FreeBSD' {
77-
ensure_packages('cron')
77+
stdlib::ensure_packages('cron')
7878
}
7979
}
8080

manifests/server/extension.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
default => $package_ensure,
130130
}
131131

132-
ensure_packages($package_name, {
132+
stdlib::ensure_packages($package_name, {
133133
ensure => $_package_ensure,
134134
tag => 'puppetlabs-postgresql',
135135
})

manifests/server/instance/passwd.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# psql will default to connecting as $user if you don't specify name
2828
$_datbase_user_same = $database == $user
2929
$_dboption = $_datbase_user_same ? {
30-
false => " --dbname ${shell_escape($database)}",
30+
false => " --dbname ${stdlib::shell_escape($database)}",
3131
default => ''
3232
}
3333

@@ -37,7 +37,7 @@
3737
# without specifying a password ('ident' or 'trust' security). This is
3838
# the default for pg_hba.conf.
3939
$escaped = postgresql::postgresql_escape($real_postgres_password)
40-
$exec_command = "${shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
40+
$exec_command = "${stdlib::shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${stdlib::shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
4141
exec { 'set_postgres_postgrespw':
4242
# This command works w/no password because we run it as postgres system
4343
# user

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": [
1111
{
1212
"name": "puppetlabs/stdlib",
13-
"version_requirement": ">= 5.2.0 < 10.0.0"
13+
"version_requirement": ">= 9.0.0 < 10.0.0"
1414
},
1515
{
1616
"name": "puppetlabs/apt",

0 commit comments

Comments
 (0)