jenkins-bot has submitted this change and it was merged.
Change subject: Remove lint:ignore:80chars comments
......................................................................
Remove lint:ignore:80chars comments
We have been ignoring the 80 char limit globally since 92b59d2.
Change-Id: I372e153d2b9ca18c5f52f5c9c3d771ec7203101f
---
M puppet/modules/mediawiki/manifests/import/dump.pp
M puppet/modules/mysql/manifests/sql.pp
M puppet/modules/mysql/manifests/user.pp
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/role/manifests/antispam.pp
M puppet/modules/role/manifests/centralauth.pp
M puppet/modules/role/manifests/centralauth/migrate_user.pp
M puppet/modules/role/manifests/cirrussearch.pp
M puppet/modules/role/manifests/gettingstarted.pp
M puppet/modules/role/manifests/globalcssjs.pp
M puppet/modules/role/manifests/graphoid.pp
M puppet/modules/role/manifests/hadoop.pp
M puppet/modules/role/manifests/mobilefrontend.pp
M puppet/modules/role/manifests/molhandler.pp
M puppet/modules/role/manifests/poolcounter.pp
M puppet/modules/role/manifests/raita.pp
M puppet/modules/role/manifests/svg.pp
17 files changed, 0 insertions(+), 38 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/import/dump.pp
b/puppet/modules/mediawiki/manifests/import/dump.pp
index 8f73ea9..e4a2f7f 100644
--- a/puppet/modules/mediawiki/manifests/import/dump.pp
+++ b/puppet/modules/mediawiki/manifests/import/dump.pp
@@ -35,10 +35,8 @@
require ::mediawiki
exec { "import_dump_${title}":
- # lint:ignore:80chars
command => "/usr/local/bin/mwscript importDump.php --wiki=${db_name}
${xml_dump}",
unless => "/usr/local/bin/mwscript pageExists.php --wiki=${db_name}
${dump_sentinel_page}",
- # lint:endignore
user => 'www-data',
require => Mediawiki::Wiki[$wiki],
}
diff --git a/puppet/modules/mysql/manifests/sql.pp
b/puppet/modules/mysql/manifests/sql.pp
index d9916ef..19040ab 100644
--- a/puppet/modules/mysql/manifests/sql.pp
+++ b/puppet/modules/mysql/manifests/sql.pp
@@ -34,10 +34,8 @@
$quoted_unless = regsubst($unless, '"', '\\"', 'G')
exec { $title:
- # lint:ignore:80chars
command => "/usr/bin/mysql -uroot -p${mysql::root_password} -qfsAe
\"${quoted_sql}\"",
unless => "/usr/bin/mysql -uroot -p${mysql::root_password} -qfsANe
\"${quoted_unless}\" | /usr/bin/tail -1 | /bin/grep -q 1",
- # lint:endignore
require => Exec['set_mysql_password'],
}
}
diff --git a/puppet/modules/mysql/manifests/user.pp
b/puppet/modules/mysql/manifests/user.pp
index 5531671..f0f98b3 100644
--- a/puppet/modules/mysql/manifests/user.pp
+++ b/puppet/modules/mysql/manifests/user.pp
@@ -56,10 +56,8 @@
}
} else {
mysql::sql { "create user ${username}":
- # lint:ignore:80chars
sql => "grant ${grant} to '${username}'@'${hostname}'
identified by '${password}'",
unless => "select exists(select 1 from mysql.user where user =
'${username}')",
- # lint:endignore
}
}
}
diff --git a/puppet/modules/payments/manifests/donation_interface.pp
b/puppet/modules/payments/manifests/donation_interface.pp
index dea8161..ebb7f6e 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -26,13 +26,11 @@
# TODO: the following cruft is brought to u by a forward reference snafu.
# Better if DonationInterfaceFormSettings would use relative paths?
- # lint:ignore:80chars
wgAdyenGatewayHtmlFormDir =>
"${DI}/adyen_gateway/forms/html",
wgAmazonGatewayHtmlFormDir =>
"${DI}/amazon_gateway/forms/html",
wgGlobalCollectGatewayHtmlFormDir =>
"${DI}/globalcollect_gateway/forms/html",
wgPayflowProGatewayHtmlFormDir =>
"${DI}/payflowpro_gateway/forms/html",
wgPaypalGatewayHtmlFormDir =>
"${DI}/paypal_gateway/forms/html",
- # lint:endignore
wgAdyenGatewayAccountInfo => {
'test' => {
diff --git a/puppet/modules/role/manifests/antispam.pp
b/puppet/modules/role/manifests/antispam.pp
index 7683553..13c4518 100644
--- a/puppet/modules/role/manifests/antispam.pp
+++ b/puppet/modules/role/manifests/antispam.pp
@@ -7,7 +7,6 @@
mediawiki::extension { 'AbuseFilter':
needs_update => true,
- # lint:ignore:80chars
settings => [
'$wgGroupPermissions["sysop"]["abusefilter-modify"] = true',
'$wgGroupPermissions["*"]["abusefilter-log-detail"] = true',
@@ -17,7 +16,6 @@
'$wgGroupPermissions["sysop"]["abusefilter-modify-restricted"] =
true',
'$wgGroupPermissions["sysop"]["abusefilter-revert"] = true',
],
- # lint:endignore
}
mediawiki::extension { 'SpamBlacklist':
diff --git a/puppet/modules/role/manifests/centralauth.pp
b/puppet/modules/role/manifests/centralauth.pp
index 90cfcf4..7cf2ec1 100644
--- a/puppet/modules/role/manifests/centralauth.pp
+++ b/puppet/modules/role/manifests/centralauth.pp
@@ -48,14 +48,12 @@
}
mediawiki::settings { 'CentralAuthPermissions':
- # lint:ignore:80chars
values => [
'$wgGroupPermissions["sysop"]["centralauth-lock"] = true;',
'$wgGroupPermissions["bureaucrat"]["centralauth-oversight"] =
true;',
'$wgGroupPermissions["bureaucrat"]["centralauth-unmerge"] = true;',
'$wgGroupPermissions["bureaucrat"]["centralauth-rename"] = true;',
]
- # lint:endignore
}
mysql::db { $shared_db:
@@ -68,10 +66,8 @@
}
mysql::sql { 'Create CentralAuth tables':
- # lint:ignore:80chars
sql => "USE ${shared_db}; SOURCE
${::mediawiki::dir}/extensions/CentralAuth/central-auth.sql;",
unless => "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE
table_schema = '${shared_db}' AND table_name = 'globalnames';",
- # lint:endignore
require => [
Mysql::Db[$shared_db],
Mediawiki::Extension['CentralAuth']
@@ -79,10 +75,8 @@
}
mysql::sql { 'Create CentralAuth spoofuser table':
- # lint:ignore:80chars
sql => "USE ${shared_db}; SOURCE
${::mediawiki::dir}/extensions/CentralAuth/AntiSpoof/patch-antispoof-global.mysql.sql;",
unless => "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE
table_schema = '${shared_db}' AND table_name = 'spoofuser';",
- # lint:endignore
require => [
Mysql::Db[$shared_db],
Mediawiki::Extension['CentralAuth']
diff --git a/puppet/modules/role/manifests/centralauth/migrate_user.pp
b/puppet/modules/role/manifests/centralauth/migrate_user.pp
index 799215c..d32aa3d 100644
--- a/puppet/modules/role/manifests/centralauth/migrate_user.pp
+++ b/puppet/modules/role/manifests/centralauth/migrate_user.pp
@@ -12,10 +12,8 @@
$user = $title,
) {
exec { "migrate_user_${user}_to_centralauth":
- # lint:ignore:80chars
command => "/usr/local/bin/mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username '${user}'
--auto",
unless => "/usr/local/bin/mwscript
extensions/CentralAuth/maintenance/migrateAccount.php --username '${user}' |
/bin/grep -q 'already exists'",
- # lint:endignore
user => 'www-data',
require => [
Class['::mediawiki::multiwiki'],
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index c83dde1..65876a5 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -79,10 +79,8 @@
}
exec { 'build_search_index':
- # lint:ignore:80chars
command => '/usr/local/bin/foreachwiki
extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php --startOver &&
/usr/local/bin/foreachwiki
extensions/CirrusSearch/maintenance/forceSearchIndex.php',
onlyif => '/usr/local/bin/mwscript
extensions/CirrusSearch/maintenance/cirrusNeedsToBeBuilt.php --quiet',
- # lint:endignore
user => 'www-data',
require => [
Class['::mediawiki::multiwiki'],
diff --git a/puppet/modules/role/manifests/gettingstarted.pp
b/puppet/modules/role/manifests/gettingstarted.pp
index b17fee7..e3bb47c 100644
--- a/puppet/modules/role/manifests/gettingstarted.pp
+++ b/puppet/modules/role/manifests/gettingstarted.pp
@@ -13,7 +13,6 @@
mediawiki::extension { 'GettingStarted':
browser_tests => true,
- # lint:ignore:80chars
settings => {
wgGettingStartedRedis => '127.0.0.1',
# A sample category configuration for local testing.
@@ -24,6 +23,5 @@
},
wgGettingStartedExcludedCategories => ['Category:Living
people'],
},
- # lint:endignore
}
}
diff --git a/puppet/modules/role/manifests/globalcssjs.pp
b/puppet/modules/role/manifests/globalcssjs.pp
index 68a4dac..62f8228 100644
--- a/puppet/modules/role/manifests/globalcssjs.pp
+++ b/puppet/modules/role/manifests/globalcssjs.pp
@@ -7,13 +7,11 @@
include ::role::centralauth
mediawiki::extension { 'GlobalCssJs':
- # lint:ignore:80chars
settings => [
"\$wgResourceLoaderSources['wiki']['apiScript'] =
'${::mediawiki::server_url}/w/api.php';",
"\$wgResourceLoaderSources['wiki']['loadScript'] =
'${::mediawiki::server_url}/w/load.php';",
'$wgGlobalCssJsConfig["wiki"] = "wiki";',
'$wgGlobalCssJsConfig["source"] = "wiki";',
],
- # lint:endignore
}
}
diff --git a/puppet/modules/role/manifests/graphoid.pp
b/puppet/modules/role/manifests/graphoid.pp
index 562a25e..3a9e648 100644
--- a/puppet/modules/role/manifests/graphoid.pp
+++ b/puppet/modules/role/manifests/graphoid.pp
@@ -5,10 +5,8 @@
require ::graphoid::install::git
# use local graphoid renderer
mediawiki::settings { 'Graphoid':
- # lint:ignore:80chars
values => [
'$wgGraphImgServiceUrl =
"//$wgServerName:11042?server=%1\$s&title=%2\$s&revid=%3\$s&id=%4\$s";',
],
- # lint:endignore
}
}
diff --git a/puppet/modules/role/manifests/hadoop.pp
b/puppet/modules/role/manifests/hadoop.pp
index 9805e96..8384d50 100644
--- a/puppet/modules/role/manifests/hadoop.pp
+++ b/puppet/modules/role/manifests/hadoop.pp
@@ -24,7 +24,6 @@
# Install Hadoop client and configs.
class { '::cdh::hadoop':
- # lint:ignore:80chars
cluster_name => 'vagrant',
namenode_hosts => $namenode_hosts,
datanode_mounts => $datanode_mounts,
@@ -43,7 +42,6 @@
# Use small heapsize for vagrant.
hadoop_heapsize => 64,
yarn_heapsize => 64,
- # lint:endignore
}
# Install and run master and worker classes all on this node.
diff --git a/puppet/modules/role/manifests/mobilefrontend.pp
b/puppet/modules/role/manifests/mobilefrontend.pp
index 50a41e9..9849b5b 100644
--- a/puppet/modules/role/manifests/mobilefrontend.pp
+++ b/puppet/modules/role/manifests/mobilefrontend.pp
@@ -26,12 +26,10 @@
mediawiki::settings { 'AlwaysMobileSkin':
wiki => 'mobile',
- # lint:ignore:80chars
values => {
wgMFAutodetectMobileView => false,
wgMFMobileHeader => 'Host',
wgMobileUrlTemplate =>
"mobile${::mediawiki::multiwiki::base_domain}",
},
- # lint:endignore
}
}
diff --git a/puppet/modules/role/manifests/molhandler.pp
b/puppet/modules/role/manifests/molhandler.pp
index 2b77d7a..ef035e7 100644
--- a/puppet/modules/role/manifests/molhandler.pp
+++ b/puppet/modules/role/manifests/molhandler.pp
@@ -8,12 +8,10 @@
require_package('openbabel')
mediawiki::extension { 'MolHandler':
- # lint:ignore:80chars
settings => [
'$wgApiFrameOptions = \'SAMEORIGIN\'',
'$wgFileExtensions = array_merge( $wgFileExtensions, array(
\'mol\', \'rxn\' ) )',
],
- # lint:endignore
require => [
Package['indigo-utils'],
Package['openbabel'],
diff --git a/puppet/modules/role/manifests/poolcounter.pp
b/puppet/modules/role/manifests/poolcounter.pp
index 9ee20d1..19b5bdd 100644
--- a/puppet/modules/role/manifests/poolcounter.pp
+++ b/puppet/modules/role/manifests/poolcounter.pp
@@ -14,7 +14,6 @@
mediawiki::extension { 'PoolCounter':
priority => $::LOAD_EARLY,
- # lint:ignore:80chars
settings => [
'$wgPoolCountClientConf["servers"][] = "127.0.0.1";',
'$wgPoolCountClientConf["timeout"] = 0.5;',
@@ -23,7 +22,6 @@
'$wgPoolCounterConf["ArticleView"]["workers"] = 2;',
'$wgPoolCounterConf["ArticleView"]["maxqueue"] = 100;',
],
- # lint:endignore
require => Service['poolcounter'],
}
}
diff --git a/puppet/modules/role/manifests/raita.pp
b/puppet/modules/role/manifests/raita.pp
index 6716109..0f7d5f4 100644
--- a/puppet/modules/role/manifests/raita.pp
+++ b/puppet/modules/role/manifests/raita.pp
@@ -51,10 +51,8 @@
}
exec { 'raita import elasticsearch data':
- # lint:ignore:80chars
command => "/usr/bin/curl -X POST '${index_url}/_bulk' --data-binary
@/tmp/raita-data.json",
onlyif => "/usr/bin/curl -sf '${index_url}/_count' | /bin/grep -q
'\"count\":0'",
- # lint:endignore
require => Exec['raita elasticsearch mappings'],
subscribe => File['/tmp/raita-data.json'],
}
diff --git a/puppet/modules/role/manifests/svg.pp
b/puppet/modules/role/manifests/svg.pp
index ba1a48d..4ccdb08 100644
--- a/puppet/modules/role/manifests/svg.pp
+++ b/puppet/modules/role/manifests/svg.pp
@@ -7,13 +7,11 @@
ensure => present,
require => Package['librsvg2-bin'],
values => [
- # lint:ignore:80chars
'$wgEnableUploads = true',
'$wgAllowTitlesInSVG = true',
'$wgSVGConverter = "rsvg"',
'$wgSVGConverters["rsvg"] = \'$path/rsvg-convert -w $width -h
$height $input -o $output\'',
'$wgFileExtensions[] = "svg"',
- # lint:endignore
],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I372e153d2b9ca18c5f52f5c9c3d771ec7203101f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
