Skip to content

Commit 3986210

Browse files
kbarberkbarber
committed
Merge pull request #117 from fhrbek/coding_style
Coding style fixes
2 parents b97d38f + bc7be13 commit 3986210

File tree

18 files changed

+107
-73
lines changed

18 files changed

+107
-73
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/postgresql/pkg
33
# This is a library, so don't pin
44
Gemfile.lock
5+
/metadata.json

‎.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>postgresql</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
21+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
22+
</natures>
23+
</projectDescription>

‎Modulefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author 'Inkling/Puppet Labs'
55
description 'PostgreSQL defined resource types'
66
summary 'PostgreSQL defined resource types'
77
license 'Apache'
8-
project_page 'https://github.com/puppetlabs/puppet-postgresql/issues'
8+
project_page 'https://github.com/puppetlabs/puppet-postgresql'
99

1010
dependency 'puppetlabs/stdlib', '>=3.2.0 <4.0.0'
1111
dependency 'puppetlabs/firewall', '>= 0.0.4'

‎manifests/config/beforeservice.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@
7373
# managing their own settings in a second conf file.
7474
file_line { 'postgresql.conf#include':
7575
path => $postgresql_conf_path,
76-
line => "include 'postgresql_puppet_extras.conf'",
76+
line => 'include \'postgresql_puppet_extras.conf\'',
7777
notify => Service['postgresqld'],
7878
}
7979

8080
# Since we're adding an "include" for this extras config file, we need
8181
# to make sure it exists.
82-
exec { "touch `dirname $postgresql_conf_path`/postgresql_puppet_extras.conf" :
83-
path => "/usr/bin:/bin",
84-
unless => "[ -f `dirname $postgresql_conf_path`/postgresql_puppet_extras.conf ]"
82+
exec { "touch `dirname ${postgresql_conf_path}`/postgresql_puppet_extras.conf" :
83+
path => '/usr/bin:/bin',
84+
unless => "[ -f `dirname ${postgresql_conf_path}`/postgresql_puppet_extras.conf ]"
8585
}
8686

8787
# TODO: is this a reasonable place for this firewall stuff?

‎manifests/database.pp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
undef => '',
3535
default => "--locale=${locale}",
3636
}
37-
$public_revoke_privilege = "CONNECT"
37+
$public_revoke_privilege = 'CONNECT'
3838
} else {
39-
$locale_option = ""
40-
$public_revoke_privilege = "ALL"
39+
$locale_option = ''
40+
$public_revoke_privilege = 'ALL'
4141
}
4242

4343
$createdb_command_tmp = "${postgresql::params::createdb_path} --template=template0 --encoding '${charset}' ${locale_option} '${dbname}'"
@@ -49,9 +49,9 @@
4949
$createdb_command = "${createdb_command_tmp} --tablespace='${tablespace}'"
5050
}
5151

52-
postgresql_psql { "Check for existence of db '$dbname'":
53-
command => "SELECT 1",
54-
unless => "SELECT datname FROM pg_database WHERE datname='$dbname'",
52+
postgresql_psql { "Check for existence of db '${dbname}'":
53+
command => 'SELECT 1',
54+
unless => "SELECT datname FROM pg_database WHERE datname='${dbname}'",
5555
cwd => $postgresql::params::datadir,
5656
require => Class['postgresql::server']
5757
} ~>
@@ -65,7 +65,7 @@
6565

6666
# This will prevent users from connecting to the database unless they've been
6767
# granted privileges.
68-
postgresql_psql {"REVOKE ${public_revoke_privilege} ON DATABASE $dbname FROM public":
68+
postgresql_psql {"REVOKE ${public_revoke_privilege} ON DATABASE ${dbname} FROM public":
6969
db => 'postgres',
7070
refreshonly => true,
7171
cwd => $postgresql::params::datadir,

‎manifests/database_grant.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
default => $privilege,
5151
}
5252

53-
postgresql_psql {"GRANT $privilege ON database $db TO $role":
53+
postgresql_psql {"GRANT ${privilege} ON database ${db} TO ${role}":
5454
db => $psql_db,
5555
psql_user => $psql_user,
56-
unless => "SELECT 1 WHERE has_database_privilege('$role', '$db', '$unless_privilege')",
56+
unless => "SELECT 1 WHERE has_database_privilege('${role}', '${db}', '${unless_privilege}')",
5757
cwd => $postgresql::params::datadir,
5858
}
5959
}

‎manifests/init.pp‎

Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,46 @@
1-
# Class: postgresql
2-
#
3-
# This is a base class that can be used to modify catalog-wide settings relating
4-
# to the various types in class contained in the postgresql module.
5-
#
6-
# If you don't declare this class in your catalog, sensible defaults will
7-
# be used. However, if you choose to declare it, it needs to appear *before*
8-
# any other types or classes from the postgresql module.
9-
#
10-
# For examples, see the files in the `tests` directory; in particular,
11-
# `/server-yum-postgresql-org.pp`.
12-
#
13-
# Parameters:
14-
# [*version*] - The postgresql version to install. If not specified, the
15-
# module will use whatever version is the default for your
16-
# OS distro.
17-
# [*manage_package_repo*] - This determines whether or not the module should
18-
# attempt to manage the postgres package repository for your
19-
# distro. Defaults to `false`, but if set to `true`, it can
20-
# be used to set up the official postgres yum/apt package
21-
# repositories for you.
22-
# [*package_source*] - This setting is only used if `manage_package_repo` is
23-
# set to `true`. It determines which package repository should
24-
# be used to install the postgres packages. Currently supported
25-
# values include `yum.postgresql.org`.
26-
# [*locale*] - This setting defines the default locale for initdb and createdb
27-
# commands. This default to 'undef' which is effectively 'C'.
28-
# [*charset*] - Sets the default charset to be used for initdb and createdb.
29-
# Defaults to 'UTF8'.
30-
# Actions:
31-
#
32-
# Requires:
33-
#
34-
# Sample Usage:
1+
# == Class: postgresql
2+
#
3+
# This is a base class that can be used to modify catalog-wide settings relating
4+
# to the various types in class contained in the postgresql module.
5+
#
6+
# If you don't declare this class in your catalog, sensible defaults will
7+
# be used. However, if you choose to declare it, it needs to appear *before*
8+
# any other types or classes from the postgresql module.
9+
#
10+
# For examples, see the files in the `tests` directory; in particular,
11+
# `/server-yum-postgresql-org.pp`.
12+
#
13+
#
14+
# [*version*]
15+
# The postgresql version to install. If not specified, the
16+
# module will use whatever version is the default for your
17+
# OS distro.
18+
# [*manage_package_repo*]
19+
# This determines whether or not the module should
20+
# attempt to manage the postgres package repository for your
21+
# distro. Defaults to `false`, but if set to `true`, it can
22+
# be used to set up the official postgres yum/apt package
23+
# repositories for you.
24+
# [*package_source*]
25+
# This setting is only used if `manage_package_repo` is
26+
# set to `true`. It determines which package repository should
27+
# be used to install the postgres packages. Currently supported
28+
# values include `yum.postgresql.org`.
29+
#
30+
# [*locale*]
31+
# This setting defines the default locale for initdb and createdb
32+
# commands. This default to 'undef' which is effectively 'C'.
33+
# [*charset*]
34+
# Sets the default charset to be used for initdb and createdb.
35+
# Defaults to 'UTF8'.
36+
#
37+
# === Examples:
38+
#
39+
# class { 'postgresql':
40+
# version => '9.2',
41+
# manage_package_repo => true,
42+
# }
43+
#
3544
#
3645
class postgresql (
3746
$version = $::postgres_default_version,
@@ -41,6 +50,7 @@
4150
$charset = 'UTF8'
4251
) {
4352
class { 'postgresql::params':
53+
4454
version => $version,
4555
manage_package_repo => $manage_package_repo,
4656
package_source => $package_source,

‎manifests/package_source/yum_postgresql_org.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
$package_version = "${version_parts[0]}${version_parts[1]}"
77

88
file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}":
9-
source => "puppet:///modules/postgresql/RPM-GPG-KEY-PGDG"
9+
source => 'puppet:///modules/postgresql/RPM-GPG-KEY-PGDG'
1010
} ->
1111

12-
yumrepo { "yum.postgresql.org":
12+
yumrepo { 'yum.postgresql.org':
1313
descr => "PostgreSQL ${version} \$releasever - \$basearch",
1414
baseurl => "http://yum.postgresql.org/${version}/redhat/rhel-\$releasever-\$basearch",
1515
enabled => 1,
1616
gpgcheck => 1,
1717
gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}",
1818
}
1919

20-
Yumrepo["yum.postgresql.org"] -> Package<|tag == 'postgresql'|>
20+
Yumrepo['yum.postgresql.org'] -> Package<|tag == 'postgresql'|>
2121

2222
}

‎manifests/params.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
case $rh_pkg_source {
5454
'yum.postgresql.org': {
55-
class { "postgresql::package_source::yum_postgresql_org":
55+
class { 'postgresql::package_source::yum_postgresql_org':
5656
version => $version
5757
}
5858
}
@@ -64,7 +64,7 @@
6464
}
6565

6666
'Debian': {
67-
class { "postgresql::package_source::apt_postgresql_org": }
67+
class { 'postgresql::package_source::apt_postgresql_org': }
6868
}
6969

7070
default: {
@@ -81,7 +81,7 @@
8181
# that pluginsync might not be enabled. Ideally this would be handled directly
8282
# in puppet.
8383
if ($::postgres_default_version == undef) {
84-
fail "No value for postgres_default_version facter fact; it's possible that you don't have pluginsync enabled."
84+
fail 'No value for postgres_default_version facter fact; it\'s possible that you don\'t have pluginsync enabled.'
8585
}
8686

8787
case $::operatingsystem {

‎manifests/psql.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
$quoted_command = regsubst($command, '"', '\\"', 'G')
3939
$quoted_unless = regsubst($unless, '"', '\\"', 'G')
4040

41-
$final_cmd = "/bin/echo \"$quoted_command\" | $psql |egrep -v -q '^$'"
41+
$final_cmd = "/bin/echo \"${quoted_command}\" | ${psql} |egrep -v -q '^$'"
4242

43-
notify { "deprecation warning: $final_cmd":
44-
message => "postgresql::psql is deprecated ; please use postgresql_psql instead.",
43+
notify { "deprecation warning: ${final_cmd}":
44+
message => 'postgresql::psql is deprecated ; please use postgresql_psql instead.',
4545
} ->
4646

4747
exec { $final_cmd:

0 commit comments

Comments
 (0)