Skip to content

Commit e9e0ee9

Browse files
authored
Merge pull request #1480 from puppetlabs/revert-1449-stdlib9
Revert "puppetlabs/stdlib: Require 9.x"
2 parents 5d396bb + 2bec262 commit e9e0ee9

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

manifests/backup/pg_dump.pp

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

manifests/server/extension.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
default => $package_ensure,
138138
}
139139

140-
stdlib::ensure_packages($package_name, {
140+
ensure_packages($package_name, {
141141
ensure => $_package_ensure,
142142
tag => 'puppetlabs-postgresql',
143143
})

manifests/server/instance/config.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
}
190190
}
191191

192-
stdlib::ensure_packages([$package_name])
192+
ensure_packages([$package_name])
193193

194194
$exec_command = ['/usr/sbin/semanage', 'port', '-a', '-t', 'postgresql_port_t', '-p', 'tcp', $port]
195195
$exec_unless = "/usr/sbin/semanage port -l | grep -qw ${port}"

manifests/server/instance/passwd.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# psql will default to connecting as $user if you don't specify name
3535
$_datbase_user_same = $database == $user
3636
$_dboption = $_datbase_user_same ? {
37-
false => " --dbname ${stdlib::shell_escape($database)}",
37+
false => " --dbname ${shell_escape($database)}",
3838
default => ''
3939
}
4040

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

metadata.json

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

0 commit comments

Comments
 (0)