Dzahn has submitted this change and it was merged.
Change subject: postgresl,sslcert: minimal lint fixes
......................................................................
postgresl,sslcert: minimal lint fixes
Change-Id: I9fe2f7e0628115ef2f507f68659264a3d2de1fe9
---
M modules/postgresql/manifests/master.pp
M modules/postgresql/manifests/slave.pp
M modules/postgresql/manifests/spatialdb.pp
M modules/postgresql/manifests/user.pp
M modules/sslcert/manifests/chainedcert.pp
5 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/postgresql/manifests/master.pp
b/modules/postgresql/manifests/master.pp
index 3b5440c..1869fff 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -42,8 +42,8 @@
) {
class { 'postgresql::server':
- pgversion => $pgversion,
ensure => $ensure,
+ pgversion => $pgversion,
includes => [ $includes, 'master.conf'],
datadir => $datadir,
}
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index 0c6fefe..329a0f9 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -34,8 +34,8 @@
) {
class { 'postgresql::server':
- pgversion => $pgversion,
ensure => $ensure,
+ pgversion => $pgversion,
includes => [ $includes, 'slave.conf'],
datadir => $datadir,
}
diff --git a/modules/postgresql/manifests/spatialdb.pp
b/modules/postgresql/manifests/spatialdb.pp
index ec2e9ee..4619108 100644
--- a/modules/postgresql/manifests/spatialdb.pp
+++ b/modules/postgresql/manifests/spatialdb.pp
@@ -87,12 +87,12 @@
} elsif $ensure == 'absent' {
exec { "drop_db-${name}":
command => "/usr/bin/dropdb ${name}",
- user => "postgres",
+ user => 'postgres',
onlyif => $db_exists,
}
exec { "drop_plpgsql_lang-${name}":
command => "/usr/bin/droplang plpgsql ${name}",
- user => "postgres",
+ user => 'postgres',
onlyif => $plpgsql_exists,
}
Exec["drop_plpgsql_lang-${name}"] -> Exec["drop_db-${name}"]
diff --git a/modules/postgresql/manifests/user.pp
b/modules/postgresql/manifests/user.pp
index 83043e9..99ffa4b 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -60,9 +60,9 @@
# listing tools like ps. Need to investigate better ways of setting the
# password .e.g. hashed with md5 in the manifest
exec { "pass_set-${name}":
- command => $pass_set,
- user => 'postgres',
- onlyif => $userexists,
+ command => $pass_set,
+ user => 'postgres',
+ onlyif => $userexists,
}
$changes = [ "set 01/type \'${type}\'",
diff --git a/modules/sslcert/manifests/chainedcert.pp
b/modules/sslcert/manifests/chainedcert.pp
index 5bb8d71..b55e679 100644
--- a/modules/sslcert/manifests/chainedcert.pp
+++ b/modules/sslcert/manifests/chainedcert.pp
@@ -42,7 +42,7 @@
if $ensure == 'present' {
$inpath = "/etc/ssl/localcerts/${title}.crt"
- $script = "/usr/local/sbin/x509-bundle"
+ $script = '/usr/local/sbin/x509-bundle'
exec { "x509-bundle ${title}-chained":
path => 'bin:/usr/bin',
cwd => '/etc/ssl/localcerts',
--
To view, visit https://gerrit.wikimedia.org/r/250053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fe2f7e0628115ef2f507f68659264a3d2de1fe9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
