Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332103 )
Change subject: mediawiki module: Linting changes
......................................................................
mediawiki module: Linting changes
Use full names for class names, as relative names are not allowed in
future Puppet versions
Add trailing commas to abide by the Coding Style guidelines
Bug: T93645
Change-Id: Ib4418247bf579bf15f489ad04e3ea13702127ae5
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
M modules/mediawiki/manifests/maintenance/pagetriage.pp
M modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
M modules/mediawiki/manifests/maintenance/refreshlinks.pp
M modules/mediawiki/manifests/maintenance/wikidata.pp
M modules/mediawiki/manifests/monitoring/graphite.pp
M modules/mediawiki/manifests/php_enmod.pp
M modules/mediawiki/manifests/users.pp
M modules/mediawiki/manifests/web.pp
M modules/mediawiki_singlenode/manifests/init.pp
11 files changed, 21 insertions(+), 21 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ebe0db0..667f5c0 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -41,7 +41,7 @@
owner => 'root',
group => 'root',
mode => '0555',
- before => Service['jobrunner']
+ before => Service['jobrunner'],
}
file { '/etc/jobrunner/jobrunner.conf':
@@ -58,7 +58,7 @@
enable => $state ? {
'stopped' => false,
default => true,
- }
+ },
}
# We declare the service, but override its status with
@@ -96,7 +96,7 @@
include ::apache::mod::proxy_fcgi
- class { 'apache::mpm':
+ class { '::apache::mpm':
mpm => 'worker',
}
@@ -107,7 +107,7 @@
apache::site{ 'hhvm_jobrunner':
priority => 1,
- content => template('mediawiki/jobrunner/site.conf.erb')
+ content => template('mediawiki/jobrunner/site.conf.erb'),
}
# Hack for T122069: on servers running GWT jobs, restart HHVM
@@ -119,7 +119,7 @@
}
} else {
cron { 'periodic_hhvm_restart':
- ensure => absent
+ ensure => absent,
}
}
}
diff --git a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
index abfdf22..7352ba5 100644
--- a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
+++ b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
@@ -1,5 +1,5 @@
class mediawiki::maintenance::cirrussearch( $ensure = present ) {
- require mediawiki::users
+ require ::mediawiki::users
Cron {
ensure => $ensure,
@@ -34,7 +34,7 @@
ensure => ensure_directory($ensure),
owner => $::mediawiki::users::web,
group => $::mediawiki::users::web,
- mode => '0775'
+ mode => '0775',
}
logrotate::conf { 'cirrus-suggest':
@@ -46,7 +46,7 @@
ensure => ensure_directory($ensure),
owner => $::mediawiki::users::web,
group => $::mediawiki::users::web,
- mode => '0775'
+ mode => '0775',
}
logrotate::conf { 'cirrus-sanitize':
diff --git a/modules/mediawiki/manifests/maintenance/pagetriage.pp
b/modules/mediawiki/manifests/maintenance/pagetriage.pp
index e67adb7..32b4e76 100644
--- a/modules/mediawiki/manifests/maintenance/pagetriage.pp
+++ b/modules/mediawiki/manifests/maintenance/pagetriage.pp
@@ -1,6 +1,6 @@
class mediawiki::maintenance::pagetriage( $ensure = present ) {
- require mediawiki
+ require ::mediawiki
system::role { 'mediawiki::maintenance::pagetriage': description =>
'Mediawiki Maintenance Server: pagetriage extension' }
diff --git a/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
b/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
index 1aa7a29..01598c2 100644
--- a/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
+++ b/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
@@ -4,6 +4,6 @@
command => '/usr/local/bin/foreachwiki
extensions/AbuseFilter/maintenance/purgeOldLogIPData.php >/dev/null 2>&1',
user => $::mediawiki::users::web,
hour => 1,
- minute => 15
+ minute => 15,
}
}
diff --git a/modules/mediawiki/manifests/maintenance/refreshlinks.pp
b/modules/mediawiki/manifests/maintenance/refreshlinks.pp
index 1ccac35..d76475f 100644
--- a/modules/mediawiki/manifests/maintenance/refreshlinks.pp
+++ b/modules/mediawiki/manifests/maintenance/refreshlinks.pp
@@ -1,7 +1,7 @@
# Include this to add cron jobs calling refreshLinks.php on all clusters.
(RT-2355)
class mediawiki::maintenance::refreshlinks( $ensure = present ) {
- require mediawiki
+ require ::mediawiki
file { [ '/var/log/mediawiki/refreshLinks' ]:
ensure => ensure_directory($ensure),
diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index 5c075e2..d5212c6 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -1,5 +1,5 @@
class mediawiki::maintenance::wikidata( $ensure = present ) {
- require mediawiki::users
+ require ::mediawiki::users
# Starts a dispatcher instance every 3 minutes
# They will run for a maximum of 9 minutes, so we can only have 3
concurrent instances.
diff --git a/modules/mediawiki/manifests/monitoring/graphite.pp
b/modules/mediawiki/manifests/monitoring/graphite.pp
index 1f0b346..0cba48a 100644
--- a/modules/mediawiki/manifests/monitoring/graphite.pp
+++ b/modules/mediawiki/manifests/monitoring/graphite.pp
@@ -11,7 +11,7 @@
warning => 1,
critical => 0,
under => true,
- nagios_critical => false
+ nagios_critical => false,
# this will be enabled shortly if we don't see false positives
}
@@ -23,7 +23,7 @@
warning => 1,
critical => 0,
under => true,
- nagios_critical => false
+ nagios_critical => false,
# this will be enabled shortly if we don't see false positives
}
}
diff --git a/modules/mediawiki/manifests/php_enmod.pp
b/modules/mediawiki/manifests/php_enmod.pp
index e9ab99c..00752c2 100644
--- a/modules/mediawiki/manifests/php_enmod.pp
+++ b/modules/mediawiki/manifests/php_enmod.pp
@@ -10,6 +10,6 @@
refreshonly => true,
user => 'root',
group => 'root',
- subscribe => File["/etc/php5/mods-available/${title}.ini"]
+ subscribe => File["/etc/php5/mods-available/${title}.ini"],
}
}
diff --git a/modules/mediawiki/manifests/users.pp
b/modules/mediawiki/manifests/users.pp
index 46537ef..2d6dcdf 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -36,7 +36,7 @@
'ALL = (root) NOPASSWD: /usr/sbin/service apache2 start',
'ALL = (root) NOPASSWD: /sbin/start hhvm',
'ALL = (root) NOPASSWD: /usr/sbin/apache2ctl graceful-stop',
- ]
+ ],
}
# The pybal-check account is used by PyBal to monitor server health
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index 337eec2..cd933bd 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -40,7 +40,7 @@
# Not needed anymore. TODO: remove at a later stage
apache::def { 'HHVM':
- ensure => absent
+ ensure => absent,
}
# Set the Server response header to be equal to the app server FQDN.
diff --git a/modules/mediawiki_singlenode/manifests/init.pp
b/modules/mediawiki_singlenode/manifests/init.pp
index 565f8ee..8e7cbeb 100644
--- a/modules/mediawiki_singlenode/manifests/init.pp
+++ b/modules/mediawiki_singlenode/manifests/init.pp
@@ -23,12 +23,12 @@
$apache_site_template = 'mediawiki_singlenode/mediawiki_singlenode.erb',
$mediawiki_hostname = $::labs_mediawiki_hostname
) {
- require base::mysterious_sysctl
+ require ::base::mysterious_sysctl
class { '::mysql::server':
config_hash => {
datadir => '/mnt/mysql',
- }
+ },
}
require_package('php5-mysql')
@@ -38,7 +38,7 @@
require_package('php-apc', 'php5-cli')
if !defined(Class['memcached']) {
- class { 'memcached':
+ class { '::memcached':
ip => '127.0.0.1',
size => $memcached_size,
}
@@ -81,7 +81,7 @@
exec { 'password_gen':
require => [ Git::Clone['mediawiki'], File["${install_path}/orig"] ],
creates => "${install_path}/orig/adminpass",
- command => "/usr/bin/openssl rand -base64 32 | tr -dc _A-Z-a-z-0-9 >
${install_path}/orig/adminpass"
+ command => "/usr/bin/openssl rand -base64 32 | tr -dc _A-Z-a-z-0-9 >
${install_path}/orig/adminpass",
}
exec { 'mediawiki_setup':
--
To view, visit https://gerrit.wikimedia.org/r/332103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4418247bf579bf15f489ad04e3ea13702127ae5
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
