Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/273009
Change subject: lint: fix some of the few remaining warnings
......................................................................
lint: fix some of the few remaining warnings
There is not that much left in this area, a small follow-up
to Ib062d7142a79. Very few warnings left in general.
Change-Id: I71dbdb10b6a480d120893262a2db05d23d311a05
---
M modules/mysql_multi_instance/manifests/instance.pp
M modules/programdashboard/manifests/app.pp
M modules/role/manifests/analytics_cluster/database/meta.pp
M modules/strongswan/manifests/monitoring/host.pp
M modules/wikimetrics/manifests/redis.pp
M modules/wikimetrics/manifests/web.pp
6 files changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/273009/1
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index 09c77c9..7f8987d 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -66,8 +66,8 @@
}
service { "mysql-${port}":
- enable => true,
- require => File["/etc/init.d/mysql-${port}"],
+ enable => true,
+ require => File["/etc/init.d/mysql-${port}"],
}
## some per-instance monitoring here
diff --git a/modules/programdashboard/manifests/app.pp
b/modules/programdashboard/manifests/app.pp
index 9d7e82f..fdf02f9 100644
--- a/modules/programdashboard/manifests/app.pp
+++ b/modules/programdashboard/manifests/app.pp
@@ -44,10 +44,10 @@
}
file { $directory:
- ensure => directory,
- owner => $owner,
- group => $group,
- mode => '0750',
+ ensure => directory,
+ owner => $owner,
+ group => $group,
+ mode => '0750',
}
$server_name = $::programdashboard::server_name
diff --git a/modules/role/manifests/analytics_cluster/database/meta.pp
b/modules/role/manifests/analytics_cluster/database/meta.pp
index b991a40..86e514f 100644
--- a/modules/role/manifests/analytics_cluster/database/meta.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta.pp
@@ -13,9 +13,9 @@
#include role::mariadb::monitor
class { 'mariadb::config':
- config => 'mariadb/analytics-meta.my.cnf.erb',
- datadir => '/var/lib/mysql',
- require => Class['mariadb::packages_wmf'],
+ config => 'mariadb/analytics-meta.my.cnf.erb',
+ datadir => '/var/lib/mysql',
+ require => Class['mariadb::packages_wmf'],
}
file { '/etc/init.d/mysql':
diff --git a/modules/strongswan/manifests/monitoring/host.pp
b/modules/strongswan/manifests/monitoring/host.pp
index c225bee..13768ad 100644
--- a/modules/strongswan/manifests/monitoring/host.pp
+++ b/modules/strongswan/manifests/monitoring/host.pp
@@ -8,8 +8,8 @@
}
sudo::user { 'nagios_strongswan':
- user => 'nagios',
- privileges => [
+ user => 'nagios',
+ privileges => [
'ALL = NOPASSWD:
/usr/local/lib/nagios/plugins/check_strongswan',
],
}
diff --git a/modules/wikimetrics/manifests/redis.pp
b/modules/wikimetrics/manifests/redis.pp
index ad3c939..4bf6ab6 100644
--- a/modules/wikimetrics/manifests/redis.pp
+++ b/modules/wikimetrics/manifests/redis.pp
@@ -14,10 +14,10 @@
redis::instance { '6379':
settings => {
- bind => '0.0.0.0',
- dir => '/srv/redis/queue',
- maxmemory => $queue_maxmemory,
- tcp_keepalive => 60,
+ bind => '0.0.0.0',
+ dir => '/srv/redis/queue',
+ maxmemory => $queue_maxmemory,
+ tcp_keepalive => 60,
},
require => File['/srv/redis/queue']
}
diff --git a/modules/wikimetrics/manifests/web.pp
b/modules/wikimetrics/manifests/web.pp
index 260fea3..b748596 100644
--- a/modules/wikimetrics/manifests/web.pp
+++ b/modules/wikimetrics/manifests/web.pp
@@ -9,20 +9,20 @@
uwsgi::app { 'wikimetrics-web':
settings => {
uwsgi => {
- plugins => 'python, router_redirect',
- 'wsgi-file' =>
"${wikimetrics::base::source_path}/wikimetrics/api.wsgi",
- master => true,
- chdir => $wikimetrics::base::source_path,
- http-socket => '0.0.0.0:8080',
- venv => $wikimetrics::base::venv_path,
- processes => $workers,
+ plugins => 'python, router_redirect',
+ 'wsgi-file' =>
"${wikimetrics::base::source_path}/wikimetrics/api.wsgi",
+ master => true,
+ chdir => $wikimetrics::base::source_path,
+ http-socket => '0.0.0.0:8080',
+ venv => $wikimetrics::base::venv_path,
+ processes => $workers,
# Serve static files on /static
- static-map =>
"/static=${wikimetrics::base::source_path}/wikimetrics/static",
+ static-map =>
"/static=${wikimetrics::base::source_path}/wikimetrics/static",
# Add Allow CORS header for /static/public
- route => '^/static/public
addheader:Access-Control-Allow-Origin: *',
+ route => '^/static/public
addheader:Access-Control-Allow-Origin: *',
# Look at the X_FORWARDED_PROTO, and if it's http, redirect to
https
# lint:ignore:single_quote_string_with_variables
- route-if => 'equal:${HTTP_X_FORWARDED_PROTO};http
redirect-permanent:https://${HTTP_HOST}${REQUEST_URI}',
+ route-if => 'equal:${HTTP_X_FORWARDED_PROTO};http
redirect-permanent:https://${HTTP_HOST}${REQUEST_URI}',
# lint:endignore
}
}
--
To view, visit https://gerrit.wikimedia.org/r/273009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71dbdb10b6a480d120893262a2db05d23d311a05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
