date:20161205

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add UI for abusefilter cases in description editing

2016-12-05 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325519

Change subject: Add UI for abusefilter cases in description editing
..

Add UI for abusefilter cases in description editing

This is a minimal UI for when abusefilters are triggered.
Unlike for page edits, this only shows a validation error text
below the edit text field. No special layout or icons here.

Use uselang parameter to get localized abusefilter error messages.

Bug: T150704
Change-Id: I90f847acffbe521e205fc25e7c54f78c09ca2632
---
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
M app/src/main/java/org/wikipedia/server/mwapi/MwServiceError.java
M app/src/test/java/org/wikipedia/descriptions/DescriptionEditClientTest.java
4 files changed, 39 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/19/325519/1

diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
index 268e81b..52cb8e5 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
@@ -23,13 +23,15 @@
 class DescriptionEditClient {
 private static final String ANONYMOUS_TOKEN = "+\\";
 private static final WikiSite WIKI_DATA_SITE = new 
WikiSite("www.wikidata.org", "");
+private static final String ABUSEFILTER_DISALLOWED = 
"abusefilter-disallowed";
+private static final String ABUSEFILTER_WARNING = "abusefilter-warning";
 
 @NonNull private final MwCachedService cachedService
 = new MwCachedService<>(Service.class);
 
 public interface Callback {
 void success(@NonNull Call call);
-void abusefilter(@NonNull Call call, boolean 
disallowed);
+void abusefilter(@NonNull Call call, String info);
 void failure(@NonNull Call call, @NonNull Throwable 
caught);
 }
 
@@ -56,7 +58,7 @@
   final boolean loggedIn,
   @NonNull final Callback cb) {
 
-Call call = service.edit(languageCode, languageCode + 
"wiki",
+Call call = service.edit(languageCode, languageCode, 
languageCode + "wiki",
 pageTitle.getPrefixedText(), description, ANONYMOUS_TOKEN, 
null,
 /* TODO: loggedIn ? "user" : */ null);
 call.enqueue(new retrofit2.Callback() {
@@ -91,10 +93,10 @@
 private void handleError(@NonNull Call call, @NonNull 
DescriptionEdit body,
  @NonNull Callback cb) {
 MwServiceError error = body.getError();
-if (error != null && error.hasMessageName("abusefilter-disallowed")) {
-cb.abusefilter(call, true);
-} else if (error != null && 
error.hasMessageName("abusefilter-warning")) {
-cb.abusefilter(call, false);
+if (error != null && error.hasMessageName(ABUSEFILTER_DISALLOWED)) {
+cb.abusefilter(call, error.getMessageHtml(ABUSEFILTER_DISALLOWED));
+} else if (error != null && error.hasMessageName(ABUSEFILTER_WARNING)) 
{
+cb.abusefilter(call, error.getMessageHtml(ABUSEFILTER_WARNING));
 } else {
 String info = body.info();
 RuntimeException exception = new RuntimeException(info != null
@@ -107,6 +109,7 @@
 @FormUrlEncoded
 @POST("w/api.php?action=wbsetdescription=json")
 Call edit(@NonNull @Field("language") String language,
+   @NonNull @Field("uselang") String useLang,
@NonNull @Field("site") String site,
@NonNull @Field("title") String title,
@NonNull @Field("value") String 
newDescription,
diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
index 74e9e9b..45147d6 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -125,12 +125,9 @@
 }
 
 @Override public void abusefilter(@NonNull 
Call call,
-  boolean disallowed) {
-if (disallowed) {
-// TODO: go to ABUSE_FILTER_DISALLOWED fragment
-} else {
-// TODO: go to ABUSE_FILTER_WARNING fragment
-}
+  String info) {
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1087"

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Revert "db-eqiad.php: Depool db1087"
..


Revert "db-eqiad.php: Depool db1087"

db1087 has finished its ALTER table and it is ready to be pooled back

This reverts commit 0161ae80fea17854c8702694f07d489ae28b2011.

Change-Id: Ib1ecc4446177c1afdbe38868698cf6876211967a
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5905050..c9d6a52 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
'db1082' => 500, # 3.6TB 512GB
-#  'db1087' => 500, # 3.6TB 512GB #T148967
+   'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],
's6' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/325313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1ecc4446177c1afdbe38868698cf6876211967a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Fix composer validation errors

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix composer validation errors
..


Fix composer validation errors

Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
---
M composer.json
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Samwilson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 28a89ae..8115995 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
-   "name": "samwilson/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-genealogy",
+   "description": "A MediaWiki extension that adds a parser function to 
assist with linking between genealogical records",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

-- 
To view, visit https://gerrit.wikimedia.org/r/325518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Fix composer validation errors

2016-12-05 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325518

Change subject: Fix composer validation errors
..

Fix composer validation errors

Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
---
M composer.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Genealogy 
refs/changes/18/325518/1

diff --git a/composer.json b/composer.json
index 28a89ae..8115995 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
-   "name": "samwilson/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-genealogy",
+   "description": "A MediaWiki extension that adds a parser function to 
assist with linking between genealogical records",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

-- 
To view, visit https://gerrit.wikimedia.org/r/325518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9776143ca05a0fd55dea48958818e5a650f2e5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Change vendor name

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Change vendor name
..


Change vendor name

Change-Id: I36d09ad644ce726f1c1cf715fda6bbe3c90f0c36
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Samwilson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 131691b..28a89ae 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-   "name": "wikimedia/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-Genealogy",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

-- 
To view, visit https://gerrit.wikimedia.org/r/325517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36d09ad644ce726f1c1cf715fda6bbe3c90f0c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Change vendor name

2016-12-05 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325517

Change subject: Change vendor name
..

Change vendor name

Change-Id: I36d09ad644ce726f1c1cf715fda6bbe3c90f0c36
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Genealogy 
refs/changes/17/325517/1

diff --git a/composer.json b/composer.json
index 131691b..28a89ae 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-   "name": "wikimedia/mediawiki-extensions-Genealogy",
+   "name": "samwilson/mediawiki-extensions-Genealogy",
"type": "mediawiki-extension",
"license": "GPL-3.0+",
"keywords": ["genealogy", "family history", "MediaWiki"],

-- 
To view, visit https://gerrit.wikimedia.org/r/325517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36d09ad644ce726f1c1cf715fda6bbe3c90f0c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Don't worry about recursive redirects, just use one

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Don't worry about recursive redirects, just use one
..


Don't worry about recursive redirects, just use one

The Person's title was following any number of redirects, but as
this optimisation is already done in the database it's not
required.

Change-Id: I5a598cc4e71a6d27c64fafae8cc2c0d881d39aeb
---
M src/Person.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Samwilson: Looks good to me, approved
  jenkins-bot: Verified

Objections:
  Legoktm: There's a problem with this change, please improve



diff --git a/src/Person.php b/src/Person.php
index 8dfbb51..a794c05 100644
--- a/src/Person.php
+++ b/src/Person.php
@@ -51,8 +51,8 @@
 */
public function getTitle() {
$page = WikiPage::factory( $this->title );
-   while ( $page->isRedirect() ) {
-   $page = WikiPage::factory( $page->getRedirectTarget() );
+   if ( $page->isRedirect() ) {
+   return $page->getRedirectTarget();
}
return $page->getTitle();
}

-- 
To view, visit https://gerrit.wikimedia.org/r/322848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a598cc4e71a6d27c64fafae8cc2c0d881d39aeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove broken apcu_set() calls

2016-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325516

Change subject: Remove broken apcu_set() calls
..

Remove broken apcu_set() calls

The method call was misnamed (bogus) and not needed anyway,
since the other BagOStuff classes fail if no key is present.

Change-Id: I726965e665c2d0c5843d8dd33504810d130b9e98
---
M includes/libs/objectcache/APCUBagOStuff.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/325516/1

diff --git a/includes/libs/objectcache/APCUBagOStuff.php 
b/includes/libs/objectcache/APCUBagOStuff.php
index 02b3c92..6e6a3ad 100644
--- a/includes/libs/objectcache/APCUBagOStuff.php
+++ b/includes/libs/objectcache/APCUBagOStuff.php
@@ -72,7 +72,7 @@
if ( apcu_exists( $key . self::KEY_SUFFIX ) ) {
return apcu_inc( $key . self::KEY_SUFFIX, $value );
} else {
-   return apcu_set( $key . self::KEY_SUFFIX, $value );
+   return false;
}
}
 
@@ -85,7 +85,7 @@
if ( apcu_exists( $key . self::KEY_SUFFIX ) ) {
return apcu_dec( $key . self::KEY_SUFFIX, $value );
} else {
-   return apcu_set( $key . self::KEY_SUFFIX, -$value );
+   return false;
}
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I726965e665c2d0c5843d8dd33504810d130b9e98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: WIP add dash to crm role

2016-12-05 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325515

Change subject: WIP add dash to crm role
..

WIP add dash to crm role

Suffering from unrelated vagrant provision error:

Error: Could not prefetch package provider 'pip': [nil, nil, nil, nil,
nil, nil, nil, nil, nil, nil, nil]

Only web suggestion was `easy_install pip` which didn't help.

Bug: T99869
Change-Id: I11bbb03e62c844b4abfccb5155b43bbbef969098
---
A puppet/modules/crm/manifests/dash.pp
M puppet/modules/crm/manifests/init.pp
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/15/325515/1

diff --git a/puppet/modules/crm/manifests/dash.pp 
b/puppet/modules/crm/manifests/dash.pp
new file mode 100644
index 000..faf058c
--- /dev/null
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -0,0 +1,13 @@
+# == Class: crm::dash
+#
+# Fundraising dashboard
+#
+class crm::dash (
+) {
+include ::crm
+
+git::clone { 'dash':
+directory => "/srv/dash",
+remote => "g...@github.com:wikimedia/wikimedia-fundraising-dash.git"
+}
+}
diff --git a/puppet/modules/crm/manifests/init.pp 
b/puppet/modules/crm/manifests/init.pp
index df53a6c..6260902 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -37,6 +37,7 @@
 include ::postfix
 include ::crm::apache
 include ::crm::civicrm
+include ::crm::dash
 include ::crm::tools
 include ::activemq
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11bbb03e62c844b4abfccb5155b43bbbef969098
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off duplicate key reporting for parser cache (2)

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Turn off duplicate key reporting for parser cache (2)
..


Turn off duplicate key reporting for parser cache (2)

Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a9d3fdd..456938b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -341,6 +341,7 @@
'purgePeriod' => 0,
'tableName' => 'pc',
'shards' => 256,
+   'reportDupes' => false
],
],
'replication' => 'async',

-- 
To view, visit https://gerrit.wikimedia.org/r/325514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off duplicate key reporting for parser cache (2)

2016-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325514

Change subject: Turn off duplicate key reporting for parser cache (2)
..

Turn off duplicate key reporting for parser cache (2)

Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/14/325514/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a9d3fdd..456938b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -341,6 +341,7 @@
'purgePeriod' => 0,
'tableName' => 'pc',
'shards' => 256,
+   'reportDupes' => false
],
],
'replication' => 'async',

-- 
To view, visit https://gerrit.wikimedia.org/r/325514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71dfedc2b87eb24bd7600fe2a4e77c7002d60076
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: [Popups] depends on EventLogging

2016-12-05 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325513

Change subject: [Popups] depends on EventLogging
..

[Popups] depends on EventLogging

Popups has a soft dependency on EventLogging but its unit and
integration tests assume that it's present.

Change-Id: I4b952a539a495b62d4f4b783b305027e9421ce70
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/13/325513/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index d4e5dc9..891bf64 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -146,7 +146,7 @@
 'PhpTagsWiki': ['PhpTags', 'PhpTagsFunctions'],
 'PictureGame': ['SocialProfile'],
 'PollNY': ['SocialProfile'],
-'Popups': ['BetaFeatures', 'TextExtracts', 'PageImages'],
+'Popups': ['BetaFeatures', 'TextExtracts', 'PageImages', 'EventLogging'],
 'PronunciationRecording': ['UploadWizard'],
 'ProofreadPage': ['LabeledSectionTransclusion', 'VisualEditor'],
 'QuickSurveys': ['EventLogging'],

-- 
To view, visit https://gerrit.wikimedia.org/r/325513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b952a539a495b62d4f4b783b305027e9421ce70
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Phuedx 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add inflected forms of sitename on Finnish Wikivoyage

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add inflected forms of sitename on Finnish Wikivoyage
..


Add inflected forms of sitename on Finnish Wikivoyage

Bug: T152376
Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10
---
M WikimediaMessages.hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Stryn: Looks good to me, but someone else must approve
  TTO: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 61282b3..f7442ea 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -825,26 +825,31 @@
'Wikiuutiset' => 'Wikiuutisten',
'Wikisitaatit' => 'Wikisitaattien',
'Wikimedia Suomi' => 'Wikimedia Suomen',
+   'Wikimatkat' => 'Wikimatkojen',
),
'partitive' => array(
'Wikiuutiset' => 'Wikiuutisia',
'Wikisitaatit' => 'Wikisitaatteja',
'Wikimedia Suomi' => 'Wikimedia Suomea',
+   'Wikimatkat' => 'Wikimatkoja',
),
'elative' => array(
'Wikiuutiset' => 'Wikiuutisista',
'Wikisitaatit' => 'Wikisitaateista',
'Wikimedia Suomi' => 'Wikimedia Suomesta',
+   'Wikimatkat' => 'Wikimatkoista',
),
'inessive' => array(
'Wikiuutiset' => 'Wikiuutisissa',
'Wikisitaatit' => 'Wikisitaateissa',
'Wikimedia Suomi' => 'Wikimedia Suomessa',
+   'Wikimatkat' => 'Wikimatkoissa',
),
'illative' => array(
'Wikiuutiset' => 'Wikiuutisiin',
'Wikisitaatit' => 'Wikisitaatteihin',
'Wikimedia Suomi' => 'Wikimedia Suomeen',
+   'Wikimatkat' => 'Wikimatkoihin',
),
); # fi
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Stryn 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Move section handling to the LST extension

2016-12-05 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325511

Change subject: Move section handling to the LST extension
..

Move section handling to the LST extension

 * This works now that ext tag take precedence over block levels.

Change-Id: Ieeb0c55d13ff159f6c1993a6aa229362c93a6e5d
---
M lib/ext/LST/index.js
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
3 files changed, 35 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/11/325511/1

diff --git a/lib/ext/LST/index.js b/lib/ext/LST/index.js
index 698f663..c375916 100644
--- a/lib/ext/LST/index.js
+++ b/lib/ext/LST/index.js
@@ -3,7 +3,11 @@
 var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
 
 var DU = ParsoidExtApi.DOMUtils;
+var Util = ParsoidExtApi.Util;
 var Promise = ParsoidExtApi.Promise;
+var defines = ParsoidExtApi.defines;
+
+var SelfclosingTagTk = defines.SelfclosingTagTk;
 
 // Special case for  until LST is implemented natively.
 var serialHandler = {
@@ -26,15 +30,44 @@
}),
 };
 
+// TODO: Properly handle this.
+// Special handling for wikisource: hide section tags for now.
+// See https://www.mediawiki.org/wiki/Parsoid/HTML_based_LST
+var tokenHandler = function(manager, pipelineOpts, extToken, cb) {
+   var sectionAttribs = [];
+   var sectionType = 'mw:Extension/LabeledSectionTransclusion';
+
+   extToken.getAttribute('options').some(function(kv) {
+   if (kv.k === 'begin' || kv.k === 'end') {
+   sectionType += '/' + kv.k;
+   sectionAttribs.push({ k: 'content', v: kv.v });
+   return true;
+   }
+   });
+   sectionAttribs.push({ k: 'typeof', v: sectionType });
+   sectionAttribs.push({ k: 'data-mw', v: JSON.stringify({ name: "section" 
}) });
+
+   var token = new SelfclosingTagTk('meta', sectionAttribs, {
+   src: extToken.getAttribute('source'),
+   tsr: Util.clone(extToken.dataAttribs.tsr),
+   });
+
+   cb({ tokens: [token] });
+};
+
 // LST constructor
 module.exports = function() {
this.config = {
tags: [
{
-   name: 'labeledSectiontransclusion/begin',
+   name: 'section',
+   tokenHandler: tokenHandler,
+   },
+   {
+   name: 'labeledsectiontransclusion/begin',
serialHandler: serialHandler,
}, {
-   name: 'labeledSectiontransclusion/end',
+   name: 'labeledsectiontransclusion/end',
serialHandler: serialHandler,
},
],
diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index e4eb64c..19cad3b 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -730,31 +730,6 @@
token = "";
}
 
-   if (origToken.name === 'section') {
-   // Special handling for wikisource: hide section tags 
for now
-   // TODO: Properly handle this. See
-   // https://www.mediawiki.org/wiki/Parsoid/HTML_based_LST
-   var sectionType = 
'mw:Extension/LabeledSectionTransclusion';
-   var sectionAttribs = [];
-   origToken.attribs.forEach(function(a) {
-   var content;
-   if (a.k === 'begin') {
-   sectionType += '/begin';
-   content = a.v;
-   } else if (a.k === 'end') {
-   sectionType += '/end';
-   content = a.v;
-   }
-   if (content) {
-   sectionAttribs.push({k: 'content', v: 
content});
-   }
-   });
-   sectionAttribs = [{k: 'typeof', v: 
sectionType}].concat(sectionAttribs);
-   token = new SelfclosingTagTk('meta', sectionAttribs, {
-   src: token,
-   tsr: origToken.tsr,
-   });
-   }
} else {
// Convert attributes to string, if necessary.
// XXX: Likely better done in AttributeTransformManager when 
processing is
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index f9755c6..59af5d7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -22890,8 +22890,6 @@
 
 !!

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use the spec'd extension model for LST

2016-12-05 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325512

Change subject: Use the spec'd extension model for LST
..

Use the spec'd extension model for LST

 * It's unclear why we have this unconventional representation.

Change-Id: If3df2ea441a9c89409d98b586a40e181047d8f8b
---
M lib/ext/LST/index.js
1 file changed, 8 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/12/325512/1

diff --git a/lib/ext/LST/index.js b/lib/ext/LST/index.js
index c375916..cd1c9ac 100644
--- a/lib/ext/LST/index.js
+++ b/lib/ext/LST/index.js
@@ -9,49 +9,21 @@
 
 var SelfclosingTagTk = defines.SelfclosingTagTk;
 
-// Special case for  until LST is implemented natively.
-var serialHandler = {
-   handle: Promise.method(function(node, state, wrapperUnmodified) {
-   var env = state.env;
-   var typeOf = node.getAttribute('typeof') || '';
-   var dp = DU.getDataParsoid(node);
-   var src;
-   if (dp.src) {
-   src = dp.src;
-   } else if (typeOf.match('begin')) {
-   src = '';
-   } else if (typeOf.match('end')) {
-   src = '';
-   } else {
-   env.log('error', 'LST  without content in: ' + 
node.outerHTML);
-   src = '';
-   }
-   return src;
-   }),
-};
-
 // TODO: Properly handle this.
 // Special handling for wikisource: hide section tags for now.
 // See https://www.mediawiki.org/wiki/Parsoid/HTML_based_LST
 var tokenHandler = function(manager, pipelineOpts, extToken, cb) {
-   var sectionAttribs = [];
-   var sectionType = 'mw:Extension/LabeledSectionTransclusion';
-
-   extToken.getAttribute('options').some(function(kv) {
-   if (kv.k === 'begin' || kv.k === 'end') {
-   sectionType += '/' + kv.k;
-   sectionAttribs.push({ k: 'content', v: kv.v });
-   return true;
-   }
-   });
-   sectionAttribs.push({ k: 'typeof', v: sectionType });
-   sectionAttribs.push({ k: 'data-mw', v: JSON.stringify({ name: "section" 
}) });
-
-   var token = new SelfclosingTagTk('meta', sectionAttribs, {
+   var argDict = Util.getArgInfo(extToken).dict;
+   if (!extToken.dataAttribs.tagWidths[1]) {
+   argDict.body = null;  // Serialize to self-closing.
+   }
+   var token = new SelfclosingTagTk('meta', [
+   { k: 'typeof', v: 'mw:Extension/' + argDict.name },
+   { k: 'data-mw', v: JSON.stringify(argDict) },
+   ], {
src: extToken.getAttribute('source'),
tsr: Util.clone(extToken.dataAttribs.tsr),
});
-
cb({ tokens: [token] });
 };
 
@@ -62,13 +34,6 @@
{
name: 'section',
tokenHandler: tokenHandler,
-   },
-   {
-   name: 'labeledsectiontransclusion/begin',
-   serialHandler: serialHandler,
-   }, {
-   name: 'labeledsectiontransclusion/end',
-   serialHandler: serialHandler,
},
],
};

-- 
To view, visit https://gerrit.wikimedia.org/r/325512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3df2ea441a9c89409d98b586a40e181047d8f8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove obsolete PPA key files

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325510

Change subject: Remove obsolete PPA key files
..

Remove obsolete PPA key files

These files were used to set up apt to source from PPAs and are no
longer in use.

Change-Id: Ib604af36b9e8b73fa0cbae7dc9bf7ee0522ad50f
---
D files/ppa/2085FE8D.key
D files/ppa/2A2356C9.key
D files/ppa/3D1B4472.key
D files/ppa/AA8F5DAB.key
4 files changed, 0 insertions(+), 50 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/325510/1

diff --git a/files/ppa/2085FE8D.key b/files/ppa/2085FE8D.key
deleted file mode 100644
index a64ae3b..000
--- a/files/ppa/2085FE8D.key
+++ /dev/null
@@ -1,12 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: SKS 1.0.10
-
-mI0ETTQqsgEEAKw4CQlBUH/RBNJCxkDDRirYEJO2nccX49jYBF1MOMTNkVejMP6UbNzRksse
-IIjZMcriuQiqmjq1qYJ8JXx5vrakAUALZRIM851m3CD1w/2waoYZNmUlfdtfeME5ny50rGz5
-FXFfKZrXfg4IMQdTYC7lq+oL1JLjzjVdFnQ4iOrxABEBAAG0HUxhdW5jaHBhZCBQUEEgZm9y
-IEdsYW5jZSBDb3JliLgEEwECACIFAk00KrICGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheA
-AAoJEK3PShoghf6N/A4EAJG3VPu5JX9WXnM0Np6GtAv4k1T3W1DqpyxhsoVlzfAbqVOLvQN+
-vb7E4lOekvvB66YXOPr7HbKFETgaLmqo5o1NoGc1IYg1XTwlGFB1aLP0KLKxNCsnworDKMcF
-+X2fgZoWqR1voprXckB+fVIVFMb0lof+A9bqMANegEMtrhdl
-=DfOR
--END PGP PUBLIC KEY BLOCK-
diff --git a/files/ppa/2A2356C9.key b/files/ppa/2A2356C9.key
deleted file mode 100644
index a6e880f..000
--- a/files/ppa/2A2356C9.key
+++ /dev/null
@@ -1,12 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: SKS 1.0.10
-
-mI0ETD/6ogEEAK8f9PI2Kbo5HVjECg90+mQTzflD6ApY5ahT9NE+G5LYjvNRYMUInZp9OB7G
-KwfFye3Cek5XxFG5QehTQfl5WPKgw+kyLqxGS82oPO1NbpAnDgY/+OeNJL+LzAZc+MkQJd4f
-FH9CUnVg3yGg8hR9sV05MtOrhqDU1qDVmXTQxCLJABEBAAG0F0xhdW5jaHBhZCBOb3ZhIFBh
-Y2thZ2VziLYEEwECACAFAkw/+qICGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAeuj03
-KiNWyYQXBACQicvIZ25lsYR93QRBlc0siBoc6ZI7i8vD0BNEz760o4eYmtTIDYXjUqAIt4+l
-LKrJtIdYaxmHuEThLhkxnmwUTygkKwW+/i2mxNBLDhY6EwNHPKHUkR6qqgP/2uzHbqYmx1R+
-oyWH/V4z8J977xV/FJ37TraD3AJfnfeZRw71Gg==
-=+1Wm
--END PGP PUBLIC KEY BLOCK-
diff --git a/files/ppa/3D1B4472.key b/files/ppa/3D1B4472.key
deleted file mode 100644
index 979a04b..000
--- a/files/ppa/3D1B4472.key
+++ /dev/null
@@ -1,12 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: SKS 1.0.10
-
-mI0ETe+FMQEEALsSsqhs28qhedNb46WOPe56cTcbd4Ozvq5w3a+CCP2YXpHpwPbRZJB4n/8u
-Xs9MI2oxP83DX65vfhMD+yFGh4aPMQNKO0tkTwoX3ouHw1F5IOvsk1kmeCHvxBkkgsOHpvYP
-psswT8VfmotVmMdzBunqeJmIkPCdw7op7VzCmMgnABEBAAG0KExhdW5jaHBhZCBQUEEgZm9y
-IE9wZW5TdGFjayByZWxlYXNlIHRlYW2IuAQTAQIAIgUCTe+FMQIbAwYLCQgHAwIGFQgCCQoL
-BBYCAwECHgECF4AACgkQfSHC7D0bRHIWGAP/WYXu6yZFmQLbV7Xl01YQH49jUkaKNn2Akc/X
-oGkHj4NZlS/byRqZC5p4lP58RgaQ5w7wZyFyjAe3q8UTK3Bq7uGnMDWOfvNNUApKsViOGkVE
-nJ747MA1MpHuJfx6VuNy7mcNRX+fhcscFQKaQQeBxj9leXYPr8clJAaqZ3Dnc5o=
-=RxF5
--END PGP PUBLIC KEY BLOCK-
diff --git a/files/ppa/AA8F5DAB.key b/files/ppa/AA8F5DAB.key
deleted file mode 100644
index 394eb9c..000
--- a/files/ppa/AA8F5DAB.key
+++ /dev/null
@@ -1,14 +0,0 @@
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mI0ET0tiawEEAOBJv3hnX+BgdsRzSrbLbcIZ8/ViGE+hP+0znB40PNobJ1izPCah
-9dKAw88oAvSvYmu0s/4YARBbHDtpMiLuNFYD2yXT2Z44HI2VTXEjUpGsDdNLo20G
-l5JMG1F/azyyjRGlUL1UHBsfEi0LC2w29glKjUGxDL7//0Y/muZCwOd9ABEBAAG0
-K0xhdW5jaHBhZCBQUEEgZm9yIE9wZW5TdGFjayBQUEEgbWFpbnRhaW5lcnOIuAQT
-AQIAIgUCT0tiawIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQoYakrqqP
-XauHzgP/TNk+ztxixp7Gt/Me/2r9FJ+MSb4dTphuWHa8dQPTeBZokK7zjz406ux9
-TMmTUAJwaZ4UR4+a+p696YixRQqPW0Pi24zNxPYDJIqT8DB+x5JA8PnzXBSVVGsv
-s83hFmLjmg5y4Y3Ej27I7k/VhAbsRhTBV+Lh3OI9JSGZplyyOLU=
-=g6id
--END PGP PUBLIC KEY BLOCK-
-

-- 
To view, visit https://gerrit.wikimedia.org/r/325510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib604af36b9e8b73fa0cbae7dc9bf7ee0522ad50f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove remnant files and templates of mha classes

2016-12-05 Thread Tim Landscheidt (Code Review)

Hello Jcrespo,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/325509

to review the following change.

Change subject: Remove remnant files and templates of mha classes
..

Remove remnant files and templates of mha classes

The classes mha::manager and mha::node were removed by
01dd84e894bca81ccdaa688baa7ff4ddf5348fa1, but the associated files and
templates were left behind.  As they are not used anymore, this change
removes them.

Change-Id: Idb7a5649c7ff0e1ad598444f26ad9b33f122ab01
---
D files/mha/master_ip_online_change
D files/mha/mha_site_switch
D modules/role/templates/mha/local.erb
D modules/role/templates/mha/siteswitch.erb
4 files changed, 0 insertions(+), 469 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/325509/1

diff --git a/files/mha/master_ip_online_change 
b/files/mha/master_ip_online_change
deleted file mode 100755
index 3ebcf20..000
--- a/files/mha/master_ip_online_change
+++ /dev/null
@@ -1,274 +0,0 @@
-#!/usr/bin/env perl
-
-#  Copyright (C) 2011 DeNA Co.,Ltd.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#  Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-## Note: This is a sample script and is not complete. Modify the script based 
on your environment.
-##
-## 2013-01 Modified for WMF, currently sets the old-master to read-only prior 
to killing threads
-## and ensures that the new-master is read-only until the slaves have been 
pointed to it. -Asher
-
-use strict;
-use warnings FATAL => 'all';
-
-use Getopt::Long;
-use MHA::DBHelper;
-use MHA::NodeUtil;
-use Time::HiRes qw( sleep gettimeofday tv_interval );
-use Data::Dumper;
-
-my $_tstart;
-my $_running_interval = 0.1;
-my (
-  $command,  $orig_master_host, $orig_master_ip,
-  $orig_master_port, $orig_master_user, $orig_master_password,
-  $new_master_host,  $new_master_ip,$new_master_port,
-  $new_master_user,  $new_master_password
-);
-GetOptions(
-  'command=s'  => \$command,
-  'orig_master_host=s' => \$orig_master_host,
-  'orig_master_ip=s'   => \$orig_master_ip,
-  'orig_master_port=i' => \$orig_master_port,
-  'orig_master_user=s' => \$orig_master_user,
-  'orig_master_password=s' => \$orig_master_password,
-  'new_master_host=s'  => \$new_master_host,
-  'new_master_ip=s'=> \$new_master_ip,
-  'new_master_port=i'  => \$new_master_port,
-  'new_master_user=s'  => \$new_master_user,
-  'new_master_password=s'  => \$new_master_password,
-);
-
-exit ();
-
-sub current_time_us {
-  my ( $sec, $microsec ) = gettimeofday();
-  my $curdate = localtime($sec);
-  return $curdate . " " . sprintf( "%06d", $microsec );
-}
-
-sub sleep_until {
-  my $elapsed = tv_interval($_tstart);
-  if ( $_running_interval > $elapsed ) {
-sleep( $_running_interval - $elapsed );
-  }
-}
-
-sub get_threads_util {
-  my $dbh= shift;
-  my $my_connection_id   = shift;
-  my $running_time_threshold = shift;
-  my $type   = shift;
-  $running_time_threshold = 0 unless ($running_time_threshold);
-  $type   = 0 unless ($type);
-  my @threads;
-
-  my $sth = $dbh->prepare("SHOW PROCESSLIST");
-  $sth->execute();
-
-  while ( my $ref = $sth->fetchrow_hashref() ) {
-my $id = $ref->{Id};
-my $user   = $ref->{User};
-my $host   = $ref->{Host};
-my $command= $ref->{Command};
-my $state  = $ref->{State};
-my $query_time = $ref->{Time};
-my $info   = $ref->{Info};
-$info =~ s/^\s*(.*?)\s*$/$1/ if defined($info);
-next if ( $my_connection_id == $id );
-next if ( defined($query_time) && $query_time < $running_time_threshold );
-next if ( defined($command)&& $command eq "Binlog Dump" );
-next if ( defined($user)   && $user eq "system user" );
-next
-  if ( defined($command)
-  && $command eq "Sleep"
-  && defined($query_time)
-  && $query_time >= 1 );
-
-if ( $type >= 1 ) {
-  next if ( defined($command) && $command eq "Sleep" );
-  next if ( defined($command) && $command eq "Connect" );
-}
-
-if ( $type >= 2 ) {
-  next if ( defined($info) && $info =~ m/^select/i );
-  next if ( defined($info) && $info =~ m/^show/i );
-}
-
-push

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1087"

2016-12-05 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325313

Change subject: Revert "db-eqiad.php: Depool db1087"
..

Revert "db-eqiad.php: Depool db1087"

db1087 has finished its ALTER table and it is ready to be pooled back

This reverts commit 0161ae80fea17854c8702694f07d489ae28b2011.

Change-Id: Ib1ecc4446177c1afdbe38868698cf6876211967a
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/13/325313/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5905050..c9d6a52 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,7 +145,7 @@
'db1070' => 50,  # 2.8TB 160GB, api, old master
'db1071' => 50,  # 2.8TB 160GB, api
'db1082' => 500, # 3.6TB 512GB
-#  'db1087' => 500, # 3.6TB 512GB #T148967
+   'db1087' => 500, # 3.6TB 512GB
'db1092' => 500, # 3.6TB 512GB
],
's6' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/325313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1ecc4446177c1afdbe38868698cf6876211967a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Remove redundant index

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove redundant index
..


Remove redundant index

Because linter_cat is the leftmost part of the linter_cat_page_position
index, we don't need a separate one.

Pointed out by jynus in T148866#2846381.

Change-Id: I3b0e75b02762cc948baf8dbdfee67b611aa3b9c1
---
M linter.sql
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/linter.sql b/linter.sql
index fa9bc8e..84ba5e2 100644
--- a/linter.sql
+++ b/linter.sql
@@ -14,6 +14,5 @@
 
 -- Query by page
 CREATE INDEX /*i*/linter_page ON /*_*/linter (linter_page);
--- Query by category
-CREATE INDEX /*i*/linter_cat ON /*_*/linter (linter_cat);
+-- Unique index for lint errors, also covers linter_cat for query by category
 CREATE UNIQUE INDEX /*i*/linter_cat_page_position ON /*_*/linter (linter_cat, 
linter_page, linter_start, linter_end);

-- 
To view, visit https://gerrit.wikimedia.org/r/325508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b0e75b02762cc948baf8dbdfee67b611aa3b9c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Remove redundant index

2016-12-05 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325508

Change subject: Remove redundant index
..

Remove redundant index

Because linter_cat is the leftmost part of the linter_cat_page_position
index, we don't need a separate one.

Pointed out by jynus in T148866#2846381.

Change-Id: I3b0e75b02762cc948baf8dbdfee67b611aa3b9c1
---
M linter.sql
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/08/325508/1

diff --git a/linter.sql b/linter.sql
index fa9bc8e..84ba5e2 100644
--- a/linter.sql
+++ b/linter.sql
@@ -14,6 +14,5 @@
 
 -- Query by page
 CREATE INDEX /*i*/linter_page ON /*_*/linter (linter_page);
--- Query by category
-CREATE INDEX /*i*/linter_cat ON /*_*/linter (linter_cat);
+-- Unique index for lint errors, also covers linter_cat for query by category
 CREATE UNIQUE INDEX /*i*/linter_cat_page_position ON /*_*/linter (linter_cat, 
linter_page, linter_start, linter_end);

-- 
To view, visit https://gerrit.wikimedia.org/r/325508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b0e75b02762cc948baf8dbdfee67b611aa3b9c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Support extension tags which shadows block level elements

2016-12-05 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325507

Change subject: Support extension tags which shadows block level elements
..

Support extension tags which shadows block level elements

Change-Id: Ieadcc21966dc30511fd9c56365b1abfcdadee3fe
---
M lib/utils/Util.js
M lib/wt2html/pegTokenizer.pegjs
M tests/parserTests-blacklist.js
3 files changed, 155 insertions(+), 140 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/07/325507/1

diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index 590406e..0e71410 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -1377,11 +1377,6 @@
}).join('');
 };
 
-Util.isHTMLElementName = function(name) {
-   name = name.toUpperCase();
-   return Consts.HTML.HTML5Tags.has(name) || 
Consts.HTML.OlderHTMLTags.has(name);
-};
-
 /**
  * Determine whether the protocol of a link is potentially valid. Use the
  * environment's per-wiki config to do so.
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 60d6e4f..68fd213 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -72,6 +72,148 @@
 }
 };
 
+var isXMLTag = function(name, block) {
+var lName = name.toLowerCase();
+var uName = name.toUpperCase();
+
+// FIXME: These are installed extension tags which we, for some
+// historical reason, are special casing in the grammar.  Ignore them
+// here, they have their own rules.
+//
+// For , see https://gerrit.wikimedia.org/r/#/c/281076/
+// where we'll clean this up.  Notice how much we can remove!
+//
+// For , see https://gerrit.wikimedia.org/r/#/c/232313/
+// which has some relevant info for serialization.
+var ignoredExtTag = lName === 'pre' || lName === 'nowiki';
+
+var isInstalledExt = env.conf.wiki.extensionTags.has(lName) && 
!ignoredExtTag;
+var isIncludeTag = lName === 'includeonly' ||
+lName === 'noinclude' || lName === 'onlyinclude';
+
+var isHtmlTag = block ?
+// We need to ignore them here too because block tags have
+// higher precedence than our questionable rules.
+constants.HTML.BlockTags.has(uName) && !ignoredExtTag :
+constants.HTML.HTML5Tags.has(uName) || 
constants.HTML.OlderHTMLTags.has(uName);
+
+return isHtmlTag || isInstalledExt || isIncludeTag;
+};
+
+var maybeExtensionTag = function(t) {
+var tagName = t.name.toLowerCase();
+
+var isInstalledExt = env.conf.wiki.extensionTags.has(tagName);
+var isIncludeTag = tagName === 'includeonly' ||
+tagName === 'noinclude' || tagName === 'onlyinclude';
+
+// Extensions have higher precedence when they shadow html tags.
+if (!(isInstalledExt || isIncludeTag)) {
+return t;
+}
+
+var dp = t.dataAttribs;
+var skipLen = 0;
+
+switch (t.constructor) {
+case EndTagTk:
+return t;
+case SelfclosingTagTk:
+dp.src = input.substring(dp.tsr[0], dp.tsr[1]);
+dp.tagWidths = [dp.tsr[1] - dp.tsr[0], 0];
+if (isIncludeTag) {
+return t;
+}
+break;
+case TagTk:
+var tsr0 = dp.tsr[0];
+var endTagRE = new RegExp("^[\\s\\S]*?()", "mi");
+var restOfInput = input.substring(tsr0);
+var tagContent = restOfInput.match(endTagRE);
+
+if (!tagContent) {
+dp.src = input.substring(dp.tsr[0], dp.tsr[1]);
+dp.tagWidths = [dp.tsr[1] - dp.tsr[0], 0];
+if (isIncludeTag) {
+return t;
+} else {
+// This is undefined behaviour.  The php parser currently
+// returns a tag here as well, which results in unclosed
+// extension tags that shadow html tags falling back to
+// their html equivalent.  The sanitizer will take care
+// of converting to text where necessary.  We do this to
+// simplify `hasWikitextTokens` when escaping wikitext,
+// which wants these as tokens because it's otherwise
+// lacking in context.
+return t;  // not text()
+}
+}
+
+var extSrc = tagContent[0];
+var endTagWidth = tagContent[1].length;
+
+// FIXME: This should be removed in favour of a native parser 
function
+// for `tag`, which invokes the extension handler directly.
+if (tagName === 'ref') {
+// Support 1-level nesting of  tags during tokenizing.
+//  tags are the exception

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Bump wikimedia/slimapp to v0.8.0

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Bump wikimedia/slimapp to v0.8.0
..


Bump wikimedia/slimapp to v0.8.0

Change-Id: I3d8ec425d3969d6bb0c353d61000bf6830a5af76
---
M composer.json
M composer.lock
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
M vendor/wikimedia/slimapp/README.md
M vendor/wikimedia/slimapp/composer.lock
M vendor/wikimedia/slimapp/src/AbstractApp.php
M vendor/wikimedia/slimapp/src/Auth/AuthManager.php
M vendor/wikimedia/slimapp/src/Auth/Password.php
M vendor/wikimedia/slimapp/src/Config.php
M vendor/wikimedia/slimapp/src/Controller.php
M vendor/wikimedia/slimapp/src/Dao/AbstractDao.php
M vendor/wikimedia/slimapp/src/HeaderMiddleware.php
M vendor/wikimedia/slimapp/src/Mailer.php
M vendor/wikimedia/slimapp/src/ParsoidClient.php
15 files changed, 498 insertions(+), 305 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  Niharika29: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 945510d..0145b06 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"require": {
"php": ">=5.5.9",
"phpmailer/phpmailer": "v5.2.9",
-   "wikimedia/slimapp": "0.7.1"
+   "wikimedia/slimapp": "0.8.0"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*",
diff --git a/composer.lock b/composer.lock
index 2976d40..318e7c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "fa0b80b0efb333ca08d38c9d370e6e74",
-"content-hash": "dbd71bd2282a693ff99033fd68d5c053",
+"hash": "0e9dd8c747da08ca6e00fe115b2150a7",
+"content-hash": "7aa99b7687e646ef7d944a186a565b60",
 "packages": [
 {
 "name": "bd808/monolog-udp2log-handler",
@@ -438,16 +438,16 @@
 },
 {
 "name": "wikimedia/slimapp",
-"version": "v0.7.1",
+"version": "v0.8.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/wikimedia-slimapp.git;,
-"reference": "bd24cdfb3cad66e0ad41f973f2bdf60fa6c19c1d"
+"reference": "c66a25d6e06087637da24c27c6beb30c3e736a02"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/wikimedia-slimapp/zipball/bd24cdfb3cad66e0ad41f973f2bdf60fa6c19c1d;,
-"reference": "bd24cdfb3cad66e0ad41f973f2bdf60fa6c19c1d",
+"url": 
"https://api.github.com/repos/wikimedia/wikimedia-slimapp/zipball/c66a25d6e06087637da24c27c6beb30c3e736a02;,
+"reference": "c66a25d6e06087637da24c27c6beb30c3e736a02",
 "shasum": ""
 },
 "require": {
@@ -462,8 +462,8 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "~0.9",
-"mediawiki/mediawiki-codesniffer": "~0.4",
-"phpunit/phpunit": "~4.6"
+"mediawiki/mediawiki-codesniffer": "0.5.1|0.7.2",
+"phpunit/phpunit": "~4.8|~5.0"
 },
 "type": "library",
 "autoload": {
@@ -487,7 +487,7 @@
 ],
 "description": "Common classes to help with creating an 
application using the Slim micro framework and Twig template engine.",
 "homepage": "https://github.com/wikimedia/wikimedia-slimapp;,
-"time": "2015-12-04 00:52:04"
+"time": "2016-11-23 18:29:30"
 }
 ],
 "packages-dev": [
@@ -628,38 +628,87 @@
 "time": "2016-02-17 10:22:13"
 },
 {
-"name": "phpdocumentor/reflection-docblock",
-"version": "2.0.4",
+"name": "phpdocumentor/reflection-common",
+"version": "1.0",
 "source": {
 "type": "git",
-"url": 
"https://github.com/phpDocumentor/ReflectionDocBlock.git;,
-"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+"url": "https://github.com/phpDocumentor/ReflectionCommon.git;,
+"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8;,
-"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c;,
+"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add missing use statement

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing use statement
..


Add missing use statement

A missing use statement for InterwikiResolver causes this to fatal
out. Add it so things work.

Change-Id: I50c3a2ec56e5c3b118a09d8033b4b6f370c97e83
---
M includes/CirrusSearch.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 7c3cfba..2717105 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -3,6 +3,7 @@
 use CirrusSearch\Connection;
 use CirrusSearch\ElasticsearchIntermediary;
 use CirrusSearch\InterwikiSearcher;
+use CirrusSearch\InterwikiResolver;
 use CirrusSearch\Search\FullTextResultsType;
 use CirrusSearch\Searcher;
 use CirrusSearch\CompletionSuggester;

-- 
To view, visit https://gerrit.wikimedia.org/r/325445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50c3a2ec56e5c3b118a09d8033b4b6f370c97e83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Report failing url for more browser assertions

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Report failing url for more browser assertions
..


Report failing url for more browser assertions

The with_browser function wraps our calls to report whatever url the
browser is at when it fails to help in debugging. Add a few more to
debug why a particular patch is failing on smoke.feature:30

Change-Id: Ibce2cfffc55699f0ff80a8dca74c8a492697bc58
---
M tests/browser/features/step_definitions/simple_search_steps.rb
1 file changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/simple_search_steps.rb 
b/tests/browser/features/step_definitions/simple_search_steps.rb
index ca2698a..0687228 100644
--- a/tests/browser/features/step_definitions/simple_search_steps.rb
+++ b/tests/browser/features/step_definitions/simple_search_steps.rb
@@ -14,16 +14,24 @@
 end
 
 Then(/^a list of suggested pages should appear$/) do
-  on(SearchPage).search_results_element.when_present.should exist
+  with_browser do
+on(SearchPage).search_results_element.when_present.should exist
+  end
 end
 Then(/^I should land on Search Results page$/) do
-  on(SearchResultsPage).search_element.when_present
-  browser.url.should match Regexp.escape("=Special%3ASearch")
+  with_browser do
+on(SearchResultsPage).search_element.when_present
+browser.url.should match Regexp.escape("=Special%3ASearch")
+  end
 end
 Then(/^(.+) should be the first result$/) do |page_name|
-  on(SearchPage).first_result.should == page_name
+  with_browser do
+on(SearchPage).first_result.should == page_name
+  end
 end
 
 Then(/^the page I arrive on has title (.+)$/) do |title|
-  browser.title.should match Regexp.escape(title)
+  with_browser do
+browser.title.should match Regexp.escape(title)
+  end
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/325435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibce2cfffc55699f0ff80a8dca74c8a492697bc58
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Wait for job to finish processing before doing commons checks

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Wait for job to finish processing before doing commons checks
..


Wait for job to finish processing before doing commons checks

The browser tests have been intermittently failing the commons tests,
and it's quite annoying. The retrys in cindy don't help here, because
the test setup deletes and recreates these pages. If the commons tests
are the only ones being run its probably more likely than in a full test
that the jobs havn't completed.

This is a bit of a hack, to make this better we would probably want to
add an API action that mimics action=cirrusdump, but it will do the
trick for now at least.

Additionally delay the creation of the duplicated file even longer. This
is another sad hack, but if the cirrustest job processes before the
commons job commons never finds out about the duplicated file. It would
be best to have some way to enqueue jobs for another wiki to check this
but not sure it's really possible with mediawiki currently.

Change-Id: I7f3a8e21907ef136038efa507d5150b76e805d1d
---
M tests/browser/features/commons.feature
M tests/browser/features/step_definitions/search_steps.rb
M tests/browser/features/support/hooks.rb
3 files changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/commons.feature 
b/tests/browser/features/commons.feature
index 675b196..3051ae7 100644
--- a/tests/browser/features/commons.feature
+++ b/tests/browser/features/commons.feature
@@ -5,7 +5,8 @@
 Then File:OnCommons.svg is the first api search result
 
   Scenario: A file that exists on commons and the local wiki returns the local 
result
-When I api search in namespace 6 for duplicated
+When within 20 seconds File:DuplicatedLocally.svg has cirrustestwiki as 
local_sites_with_dupe
+Then I api search in namespace 6 for duplicated
 Then File:DuplicatedLocally.svg is the first api search result
 And Locally stored file *duplicated* on commons is the highlighted snippet 
of the first api search result
 And there is no second api search result
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index adecca3..175812a 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -497,6 +497,14 @@
 step("#{title} is the first suggestion")
   end
 end
+Then(/^within (\d+) seconds (.*) has (.*) as local_sites_with_dupe$/) do 
|seconds, page, value|
+  on_wiki("commons") do
+within(seconds) do
+  step("I dump the cirrus data for " + page)
+  step('the page text contains "local_sites_with_dupe":["' + value + '"]')
+end
+  end
+end
 Then(/^there is (no|a)? link to create a new page from the search result$/) do 
|modifier|
   with_browser do
 if modifier == "a"
diff --git a/tests/browser/features/support/hooks.rb 
b/tests/browser/features/support/hooks.rb
index 20e04d3..c515947 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -77,7 +77,7 @@
   And I wait 10 seconds
   And a file named File:OnCommons.svg exists on commons with contents 
OnCommons.svg and description File stored on commons for test purposes
   And a file named File:DuplicatedLocally.svg exists on commons with 
contents DuplicatedLocally.svg and description File stored on commons and 
duplicated locally
-  And I wait 10 seconds
+  And I wait 30 seconds
   And a file named File:DuplicatedLocally.svg exists with contents 
DuplicatedLocally.svg and description Locally stored file duplicated on commons
   And I wait 10 seconds
 )

-- 
To view, visit https://gerrit.wikimedia.org/r/325428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f3a8e21907ef136038efa507d5150b76e805d1d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.

2016-12-05 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325316

Change subject: Localisation updates from https://translatewiki.net.
..

Localisation updates from https://translatewiki.net.

Change-Id: I38cd6be8687bb34f85f5a6bcbb125b4f119da1ab
---
M app/src/main/res/values-be/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-diq/strings.xml
M app/src/main/res/values-ko/strings.xml
A app/src/main/res/values-ksh/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-ne/strings.xml
M app/src/main/res/values-pa/strings.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values-sa/strings.xml
A app/src/main/res/values-x-invalidLanguageCode/strings.xml
11 files changed, 161 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/16/325316/1

diff --git a/app/src/main/res/values-be/strings.xml 
b/app/src/main/res/values-be/strings.xml
index 8865faf..9ada5a6 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -6,7 +6,7 @@
   Вікімедыя
   Так
   Не
-  Пошук у Вікіпэдыі
+  Пошук у Вікіпедыі
   Гісторыя
   Не атрымліваецца падключыцца да 
Інтэрнэту.
   Паўтарыць
diff --git a/app/src/main/res/values-ca/strings.xml 
b/app/src/main/res/values-ca/strings.xml
index 63c85bb..ae292f7 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -297,6 +297,7 @@
   
   Avui
   Què és això?
+  Escriviu una descripció!
   Desa
   Afegeix una 
descripció
 
diff --git a/app/src/main/res/values-diq/strings.xml 
b/app/src/main/res/values-diq/strings.xml
index 54a4794..84b4d4d 100644
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@@ -37,7 +37,7 @@
   %.2f km
   Xeritay sero yu cay zoom ke
   Peyên rocaniye %s
-  Werênayış
+  Behs
   Çina  ver niro se zerrek a 
class=\"external\" rel=\"nofollow\" 
href=\"//creativecommons.org/licenses/by-sa/3.0/\"CC BY-SA 3.0/a 
lisanslı bınd şıma şınê bıkarnê
   Wikipedia Zıwan
   Cı geyre
diff --git a/app/src/main/res/values-ko/strings.xml 
b/app/src/main/res/values-ko/strings.xml
index 78675b4..84284eb 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -14,7 +14,7 @@
   방문 기록 지우기
   이 문서가 존재하지 않습니다.
   방문 기록 지우기
-  모든 방문 기록을 지우고 현재 열려있는 모든 탭을 
닫습니다. 정말 그렇게 하시겠습니까?
+  모든 방문 기록을 지우고 현재 열려 있는 모든 탭을 
닫습니다. 계속하시겠습니까?
   저장된 문서
   다음을 통해 공유
   %s에서 넘어옴
diff --git a/app/src/main/res/values-ksh/strings.xml 
b/app/src/main/res/values-ksh/strings.xml
new file mode 100644
index 000..2b5d411
--- /dev/null
+++ b/app/src/main/res/values-ksh/strings.xml
@@ -0,0 +1 @@
+
diff --git a/app/src/main/res/values-nb/strings.xml 
b/app/src/main/res/values-nb/strings.xml
index d65ba04..a280d40 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -21,7 +21,7 @@
   Vis faner
   Endre språk
   Søk i siden
-  Innholdsproblemer
+  Innholdsmerknader
   Skrift og utseende
   Legg til i leseliste
   Del lenke
diff --git a/app/src/main/res/values-ne/strings.xml 
b/app/src/main/res/values-ne/strings.xml
index 0b97cae..54f05b4 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -142,13 +142,14 @@
   अर्को
   बचत गर्नुहोस्
   पूर्वावलोकन
-  टाइपो ठीक गरियो
-  ब्याकरण ठीक बनाइयो
+  टाइपो सुधार गरियो
+  व्याकरण सुधार गरियो
   लिङ्क थप गरियो
   अन्य
   तपाईंले पृष्ठमा सुधार गर्नुभएका 
अन्य तरिकाहरू
   अर्को खोज्नुहोस्
   पछिल्लो खोज्नुहोस्
+  तपाईं यो सम्पादन बचत गर्न 
सक्नुहुन्न। कृपया अघिल्लो पृष्ठमा गएर यसलाई सम्पादन गर्नुहोस्।
   पृष्ठका समस्याहरू
   पृष्ठका समस्याहरू
   अक्षरको आकार
@@ -198,6 +199,7 @@
   ट्याब बन्द गर्नुहोस्
   पृष्ठलार्इ ब्राउजरमा हेर्नुहोस्
   सर्भरले यो अनुरोध पूरा गर्न 
सकेन।
+  सर्भरबाट आएको प्रतिक्रिया सही 
तरिकाले फर्म्याट गरिएको छैन।
   एउटा अज्ञात त्रुटि देखा पर्‍यो।
   सन्देश: \"%s\"
   कोड: \"%s\"
@@ -220,7 +222,7 @@
   अनुप्रयोग त्रुटि
   फेरि शुरु गर्नुहोस्
   बाहिर निस्कनुहोस्
-  यो लेखलार्इ अध्ययन सूचीमा 
थप्नुहोस्
+  यो लेखलार्इ कुनै अध्ययन सूचीमा 
थप्नुहोस्
   लेखको लिङ्क आदान-प्रदान 
गर्नुहोस्
   लेख भएको स्थानसम्म नेभिगेट 
गर्नुहोस्।
   मेरा सूचीहरू
@@ -236,6 +238,8 @@
   श्रेणीबद्ध गर्नुहोस्
   नाम अनुसार श्रेणीबद्ध 
गर्नुहोस्
   नाम अनुसार श्रेणीबद्ध 
गर्नुहोस् (उल्टो क्रममा)
+  सबैभन्दा भर्खरैको क्रममा 
श्रेणीबद्ध गर्नुहोस्
+  सबैभन्दा कम भर्खरैको क्रममा 
श्रेणीबद्ध गर्नुहोस्
   अध्ययन सूचीको विवरण सम्पादन 
गर्नुहोस्
   अध्ययन सूची मेट्नुहोस्
   मेरो अध्ययन सूची
@@ -258,6 +262,8 @@
   प्राथमिकताहरू
   पढ्ने कार्य जारी 
राख्नुहोस्
   किनकी तपाईंले यो पढ्नुभएको 
थियो
+  क्रमरहित ढङ्गले चुनिएको लेख
+  विकिपिडियाबाट क्रमरहित ढङ्गले 
चुनिएको कुनै लेख पढ्नुहोस्
   विकिपिडियामा आज
   %s को मुख्य पृष्ठ
   आजको तस्बिर
@@ -265,6 +271,7 @@
   यो कार्ड लुकाउनुहोस्
   कार्ड लुकाइयो।
   थप विकल्पहरू
+  विकिमिडिया

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Install zip for statistics::web role (on thorium)

2016-12-05 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325314

Change subject: Install zip for statistics::web role (on thorium)
..

Install zip for statistics::web role (on thorium)

Bug: T149438
Change-Id: I89af996ff78d7b77b58e2ff2a7eadfe767c68d0b
---
M modules/statistics/manifests/web.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/325314/1

diff --git a/modules/statistics/manifests/web.pp 
b/modules/statistics/manifests/web.pp
index ff60e5a..b3211b5 100644
--- a/modules/statistics/manifests/web.pp
+++ b/modules/statistics/manifests/web.pp
@@ -19,6 +19,7 @@
 require_package([
 'mc',
 'unzip',
+'zip',
 ])
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89af996ff78d7b77b58e2ff2a7eadfe767c68d0b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove superfluos mixins that are available in core

2016-12-05 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325506

Change subject: Remove superfluos mixins that are available in core
..

Remove superfluos mixins that are available in core

Removing mixins that have been added to core since addition in
MobileFrontend to lower maintenance costs.

Change-Id: Idaf445bc10ded01ce621d569d09ddab6304d5c40
---
M minerva.less/minerva.mixins.less
1 file changed, 2 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/06/325506/1

diff --git a/minerva.less/minerva.mixins.less b/minerva.less/minerva.mixins.less
index 5bfc062..a9264bd 100644
--- a/minerva.less/minerva.mixins.less
+++ b/minerva.less/minerva.mixins.less
@@ -1,4 +1,5 @@
 @import 'mediawiki.mixins.less';
+@import 'mediawiki.mixins.animation.less';
 
 // Shorthand for background-image-svg in core
 .background-image-svg-quick( @url ) {
@@ -23,27 +24,6 @@
.m-background-image-svg( ~'@{url}.svg', ~'@{url}.png' );
 }
 
-.box-sizing( @value ) {
-   -moz-box-sizing: @value;
-   -webkit-box-sizing: @value;
-   box-sizing: @value;
-}
-
-.background-size( @width: auto, @height: auto ) {
-   /* use -webkit prefix for older android browsers eg. nexus 1 */
-   -o-background-size: @width @height;
-   -webkit-background-size: @width @height;
-   background-size: @width @height;
-}
-
-.vertical-gradient ( @startColor: #808080, @endColor: #fff, @startPos: 0, 
@endPos: 100% ) {
-   background-color: @endColor;
-   background-image: -moz-linear-gradient( top, @startColor @startPos, 
@endColor @endPos ); // Firefox 3.6+
-   background-image: -webkit-gradient( linear, left top, left bottom, 
color-stop( @startPos, @startColor ), color-stop( @endPos, @endColor ) ); // 
Safari 4+, Chrome 2+
-   background-image: -webkit-linear-gradient( top, @startColor @startPos, 
@endColor @endPos ); // Safari 5.1+, Chrome 10+
-   background-image: linear-gradient( @startColor @startPos, @endColor 
@endPos ); // Standard
-}
-
 .transform( @transform ) {
-webkit-transform: @transform;
transform: @transform;
@@ -64,9 +44,4 @@
 
-webkit-transition: -webkit-transform @arguments;
transition: transform @arguments;
-}
-
-.animation( @args ) {
-   -webkit-animation: @args;
-   animation: @args;
-}
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/325506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaf445bc10ded01ce621d569d09ddab6304d5c40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off duplicate key reporting for parser cache

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Turn off duplicate key reporting for parser cache
..


Turn off duplicate key reporting for parser cache

Change-Id: Ia21618f60fafb38727008dc61887e8e48ba8f4fd
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 028efb3..a9d3fdd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -343,7 +343,8 @@
'shards' => 256,
],
],
-   'replication' => 'async'
+   'replication' => 'async',
+   'reportDupes' => false
 ];
 
 $wgSessionsInObjectCache = true;

-- 
To view, visit https://gerrit.wikimedia.org/r/325505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia21618f60fafb38727008dc61887e8e48ba8f4fd
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off duplicate key reporting for parser cache

2016-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325505

Change subject: Turn off duplicate key reporting for parser cache
..

Turn off duplicate key reporting for parser cache

Change-Id: Ia21618f60fafb38727008dc61887e8e48ba8f4fd
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/05/325505/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d7054d9..53f6cbe 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -342,7 +342,8 @@
'shards' => 256,
],
],
-   'replication' => 'async'
+   'replication' => 'async',
+   'reportDupes' => false
 ];
 
 $wgSessionsInObjectCache = true;

-- 
To view, visit https://gerrit.wikimedia.org/r/325505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia21618f60fafb38727008dc61887e8e48ba8f4fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolserver_legacy: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325502

Change subject: toolserver_legacy: Fix puppet URL in comment
..

toolserver_legacy: Fix puppet URL in comment

Change-Id: I9dba81b4bde9a7b7ba249dee036eac7c25516d1b
---
M modules/toolserver_legacy/templates/www.toolserver.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/325502/1

diff --git a/modules/toolserver_legacy/templates/www.toolserver.org.erb 
b/modules/toolserver_legacy/templates/www.toolserver.org.erb
index 4abb20b..1897f58 100644
--- a/modules/toolserver_legacy/templates/www.toolserver.org.erb
+++ b/modules/toolserver_legacy/templates/www.toolserver.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/wikitech.wikimedia.org
+### puppet:///toolserver_legacy/www.toolserver.org.erb
 #
 # vim: filetype=apache
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dba81b4bde9a7b7ba249dee036eac7c25516d1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: racktables: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325498

Change subject: racktables: Fix puppet URL in comment
..

racktables: Fix puppet URL in comment

Change-Id: I9f3d0300262410727e2182f4e83bc3cb5c5057f2
---
M modules/racktables/templates/racktables.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/325498/1

diff --git a/modules/racktables/templates/racktables.wikimedia.org.erb 
b/modules/racktables/templates/racktables.wikimedia.org.erb
index ca6233a..c8b8bce 100644
--- a/modules/racktables/templates/racktables.wikimedia.org.erb
+++ b/modules/racktables/templates/racktables.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/racktables.wikimedia.org.erb
+### puppet:///racktables/racktables.wikimedia.org.erb
 #
 # vim: filetype=apache
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f3d0300262410727e2182f4e83bc3cb5c5057f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: scap: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325501

Change subject: scap: Fix puppet URL in comment
..

scap: Fix puppet URL in comment

Change-Id: I389e1b8b5e89244f0374d42bab48c56bdeb559ad
---
M modules/scap/files/l10nupdate.logrotate
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/325501/1

diff --git a/modules/scap/files/l10nupdate.logrotate 
b/modules/scap/files/l10nupdate.logrotate
index 6c9824f..2e64084 100644
--- a/modules/scap/files/l10nupdate.logrotate
+++ b/modules/scap/files/l10nupdate.logrotate
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/l10nupdate
+### puppet:///scap/l10nupdate.logrotate
 #
 
 /var/log/l10nupdatelog/*.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I389e1b8b5e89244f0374d42bab48c56bdeb559ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: zuul: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325504

Change subject: zuul: Fix puppet URL in comment
..

zuul: Fix puppet URL in comment

Change-Id: I82cad2ddde02b108b633692baba70af69722e670
---
M modules/zuul/files/gearman-logging.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/325504/1

diff --git a/modules/zuul/files/gearman-logging.conf 
b/modules/zuul/files/gearman-logging.conf
index 55a76e3..7531dc7 100644
--- a/modules/zuul/files/gearman-logging.conf
+++ b/modules/zuul/files/gearman-logging.conf
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/zuul/gearman-logging.conf
+### puppet:///zuul/gearman-logging.conf
 #
 # vim: set filetype=dosini:
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82cad2ddde02b108b633692baba70af69722e670
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325499

Change subject: role: Fix puppet URL in comment
..

role: Fix puppet URL in comment

Change-Id: I19cea8935ba701ed81777ef1143514f7dad16924
---
M modules/role/templates/kibana/apache.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/325499/1

diff --git a/modules/role/templates/kibana/apache.conf.erb 
b/modules/role/templates/kibana/apache.conf.erb
index 7945c07..5b538b9 100644
--- a/modules/role/templates/kibana/apache.conf.erb
+++ b/modules/role/templates/kibana/apache.conf.erb
@@ -1,7 +1,7 @@
 # vim: sw=2 ts=2 sts=2 et ft=apache
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/kibana/apache.conf
+### puppet:///role/kibana/apache.conf.erb
 #
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19cea8935ba701ed81777ef1143514f7dad16924
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikistats: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325503

Change subject: wikistats: Fix puppet URL in comment
..

wikistats: Fix puppet URL in comment

Change-Id: Ie996f9c541c434e9c68270b3b421fa172086fa60
---
M modules/wikistats/templates/apache/wikistats.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/325503/1

diff --git a/modules/wikistats/templates/apache/wikistats.erb 
b/modules/wikistats/templates/apache/wikistats.erb
index 8ef14c5..b2f21d2 100644
--- a/modules/wikistats/templates/apache/wikistats.erb
+++ b/modules/wikistats/templates/apache/wikistats.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/wikistats/templates/apache/wikistats.erb
+### puppet:///wikistats/apache/wikistats.erb
 #
 # vim: filetype=apache
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie996f9c541c434e9c68270b3b421fa172086fa60
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325500

Change subject: rsync: Fix puppet URL in comment
..

rsync: Fix puppet URL in comment

Change-Id: I93a6923f7fa5c2d4404156f451e81f71941a854c
---
M modules/rsync/templates/rsync.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/325500/1

diff --git a/modules/rsync/templates/rsync.default.erb 
b/modules/rsync/templates/rsync.default.erb
index 7a5ad7c..6756983 100644
--- a/modules/rsync/templates/rsync.default.erb
+++ b/modules/rsync/templates/rsync.default.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/rsync/rsync.default.erb
+### puppet:///rsync/rsync.default.erb
 #
 
 # defaults file for rsync daemon mode

-- 
To view, visit https://gerrit.wikimedia.org/r/325500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93a6923f7fa5c2d4404156f451e81f71941a854c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: publichtml: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325497

Change subject: publichtml: Fix puppet URL in comment
..

publichtml: Fix puppet URL in comment

Change-Id: Ide4030e29e30b9f637769e2b841230e0757dca9d
---
M modules/publichtml/templates/apacheconfig.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/325497/1

diff --git a/modules/publichtml/templates/apacheconfig.erb 
b/modules/publichtml/templates/apacheconfig.erb
index ac71027..bdccd72 100644
--- a/modules/publichtml/templates/apacheconfig.erb
+++ b/modules/publichtml/templates/apacheconfig.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/publichtml/apacheconfig.erb
+### puppet:///publichtml/apacheconfig.erb
 #
 # vim: filetype=apache
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide4030e29e30b9f637769e2b841230e0757dca9d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: extdist: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325489

Change subject: extdist: Fix puppet URL in comment
..

extdist: Fix puppet URL in comment

Change-Id: I917c918d849c394008e5a0b71c14b111b36fc5fd
---
M modules/extdist/templates/extdist.nginx.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/325489/1

diff --git a/modules/extdist/templates/extdist.nginx.erb 
b/modules/extdist/templates/extdist.nginx.erb
index 69558a6..c0548a8 100644
--- a/modules/extdist/templates/extdist.nginx.erb
+++ b/modules/extdist/templates/extdist.nginx.erb
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///templates/extdist.nginx.erb
+ puppet:///extdist/extdist.nginx.erb
 
   Changes to this file will be discarded by Puppet periodically
   and without warning.

-- 
To view, visit https://gerrit.wikimedia.org/r/325489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I917c918d849c394008e5a0b71c14b111b36fc5fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki_singlenode: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325495

Change subject: mediawiki_singlenode: Fix puppet URL in comment
..

mediawiki_singlenode: Fix puppet URL in comment

Change-Id: Ic16b37ee84fd6311268d0f84609ae7616ae845a1
---
M modules/mediawiki_singlenode/templates/labs-localsettings
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/325495/1

diff --git a/modules/mediawiki_singlenode/templates/labs-localsettings 
b/modules/mediawiki_singlenode/templates/labs-localsettings
index 3560e47..22fb49e 100644
--- a/modules/mediawiki_singlenode/templates/labs-localsettings
+++ b/modules/mediawiki_singlenode/templates/labs-localsettings
@@ -1,7 +1,7 @@
 https://gerrit.wikimedia.org/r/325495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic16b37ee84fd6311268d0f84609ae7616ae845a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ocg: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325496

Change subject: ocg: Fix puppet URL in comment
..

ocg: Fix puppet URL in comment

Change-Id: I82ddc68e1e30e1a10dc165c0aa034c6e6862204a
---
M modules/ocg/files/logrotate
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/325496/1

diff --git a/modules/ocg/files/logrotate b/modules/ocg/files/logrotate
index 9bf4576..c182e37 100644
--- a/modules/ocg/files/logrotate
+++ b/modules/ocg/files/logrotate
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/ocg/logrotate
+### puppet:///ocg/logrotate
 #
 
 /srv/deployment/ocg/log/ocg.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82ddc68e1e30e1a10dc165c0aa034c6e6862204a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325493

Change subject: labstore: Fix puppet URL in comment
..

labstore: Fix puppet URL in comment

Change-Id: Ie518e393d7398621d1a137df01588fa3df40a395
---
M modules/labstore/files/archive-project-volumes
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/325493/1

diff --git a/modules/labstore/files/archive-project-volumes 
b/modules/labstore/files/archive-project-volumes
index 7cd4ab3..ff3f222 100755
--- a/modules/labstore/files/archive-project-volumes
+++ b/modules/labstore/files/archive-project-volumes
@@ -2,7 +2,7 @@
 
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///files/ldap/scripts/archive-managed-projects
+# puppet:///labstore/archive-project-volumes
 #
 """
  Sometimes labs projects are deleted.  When this happens,

-- 
To view, visit https://gerrit.wikimedia.org/r/325493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie518e393d7398621d1a137df01588fa3df40a395
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325490

Change subject: gerrit: Fix puppet URL in comment
..

gerrit: Fix puppet URL in comment

Change-Id: I0a222a92cd44518222ca51307fddcdf02dfb3bb7
---
M modules/gerrit/templates/gerrit.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/325490/1

diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb 
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 209177b..3f4ef71 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/gerrit.wikimedia.org.erb
+### puppet:///gerrit/gerrit.wikimedia.org.erb
 #
 # vim: filetype=apache
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a222a92cd44518222ca51307fddcdf02dfb3bb7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ipmi: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325492

Change subject: ipmi: Fix puppet URL in comment
..

ipmi: Fix puppet URL in comment

Change-Id: I8f7bccea337c6a9d27dfdd00fdf685cae74c89be
---
M modules/ipmi/files/ipmi_mgmt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/325492/1

diff --git a/modules/ipmi/files/ipmi_mgmt b/modules/ipmi/files/ipmi_mgmt
index 1a29cac..5806219 100644
--- a/modules/ipmi/files/ipmi_mgmt
+++ b/modules/ipmi/files/ipmi_mgmt
@@ -2,7 +2,7 @@
 
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/ipmi/files/ipmi_mgmt
+### puppet:///ipmi/ipmi_mgmt
 #
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin

-- 
To view, visit https://gerrit.wikimedia.org/r/325492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f7bccea337c6a9d27dfdd00fdf685cae74c89be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: exim4: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325488

Change subject: exim4: Fix puppet URL in comment
..

exim4: Fix puppet URL in comment

Change-Id: I866acfb911699357330fe5ab53a63aa0d46ac546
---
M modules/exim4/templates/exim4.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/325488/1

diff --git a/modules/exim4/templates/exim4.default.erb 
b/modules/exim4/templates/exim4.default.erb
index 1de3dce..2f7c2bc 100644
--- a/modules/exim4/templates/exim4.default.erb
+++ b/modules/exim4/templates/exim4.default.erb
@@ -1,7 +1,7 @@
 # /etc/default/exim4
 #
 ### THIS FILE IS MANAGED BY PUPPET 
-### puppet:///templates/exim/exim4.default.erb
+### puppet:///exim4/exim4.default.erb
 #
 
 EX4DEF_VERSION=''

-- 
To view, visit https://gerrit.wikimedia.org/r/325488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I866acfb911699357330fe5ab53a63aa0d46ac546
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325491

Change subject: icinga: Fix puppet URL in comment
..

icinga: Fix puppet URL in comment

Change-Id: Ia499197a25518389d140ea93709ab675e52919e1
---
M modules/icinga/files/logrotate.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/325491/1

diff --git a/modules/icinga/files/logrotate.conf 
b/modules/icinga/files/logrotate.conf
index a3cab58..2c2107d 100644
--- a/modules/icinga/files/logrotate.conf
+++ b/modules/icinga/files/logrotate.conf
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/icinga
+### puppet:///icinga/logrotate.conf
 #
 
 /var/log/icinga/icinga.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia499197a25518389d140ea93709ab675e52919e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325494

Change subject: logstash: Fix puppet URL in comment
..

logstash: Fix puppet URL in comment

Change-Id: I9804aa64f20224914370a4b0fd1faa233e7f0890
---
M modules/logstash/templates/default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/325494/1

diff --git a/modules/logstash/templates/default.erb 
b/modules/logstash/templates/default.erb
index 7f9167c..8d5c575 100644
--- a/modules/logstash/templates/default.erb
+++ b/modules/logstash/templates/default.erb
@@ -1,6 +1,6 @@
 #
 ## THIS FILE IS MANAGED BY PUPPET
-## puppet:///modules/logstash/default
+## puppet:///logstash/default.erb
 #
 
 # Start logstash on boot?

-- 
To view, visit https://gerrit.wikimedia.org/r/325494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9804aa64f20224914370a4b0fd1faa233e7f0890
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eventlogging: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325487

Change subject: eventlogging: Fix puppet URL in comment
..

eventlogging: Fix puppet URL in comment

Change-Id: I6d71f36133eea6de322d2a225a46f8ea50514821
---
M modules/eventlogging/templates/logrotate.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/325487/1

diff --git a/modules/eventlogging/templates/logrotate.erb 
b/modules/eventlogging/templates/logrotate.erb
index 4a08f11..82e1271 100644
--- a/modules/eventlogging/templates/logrotate.erb
+++ b/modules/eventlogging/templates/logrotate.erb
@@ -1,5 +1,5 @@
 # This file is managed by Puppet.
-# puppet:///modules/eventlogging/logrotate
+# puppet:///eventlogging/logrotate.erb
 # Rotate eventlogging daemon runtime logs
 #
 <%= @log_dir %>/*.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d71f36133eea6de322d2a225a46f8ea50514821
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: statistics: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325482

Change subject: statistics: Fix puppet URLs in comments
..

statistics: Fix puppet URLs in comments

Change-Id: I24b6ce32b752b943fe857052489ee1cb7a44f768
---
M modules/statistics/templates/discovery-stats.logrotate.erb
M modules/statistics/templates/wmde/logrotate.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/325482/1

diff --git a/modules/statistics/templates/discovery-stats.logrotate.erb 
b/modules/statistics/templates/discovery-stats.logrotate.erb
index 0ef8efa..dce5afa 100644
--- a/modules/statistics/templates/discovery-stats.logrotate.erb
+++ b/modules/statistics/templates/discovery-stats.logrotate.erb
@@ -1,5 +1,5 @@
 # This file is managed by Puppet.
-# puppet:///modules/statistics/discovery-stats.logrotate
+# puppet:///statistics/discovery-stats.logrotate.erb
 # Rotate statistics::discovery cron output logs
 #
 <%= @log_dir %>/*.log {
diff --git a/modules/statistics/templates/wmde/logrotate.erb 
b/modules/statistics/templates/wmde/logrotate.erb
index aff66e7..eb733b2 100644
--- a/modules/statistics/templates/wmde/logrotate.erb
+++ b/modules/statistics/templates/wmde/logrotate.erb
@@ -1,5 +1,5 @@
 # This file is managed by Puppet.
-# puppet:///modules/statistics/wmde/logrotate
+# puppet:///statistics/wmde/logrotate.erb
 # Rotate statistics/wmde cron output logs
 #
 <%= @log_dir %>/*.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24b6ce32b752b943fe857052489ee1cb7a44f768
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325486

Change subject: elasticsearch: Fix puppet URL in comment
..

elasticsearch: Fix puppet URL in comment

Change-Id: Icc6d312a145d0a538b5d0a61bfe1b427d2dbeee3
---
M modules/elasticsearch/files/logrotate
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/325486/1

diff --git a/modules/elasticsearch/files/logrotate 
b/modules/elasticsearch/files/logrotate
index 5a5131f..059ecb0 100644
--- a/modules/elasticsearch/files/logrotate
+++ b/modules/elasticsearch/files/logrotate
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/elasticsearch/logrotate
+### puppet:///elasticsearch/logrotate
 #
 
 /var/log/elasticsearch/*.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc6d312a145d0a538b5d0a61bfe1b427d2dbeee3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: udp2log: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325483

Change subject: udp2log: Fix puppet URLs in comments
..

udp2log: Fix puppet URLs in comments

Change-Id: Ia272583601ccd6935099eaca03cf1ee771bbdebe
---
M modules/udp2log/files/demux.py
M modules/udp2log/files/udp2log.init
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/325483/1

diff --git a/modules/udp2log/files/demux.py b/modules/udp2log/files/demux.py
index 1c89345..22eb2cd 100755
--- a/modules/udp2log/files/demux.py
+++ b/modules/udp2log/files/demux.py
@@ -1,6 +1,6 @@
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///files/misc/demux.py
+# puppet:///udp2log/demux.py
 #
 
 # Simple python script for demultiplexing MediaWiki log files
diff --git a/modules/udp2log/files/udp2log.init 
b/modules/udp2log/files/udp2log.init
index 1587378..4ee206d 100755
--- a/modules/udp2log/files/udp2log.init
+++ b/modules/udp2log/files/udp2log.init
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/udp2log/udp2log.init
+### puppet:///udp2log/udp2log.init
 #
 
 # Start/stop the udp2log daemon.

-- 
To view, visit https://gerrit.wikimedia.org/r/325483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia272583601ccd6935099eaca03cf1ee771bbdebe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptly: Fix puppet URL in comment

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325485

Change subject: aptly: Fix puppet URL in comment
..

aptly: Fix puppet URL in comment

Change-Id: I8019b8544652ea3d23df7301c44ac62c6a51e639
---
M modules/aptly/files/aptly.nginx.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/325485/1

diff --git a/modules/aptly/files/aptly.nginx.conf 
b/modules/aptly/files/aptly.nginx.conf
index fba3744..298c1eb 100644
--- a/modules/aptly/files/aptly.nginx.conf
+++ b/modules/aptly/files/aptly.nginx.conf
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/aptly/aptly.nginx.conf
+ puppet:///aptly/aptly.nginx.conf
 
   Changes to this file will be discarded by Puppet periodically
   and without warning.

-- 
To view, visit https://gerrit.wikimedia.org/r/325485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8019b8544652ea3d23df7301c44ac62c6a51e639
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikimania_scholarships: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325484

Change subject: wikimania_scholarships: Fix puppet URLs in comments
..

wikimania_scholarships: Fix puppet URLs in comments

Change-Id: I7f84fbef2c4939c870686cefac37b5f9331acfea
---
M modules/wikimania_scholarships/templates/apache.conf.erb
M modules/wikimania_scholarships/templates/env.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/325484/1

diff --git a/modules/wikimania_scholarships/templates/apache.conf.erb 
b/modules/wikimania_scholarships/templates/apache.conf.erb
index bbfadca..28e5357 100644
--- a/modules/wikimania_scholarships/templates/apache.conf.erb
+++ b/modules/wikimania_scholarships/templates/apache.conf.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/wikimania_scholarships/apache.conf
+### puppet:///wikimania_scholarships/apache.conf.erb
 #
 
   ServerName <%= @hostname %>
diff --git a/modules/wikimania_scholarships/templates/env.erb 
b/modules/wikimania_scholarships/templates/env.erb
index 24c31cc..9d28e41 100644
--- a/modules/wikimania_scholarships/templates/env.erb
+++ b/modules/wikimania_scholarships/templates/env.erb
@@ -1,6 +1,6 @@
 ;
 ;;; THIS FILE IS MANAGED BY PUPPET
-;;; puppet:///modules/wikimania_scholarships/env
+;;; puppet:///wikimania_scholarships/env.erb
 ;
 
 ; PHP PDO database connection data source name

-- 
To view, visit https://gerrit.wikimedia.org/r/325484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f84fbef2c4939c870686cefac37b5f9331acfea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325480

Change subject: smokeping: Fix puppet URLs in comments
..

smokeping: Fix puppet URLs in comments

Change-Id: I3270685d777c675716d8b113ab63e5a3128fe5d7
---
M modules/smokeping/files/config.d/Alerts
M modules/smokeping/files/config.d/General
M modules/smokeping/files/config.d/Probes
M modules/smokeping/files/config.d/Targets
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/325480/1

diff --git a/modules/smokeping/files/config.d/Alerts 
b/modules/smokeping/files/config.d/Alerts
index 57bbd3f..a66ba79 100644
--- a/modules/smokeping/files/config.d/Alerts
+++ b/modules/smokeping/files/config.d/Alerts
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/smokeping/config.d/Alerts
+### puppet:///smokeping/config.d/Alerts
 #
 
 *** Alerts ***
diff --git a/modules/smokeping/files/config.d/General 
b/modules/smokeping/files/config.d/General
index 657e701..3201a32 100644
--- a/modules/smokeping/files/config.d/General
+++ b/modules/smokeping/files/config.d/General
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/smokeping/config.d/General
+### puppet:///smokeping/config.d/General
 #
 
 
diff --git a/modules/smokeping/files/config.d/Probes 
b/modules/smokeping/files/config.d/Probes
index f126dad..5740aff 100644
--- a/modules/smokeping/files/config.d/Probes
+++ b/modules/smokeping/files/config.d/Probes
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/smokeping/config.d/Probes
+### puppet:///smokeping/config.d/Probes
 #
 
 *** Probes ***
diff --git a/modules/smokeping/files/config.d/Targets 
b/modules/smokeping/files/config.d/Targets
index f58ab70..a3b534b 100644
--- a/modules/smokeping/files/config.d/Targets
+++ b/modules/smokeping/files/config.d/Targets
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/smokeping/config.d/Targets
+### puppet:///smokeping/config.d/Targets
 #
 
 *** Targets ***

-- 
To view, visit https://gerrit.wikimedia.org/r/325480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3270685d777c675716d8b113ab63e5a3128fe5d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: snapshot: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325481

Change subject: snapshot: Fix puppet URLs in comments
..

snapshot: Fix puppet URLs in comments

Change-Id: I2a066c4ca6dae936d1238f3969e2ec77af585dda
---
M modules/snapshot/files/cron/dumpwikidatajson.sh
M modules/snapshot/files/cron/dumpwikidatattl.sh
M modules/snapshot/files/cron/list-last-n-good-dumps.py
M modules/snapshot/files/cron/logrotate.cirrusdump
M modules/snapshot/files/cron/runphpscriptletonallwikis.py
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/325481/1

diff --git a/modules/snapshot/files/cron/dumpwikidatajson.sh 
b/modules/snapshot/files/cron/dumpwikidatajson.sh
index e7144ae..11ce575 100644
--- a/modules/snapshot/files/cron/dumpwikidatajson.sh
+++ b/modules/snapshot/files/cron/dumpwikidatajson.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # This file is maintained by puppet!
-# puppet:///modules/snapshot/cron/dumpwikidatajson.sh
+# puppet:///snapshot/cron/dumpwikidatajson.sh
 #
 #
 # Generate a json dump for Wikidata and remove old ones.
diff --git a/modules/snapshot/files/cron/dumpwikidatattl.sh 
b/modules/snapshot/files/cron/dumpwikidatattl.sh
index d1a2c4d..903eb4c 100644
--- a/modules/snapshot/files/cron/dumpwikidatattl.sh
+++ b/modules/snapshot/files/cron/dumpwikidatattl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # This file is maintained by puppet!
-# puppet:///modules/snapshot/cron/dumpwikidatattl.sh
+# puppet:///snapshot/cron/dumpwikidatattl.sh
 #
 #
 # Generate a json dump for Wikidata and remove old ones.
diff --git a/modules/snapshot/files/cron/list-last-n-good-dumps.py 
b/modules/snapshot/files/cron/list-last-n-good-dumps.py
index 5b051c1..16aaac3 100755
--- a/modules/snapshot/files/cron/list-last-n-good-dumps.py
+++ b/modules/snapshot/files/cron/list-last-n-good-dumps.py
@@ -10,7 +10,7 @@
 
 #
 # This file is maintained by puppet!
-# puppet:///modules/snapshot/cron/list-last-n-good-dumps.py
+# puppet:///snapshot/cron/list-last-n-good-dumps.py
 #
 
 
diff --git a/modules/snapshot/files/cron/logrotate.cirrusdump 
b/modules/snapshot/files/cron/logrotate.cirrusdump
index 034a25d..35d61b3 100644
--- a/modules/snapshot/files/cron/logrotate.cirrusdump
+++ b/modules/snapshot/files/cron/logrotate.cirrusdump
@@ -1,5 +1,5 @@
 # This file is managed by puppet
-# puppet:///modules/snapshot/cron/logrotate.cirrusdump
+# puppet:///snapshot/cron/logrotate.cirrusdump
 #
 /var/log/cirrusdump/*.log {
 daily
diff --git a/modules/snapshot/files/cron/runphpscriptletonallwikis.py 
b/modules/snapshot/files/cron/runphpscriptletonallwikis.py
index e87ec82..4954992 100644
--- a/modules/snapshot/files/cron/runphpscriptletonallwikis.py
+++ b/modules/snapshot/files/cron/runphpscriptletonallwikis.py
@@ -5,7 +5,7 @@
 
 #
 # This file is maintained by puppet!
-# puppet:///modules/snapshot/cron/runphpscriptletonallwikis.py
+# puppet:///snapshot/cron/runphpscriptletonallwikis.py
 #
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a066c4ca6dae936d1238f3969e2ec77af585dda
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: noc: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325477

Change subject: noc: Fix puppet URLs in comments
..

noc: Fix puppet URLs in comments

Change-Id: I95a4fa3abebf99a2128bf218940ef223cfb29a8e
---
M modules/noc/templates/dbtree.wikimedia.org.erb
M modules/noc/templates/noc.wikimedia.org.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/325477/1

diff --git a/modules/noc/templates/dbtree.wikimedia.org.erb 
b/modules/noc/templates/dbtree.wikimedia.org.erb
index 43804a2..ffb6629 100644
--- a/modules/noc/templates/dbtree.wikimedia.org.erb
+++ b/modules/noc/templates/dbtree.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/noc/templates/dbtree.wikimedia.org.erb
+### puppet:///noc/dbtree.wikimedia.org.erb
 #
 # vim: filetype=apache
 
diff --git a/modules/noc/templates/noc.wikimedia.org.erb 
b/modules/noc/templates/noc.wikimedia.org.erb
index d61ccd8..dedb40e 100644
--- a/modules/noc/templates/noc.wikimedia.org.erb
+++ b/modules/noc/templates/noc.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/noc/templates/noc.wikimedia.org.erb
+### puppet:///noc/noc.wikimedia.org.erb
 #
 # vim: filetype=apache
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95a4fa3abebf99a2128bf218940ef223cfb29a8e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325478

Change subject: openldap: Fix puppet URLs in comments
..

openldap: Fix puppet URLs in comments

Change-Id: Ibb14d0d254ce37067842ad9027ed2b6243a6d01d
---
M modules/openldap/templates/default.erb
M modules/openldap/templates/ldap.conf.erb
M modules/openldap/templates/slapd.erb
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/325478/1

diff --git a/modules/openldap/templates/default.erb 
b/modules/openldap/templates/default.erb
index ec6e8d4..5459ec1 100644
--- a/modules/openldap/templates/default.erb
+++ b/modules/openldap/templates/default.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/openldap/templates/default.erb
+### puppet:///openldap/default.erb
 ###
 
 # Bump the fd limit, otherwise we max out LDAP connections at around 1000
diff --git a/modules/openldap/templates/ldap.conf.erb 
b/modules/openldap/templates/ldap.conf.erb
index 5c5276f..8f94f09 100644
--- a/modules/openldap/templates/ldap.conf.erb
+++ b/modules/openldap/templates/ldap.conf.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/openldap/templates/ldap.conf.erb
+### puppet:///openldap/ldap.conf.erb
 ###
 
 # See ldap.conf(5) for details
diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index d331e3b..66c4f66 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/openldap/templates/slapd.erb
+### puppet:///openldap/slapd.erb
 #
 
 # Only allow v3 bindings

-- 
To view, visit https://gerrit.wikimedia.org/r/325478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb14d0d254ce37067842ad9027ed2b6243a6d01d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325479

Change subject: openstack: Fix puppet URLs in comments
..

openstack: Fix puppet URLs in comments

Change-Id: I1ee6923c95dc8dd6c9c4c98d298c4cec54045a6e
---
M modules/openstack/files/kilo/virtscripts/cold-migrate
M modules/openstack/files/kilo/virtscripts/cold-nova-migrate
M modules/openstack/files/kilo/virtscripts/live-migrate
M modules/openstack/files/kilo/virtscripts/logstat.py
M modules/openstack/files/kilo/virtscripts/prod.sh
M modules/openstack/files/liberty/virtscripts/cold-migrate
M modules/openstack/files/liberty/virtscripts/cold-nova-migrate
M modules/openstack/files/liberty/virtscripts/live-migrate
M modules/openstack/files/liberty/virtscripts/logstat.py
M modules/openstack/files/liberty/virtscripts/makedomain
M modules/openstack/files/liberty/virtscripts/prod.sh
M modules/openstack/files/mitaka/virtscripts/cold-migrate
M modules/openstack/files/mitaka/virtscripts/cold-nova-migrate
M modules/openstack/files/mitaka/virtscripts/live-migrate
M modules/openstack/files/mitaka/virtscripts/logstat.py
M modules/openstack/files/mitaka/virtscripts/makedomain
M modules/openstack/files/mitaka/virtscripts/prod.sh
M modules/openstack/files/rabbitmq/labs-rabbitmq.default
M modules/openstack/templates/common/wikitech.wikimedia.org.erb
M modules/openstack/templates/kilo/horizon/horizon.wikimedia.org.erb
M modules/openstack/templates/kilo/horizon/labtesthorizon.wikimedia.org.erb
M modules/openstack/templates/kilo/horizon/local_settings.py.erb
M modules/openstack/templates/liberty/horizon/horizon.wikimedia.org.erb
M modules/openstack/templates/liberty/horizon/labtesthorizon.wikimedia.org.erb
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
M modules/openstack/templates/mitaka/horizon/horizon.wikimedia.org.erb
M modules/openstack/templates/mitaka/horizon/labtesthorizon.wikimedia.org.erb
M modules/openstack/templates/mitaka/horizon/local_settings.py.erb
28 files changed, 28 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/325479/1

diff --git a/modules/openstack/files/kilo/virtscripts/cold-migrate 
b/modules/openstack/files/kilo/virtscripts/cold-migrate
index 6d2489e..d7d0587 100755
--- a/modules/openstack/files/kilo/virtscripts/cold-migrate
+++ b/modules/openstack/files/kilo/virtscripts/cold-migrate
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///modules/openstack/kilo/virtscripts/cold-migrate
+# puppet:///openstack/kilo/virtscripts/cold-migrate
 #
 """
  cold-migrate stops an instance, moves it to a new host,
diff --git a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate 
b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
index a1d19b8..27e5b71 100755
--- a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
+++ b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///modules/openstack/kilo/virtscripts/cold-nova-migrate
+# puppet:///openstack/kilo/virtscripts/cold-nova-migrate
 #
 """
  cold-nova-migrate is a not-very-smart wrapper around the standard
diff --git a/modules/openstack/files/kilo/virtscripts/live-migrate 
b/modules/openstack/files/kilo/virtscripts/live-migrate
index cb56095..855cbb8 100755
--- a/modules/openstack/files/kilo/virtscripts/live-migrate
+++ b/modules/openstack/files/kilo/virtscripts/live-migrate
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///modules/openstack/kilo/virtscripts/live-migrate
+# puppet:///openstack/kilo/virtscripts/live-migrate
 #
 """
  live-migrate is a wrapper around nova's built-in block migrate
diff --git a/modules/openstack/files/kilo/virtscripts/logstat.py 
b/modules/openstack/files/kilo/virtscripts/logstat.py
index 8e12c81..a99165b 100644
--- a/modules/openstack/files/kilo/virtscripts/logstat.py
+++ b/modules/openstack/files/kilo/virtscripts/logstat.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///modules/openstack/kilo/virtscripts/logstat.py
+# puppet:///openstack/kilo/virtscripts/logstat.py
 #
 # encoding: utf-8
 """
diff --git a/modules/openstack/files/kilo/virtscripts/prod.sh 
b/modules/openstack/files/kilo/virtscripts/prod.sh
index 80b1a1e..758ff39 100644
---

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325476

Change subject: mediawiki: Fix puppet URLs in comments
..

mediawiki: Fix puppet URLs in comments

Change-Id: I92054992e9663c564fc9bed3b9daf68f9a85e026
---
M modules/mediawiki/files/maintenance/logrotate.d_translationnotifications
M modules/mediawiki/files/maintenance/logrotate.d_wikidata
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/325476/1

diff --git 
a/modules/mediawiki/files/maintenance/logrotate.d_translationnotifications 
b/modules/mediawiki/files/maintenance/logrotate.d_translationnotifications
index f500986..f0ad458 100644
--- a/modules/mediawiki/files/maintenance/logrotate.d_translationnotifications
+++ b/modules/mediawiki/files/maintenance/logrotate.d_translationnotifications
@@ -1,6 +1,6 @@
 
#
 ### THIS FILE IS MANAGED BY PUPPET
-### 
puppet:///modules/mediawiki/maintenance/logrotate.d_translationnotifications
+### puppet:///mediawiki/maintenance/logrotate.d_translationnotifications
 
#
 
 /var/log/translationnotifications/*.log {
diff --git a/modules/mediawiki/files/maintenance/logrotate.d_wikidata 
b/modules/mediawiki/files/maintenance/logrotate.d_wikidata
index fef4eea..5c7b190 100644
--- a/modules/mediawiki/files/maintenance/logrotate.d_wikidata
+++ b/modules/mediawiki/files/maintenance/logrotate.d_wikidata
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/wikidata
+### puppet:///mediawiki/maintenance/logrotate.d_wikidata
 #
 
 /var/log/wikidata/*.log {

-- 
To view, visit https://gerrit.wikimedia.org/r/325476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92054992e9663c564fc9bed3b9daf68f9a85e026
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325474

Change subject: install_server: Fix puppet URLs in comments
..

install_server: Fix puppet URLs in comments

Change-Id: I60ac49f48599a85e2588dd079a16ddde6176ede7
---
M modules/install_server/files/dhcpd/dhcpd.conf
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/325474/1

diff --git a/modules/install_server/files/dhcpd/dhcpd.conf 
b/modules/install_server/files/dhcpd/dhcpd.conf
index 6ce3650..04f038e 100644
--- a/modules/install_server/files/dhcpd/dhcpd.conf
+++ b/modules/install_server/files/dhcpd/dhcpd.conf
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/install_server/dhcpd/dhcpd.conf
+ puppet:///install_server/dhcpd/dhcpd.conf
 ##
 
 # DHCPd configuration file for Wikimedia server installations
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 2fdd229..5c167ff 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/install_server/dhcpd/linux-host-entries.ttyS0-115200
+ puppet:///install_server/dhcpd/linux-host-entries.ttyS0-115200
 ##
 
 host alsafi {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600
index 9bddb82..6a3d1e1 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/install_server/dhcpd/linux-host-entries.ttyS0-9600
+ puppet:///install_server/dhcpd/linux-host-entries.ttyS0-9600
 ##
 
 host cam1-a-eqiad {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 5b085c7..ac3c345 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/install_server/dhcpd/linux-host-entries.ttyS1-115200
+ puppet:///install_server/dhcpd/linux-host-entries.ttyS1-115200
 ##
 
 host acamar {

-- 
To view, visit https://gerrit.wikimedia.org/r/325474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ac49f48599a85e2588dd079a16ddde6176ede7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ldap: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325475

Change subject: ldap: Fix puppet URLs in comments
..

ldap: Fix puppet URLs in comments

Change-Id: I92c0bc20700aa51a5e34d309be100d0adf3ea6ae
---
M modules/ldap/files/scripts/add-ldap-group
M modules/ldap/files/scripts/ldaplist
M modules/ldap/files/scripts/ldapsupportlib.py
M modules/ldap/files/scripts/opendj-backup.sh
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/325475/1

diff --git a/modules/ldap/files/scripts/add-ldap-group 
b/modules/ldap/files/scripts/add-ldap-group
index ab43c04..40efdab 100755
--- a/modules/ldap/files/scripts/add-ldap-group
+++ b/modules/ldap/files/scripts/add-ldap-group
@@ -2,7 +2,7 @@
 
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/ldap/scripts/add-ldap-group
+### puppet:///ldap/scripts/add-ldap-group
 #
 
 import sys
diff --git a/modules/ldap/files/scripts/ldaplist 
b/modules/ldap/files/scripts/ldaplist
index f7b16ed..2d558c2 100755
--- a/modules/ldap/files/scripts/ldaplist
+++ b/modules/ldap/files/scripts/ldaplist
@@ -2,7 +2,7 @@
 
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/ldap/scripts/ldaplist
+### puppet:///ldap/scripts/ldaplist
 #
 
 import ldapsupportlib
diff --git a/modules/ldap/files/scripts/ldapsupportlib.py 
b/modules/ldap/files/scripts/ldapsupportlib.py
index c24adb5..d4595db 100644
--- a/modules/ldap/files/scripts/ldapsupportlib.py
+++ b/modules/ldap/files/scripts/ldapsupportlib.py
@@ -2,7 +2,7 @@
 
 #
 # THIS FILE IS MANAGED BY PUPPET
-# puppet:///modules/ldap/scripts/ldapsupportlib.py
+# puppet:///ldap/scripts/ldapsupportlib.py
 #
 
 import os
diff --git a/modules/ldap/files/scripts/opendj-backup.sh 
b/modules/ldap/files/scripts/opendj-backup.sh
index 4fa3c2d..18f44dc 100644
--- a/modules/ldap/files/scripts/opendj-backup.sh
+++ b/modules/ldap/files/scripts/opendj-backup.sh
@@ -2,7 +2,7 @@
 
 #
 ### THIS FILE IS MANAGED BY PUPPET 
-### puppet:///modules/ldap/scripts/opendj-backup.sh
+### puppet:///ldap/scripts/opendj-backup.sh
 #
 
 # LDAP backups shouldn't be readable by all

-- 
To view, visit https://gerrit.wikimedia.org/r/325475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92c0bc20700aa51a5e34d309be100d0adf3ea6ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: iegreview: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325473

Change subject: iegreview: Fix puppet URLs in comments
..

iegreview: Fix puppet URLs in comments

Change-Id: Ifbe098d112dca1ae9cd0e1e4b8b6ff2d5a829cd6
---
M modules/iegreview/templates/apache.conf.erb
M modules/iegreview/templates/env.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/325473/1

diff --git a/modules/iegreview/templates/apache.conf.erb 
b/modules/iegreview/templates/apache.conf.erb
index 9acb4c6..32729ab 100644
--- a/modules/iegreview/templates/apache.conf.erb
+++ b/modules/iegreview/templates/apache.conf.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/iegreview/apache.conf
+### puppet:///iegreview/apache.conf.erb
 #
 
   ServerName <%= @hostname %>
diff --git a/modules/iegreview/templates/env.erb 
b/modules/iegreview/templates/env.erb
index 3929f0a..4ff40bd 100644
--- a/modules/iegreview/templates/env.erb
+++ b/modules/iegreview/templates/env.erb
@@ -1,6 +1,6 @@
 ;
 ;;; THIS FILE IS MANAGED BY PUPPET
-;;; puppet:///modules/iegreview/env
+;;; puppet:///iegreview/env.erb
 ;
 
 ; PHP PDO database connection data source name

-- 
To view, visit https://gerrit.wikimedia.org/r/325473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbe098d112dca1ae9cd0e1e4b8b6ff2d5a829cd6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...prometheus-redis-exporter[master]: Initial debianization

2016-12-05 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325471

Change subject: Initial debianization
..

Initial debianization

Change-Id: I40ab0c9030c225cdb4aa71f78455eb65aa8c1f42
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/default
A debian/dirs
A debian/docs
A debian/gbp.conf
A debian/init
A debian/lintian-overrides
A debian/postinst
A debian/postrm
A debian/rules
A debian/service
A debian/source/format
A debian/watch
16 files changed, 287 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/prometheus-redis-exporter 
refs/changes/71/325471/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..39ac0b4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+prometheus-redis-exporter (0.10.3-1) unstable; urgency=medium
+
+  * Initial packaging
++ Tests require a local redis running, skip for now
+
+ -- Filippo Giunchedi   Mon, 10 Oct 2016 12:42:38 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..472d9f3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,23 @@
+Source: prometheus-redis-exporter
+Section: net
+Priority: extra
+Maintainer: Debian Go Packaging Team 

+Uploaders: Filippo Giunchedi 
+Build-Depends: debhelper (>= 9.0.0), dh-golang, golang-go, dh-systemd (>= 1.5),
+ golang-github-beorn7-perks-dev,
+ golang-github-prometheus-common-dev,
+ golang-github-sirupsen-logrus-dev,
+ golang-prometheus-client-dev,
+ golang-protobuf-extensions-dev,
+ golang-github-garyburd-redigo-dev
+Standards-Version: 3.9.8
+Vcs-Git: 
https://anonscm.debian.org/git/pkg-go/packages/prometheus-redis-exporter.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-go/packages/prometheus-redis-exporter.git/
+Homepage: https://github.com/prometheus/redis_exporter
+XS-Go-Import-Path: github.com/prometheus/redis_exporter
+
+Package: prometheus-redis-exporter
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, daemon
+Built-Using: ${misc:Built-Using}
+Description: Prometheus exporter for Redis server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..41d746e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: github.com/oliver006/redis_exporter
+Source: https://github.com/oliver006/redis_exporter
+
+Files: *
+Copyright: 2016 Oliver 
+License: MIT
+
+Files: debian/*
+Copyright: 2016 Filippo Giunchedi 
+License: MIT
+
+License: MIT
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in 
all
+  copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
diff --git a/debian/default b/debian/default
new file mode 100644
index 000..a8b5d56
--- /dev/null
+++ b/debian/default
@@ -0,0 +1,27 @@
+#ARGS=''
+
+# Environment-equivalent of -redis.password / -redis.addr
+#REDIS_PASSWORD=''
+#REDIS_ADDR=''
+
+# Usage of prometheus-redis-exporter:
+#  -check-keys string
+#  Comma separated list of keys to export value and length/size
+#  -debug
+#  Output verbose debug information
+#  -log-format string
+#  Log format, valid options are txt and json (default "txt")
+#  -namespace string
+#  Namespace for metrics (default "redis")
+#  -redis.addr string
+#  Address of one or more redis nodes, separated by separator (default 
"redis://localhost:6379")
+#  -redis.password string
+#  Password for one or more redis nodes, separated by separator
+#  -separator string
+#  separator used to split redis.addr and redis.password into several 
elements. (default ",")
+#  -version
+#  Show version information and exit
+#  -web.listen-address string
+#

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dataset: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325472

Change subject: dataset: Fix puppet URLs in comments
..

dataset: Fix puppet URLs in comments

Change-Id: I5a450a83b5851c352275512f1d750f81a39fa225
---
M modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
M modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
M modules/dataset/files/rsync/rsyncd.conf.globalopts
M modules/dataset/files/rsync/rsyncd.conf.phab_dump
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/325472/1

diff --git a/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers 
b/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
index 7ea2ecb..450064e 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
+++ b/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
@@ -1,5 +1,5 @@
 #
-### puppet:///files/rsync/rsyncd.conf.datasets_to_peers
+### puppet:///dataset/rsync/rsyncd.conf.datasets_to_peers
 #
 
 # for rolling rsyncs between dataset hosts
diff --git a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public 
b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
index 49441a0..a91b5ad 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
+++ b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/dataset/rsync/rsyncd.conf.dumps_to_public
+### puppet:///dataset/rsync/rsyncd.conf.dumps_to_public
 #
 
 # rsync config for public retrievers/mirrors of XML dumps
diff --git a/modules/dataset/files/rsync/rsyncd.conf.globalopts 
b/modules/dataset/files/rsync/rsyncd.conf.globalopts
index e9792c2..5b7d3d5 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.globalopts
+++ b/modules/dataset/files/rsync/rsyncd.conf.globalopts
@@ -4,7 +4,7 @@
 
 
 #
-### puppet:///files/rsync/rsyncd.conf.globalopts
+### puppet:///dataset/rsync/rsyncd.conf.globalopts
 #
 # rsync conf file for mirror sites of XML dumps
 #
diff --git a/modules/dataset/files/rsync/rsyncd.conf.phab_dump 
b/modules/dataset/files/rsync/rsyncd.conf.phab_dump
index f22ef0b..9b7fd29 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.phab_dump
+++ b/modules/dataset/files/rsync/rsyncd.conf.phab_dump
@@ -1,5 +1,5 @@
 #
-### puppet:///files/rsync/rsyncd.conf.phab_dump
+### puppet:///dataset/rsync/rsyncd.conf.phab_dump
 #
 
 # write access from iridium to other/misc directory.

-- 
To view, visit https://gerrit.wikimedia.org/r/325472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a450a83b5851c352275512f1d750f81a39fa225
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325470

Change subject: contint: Fix puppet URLs in comments
..

contint: Fix puppet URLs in comments

Change-Id: I88d1473b6c6ae212f598fff4069fb81434286463
---
M modules/contint/files/apache/proxy_gerrit
M modules/contint/files/apache/proxy_jenkins
M modules/contint/files/apache/proxy_zuul
M modules/contint/files/disable-apc.ini
M modules/contint/templates/apache/doc.wikimedia.org.erb
M modules/contint/templates/apache/integration.mediawiki.org.erb
M modules/contint/templates/apache/listen.erb
M modules/contint/templates/apache/localvhost.erb
8 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/325470/1

diff --git a/modules/contint/files/apache/proxy_gerrit 
b/modules/contint/files/apache/proxy_gerrit
index 822973d..36b0cbd 100644
--- a/modules/contint/files/apache/proxy_gerrit
+++ b/modules/contint/files/apache/proxy_gerrit
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/proxy_gerrit
+### puppet:///contint/apache/proxy_gerrit
 #
 # vim: filetype=apache
 
diff --git a/modules/contint/files/apache/proxy_jenkins 
b/modules/contint/files/apache/proxy_jenkins
index 840c82a..66c1029 100644
--- a/modules/contint/files/apache/proxy_jenkins
+++ b/modules/contint/files/apache/proxy_jenkins
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/proxy_jenkins
+### puppet:///contint/apache/proxy_jenkins
 #
 # vim: filetype=apache
 
diff --git a/modules/contint/files/apache/proxy_zuul 
b/modules/contint/files/apache/proxy_zuul
index ce748a1..6f64e16 100644
--- a/modules/contint/files/apache/proxy_zuul
+++ b/modules/contint/files/apache/proxy_zuul
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/proxy_zuul
+### puppet:///contint/apache/proxy_zuul
 #
 # vim: filetype=apache
 
diff --git a/modules/contint/files/disable-apc.ini 
b/modules/contint/files/disable-apc.ini
index ffbf80b..4e16cfe 100644
--- a/modules/contint/files/disable-apc.ini
+++ b/modules/contint/files/disable-apc.ini
@@ -1,5 +1,5 @@
 ; This file is managed by puppet
-; puppet:///modules/contint/disable-apc.ini
+; puppet:///contint/disable-apc.ini
 extension="apc.so"
 
 ; Disabled on contint host since APC gets confused when files are changing
diff --git a/modules/contint/templates/apache/doc.wikimedia.org.erb 
b/modules/contint/templates/apache/doc.wikimedia.org.erb
index 33d23c4..69ea38d 100644
--- a/modules/contint/templates/apache/doc.wikimedia.org.erb
+++ b/modules/contint/templates/apache/doc.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/doc.wikimedia.org
+### puppet:///contint/apache/doc.wikimedia.org.erb
 #
 # vim: filetype=apache
 
diff --git a/modules/contint/templates/apache/integration.mediawiki.org.erb 
b/modules/contint/templates/apache/integration.mediawiki.org.erb
index 89af456..7473cb0 100644
--- a/modules/contint/templates/apache/integration.mediawiki.org.erb
+++ b/modules/contint/templates/apache/integration.mediawiki.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/integration.mediawiki.org
+### puppet:///contint/apache/integration.mediawiki.org.erb
 #
 # vim: filetype=apache
 
diff --git a/modules/contint/templates/apache/listen.erb 
b/modules/contint/templates/apache/listen.erb
index 30926c1..e3eeb10 100644
--- a/modules/contint/templates/apache/listen.erb
+++ b/modules/contint/templates/apache/listen.erb
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/contint/apache/listen.erb
+ puppet:///contint/apache/listen.erb
 ##
 
 # Ports Apache is listening to in addition to the default ports:
diff --git a/modules/contint/templates/apache/localvhost.erb 
b/modules/contint/templates/apache/localvhost.erb
index 551fd08..3ae429a 100644
--- a/modules/contint/templates/apache/localvhost.erb
+++ b/modules/contint/templates/apache/localvhost.erb

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325468

Change subject: base: Fix puppet URLs in comments
..

base: Fix puppet URLs in comments

Change-Id: I52f01d2ff70668b4d953f21fd4bc8c8998d85e76
---
M modules/base/files/environment/mysql-ps1.sh
M modules/base/files/firewall/main-minimal.conf
M modules/base/files/labs-acct.default
M modules/base/files/logrotate/puppet
M modules/base/files/logrotate/upstart
M modules/base/files/screenrc
M modules/base/files/upstart/ttyS0.conf
7 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/325468/1

diff --git a/modules/base/files/environment/mysql-ps1.sh 
b/modules/base/files/environment/mysql-ps1.sh
index a08c9dd..21c4c95 100644
--- a/modules/base/files/environment/mysql-ps1.sh
+++ b/modules/base/files/environment/mysql-ps1.sh
@@ -1,5 +1,5 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/environment/mysql-ps1.sh
+### puppet:///base/environment/mysql-ps1.sh
 #
 export MYSQL_PS1='mysql:\u@\h [\d]> '
diff --git a/modules/base/files/firewall/main-minimal.conf 
b/modules/base/files/firewall/main-minimal.conf
index d0aeaa2..5e74a94 100644
--- a/modules/base/files/firewall/main-minimal.conf
+++ b/modules/base/files/firewall/main-minimal.conf
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/base/firewall/main-minimal.conf
+ puppet:///base/firewall/main-minimal.conf
 ##
 
 # basic minimal ruleset
diff --git a/modules/base/files/labs-acct.default 
b/modules/base/files/labs-acct.default
index c4014e4..6543cb9 100644
--- a/modules/base/files/labs-acct.default
+++ b/modules/base/files/labs-acct.default
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/labs-acct.default
+### puppet:///base/labs-acct.default
 #
 
 # Defaults for acct
diff --git a/modules/base/files/logrotate/puppet 
b/modules/base/files/logrotate/puppet
index 60c5487..30df976 100644
--- a/modules/base/files/logrotate/puppet
+++ b/modules/base/files/logrotate/puppet
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/logrotate/puppet
+### puppet:///base/logrotate/puppet
 #
 
 /var/log/puppet {
diff --git a/modules/base/files/logrotate/upstart 
b/modules/base/files/logrotate/upstart
index a134531..04b9ebe 100644
--- a/modules/base/files/logrotate/upstart
+++ b/modules/base/files/logrotate/upstart
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/logrotate/puppet
+### puppet:///base/logrotate/upstart
 #
 
 #
diff --git a/modules/base/files/screenrc b/modules/base/files/screenrc
index 1a527eb..154f2a5 100644
--- a/modules/base/files/screenrc
+++ b/modules/base/files/screenrc
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/base/screenrc
+ puppet:///base/screenrc
 ##
 
 #change the hardstatus settings to give an window list at the bottom of the
diff --git a/modules/base/files/upstart/ttyS0.conf 
b/modules/base/files/upstart/ttyS0.conf
index bd683ac..5d89912 100644
--- a/modules/base/files/upstart/ttyS0.conf
+++ b/modules/base/files/upstart/ttyS0.conf
@@ -1,6 +1,6 @@
 #
  THIS FILE IS MANAGED BY PUPPET
- puppet:///modules/base/upstart/ttyS0.conf
+ puppet:///base/upstart/ttyS0.conf
 ##
 #
 # ttyS0 - getty

-- 
To view, visit https://gerrit.wikimedia.org/r/325468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f01d2ff70668b4d953f21fd4bc8c8998d85e76
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: Fix puppet URLs in comments

2016-12-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325469

Change subject: beta: Fix puppet URLs in comments
..

beta: Fix puppet URLs in comments

Change-Id: Ic660030a88730d6d030c80a8ac6a94fd938e6775
---
M modules/beta/files/wmf-beta-update-databases.py
M modules/beta/templates/wmf-beta-autoupdate.py.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/325469/1

diff --git a/modules/beta/files/wmf-beta-update-databases.py 
b/modules/beta/files/wmf-beta-update-databases.py
index 2ddf28f..4ec8bf1 100755
--- a/modules/beta/files/wmf-beta-update-databases.py
+++ b/modules/beta/files/wmf-beta-update-databases.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 ###
 # WARNING: this file is managed by Puppet
-# puppet:///modules/beta/wmf-beta-update-databases.py
+# puppet:///beta/wmf-beta-update-databases.py
 ###
 
 """
diff --git a/modules/beta/templates/wmf-beta-autoupdate.py.erb 
b/modules/beta/templates/wmf-beta-autoupdate.py.erb
index a11da1c..78bc794 100755
--- a/modules/beta/templates/wmf-beta-autoupdate.py.erb
+++ b/modules/beta/templates/wmf-beta-autoupdate.py.erb
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 ###
 # WARNING: this file is managed by Puppet
-# puppet:///modules/beta/wmf-beta-autoupdate.py
+# puppet:///beta/wmf-beta-autoupdate.py.erb
 ###
 
 """

-- 
To view, visit https://gerrit.wikimedia.org/r/325469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic660030a88730d6d030c80a8ac6a94fd938e6775
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add "objectcache" log group

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add "objectcache" log group
..


Add "objectcache" log group

Change-Id: I7d43dee4a2c74f66201c2115bfab71d2de5233d8
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ccde3c0..8f9d9d8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4592,6 +4592,7 @@
'MassMessage' => 'debug', // for 59464 -legoktm 2013/12/15
'Math' => 'info',  // mobrovac for T121445
'memcached' => 'error', // -aaron 2012/10/24
+   'objectcache' => 'warning',
'message-format' => [ 'logstash' => 'warning' ],
'mobile' => 'debug',
'NewUserMessage' => 'debug',

-- 
To view, visit https://gerrit.wikimedia.org/r/325467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d43dee4a2c74f66201c2115bfab71d2de5233d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add "objectcache" log group

2016-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325467

Change subject: Add "objectcache" log group
..

Add "objectcache" log group

Change-Id: I7d43dee4a2c74f66201c2115bfab71d2de5233d8
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/67/325467/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 523a7f5..503419e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4585,6 +4585,7 @@
'MassMessage' => 'debug', // for 59464 -legoktm 2013/12/15
'Math' => 'info',  // mobrovac for T121445
'memcached' => 'error', // -aaron 2012/10/24
+   'objectcache' => 'warning',
'message-format' => [ 'logstash' => 'warning' ],
'mobile' => 'debug',
'NewUserMessage' => 'debug',

-- 
To view, visit https://gerrit.wikimedia.org/r/325467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d43dee4a2c74f66201c2115bfab71d2de5233d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: add redis_exporter class

2016-12-05 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325466

Change subject: prometheus: add redis_exporter class
..

prometheus: add redis_exporter class

Monitor a single redis instance given its address and password.

Bug: T148637
Change-Id: Iba79dd8a3afcefba776934caa17291322df8809a
---
A modules/prometheus/manifests/redis_exporter.pp
A 
modules/prometheus/templates/initscripts/prometheus-redis-expor...@.systemd.erb
2 files changed, 60 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/325466/1

diff --git a/modules/prometheus/manifests/redis_exporter.pp 
b/modules/prometheus/manifests/redis_exporter.pp
new file mode 100644
index 000..66152e8
--- /dev/null
+++ b/modules/prometheus/manifests/redis_exporter.pp
@@ -0,0 +1,47 @@
+# Prometheus Redis server metrics exporter.
+
+# === Parameters
+#
+# [*$instance*]
+#  The instance name to use, e.g. as the service suffix
+#
+# [*$arguments*]
+#  The command line arguments to run prometheus-redis-exporter
+#
+# [*$redis_password*]
+#  The Redis instance password
+#
+# [*$listen_address*]
+#  The host:port tuple to listen on, host can be omitted.
+
+define prometheus::redis_exporter (
+$instance = $title,
+$arguments = '',
+$redis_password = '',
+$listen_address = ':9121',
+) {
+require_package('prometheus-redis-exporter')
+$service_name = "prometheus-redis-exporter@${instance}"
+
+exec { "mask_default_redis_exporter_${instance}":
+command => '/bin/systemctl mask prometheus-redis-exporter.service',
+creates => '/etc/systemd/system/prometheus-redis-exporter.service',
+}
+
+file { "/etc/default/${service_name}":
+ensure  => present,
+mode=> '0400',
+owner   => 'root',
+group   => 'root',
+content => 
"ARGS=\"${arguments}\"\nREDIS_PASSWORD=\"${redis_password}\"",
+notify  => Service[$service_name],
+}
+
+base::service_unit { $service_name:
+ensure=> present,
+refresh   => true,
+systemd   => true,
+template_name => 'prometheus-redis-exporter@',
+require   => Package['prometheus-redis-exporter'],
+}
+}
diff --git 
a/modules/prometheus/templates/initscripts/prometheus-redis-expor...@.systemd.erb
 
b/modules/prometheus/templates/initscripts/prometheus-redis-expor...@.systemd.erb
new file mode 100644
index 000..739b2a7
--- /dev/null
+++ 
b/modules/prometheus/templates/initscripts/prometheus-redis-expor...@.systemd.erb
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prometheus exporter for Redis server (instance %i)
+Documentation=https://prometheus.io/docs/introduction/overview/
+
+[Service]
+Restart=always
+User=prometheus
+Group=prometheus
+EnvironmentFile=/etc/default/prometheus-redis-exporter@%i
+ExecStart=/usr/bin/prometheus-redis-exporter -web.listen-address <%= 
@listen_address %> $ARGS
+
+[Install]
+WantedBy=multi-user.target

-- 
To view, visit https://gerrit.wikimedia.org/r/325466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba79dd8a3afcefba776934caa17291322df8809a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi...

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment

d93b916 Submodule update.
  CiviCRM - Do not give validation error on address with no location_type
24480a6 Update thank you letter.
8e05deb Simulate 1000 emails

Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Eileen: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/325465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi...

2016-12-05 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325465

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment

d93b916 Submodule update.
  CiviCRM - Do not give validation error on address with no location_type
24480a6 Update thank you letter.
8e05deb Simulate 1000 emails

Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/65/325465/1


-- 
To view, visit https://gerrit.wikimedia.org/r/325465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2016-12-05 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325464

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

93b916 Submodule update.
  civicrm - Do not give validation error on address with no location_type
ff86662 Alternate fix for reconciliation report doubling some rows.
24480a6 Update thank you letter.
8e05deb Simulate 1000 emails

Change-Id: Ibbda88a934d8371cdbe6cd968b5145ceb3bc35b2
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/325464/1


-- 
To view, visit https://gerrit.wikimedia.org/r/325464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbda88a934d8371cdbe6cd968b5145ceb3bc35b2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Alternate fix for reconciliation report doubling some rows.

2016-12-05 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325463

Change subject: Alternate fix for reconciliation report doubling some rows.
..

Alternate fix for reconciliation report doubling some rows.

The previous fix was to filter fee rows out of the join. That works. But I 
wanted to trial
a bit more and to do so it seemed really useful to be able to see the total in 
the original
currency. Once I tried adding that it showed that the rows were still being 
duplicated,
only the value was blank for the 'wrong' rows. I feel replacing the left join 
with a WHERE
might save confusion later. Also, I think the option of original_amount total 
seems useful.

Bug: T152238
Change-Id: I63e2240da371bd18cb4bc37c9424365cbc27968b
---
M 
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
1 file changed, 17 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/63/325463/1

diff --git 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index 98511e5..b2402f8 100644
--- 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++ 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -107,6 +107,13 @@
 'default' => false,
 'no_display' => true,
 ),
+'original_amount' => array(
+  'title' => ts( 'Original Amount' ),
+  'type' => CRM_Utils_Type::T_MONEY,
+  'statistics' => array(
+'sum' => ts( 'Total Original Amount' ),
+  ),
+),
 'original_currency' => array(
 'title' => ts( 'Original Currency' ),
 'required' => true,
@@ -204,12 +211,6 @@
 }
 
 function from( ) {
-
-$depositFinancialAccountID = civicrm_api3('FinancialAccount', 
'getvalue', array(
-  'return' => 'id',
-  'name' => 'Deposit Bank Account',
-));
-
 $this->_from = <<_aliases['civicrm_contribution']}
 LEFT JOIN wmf_contribution_extra {$this->_aliases['wmf_contribution_extra']}
@@ -221,7 +222,6 @@
 
   LEFT JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']}
 ON {$this->_aliases['civicrm_financial_trxn']}.id = 
entity_financial_trxn_civireport.financial_trxn_id
-AND 
{$this->_aliases['civicrm_financial_trxn']}.to_financial_account_id = 
{$depositFinancialAccountID}
 EOS;
 if ( $this->isTableSelected( 'civicrm_country' ) ) {
 $this->_from .= <<_selectAliases[] = $field['dbAlias'];
 }
 
+function storeWhereHavingClauseArray() {
+  parent::storeWhereHavingClauseArray();
+  $depositFinancialAccountID = civicrm_api3('FinancialAccount', 
'getvalue', array(
+'return' => 'id',
+'name' => 'Deposit Bank Account',
+  ));
+  $this->_whereClauses[] = 
"{$this->_aliases['civicrm_financial_trxn']}.to_financial_account_id = 
{$depositFinancialAccountID}";
+
+}
+
   /**
*
   * Alter display of rows.

-- 
To view, visit https://gerrit.wikimedia.org/r/325463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63e2240da371bd18cb4bc37c9424365cbc27968b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Remove error suppression for gallery tests

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove error suppression for gallery tests
..


Remove error suppression for gallery tests

Change-Id: Id6197bd7f76ceb437d83aa1fa287514981ec1642
---
M bin/parserTests.js
1 file changed, 0 insertions(+), 6 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/bin/parserTests.js b/bin/parserTests.js
index addbb85..30c38e4 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1975,12 +1975,6 @@
this.comments = [];
 
var suppressErrors = 
item.options.parsoid && item.options.parsoid.suppressErrors;
-   // HACK: suppress errors for all tests 
where wikitext has
-   //  tag: these emit lots of 
noise on stderr and
-   // we know that we don't support 
 yet.
-   if (/)/.test(item.wikitext 
|| '')) {
-   suppressErrors = true;
-   }
if (suppressErrors) {

this.env.setLogger(this.suppressLogger);
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6197bd7f76ceb437d83aa1fa287514981ec1642
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jsbench: move files to modules/role/files/jsbench/

2016-12-05 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325462

Change subject: jsbench: move files to modules/role/files/jsbench/
..

jsbench: move files to modules/role/files/jsbench/

Change-Id: I620450366731b24f24faba40c66da693df6707f6
---
R modules/role/files/jsbench/benchmarks/README
R modules/role/files/jsbench/benchmarks/ve.js
R modules/role/files/jsbench/devwiki.conf
R modules/role/files/jsbench/jsbench
R modules/role/files/jsbench/systemd
R modules/role/files/jsbench/upstart
M modules/role/manifests/jsbench.pp
7 files changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/325462/1

diff --git a/files/jsbench/benchmarks/README 
b/modules/role/files/jsbench/benchmarks/README
similarity index 100%
rename from files/jsbench/benchmarks/README
rename to modules/role/files/jsbench/benchmarks/README
diff --git a/files/jsbench/benchmarks/ve.js 
b/modules/role/files/jsbench/benchmarks/ve.js
similarity index 100%
rename from files/jsbench/benchmarks/ve.js
rename to modules/role/files/jsbench/benchmarks/ve.js
diff --git a/files/jsbench/devwiki.conf 
b/modules/role/files/jsbench/devwiki.conf
similarity index 100%
rename from files/jsbench/devwiki.conf
rename to modules/role/files/jsbench/devwiki.conf
diff --git a/files/jsbench/jsbench b/modules/role/files/jsbench/jsbench
similarity index 100%
rename from files/jsbench/jsbench
rename to modules/role/files/jsbench/jsbench
diff --git a/files/jsbench/systemd b/modules/role/files/jsbench/systemd
similarity index 100%
rename from files/jsbench/systemd
rename to modules/role/files/jsbench/systemd
diff --git a/files/jsbench/upstart b/modules/role/files/jsbench/upstart
similarity index 100%
rename from files/jsbench/upstart
rename to modules/role/files/jsbench/upstart
diff --git a/modules/role/manifests/jsbench.pp 
b/modules/role/manifests/jsbench.pp
index 5dbd87d..b419031 100644
--- a/modules/role/manifests/jsbench.pp
+++ b/modules/role/manifests/jsbench.pp
@@ -42,10 +42,8 @@
 require=> File['/srv/profile'],
 }
 
-# move files to module?
-# lint:ignore:puppet_url_without_modules
 file { '/usr/local/bin/jsbench':
-source => 'puppet:///files/jsbench/jsbench',
+source => 'puppet:///modules/role/jsbench/jsbench',
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
@@ -54,7 +52,7 @@
 if $::initsystem == 'upstart' {
 file { '/etc/init/jsbench-browser.conf':
 ensure => present,
-source => 'puppet:///files/jsbench/upstart',
+source => 'puppet:///modules/role/jsbench/upstart',
 mode   => '0444',
 }
 }
@@ -62,14 +60,13 @@
 if $::initsystem == 'systemd' {
 file { '/etc/systemd/system/jsbench-browser.service':
 ensure => present,
-source => 'puppet:///files/jsbench/systemd',
+source => 'puppet:///modules/role/jsbench/systemd',
 mode   => '0444',
 }
 }
 
 file { '/usr/local/share/jsbench':
-source  => 'puppet:///files/jsbench/benchmarks',
+source  => 'puppet:///modules/role/jsbench/benchmarks',
 recurse => true,
 }
-# lint:endignore
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I620450366731b24f24faba40c66da693df6707f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update.

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Submodule update.
..


Submodule update.

Do not give validation error on address with no location_type.

Change-Id: I09cfcac9d80af330f6d50459ad6bee7618191220
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Eileen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/civicrm b/civicrm
index b9fcc61..8af59fb 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b9fcc61d815a8ce679161719e801fa98b7447d31
+Subproject commit 8af59fb6cab3ff2f2bfcb62caae4bdc9f43a803c

-- 
To view, visit https://gerrit.wikimedia.org/r/325451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I09cfcac9d80af330f6d50459ad6bee7618191220
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganeti: move id_dsa.pub from /files to modules/role/file/gan...

2016-12-05 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325461

Change subject: ganeti: move id_dsa.pub from /files to modules/role/file/ganeti/
..

ganeti: move id_dsa.pub from /files to modules/role/file/ganeti/

Change-Id: I7bb7bd64388cb611498c7a91b268682b3d5b82f6
---
R modules/role/files/ganeti/id_dsa.pub
M modules/role/manifests/ganeti.pp
2 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/325461/1

diff --git a/files/ganeti/id_dsa.pub b/modules/role/files/ganeti/id_dsa.pub
similarity index 100%
rename from files/ganeti/id_dsa.pub
rename to modules/role/files/ganeti/id_dsa.pub
diff --git a/modules/role/manifests/ganeti.pp b/modules/role/manifests/ganeti.pp
index d58dfa9..5b90054 100644
--- a/modules/role/manifests/ganeti.pp
+++ b/modules/role/manifests/ganeti.pp
@@ -13,10 +13,7 @@
 ensure => present,
 user   => 'root',
 skey   => 'ganeti',
-# move to ganeti module?
-# lint:ignore:puppet_url_without_modules
-source => 'puppet:///files/ganeti/id_dsa.pub',
-# lint:endignore
+source => 'puppet:///modules/role/ganeti/id_dsa.pub',
 }
 
 # And the private key
@@ -33,9 +30,7 @@
 owner  => 'root',
 group  => 'root',
 mode   => '0400',
-# lint:ignore:puppet_url_without_modules
-source => 'puppet:///files/ganeti/id_dsa.pub',
-# lint:endignore
+source => 'puppet:///modules/role/ganeti/id_dsa.pub',
 }
 
 # If ganeti_cluster fact is not defined, the node has not been added to a

-- 
To view, visit https://gerrit.wikimedia.org/r/325461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb7bd64388cb611498c7a91b268682b3d5b82f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: move install_console from global /files to modules/role/files/

2016-12-05 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325460

Change subject: move install_console from global /files to modules/role/files/
..

move install_console from global /files to modules/role/files/

Change-Id: I97d5d8a242ed6b296421f5673818dcd13376498a
---
R modules/role/files/access_new_install/install_console
M modules/role/manifests/access_new_install.pp
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/325460/1

diff --git a/files/misc/scripts/install_console 
b/modules/role/files/access_new_install/install_console
similarity index 100%
rename from files/misc/scripts/install_console
rename to modules/role/files/access_new_install/install_console
diff --git a/modules/role/manifests/access_new_install.pp 
b/modules/role/manifests/access_new_install.pp
index 98119b7..99e5815 100644
--- a/modules/role/manifests/access_new_install.pp
+++ b/modules/role/manifests/access_new_install.pp
@@ -21,7 +21,7 @@
 mode   => '0555',
 # FIXME - move to module install_server?
 # lint:ignore:puppet_url_without_modules
-source => 'puppet:///files/misc/scripts/install_console',
+source => 'puppet:///modules/role/access_new_install/install_console',
 # lint:endignore
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97d5d8a242ed6b296421f5673818dcd13376498a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Stop using deprecated Revision::getText()

2016-12-05 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325459

Change subject: Stop using deprecated Revision::getText()
..

Stop using deprecated Revision::getText()

Also don't serialize and reparse wikitext in 
FlaggedRevsUIHooks::overrideRedirect(),
instead use the Content object directly.

Change-Id: I730a3370d9e1f364371f0b896f6f9fbdb6dd9bcd
---
M backend/FlaggedRevision.php
M frontend/FlaggedRevsUI.hooks.php
2 files changed, 4 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/59/325459/1

diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index c812eae..fa856f6 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -474,10 +474,10 @@
/**
 * Get text of the corresponding revision
 * Note: here for convenience
-* @return string|false revision timestamp in MW format
+* @return string Revision text
 */
public function getRevText() {
-   return $this->mRevision->getText();
+   return ContentHandler::getContentText( 
$this->mRevision->getContent() );
}
 
/**
diff --git a/frontend/FlaggedRevsUI.hooks.php b/frontend/FlaggedRevsUI.hooks.php
index 0abe3be..eb0e675 100644
--- a/frontend/FlaggedRevsUI.hooks.php
+++ b/frontend/FlaggedRevsUI.hooks.php
@@ -219,14 +219,8 @@
if ( is_array( $tuple ) ) { // cache hit
list( $ignoreRedirect, $target ) = $tuple;
} else { // cache miss; fetch the stable rev text...
-   $text = $srev->getRevText();
-   $redirect = $fa->getRedirectURL(
-   ContentHandler::makeContent(
-   $text,
-   null,
-   CONTENT_MODEL_WIKITEXT
-   )->getUltimateRedirectTarget()
-   );
+   $content = $srev->getRevision()->getContent();
+   $redirect = $fa->getRedirectURL( 
$content->getUltimateRedirectTarget() );
if ( $redirect ) {
$target = $redirect; // use stable 
redirect
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/325459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I730a3370d9e1f364371f0b896f6f9fbdb6dd9bcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Provide test case for getPageImageCandidates

2016-12-05 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325458

Change subject: Provide test case for getPageImageCandidates
..

Provide test case for getPageImageCandidates

Change-Id: I1a0d2d331c79df3e5505ae54d27f23e1cb5b910c
---
M tests/phpunit/LinksUpdateHookHandlerTest.php
1 file changed, 60 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/58/325458/1

diff --git a/tests/phpunit/LinksUpdateHookHandlerTest.php 
b/tests/phpunit/LinksUpdateHookHandlerTest.php
index 5655633..b43f6bb 100644
--- a/tests/phpunit/LinksUpdateHookHandlerTest.php
+++ b/tests/phpunit/LinksUpdateHookHandlerTest.php
@@ -6,10 +6,10 @@
 use PageImages;
 use PageImages\Hooks\LinksUpdateHookHandler;
 use ParserOutput;
-use PHPUnit_Framework_TestCase;
+use MediaWikiTestCase;
 use RepoGroup;
 use TestingAccessWrapper;
-
+use Title;
 
 /**
  * @covers PageImages\Hooks\LinksUpdateHookHandler
@@ -19,7 +19,7 @@
  * @license WTFPL 2.0
  * @author Thiemo Mättig
  */
-class LinksUpdateHookHandlerTest extends PHPUnit_Framework_TestCase {
+class LinksUpdateHookHandlerTest extends MediaWikiTestCase {
 
public function tearDown() {
// remove mock added in testGetMetadata()
@@ -29,18 +29,54 @@
 
/**
 * @param array $images
+* @param [false|array] $images in lead section. (optional)
 * @return LinksUpdate
 */
-   private function getLinksUpdate( array $images ) {
+   private function getLinksUpdate( array $images, $leadImages = false ) {
$parserOutput = new ParserOutput();
$parserOutput->setExtensionData( 'pageImages', $images );
+   $parserOutputLead = new ParserOutput();
+   $parserOutputLead->setExtensionData( 'pageImages', $leadImages 
|| $images );
+
+   $rev = $this->getMockBuilder( 'Revision' )
+   ->disableOriginalConstructor()
+   ->getMock();
+
+   $content = $this->getMockBuilder( 'AbstractContent' )
+   ->disableOriginalConstructor()
+   ->getMock();
+
+   $sectionContent = $this->getMockBuilder( 'AbstractContent' )
+   ->disableOriginalConstructor()
+   ->getMock();
 
$linksUpdate = $this->getMockBuilder( 'LinksUpdate' )
->disableOriginalConstructor()
->getMock();
+
+   $linksUpdate->expects( $this->any() )
+   ->method( 'getTitle' )
+   ->will( $this->returnValue( new Title( 
'LinksUpdateHandlerTest' ) ) );
+
$linksUpdate->expects( $this->any() )
->method( 'getParserOutput' )
->will( $this->returnValue( $parserOutput ) );
+
+   $linksUpdate->expects( $this->any() )
+   ->method( 'getRevision' )
+   ->will( $this->returnValue( $rev ) );
+
+   $rev->expects( $this->any() )
+   ->method( 'getContent' )
+   ->will( $this->returnValue( $content ) );
+
+   $content->expects( $this->any() )
+   ->method( 'getSection' )
+   ->will( $this->returnValue( $sectionContent ) );
+
+   $sectionContent->expects( $this->any() )
+   ->method( 'getParserOutput' )
+   ->will( $this->returnValue( $parserOutputLead ) );
 
return $linksUpdate;
}
@@ -155,6 +191,26 @@
}
 
/**
+*/
+   public function testGetPageImageCandidates() {
+   $candidates = [
+   [ 'filename' => 'A.jpg', 'score' => 100, 
'isFree' => false ],
+   [ 'filename' => 'B.jpg', 'score' => 90, 
'isFree' => false ],
+   ];
+   $linksUpdate = $this->getLinksUpdate( $candidates, array_slice( 
$candidates, 0, 1 ) );
+
+   // should get without lead.
+   $handler = new LinksUpdateHookHandler();
+   $this->setMwGlobals( 'wgPageImagesLeadSectionOnly', false );
+   $images = $handler->getPageImageCandidates( $linksUpdate );
+   $this->assertTrue( count( $images ) === 2, 'All images are 
returned.' );
+
+   $this->setMwGlobals( 'wgPageImagesLeadSectionOnly', true );
+   $images = $handler->getPageImageCandidates( $linksUpdate );
+   $this->assertTrue( count( $images ) === 1, 'Only lead images 
are returned.' );
+   }
+
+   /**
 * @dataProvider provideGetScore
 */
public function testGetScore( $image, $scoreFromTable, $position, 
$expected ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/325458
To unsubscribe,

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove files/apache/ports.conf and files/apache/ports.conf.ssl

2016-12-05 Thread Tim Landscheidt (Code Review)

Hello Dzahn,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/325457

to review the following change.

Change subject: Remove files/apache/ports.conf and files/apache/ports.conf.ssl
..

Remove files/apache/ports.conf and files/apache/ports.conf.ssl

files/apache/ports.conf and files/apache/ports.conf.ssl were added in
f9df52dc4b64868c7f52fb12f2a05a4b0cc1b483 and
92ce13bfab6abe12bbc78bdcf46e17d2c8045e3e, respectively.  They are not
used.

Change-Id: Ic83fc104ef1872f93b8bf586b7b2c8a4c2e65c49
---
D files/apache/ports.conf
D files/apache/ports.conf.ssl
2 files changed, 0 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/325457/1

diff --git a/files/apache/ports.conf b/files/apache/ports.conf
deleted file mode 100644
index 99421c5..000
--- a/files/apache/ports.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# !This file is managed by Puppet!
-# this is a default Debian/Ubuntu ports.conf _besides_ NameVirtualHost *:80 
being commented
-# it avoids "NameVirtualHost *:80 has no VirtualHosts"-warnings because of a 
duplicate definition when using "apache_confd { namevirtualhost.." with puppet
-
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default
-# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
-# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
-# README.Debian.gz
-
-# NameVirtualHost *:80
-Listen 80
-
-
-# If you add NameVirtualHost *:443 here, you will also have to change
-# the VirtualHost statement in /etc/apache2/sites-available/default-ssl
-# to 
-# Server Name Indication for SSL named virtual hosts is currently not
-# supported by MSIE on Windows XP.
-Listen 443
-
-
-
-Listen 443
-
-
diff --git a/files/apache/ports.conf.ssl b/files/apache/ports.conf.ssl
deleted file mode 100644
index 25a0d02..000
--- a/files/apache/ports.conf.ssl
+++ /dev/null
@@ -1,10 +0,0 @@
-# ! this file is managed by puppet !
-# simple Apache ports.conf with enabled SSL (NameVirtualHost *:443)
-
-NameVirtualHost *:80
-Listen 80
-
-
-NameVirtualHost *:443
-Listen 443
-

-- 
To view, visit https://gerrit.wikimedia.org/r/325457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic83fc104ef1872f93b8bf586b7b2c8a4c2e65c49
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Rename $wgFlagRestrctions to $wgFlaggedRevsTagsRestrictions

2016-12-05 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325456

Change subject: Rename $wgFlagRestrctions to $wgFlaggedRevsTagsRestrictions
..

Rename $wgFlagRestrctions to $wgFlaggedRevsTagsRestrictions

$wgFlagRestrictions was deprecated in 2010: see 545602169e0 in FlaggedRevs.

Change-Id: Ibf6edd12062558febc64edd52b31351150496d2e
---
M wmf-config/flaggedrevs.php
1 file changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/56/325456/1

diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index ad8f08c..88b6255 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -14,7 +14,7 @@
 $wgFlaggedRevsTags = [
'accuracy' => [ 'levels' => 2, 'quality' => 2, 'pristine' => 4 ],
 ];
-$wgFlagRestrictions = [
+$wgFlaggedRevsTagsRestrictions = [
'accuracy' => [ 'review' => 1, 'autoreview' => 1 ],
 ];
 $wgGroupPermissions['autoconfirmed']['movestable'] = true; // T16166
@@ -56,7 +56,7 @@
'status' => [ 'levels' => 1, 'quality' => 2, 'pristine' => 3 ],
];
# Restrict autoconfirmed to flagging semi-protected
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'status' => [ 'review' => 1, 'autoreview' => 1 ],
];
# Restriction levels for auto-review/review rights
@@ -104,7 +104,7 @@
'status' => [ 'levels' => 1, 'quality' => 2, 'pristine' => 3 ],
];
# Restrict autoconfirmed to flagging semi-protected
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'status' => [ 'review' => 1, 'autoreview' => 1 ],
];
# Restriction levels for autoconfirmed, autopatrol and review rights
@@ -247,7 +247,7 @@
'status' => [ 'levels' => 1, 'quality' => 2, 'pristine' => 3 ],
];
# Restrict autoconfirmed to flagging semi-protected
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'status' => [ 'review' => 1, 'autoreview' => 1 ],
];
# Restriction levels for auto-review/review rights
@@ -350,7 +350,7 @@
'status' => [ 'levels' => 1, 'quality' => 2, 'pristine' => 3 ],
];
# Restrict autoconfirmed to flagging semi-protected
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'status' => [ 'review' => 1, 'autoreview' => 1 ],
];
# Restriction levels for auto-review/review rights
@@ -403,7 +403,7 @@
$wgFlaggedRevsTags = [
'accuracy' => [ 'levels' => 3, 'quality' => 3, 'pristine' => 4 
],
];
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'accuracy' => [ 'review' => 3, 'autoreview' => 2 ],
];
 }
@@ -426,7 +426,7 @@
$wgFlaggedRevsTags = [ 'completeness' => 3, 'accuracy' => 3, 
'formatting' => 3 ];
$wgFlaggedRevValues = 4;
$wgFlaggedRevsAutoReviewNew = false;
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'completeness' => [ 'review' => 3, 'autoreview' => 3 ],
'accuracy' => [ 'review' => 3, 'autoreview' => 3 ],
'formatting'   => [ 'review' => 3, 'autoreview' => 3 ],
@@ -445,7 +445,7 @@
'status' => [ 'levels' => 1, 'quality' => 2, 'pristine' => 3 ],
];
# Restrict autoconfirmed to flagging semi-protected
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'status' => [ 'review' => 1, 'autoreview' => 1 ],
];
# Restriction levels for auto-review/review rights
@@ -558,7 +558,7 @@
'status' => [ 'levels' => 1, 'quality' => 2, 'pristine' => 3 ],
];
# Restrict autoconfirmed to flagging semi-protected
-   $wgFlagRestrictions = [
+   $wgFlaggedRevsTagsRestrictions = [
'status' => [ 'review' => 1, 'autoreview' => 1 ],
];
# Restriction levels for autoconfirmed rights

-- 
To view, visit https://gerrit.wikimedia.org/r/325456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf6edd12062558febc64edd52b31351150496d2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Install zip for statistics::web role (on thorium)

2016-12-05 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Install zip for statistics::web role (on thorium)
..


Install zip for statistics::web role (on thorium)

Bug: T149438
Change-Id: I89af996ff78d7b77b58e2ff2a7eadfe767c68d0b
---
M modules/statistics/manifests/web.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/modules/statistics/manifests/web.pp 
b/modules/statistics/manifests/web.pp
index ff60e5a..b3211b5 100644
--- a/modules/statistics/manifests/web.pp
+++ b/modules/statistics/manifests/web.pp
@@ -19,6 +19,7 @@
 require_package([
 'mc',
 'unzip',
+'zip',
 ])
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I89af996ff78d7b77b58e2ff2a7eadfe767c68d0b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make SpecialGoToLinkedPage use OOUI

2016-12-05 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325455

Change subject: Make SpecialGoToLinkedPage use OOUI
..

Make SpecialGoToLinkedPage use OOUI

Change-Id: I80ecaceef17ee57b720b1e3a7562d355538c885f
---
M repo/includes/Specials/SpecialGoToLinkedPage.php
M repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
2 files changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/55/325455/1

diff --git a/repo/includes/Specials/SpecialGoToLinkedPage.php 
b/repo/includes/Specials/SpecialGoToLinkedPage.php
index e103127..801b563 100644
--- a/repo/includes/Specials/SpecialGoToLinkedPage.php
+++ b/repo/includes/Specials/SpecialGoToLinkedPage.php
@@ -245,7 +245,7 @@
)
);
 
-   HTMLForm::factory( 'inline', $formDescriptor, 
$this->getContext() )
+   HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() 
)
->setId( 'wb-gotolinkedpage-form1' )
->setMethod( 'get' )
->setSubmitID( 'wb-gotolinkedpage-submit' )
diff --git a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
index 3f73d42..764ea83 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
@@ -164,23 +164,19 @@
$matchers['site'] = array(
'tag' => 'input',
'attributes' => array(
-   'id' => 'wb-gotolinkedpage-sitename',
'name' => 'site',
'value' => $site
) );
$matchers['itemid'] = array(
'tag' => 'input',
'attributes' => array(
-   'id' => 'wb-gotolinkedpage-itemid',
'name' => 'itemid',
'value' => $item
) );
$matchers['submit'] = array(
-   'tag' => 'input',
+   'tag' => 'button',
'attributes' => array(
-   'id' => 'wb-gotolinkedpage-submit',
'type' => 'submit',
-   'name' => ''
)
);
foreach ( $matchers as $key => $matcher ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/325455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80ecaceef17ee57b720b1e3a7562d355538c885f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Simulate 1000 emails

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Simulate 1000 emails
..


Simulate 1000 emails

Just the database bits, no actual email sending.

This WILL update the thankyou_date column and add activities
according to CiviMail record configuration.

It also needs 1000 rows in the contribution table with
thankyou_date = null and contacts with email that isn't
nob...@wikimedia.org

FIXME: some stupid manipulation of the thank_you_days parameter.

Change-Id: Icc7bb5bc2a1fdc6091579a13ebda9d010a5fdc3a
---
M sites/all/modules/thank_you/thank_you.drush.inc
M sites/all/modules/thank_you/thank_you.module
2 files changed, 90 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/thank_you/thank_you.drush.inc 
b/sites/all/modules/thank_you/thank_you.drush.inc
index bfe12c8..6dbdc0d 100644
--- a/sites/all/modules/thank_you/thank_you.drush.inc
+++ b/sites/all/modules/thank_you/thank_you.drush.inc
@@ -13,6 +13,11 @@
 'aliases' => array( 'ty' ),
   );
 
+  $items['thank-you-test'] = array(
+'description' =>
+  'Simulates sending 1000 thank you emails for donations, to test DB 
performance',
+'aliases' => array( 'tyt' ),
+  );
   return $items;
 }
 
@@ -47,3 +52,14 @@
  exit(drush_get_error());
   }
 }
+
+
+/**
+ * Fires the 'batch_process' method in the thank_you module.
+ *
+ * This simply executes the code necessary to run the thank you modules.
+ * All configuration happens in the module.
+ */
+function drush_thank_you_test() {
+   module_invoke( 'thank_you', 'batch_test' );
+}
diff --git a/sites/all/modules/thank_you/thank_you.module 
b/sites/all/modules/thank_you/thank_you.module
index 12f7404..abd2562 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -15,6 +15,9 @@
 // * reconsider need for twig extensions, we already do calculated values
 // * give template fragments a named key rather than using integers
 
+// FIXME: this constant is for test code
+const DUMB_BIG_TY_DAYS = 10;
+
 /**
  * Implements hook_permission
  */
@@ -718,6 +721,15 @@
 return;
}
 
+   // FIXME: refactor this whole module to be more object oriented, so we 
can
+   // just set these properties and override during the test.
+   // This code resets the thank_you_days variable in case it's been left 
in
+   // a bad state by an aborted simulation run
+   if ( $days == DUMB_BIG_TY_DAYS ) {
+   $days = variable_get( 'old_thank_you_days', false );
+   variable_set( 'thank_you_days', $days );
+   }
+
watchdog( "thank_you", "Attempting to send $batch thank you mails for 
contributions from the last $days days.", array(), WATCHDOG_INFO );
 
$dbs = wmf_civicrm_get_dbs();
@@ -843,5 +855,67 @@
return variable_get( 'thank_you_unsubscribe_url', '' ) . '?' . 
http_build_query( $unsub_params, '', '&' );
 }
 
+function thank_you_batch_test() {
+   if ( !defined( 'WMF_UNSUB_SALT' ) ) {
+   define( 'WMF_UNSUB_SALT', 'aslkdhaslkdjasd' );
+   }
+   civicrm_initialize();
+
+   $create_civi_mail = variable_get( 'thank_you_add_civimail_records', 
'false' );
+   $rate = variable_get( 'thank_you_civimail_rate', 1.0 );
+
+   // Don't actually send any emails
+   wmf_communication\Mailer::$defaultSystem = 'test';
+
+   // Don't want to skip anything due to age
+   $oldTyDays = variable_get('thank_you_days', 14);
+   variable_set('old_thank_you_days', $oldTyDays);
+   variable_set('thank_you_days', DUMB_BIG_TY_DAYS);
+
+   watchdog( "thank_you", "Simulating up to 1000 thank you mails.", 
array(), WATCHDOG_INFO );
+   watchdog( "thank_you", "Civimail creation: $create_civi_mail. Sample 
rate: $rate", array(), WATCHDOG_INFO );
+
+   $start = time();
+   $sent = 0;
+   
+   $dbs = wmf_civicrm_get_dbs();
+   $dbs->push( 'civicrm' );
+   try {
+
+   $ty_query = << 'nob...@wikimedia.org'
+   AND thankyou_date IS NULL
+   AND no_thank_you IS NULL
+   ORDER BY id DESC LIMIT 1000;
+EOT;
+
+   $result = db_query( $ty_query );
+   foreach ( $result as $contribution ) {
+   watchdog(
+   "thank_you",
+   "Pretending to send thank you mail for 
contribution ID [{$contribution->id}], trxn_id [{$contribution->trxn_id}]",
+   array(),
+   WATCHDOG_INFO
+   );
+   if ( thank_you_for_contribution( $contribution->id ) ) {
+   $sent++;
+   }
+   }
+   } catch ( Exception $ex ) {
+   // Just need to make sure we reset the TY days
+

[MediaWiki-commits] [Gerrit] wikimedia...drupal[master]: Re-apply WMF patches

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Re-apply WMF patches
..


Re-apply WMF patches

Note I have rolled the following into one patch. I had to fix conflicts on the
98f9e6b (FR #1070) patch on includes/registry.inc

debfcf6 Use sans-serifs for Civi's sake
98f9e6b (FR #1070) Drupal registry supports namespaces
89c75c5 Accept anything callable as a callback, need not be a global function 
name.
e91344f WIP fixes for testing

Change-Id: I4220bfd37a587acf07942e4f94d416908aafcdbe
---
M includes/form.inc
M includes/registry.inc
M modules/system/system.info
A modules/system/tests/NamespacedClass.php
M modules/user/user.module
M themes/bartik/css/style.css
6 files changed, 19 insertions(+), 4 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/form.inc b/includes/form.inc
index 130775f..835b117 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -789,7 +789,7 @@
 
   // We first check to see if there's a function named after the $form_id.
   // If there is, we simply pass the arguments on to it to get the form.
-  if (!function_exists($form_id)) {
+  if (!is_callable($form_id)) {
 // In cases where many form_ids need to share a central constructor 
function,
 // such as the node editing form, modules can implement hook_forms(). It
 // maps one or more form_ids to the correct constructor functions.
diff --git a/includes/registry.inc b/includes/registry.inc
index 29a1fca..67c7a4c 100644
--- a/includes/registry.inc
+++ b/includes/registry.inc
@@ -164,8 +164,14 @@
  *   (optional) Weight of the module.
  */
 function _registry_parse_file($filename, $contents, $module = '', $weight = 0) 
{
+  $namespace = '';
+  // We support one namespace per file
+  if 
(preg_match('/^<\?(?:php)?\s*(?:declare[^;]+;\s*)?namespace\s+?([a-zA-Z0-9_]+)/ms',
 $contents, $matches)) {
+$namespace = $matches[1] . '\\';
+  }
   if 
(preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface|trait)\s+([a-zA-Z0-9_]+)/m',
 $contents, $matches)) {
-foreach ($matches[2] as $key => $name) {
+foreach ($matches[2] as $key => &$name) {
+  $name = $namespace . $name;
   db_merge('registry')
 ->key(array(
   'name' => $name,
diff --git a/modules/system/system.info b/modules/system/system.info
index 3653157..8241d4c 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -9,6 +9,7 @@
 files[] = system.tar.inc
 files[] = system.updater.inc
 files[] = system.test
+files[] = tests/NamespacedClass.php
 required = TRUE
 configure = admin/config/system
 
diff --git a/modules/system/tests/NamespacedClass.php 
b/modules/system/tests/NamespacedClass.php
new file mode 100644
index 000..b27aedb
--- /dev/null
+++ b/modules/system/tests/NamespacedClass.php
@@ -0,0 +1,4 @@
+uid == 1) {
 return TRUE;
@@ -1570,7 +1574,7 @@
  *   TRUE if the user is logged in, FALSE if the user is anonymous.
  */
 function user_is_logged_in() {
-  return (bool) $GLOBALS['user']->uid;
+  return $GLOBALS['user'] && (bool) $GLOBALS['user']->uid;
 }
 
 /**
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 8426e56..80d8a5c 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -106,7 +106,7 @@
 #site-slogan,
 .ui-widget,
 .comment-form label {
-  font-family: Georgia, "Times New Roman", Times, serif;
+  font-family: Helvetica, Arial, sans-serif;
 }
 #header,
 #footer-wrapper,

-- 
To view, visit https://gerrit.wikimedia.org/r/322823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4220bfd37a587acf07942e4f94d416908aafcdbe
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...RelatedLinks[master]: 1.2.7

2016-12-05 Thread Sleepinglion (Code Review)

Sleepinglion has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325454

Change subject: 1.2.7
..

1.2.7

Change-Id: I00057608ed485c69a21cc2642c543ad750e366b0
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedLinks 
refs/changes/54/325454/1


-- 
To view, visit https://gerrit.wikimedia.org/r/325454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00057608ed485c69a21cc2642c543ad750e366b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedLinks
Gerrit-Branch: master
Gerrit-Owner: Sleepinglion 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update.

2016-12-05 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325451

Change subject: Submodule update.
..

Submodule update.

Do not give validation error on address with no location_type.

Change-Id: I09cfcac9d80af330f6d50459ad6bee7618191220
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/51/325451/1

diff --git a/civicrm b/civicrm
index b9fcc61..8af59fb 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b9fcc61d815a8ce679161719e801fa98b7447d31
+Subproject commit 8af59fb6cab3ff2f2bfcb62caae4bdc9f43a803c

-- 
To view, visit https://gerrit.wikimedia.org/r/325451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09cfcac9d80af330f6d50459ad6bee7618191220
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...drupal[master]: Upgrade to Drupal 7.52 upstream

2016-12-05 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Upgrade to Drupal 7.52 upstream
..


Upgrade to Drupal 7.52 upstream

Change-Id: I986bb122e1d722d31d4d25f974f10ac3ccfdb8b6
---
A .editorconfig
M CHANGELOG.txt
M MAINTAINERS.txt
M includes/ajax.inc
M includes/bootstrap.inc
M includes/common.inc
M includes/database/database.inc
M includes/database/mysql/database.inc
M includes/database/mysql/schema.inc
M includes/database/pgsql/database.inc
M includes/database/select.inc
M includes/database/sqlite/database.inc
M includes/entity.inc
M includes/errors.inc
M includes/file.inc
M includes/form.inc
M includes/install.core.inc
M includes/locale.inc
M includes/menu.inc
M includes/module.inc
M includes/registry.inc
M includes/session.inc
M includes/theme.inc
M includes/update.inc
M misc/ajax.js
M misc/autocomplete.js
M misc/drupal.js
M misc/tabledrag.js
M modules/aggregator/aggregator.info
M modules/aggregator/aggregator.processor.inc
M modules/aggregator/tests/aggregator_test.info
M modules/block/block.info
M modules/block/block.module
M modules/block/tests/block_test.info
M modules/block/tests/themes/block_test_theme/block_test_theme.info
M modules/blog/blog.info
M modules/blog/blog.module
M modules/book/book.info
M modules/color/color.info
M modules/comment/comment.info
M modules/comment/comment.test
M modules/contact/contact.info
M modules/contextual/contextual.info
M modules/dashboard/dashboard.info
M modules/dblog/dblog.admin.inc
M modules/dblog/dblog.info
M modules/dblog/dblog.install
M modules/dblog/dblog.module
M modules/dblog/dblog.test
M modules/field/field.crud.inc
M modules/field/field.info
M modules/field/field.install
M modules/field/field.module
M modules/field/modules/field_sql_storage/field_sql_storage.info
M modules/field/modules/list/list.info
M modules/field/modules/list/tests/list.test
M modules/field/modules/list/tests/list_test.info
M modules/field/modules/number/number.info
M modules/field/modules/number/number.module
M modules/field/modules/number/number.test
M modules/field/modules/options/options.info
M modules/field/modules/options/options.test
M modules/field/modules/text/text.info
M modules/field/modules/text/text.test
M modules/field/tests/field_test.info
M modules/field_ui/field_ui.info
M modules/field_ui/field_ui.module
M modules/field_ui/field_ui.test
M modules/file/file.info
M modules/file/file.module
M modules/file/tests/file.test
M modules/file/tests/file_module_test.info
M modules/filter/filter.info
M modules/filter/filter.test
M modules/forum/forum.info
M modules/help/help.info
M modules/image/image.info
M modules/image/image.test
M modules/image/tests/image_module_test.info
M modules/locale/locale.admin.inc
M modules/locale/locale.info
M modules/locale/locale.test
M modules/locale/tests/locale_test.info
M modules/menu/menu.admin.inc
M modules/menu/menu.info
M modules/menu/menu.module
M modules/menu/menu.test
M modules/node/content_types.inc
M modules/node/node.info
M modules/node/node.install
M modules/node/node.test
M modules/node/tests/node_access_test.info
M modules/node/tests/node_test.info
M modules/node/tests/node_test_exception.info
M modules/openid/openid.info
M modules/openid/openid.test
M modules/openid/tests/openid_test.info
M modules/overlay/overlay.info
M modules/overlay/overlay.module
M modules/path/path.info
M modules/php/php.info
M modules/poll/poll.info
M modules/profile/profile.info
M modules/rdf/rdf.info
M modules/rdf/tests/rdf_test.info
M modules/search/search.api.php
M modules/search/search.info
M modules/search/tests/search_embedded_form.info
M modules/search/tests/search_extra_type.info
M modules/search/tests/search_node_tags.info
M modules/shortcut/shortcut.info
M modules/simpletest/drupal_web_test_case.php
A modules/simpletest/files/image-test-no-transparency.gif
M modules/simpletest/simpletest.info
M modules/simpletest/simpletest.module
M modules/simpletest/simpletest.test
M modules/simpletest/tests/actions_loop_test.info
M modules/simpletest/tests/ajax_forms_test.info
M modules/simpletest/tests/ajax_test.info
M modules/simpletest/tests/batch_test.info
M modules/simpletest/tests/boot_test_1.info
M modules/simpletest/tests/boot_test_2.info
M modules/simpletest/tests/bootstrap.test
M modules/simpletest/tests/common.test
M modules/simpletest/tests/common_test.info
M modules/simpletest/tests/common_test_cron_helper.info
M modules/simpletest/tests/database_test.info
M modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
M 
modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
M 
modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
M modules/simpletest/tests/entity_cache_test.info
M modules/simpletest/tests/entity_cache_test_dependency.info
M modules/simpletest/tests/entity_crud_hook_test.info
M

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Roll out wikidata description taglines to French and German ...

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Roll out wikidata description taglines to French and German 
Wikipedias
..


Roll out wikidata description taglines to French and German Wikipedias

Update nowikidatadescriptiontaglines.dblist to remove top 6 wikis given
that only 2 wikis (English and Russian) do not have this feature.

Explicitly disable there.

Bug: T151345
Change-Id: Ic3e75fcf3d6a58f93f7077dbdf8ee2e97d6c7053
---
M dblists/nowikidatadescriptiontaglines.dblist
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 7 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  Bmansurov: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/dblists/nowikidatadescriptiontaglines.dblist 
b/dblists/nowikidatadescriptiontaglines.dblist
index 7a94bf1..fdeac05 100644
--- a/dblists/nowikidatadescriptiontaglines.dblist
+++ b/dblists/nowikidatadescriptiontaglines.dblist
@@ -1 +1 @@
-%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + top6-wikipedia.dblist + special.dblist - s4.dblist
\ No newline at end of file
+%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
\ No newline at end of file
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 62ece75..ccde3c0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14665,13 +14665,11 @@
'nowikidatadescriptiontaglines' => [
'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
-   // This can be removed when top6-wikipedia.dblist is no longer inside 
nowikidatadescriptiontaglines
-   'jawiki' => [
-   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => true
+   'ruwiki' => [
+   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
-   // This can be removed when top6-wikipedia.dblist is no longer inside 
nowikidatadescriptiontaglines
-   'eswiki' => [
-   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => true
+   'enwiki' => [
+   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
 ],
 'wgMinervaUseFooterV2' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/325366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3e75fcf3d6a58f93f7077dbdf8ee2e97d6c7053
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge master into deploy

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deploy
..


Merge master into deploy

eedca3e450859e68ff5747cf40a8c57ad575fdca Try upload 3 times

Change-Id: I219896e77119698e95b0cc86bb9ba6890d2534b1
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/325449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I219896e77119698e95b0cc86bb9ba6890d2534b1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Don't autopatrol autoreviewed users in protection-based configs

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Don't autopatrol autoreviewed users in protection-based configs
..


Don't autopatrol autoreviewed users in protection-based configs

This no longer autopatrols autoreviewed users in protection-based
configs, since on wikis with those configs the autopatrolled
permission requires a much higher level of trust than the
autoreviewed permission. And when not using RC patrol, log entries
for autopatrols were created that were not for new pages hence
didn't make sense to end users.

Bug: T150086
Change-Id: Ia0565c7aabffc1a53bb5b5486699fceba192c38c
---
M backend/FlaggedRevs.hooks.php
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/backend/FlaggedRevs.hooks.php b/backend/FlaggedRevs.hooks.php
index a669280..ea19fa7 100755
--- a/backend/FlaggedRevs.hooks.php
+++ b/backend/FlaggedRevs.hooks.php
@@ -637,6 +637,12 @@
if ( empty( $rc->mAttribs['rc_this_oldid'] ) ) {
return true;
}
+   // don't autopatrol autoreviewed edits when using pending 
changes,
+   // otherwise edits by autoreviewed users on pending changes 
protected pages would be
+   // autopatrolled and could not be checked through RC patrol as 
on regular pages
+   if ( FlaggedRevs::useOnlyIfProtected() ) {
+   return true;
+   }
$fa = FlaggableWikiPage::getTitleInstance( $rc->getTitle() );
$fa->loadPageData( 'fromdbmaster' );
// Is the page reviewable?

-- 
To view, visit https://gerrit.wikimedia.org/r/315109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0565c7aabffc1a53bb5b5486699fceba192c38c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Cenarium 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable Wikipedia beta banner experiment

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Disable Wikipedia beta banner experiment
..


Disable Wikipedia beta banner experiment

Bug: T148634
Change-Id: I762bd4c22534bd483e33a4b20dfb246e78e7ed4d
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  Bmansurov: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 21a8dd1..62ece75 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17598,22 +17598,18 @@
'svwikivoyage' => false,
'viwikivoyage' => false,
'cawiki' => true, // T114392
-   'enwiki' => true, // T101108
 ],
 
 'wgWPBSkinBlacklist' => [
'default' => [],
-   'enwiki' => [ 'monobook', 'modern', 'vector', 'cologneblue', 'minerva' 
], // T101108
 ],
 
 'wgWPBEnablePageImagesBanners' => [
'default' => false,
-   'enwiki' => true, // T101108
 ],
 
 'wgWPBEnableHeadingOverride' => [
'default' => true,
-   'enwiki' => false, // T101108
 ],
 
 'wgWPBNamespaces' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/325370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I762bd4c22534bd483e33a4b20dfb246e78e7ed4d
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: First pass on LexicalCategory

2016-12-05 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325450

Change subject: First pass on LexicalCategory
..

First pass on LexicalCategory

 - Add provider interface
 - Add to entity as an attribute and add getter and setter
 - Consider in equals() method
 - Consider in __clone() method
 - Consider in isEmpty() method

Bug: T149495
Change-Id: Ide61b04304721122aa0dd732a2b7aac08c73ee7b
---
M src/DataModel/Lexeme.php
A src/DataModel/Providers/LexicalCategoryProvider.php
M src/DataModel/Serialization/LexemeDeserializer.php
M tests/phpunit/composer/DataModel/LexemeTest.php
4 files changed, 93 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme 
refs/changes/50/325450/1

diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 773dd85..dcdfc69 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Statement\StatementListProvider;
 use Wikibase\DataModel\Term\DescriptionsProvider;
@@ -13,12 +14,13 @@
 use Wikibase\DataModel\Term\LabelsProvider;
 use Wikibase\DataModel\Term\TermList;
 use Wikibase\Lexeme\DataModel\Providers\LemmasProvider;
+use Wikibase\Lexeme\DataModel\Providers\LexicalCategoryProvider;
 
 /**
  * @license GPL-2.0+
  */
 class Lexeme implements EntityDocument, StatementListProvider, 
FingerprintProvider,
-   LabelsProvider, DescriptionsProvider, LemmasProvider {
+   LabelsProvider, DescriptionsProvider, LemmasProvider, 
LexicalCategoryProvider {
 
const ENTITY_TYPE = 'lexeme';
 
@@ -43,18 +45,26 @@
private $lemmas;
 
/**
+* @var Item|null
+*/
+   private $lexicalCategory;
+
+   /**
 * @param LexemeId|null $id
 * @param TermList|null $lemmas
+* @param Item|null $lexicalCategory
 * @param StatementList|null $statements
 */
public function __construct(
LexemeId $id = null,
TermList $lemmas = null,
+   Item $lexicalCategory = null,
StatementList $statements = null
) {
-   // TODO: add lemma, language and lexical category
+   // TODO: add language
$this->id = $id;
$this->lemmas = $lemmas;
+   $this->lexicalCategory = $lexicalCategory;
$this->statements = $statements ?: new StatementList();
// TODO: Remove this once Wikibase can work without fingerprint
$this->fingerprint = new Fingerprint();
@@ -137,6 +147,7 @@
// TODO: should also check other attributes once implemented
return ( is_null( $this->lemmas )
|| $this->lemmas->isEmpty() )
+   && is_null( $this->lexicalCategory )
&& $this->statements->isEmpty();
}
 
@@ -161,7 +172,18 @@
$this->lemmas !== null
&& $this->lemmas->equals( $target->getLemmas() ) )
);
+
+   $sameLexicalCategory = ( $this->lexicalCategory === 
$target->getLexicalCategory() || (
+   $this->lexicalCategory !== null
+   && $this->lexicalCategory->equals( 
$target->getLexicalCategory() )
+   && $this->lexicalCategory->getId() !== null
+   && $this->lexicalCategory->getId()->equals(
+   $target->getLexicalCategory()->getId()
+   ) )
+   );
+
return $sameLemmas
+   && $sameLexicalCategory
&& $this->statements->equals( $target->statements );
}
 
@@ -196,4 +218,18 @@
$this->lemmas = $lemmas;
}
 
+   /**
+* @return Item
+*/
+   public function getLexicalCategory() {
+   return $this->lexicalCategory;
+   }
+
+   /**
+* @param Item $lexicalCategory
+*/
+   public function setLexicalCategory( Item $lexicalCategory ) {
+   $this->lexicalCategory = $lexicalCategory;
+   }
+
 }
diff --git a/src/DataModel/Providers/LexicalCategoryProvider.php 
b/src/DataModel/Providers/LexicalCategoryProvider.php
new file mode 100644
index 000..d684494
--- /dev/null
+++ b/src/DataModel/Providers/LexicalCategoryProvider.php
@@ -0,0 +1,23 @@
+
+ */
+interface LexicalCategoryProvider {
+
+   /**
+* This is guaranteed to return the original.
+*
+* @return Item
+*/
+   public function getLexicalCategory();
+
+}
diff

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge master into deploy

2016-12-05 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325449

Change subject: Merge master into deploy
..

Merge master into deploy

eedca3e450859e68ff5747cf40a8c57ad575fdca Try upload 3 times

Change-Id: I219896e77119698e95b0cc86bb9ba6890d2534b1
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/49/325449/1


-- 
To view, visit https://gerrit.wikimedia.org/r/325449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I219896e77119698e95b0cc86bb9ba6890d2534b1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Try upload 3 times

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Try upload 3 times
..


Try upload 3 times

Four shalt thou not count, neither count thou two, excepting that thou then
proceed to three. Five is right out.

Bug: T152352
Change-Id: I134c1235b7d2cda695d34e5ad4478ac86aac4098
---
M silverpop_export/upload.py
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/silverpop_export/upload.py b/silverpop_export/upload.py
index 950a3d4..8ab7e27 100644
--- a/silverpop_export/upload.py
+++ b/silverpop_export/upload.py
@@ -2,6 +2,7 @@
 
 import glob
 import os
+import sys
 
 import process
 from process.logging import Logger as log
@@ -36,6 +37,14 @@
 
 lock.begin()
 
-upload_most_recent()
+for i in range(3):
+try:
+upload_most_recent()
+break
+except:
+log.error("Ran into trouble: " + str(sys.exc_info()))
+
+if i == 2:
+raise
 
 lock.end()

-- 
To view, visit https://gerrit.wikimedia.org/r/325446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I134c1235b7d2cda695d34e5ad4478ac86aac4098
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update thank you letter.

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Update thank you letter.
..


Update thank you letter.

Bug: T151814
Change-Id: I7a02ac142d2ad88656801d4583b4d094656505ea
---
M sites/all/modules/wmf_civicrm/templates/offline_receipt.html
M sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
3 files changed, 34 insertions(+), 19 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/wmf_civicrm/templates/offline_receipt.html 
b/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
index b2b2eae..ab2d2b7 100644
--- a/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
+++ b/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
@@ -16,25 +16,27 @@
 
 Dear {contact.first_name},
 
-Thank you for your donation of {$amount|crmMoney:$currency} to the 
Wikimedia Foundation. The Wikimedia Foundation is the non-profit organization 
that supports Wikipedia and other free knowledge projects. Our mission is to 
build the most accessible and comprehensive source of free knowledge in the 
world.
+Thank you for your support of Wikipedia and the Wikimedia Foundation. Your 
contribution of {$amount|crmMoney:$currency} supports Wikipedia and helps 
secure the future of free knowledge for everyone.
 
-We believe that knowledge is a fundamental human right. As humanity rushes 
into our digital future, we need open, accessible, public spaces to access 
knowledge online. Wikimedia is such a space. Wikipedia delivers free knowledge 
to people, by people, in hundreds of languages around our planet.
+Wikipedia is possible because of a powerful idea: that people, like you 
and me, can participate in building the world’s knowledge and making it freely 
available to everyone, everywhere.
 
-Over the course of a year, Wikipedia is edited and read by people on every 
continent, including Antarctica. Nearly half a billion people visit Wikipedia 
every month for everything from preserving cultural heritage, to improving 
cancer detection, to researching homework. They come to learn. They stay and 
discover.
+Today, thanks to the support of millions of volunteer contributors and 
supporters, you can wander Wikipedia for hours. With more than 40 million 
Wikipedia articles and 35 million freely licensed images, Wikipedia can answer 
almost any question, and take you places you’ve never been.
 
-Everyone is a potential Wikipedian. If you don\'t find what you\'re looking 
for on Wikipedia, you can https://en.wikipedia.org/wiki/Special:UserLogin?type=signupcampaign=lila2015\;>start
 creating it yourself. The articles, words, pictures and data are created 
by a diverse community of people who volunteer to share their knowledge with 
the world.
+Your donation supports the creation and sharing of free knowledge in real, 
practical ways. It helps us make Wikipedia fast, secure, and accessible to 
everyone in the world. It helps us bring free access to Wikipedia in places 
where high mobile data costs prevent people from going online. It helps us 
support people who are digitizing knowledge currently locked away in analog 
archives. It protects Wikipedia from threats to free knowledge and the open 
internet.
 
-Every day, we ask ourselves how we can increase our impact, and ensure 
Wikipedia and its sister projects are even more accurate, rich, and accessible 
tomorrow than they are today. Your donation will help us get there.
+Your support means that you can find the information you need now, wherever 
you may be - to settle a bet with a friend at a dinner party, or to understand 
the world around us.
 
-Thank you for keeping us growing and impacting lives another year.
+Donating to Wikipedia makes you the champion of a powerful idea.
 
-Wikimedia Foundation
+Wikipedia will continue to evolve, grow, and meet new challenges. We’re 
excited and eager to meet these and more. Your donation will help us get there. 
We can’t thank you enough for your support.
 
-Many employers will match employee contributions: please check with your 
company to see if they have a https://wikimediafoundation.org/wiki/Matching_Gifts/form\;>corporate 
matching gift program.
+On behalf of the Wikimedia Foundation, thank you for investing in our 
future and taking this journey with us.
 
-For your records: Your donation, number CNT-{$contactID}, on 
{$receive_date|truncate:10:\'\'|crmDate}
+Katherine Maher
+Executive Director, Wikimedia Foundation
+
+Many employers will match employee contributions: please check with your 
company to see if they have a https://wikimediafoundation.org/wiki/Matching_Gifts/form\;>corporate 
matching gift program. For your records: Your donation, number 
CNT-{$contactID}, on {$receive_date|truncate:10:\'\'|crmDate}
 was {$amount|crmMoney:$currency}.
-
 
 This letter may serve as a record of your

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Re-enable banners on Romanian Wikivoyage

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Re-enable banners on Romanian Wikivoyage
..


Re-enable banners on Romanian Wikivoyage

Follow up to I08ed6ecceb7e5ae98100a043b2cd28319c84208a
where it was accidentally disabled.

Change-Id: I6e430843e02820ecf72329ad5be62822d65f486c
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1706edb..21a8dd1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17595,7 +17595,6 @@
'elwikivoyage' => false,
'ptwikivoyage' => false,
'nlwikivoyage' => false,
-   'rowikivoyage' => false,
'svwikivoyage' => false,
'viwikivoyage' => false,
'cawiki' => true, // T114392

-- 
To view, visit https://gerrit.wikimedia.org/r/325447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e430843e02820ecf72329ad5be62822d65f486c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Less noisy queue consumer logging

2016-12-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Less noisy queue consumer logging
..


Less noisy queue consumer logging

Bug: T151954
Change-Id: Ifc98c04c5778a7a1a63e084fb0f69a6707a6b1a8
---
M Core/QueueConsumers/BaseQueueConsumer.php
1 file changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Core/QueueConsumers/BaseQueueConsumer.php 
b/Core/QueueConsumers/BaseQueueConsumer.php
index 5367c51..05b72b9 100644
--- a/Core/QueueConsumers/BaseQueueConsumer.php
+++ b/Core/QueueConsumers/BaseQueueConsumer.php
@@ -101,10 +101,18 @@
}
$timeOk = $this->timeLimit === 0 || time() <= 
$startTime + $this->timeLimit;
$countOk = $this->messageLimit === 0 || $processed < 
$this->messageLimit;
-   $debugMessage = 'Data is ' . ( $data === null ? '' : 
'not ' ) . 'null, ' .
-   "time limit ($this->timeLimit) is " . ( $timeOk 
? 'not ' : '' ) . 'elapsed, ' .
-   "message limit ($this->messageLimit) is " . ( 
$countOk ? 'not ' : '' ) . 'reached.';
-   Logger::debug( $debugMessage );
+
+   $debugMessages = array();
+   if ( $data === null ) {
+   $debugMessages[] = 'Queue is empty.';
+   } else if ( !$timeOk ) {
+   $debugMessages[] = "Time limit 
($this->timeLimit) is elapsed.";
+   } else if ( !$countOk ) {
+   $debugMessages[] = "Message limit 
($this->messageLimit) is reached.";
+   }
+   if ( !empty( $debugMessages ) ) {
+   Logger::debug( implode( ' ', $debugMessages ) );
+   }
}
while( $timeOk && $countOk && $data !== null );
return $processed;

-- 
To view, visit https://gerrit.wikimedia.org/r/324343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc98c04c5778a7a1a63e084fb0f69a6707a6b1a8
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 4 >

1 - 100 of 367 matches

Mail list logo