[MediaWiki-commits] [Gerrit] translatewiki[master]: [TimedMediaHandler] Re-register module TimedText Attempt to ...

2017-01-26 Thread Gerrit Patch Uploader (Code Review) 
Gerrit Patch Uploader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334504 )

Change subject: [TimedMediaHandler] Re-register module TimedText Attempt to 
re-register TimedText as it was done in rGTWNe4f8e180cbd1 with EmbedPlayer. 
See: 
https://translatewiki.net/wiki/Thread:Support/TimedMediaHandler_-_missing_groups
 Change-Id: I31e55ffe872ed91f4c844
..

[TimedMediaHandler] Re-register module TimedText
Attempt to re-register TimedText as it was done in rGTWNe4f8e180cbd1 with 
EmbedPlayer.
See: 
https://translatewiki.net/wiki/Thread:Support/TimedMediaHandler_-_missing_groups
Change-Id: I31e55ffe872ed91f4c8445b4271818e3af5253a7
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/04/334504/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index f847936..12913c9 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2414,6 +2414,9 @@
 Timed Media Handler - Embed Player
 file = TimedMediaHandler/MwEmbedModules/EmbedPlayer/i18n/%CODE%.json
 
+Timed Media Handler - Timed Text
+file = TimedMediaHandler/MwEmbedModules/TimedText/i18n/%CODE%.json
+
 Timeline
 file = timeline/i18n/%CODE%.json
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31e55ffe872ed91f4c8445b4271818e3af5253a7
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use postWithToken and formatversion=2 for action=purge

2017-01-26 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334503 )

Change subject: Use postWithToken and formatversion=2 for action=purge
..

Use postWithToken and formatversion=2 for action=purge

Change-Id: I4fa75d50bc9f5b33320507b7b7a73bb3bdd61349
---
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/03/334503/1

diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js 
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index f4ea265..9d3f2c3 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -571,7 +571,8 @@
 
// Purge this page in the background... we shouldn't confuse 
the user with the newly added
// link(s) not being there:
-   mwApi.post( {
+   mwApi.postWithToken( 'csrf', {
+   formatversion: 2,
action: 'purge',
titles: this.options.pageTitle
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fa75d50bc9f5b33320507b7b7a73bb3bdd61349
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Core] Add optioal key

2017-01-26 Thread Raimond Spekking (Code Review) 
Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334502 )

Change subject: [Core] Add optioal key
..


[Core] Add optioal key

Change-Id: Ib84d12a40febbb53c5d22bca15a742ea8fad48af
---
M groups/MediaWiki/MediaWiki.yaml
M groups/MediaWiki/mediawiki-extensions.txt
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 971d8a7..bdd3a36 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -46,6 +46,7 @@
 
 TAGS:
   optional:
+- apisandbox-request-format-json-label
 - authprovider-confirmlink-failed-line
 - authprovider-confirmlink-option
 - backlinksubtitle
diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index f55ce1a..f847936 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2257,7 +2257,7 @@
 magicfile = SmoothGallery/SmoothGallery.i18n.magic.php
 ignored = smoothgallery-pagetext
 
-# Snippet // No message documentation
+# Snippet // No message documentation, inactive per T154220
 
 Social Profile
 aliasfile = SocialProfile/SocialProfile.alias.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib84d12a40febbb53c5d22bca15a742ea8fad48af
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Core] Add optioal key

2017-01-26 Thread Raimond Spekking (Code Review) 
Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334502 )

Change subject: [Core] Add optioal key
..

[Core] Add optioal key

Change-Id: Ib84d12a40febbb53c5d22bca15a742ea8fad48af
---
M groups/MediaWiki/MediaWiki.yaml
M groups/MediaWiki/mediawiki-extensions.txt
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/02/334502/1

diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 971d8a7..bdd3a36 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -46,6 +46,7 @@
 
 TAGS:
   optional:
+- apisandbox-request-format-json-label
 - authprovider-confirmlink-failed-line
 - authprovider-confirmlink-option
 - backlinksubtitle
diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index f55ce1a..f847936 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2257,7 +2257,7 @@
 magicfile = SmoothGallery/SmoothGallery.i18n.magic.php
 ignored = smoothgallery-pagetext
 
-# Snippet // No message documentation
+# Snippet // No message documentation, inactive per T154220
 
 Social Profile
 aliasfile = SocialProfile/SocialProfile.alias.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib84d12a40febbb53c5d22bca15a742ea8fad48af
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Fix restriction validation bug

2017-01-26 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334501 )

Change subject: Fix restriction validation bug
..

Fix restriction validation bug

Introduced in I8c2a2713e94b.

Change-Id: I567204fa1c615f215722a4bd6ee9a4e89dccaf45
---
M control/MWOAuthSubmitControl.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/01/334501/1

diff --git a/control/MWOAuthSubmitControl.php b/control/MWOAuthSubmitControl.php
index 1864b1f..57d5af0 100644
--- a/control/MWOAuthSubmitControl.php
+++ b/control/MWOAuthSubmitControl.php
@@ -178,7 +178,7 @@
if ( !isset( $this->vals[$field] ) ) {
// @TODO: check for field-specific message first
return $this->failure( "missing_field_$field", 
'mwoauth-missing-field', $field );
-   } elseif ( !is_scalar( $this->vals[$field] ) ) {
+   } elseif ( !is_scalar( $this->vals[$field] ) && $field 
!== 'restrictions' ) {
// @TODO: check for field-specific message first
return $this->failure( "invalid_field_$field", 
'mwoauth-invalid-field', $field );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I567204fa1c615f215722a4bd6ee9a4e89dccaf45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWSaveDialog: only focus summary if we're on the save panel

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334373 )

Change subject: MWSaveDialog: only focus summary if we're on the save panel
..


MWSaveDialog: only focus summary if we're on the save panel

Firefox throws exceptions when trying to focus hidden inputs. Using the
"preview" keyboard shortcut entirely bypasses the save panel, but the ready
process assumes it'll always be opened first.

Bug: T153958
Change-Id: Ifb3861116565e77c30b3874fe47889298c3ace6d
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 687897b..e7c0a39 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -584,8 +584,14 @@
 ve.ui.MWSaveDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWSaveDialog.super.prototype.getReadyProcess.call( this, 
data )
.next( function () {
-   // This includes a #focus call
-   this.editSummaryInput.moveCursorToEnd();
+   // Support: Firefox
+   // In Firefox, trying to focus a hidden input will 
throw an
+   // exception. This would happen when opening the 
preview via
+   // keyboard shortcut.
+   if ( this.panels.getCurrentItem() === this.savePanel ) {
+   // This includes a #focus call
+   this.editSummaryInput.moveCursorToEnd();
+   }
}, this );
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb3861116565e77c30b3874fe47889298c3ace6d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
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...VisualEditor[master]: Override ui.CommentInspector so that copying from it sets te...

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331535 )

Change subject: Override ui.CommentInspector so that copying from it sets 
text/x-wiki
..


Override ui.CommentInspector so that copying from it sets text/x-wiki

Bug: T154837
Change-Id: I3413c955aa23d34683e1a028a581b1ea34d55d49
---
M extension.json
A modules/ve-mw/ui/inspectors/ve.ui.MWCommentInspector.js
2 files changed, 60 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 4852161..5eecc46 100644
--- a/extension.json
+++ b/extension.json
@@ -1203,7 +1203,8 @@

"modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js",

"modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js",

"modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js",
-   
"modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js"
+   
"modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js",
+   
"modules/ve-mw/ui/inspectors/ve.ui.MWCommentInspector.js"
],
"styles": [

"modules/ve-mw/ui/styles/inspectors/ve.ui.MWExtensionInspector.css",
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWCommentInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWCommentInspector.js
new file mode 100644
index 000..2c9f6a8
--- /dev/null
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWCommentInspector.js
@@ -0,0 +1,58 @@
+/*!
+ * VisualEditor UserInterface MWCommentInspector class.
+ *
+ * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * Inspector for editing Mediawiki comments.
+ *
+ * @class
+ * @extends ve.ui.CommentInspector
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWCommentInspector = function VeUiMWCommentInspector() {
+   // Parent constructor
+   ve.ui.MWCommentInspector.super.apply( this, arguments );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWCommentInspector, ve.ui.CommentInspector );
+
+/* Static properties */
+
+ve.ui.MWCommentInspector.static.name = 'comment';
+
+ve.ui.MWCommentInspector.static.modelClasses = [ ve.dm.CommentNode ];
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWCommentInspector.prototype.initialize = function () {
+   // Parent method
+   ve.ui.MWCommentInspector.super.prototype.initialize.apply( this, 
arguments );
+
+   this.textWidget.$input.on( 'copy', this.onCopy.bind( this ) );
+};
+
+ve.ui.MWCommentInspector.prototype.onCopy = function ( e ) {
+   var clipboardData = e.originalEvent.clipboardData,
+   selection = ( e.target.value ).substring( 
e.target.selectionStart, e.target.selectionEnd );
+   if ( ve.isClipboardDataFormatsSupported( e, true ) ) {
+   // We are in an environment where setting text/x-wiki will work
+   e.preventDefault();
+
+   clipboardData.setData( 'text/x-wiki', selection );
+   clipboardData.setData( 'text/plain', selection ); // If you're 
pasting to not-VE
+   }
+};
+
+/* Registration */
+
+ve.ui.windowFactory.register( ve.ui.MWCommentInspector );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3413c955aa23d34683e1a028a581b1ea34d55d49
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: Esanders 
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...NSFileRepo[master]: NSFileRepo: deliver images without a file repository e.g. Ma...

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334500 )

Change subject: NSFileRepo: deliver images without a file repository e.g. Math 
extension
..


NSFileRepo: deliver images without a file repository e.g. Math extension

Fixed issue from ERM5234

Needs merge to master

Change-Id: Ia6e0ed77cb9c0db6ab0e79252e2d1c190c045293
---
M nsfr_img_auth.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/nsfr_img_auth.php b/nsfr_img_auth.php
index 3ee839e..de9725c 100644
--- a/nsfr_img_auth.php
+++ b/nsfr_img_auth.php
@@ -154,8 +154,12 @@
if ( !$file->exists() || $file->isDeleted( File::DELETED_FILE ) 
) {
$file = wfFindFile( $name ); //Give other repos a 
chance to handle this
if( !$file || !$file->exists() || $file->isDeleted( 
File::DELETED_FILE ) ) {
-   wfForbidden( 'img-auth-accessdenied', 
'img-auth-nofile', $filename );
-   return;
+
+   global $wgUploadDirectory;
+   if( !file_exists( $wgUploadDirectory.$path ) ) {
+   wfForbidden( 'img-auth-accessdenied', 
'img-auth-nofile', $filename );
+   return;
+   }
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6e0ed77cb9c0db6ab0e79252e2d1c190c045293
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Nasty 
Gerrit-Reviewer: Robert Vogel 
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...NSFileRepo[master]: NSFileRepo: deliver images without a file repository e.g. Ma...

2017-01-26 Thread Robert Vogel (Code Review) 
Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334500 )

Change subject: NSFileRepo: deliver images without a file repository e.g. Math 
extension
..

NSFileRepo: deliver images without a file repository e.g. Math extension

Fixed issue from ERM5234

Needs merge to master

Change-Id: Ia6e0ed77cb9c0db6ab0e79252e2d1c190c045293
---
M nsfr_img_auth.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NSFileRepo 
refs/changes/00/334500/1

diff --git a/nsfr_img_auth.php b/nsfr_img_auth.php
index 3ee839e..de9725c 100644
--- a/nsfr_img_auth.php
+++ b/nsfr_img_auth.php
@@ -154,8 +154,12 @@
if ( !$file->exists() || $file->isDeleted( File::DELETED_FILE ) 
) {
$file = wfFindFile( $name ); //Give other repos a 
chance to handle this
if( !$file || !$file->exists() || $file->isDeleted( 
File::DELETED_FILE ) ) {
-   wfForbidden( 'img-auth-accessdenied', 
'img-auth-nofile', $filename );
-   return;
+
+   global $wgUploadDirectory;
+   if( !file_exists( $wgUploadDirectory.$path ) ) {
+   wfForbidden( 'img-auth-accessdenied', 
'img-auth-nofile', $filename );
+   return;
+   }
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6e0ed77cb9c0db6ab0e79252e2d1c190c045293
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Nasty 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Related Changes Link for all categories

2017-01-26 Thread Shanikae (Code Review) 
Shanikae has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334499 )

Change subject: Add Related Changes Link for all categories
..

Add Related Changes Link for all categories

Add Related Changes link into the toolbox for the populated redlinked
categories as well since users need to see changes made in these
categories as well.

Bug: T147762
Change-Id: Ic5dd6f531b5ff47ce68fd2893fd1550d10f74e4e
---
M includes/skins/SkinTemplate.php
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/334499/1

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index bf260aa..2a262f0 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1283,11 +1283,9 @@
'href' => $this->getTitle()->getLocalURL( 
"action=info" )
];
 
-   if ( $this->getTitle()->exists() ) {
-   $nav_urls['recentchangeslinked'] = [
-   'href' => SpecialPage::getTitleFor( 
'Recentchangeslinked', $this->thispage )->getLocalURL()
-   ];
-   }
+   $nav_urls['recentchangeslinked'] = [
+ 'href' => SpecialPage::getTitleFor( 
'Recentchangeslinked', $this->thispage )->getLocalURL()
+   ];
}
 
$user = $this->getRelevantUser();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5dd6f531b5ff47ce68fd2893fd1550d10f74e4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Shanikae 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Notify user when gem version of plugin is installed

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334498 )

Change subject: Notify user when gem version of plugin is installed
..


Notify user when gem version of plugin is installed

Follow up to c8ca59051837 that adds a check for the deprecated gem
version of the mediawiki-vagrant plugin. When detected the user will be
given a message explaining how to uninstall the plugin and the current
action will be halted.

Bug: T156380
Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
---
M Vagrantfile
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index ad04acb..051da69 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,6 +33,15 @@
 require 'ipaddr'
 require 'socket'
 
+# T156380: Check to see if the legacy gem version of the plugin is installed
+if Vagrant.has_plugin?('mediawiki-vagrant')
+raise <<-EOS
+
+The deprecated mediawiki-vagrant plugin is installed.
+Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+EOS
+end
+
 mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
 settings = mwv.load_settings
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
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/vagrant[jessie-migration]: Notify user when gem version of plugin is installed

2017-01-26 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334498 )

Change subject: Notify user when gem version of plugin is installed
..

Notify user when gem version of plugin is installed

Follow up to c8ca59051837 that adds a check for the deprecated gem
version of the mediawiki-vagrant plugin. When detected the user will be
given a message explaining how to uninstall the plugin and the current
action will be halted.

Bug: T156380
Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
---
M Vagrantfile
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/98/334498/1

diff --git a/Vagrantfile b/Vagrantfile
index ad04acb..051da69 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,6 +33,15 @@
 require 'ipaddr'
 require 'socket'
 
+# T156380: Check to see if the legacy gem version of the plugin is installed
+if Vagrant.has_plugin?('mediawiki-vagrant')
+raise <<-EOS
+
+The deprecated mediawiki-vagrant plugin is installed.
+Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+EOS
+end
+
 mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
 settings = mwv.load_settings
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Notify user when gem version of plugin is installed

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334497 )

Change subject: Notify user when gem version of plugin is installed
..


Notify user when gem version of plugin is installed

Follow up to c8ca59051837 that adds a check for the deprecated gem
version of the mediawiki-vagrant plugin. When detected the user will be
given a message explaining how to uninstall the plugin and the current
action will be halted.

Bug: T156380
Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
---
M Vagrantfile
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 4fc8176..4c657f5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,6 +33,15 @@
 require 'ipaddr'
 require 'socket'
 
+# T156380: Check to see if the legacy gem version of the plugin is installed
+if Vagrant.has_plugin?('mediawiki-vagrant')
+raise <<-EOS
+
+The deprecated mediawiki-vagrant plugin is installed.
+Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+EOS
+end
+
 mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
 settings = mwv.load_settings
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gilles 
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/vagrant[master]: Notify user when gem version of plugin is installed

2017-01-26 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334497 )

Change subject: Notify user when gem version of plugin is installed
..

Notify user when gem version of plugin is installed

Follow up to c8ca59051837 that adds a check for the deprecated gem
version of the mediawiki-vagrant plugin. When detected the user will be
given a message explaining how to uninstall the plugin and the current
action will be halted.

Bug: T156380
Change-Id: Iaeacff7edabb5d8bf661c8e51093b966806b3e6c
---
M Vagrantfile
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/97/334497/1

diff --git a/Vagrantfile b/Vagrantfile
index 4fc8176..4c657f5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,6 +33,15 @@
 require 'ipaddr'
 require 'socket'
 
+# T156380: Check to see if the legacy gem version of the plugin is installed
+if Vagrant.has_plugin?('mediawiki-vagrant')
+raise <<-EOS
+
+The deprecated mediawiki-vagrant plugin is installed.
+Please remove it by running `vagrant plugin uninstall mediawiki-vagrant`.
+EOS
+end
+
 mwv = MediaWikiVagrant::Environment.new(File.expand_path('..', __FILE__))
 settings = mwv.load_settings
 

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Add link to documentation

2017-01-26 Thread Prtksxna (Code Review) 
Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334496 )

Change subject: demos: Add link to documentation
..

demos: Add link to documentation

This hardcodes the URLS so that it works on doc.wikimedia.org. This
is a bad idea.

Bug: T127281
Change-Id: Ie7667f3128fcf4a8e3d07e861e6ccfbd66b5b8ce
---
M demos/demo.js
M demos/demos.php
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/96/334496/1

diff --git a/demos/demo.js b/demos/demo.js
index 49620e2..47af285 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -53,6 +53,13 @@
new OO.ui.ButtonOptionWidget( { data: 'mobile', label: 'Mobile' 
} )
] );
 
+   this.documentationLink = new OO.ui.ButtonWidget( {
+   label: 'Docs',
+   icon: 'journal',
+   href: '../js/',
+   flags: [ 'progressive' ]
+   } );
+
// Events
this.pageMenu.on( 'choose', OO.ui.bind( this.onModeChange, this ) );
this.themeSelect.on( 'choose', OO.ui.bind( this.onModeChange, this ) );
@@ -71,7 +78,8 @@
this.themeSelect.$element,
this.directionSelect.$element,
this.jsPhpSelect.$element,
-   this.platformSelect.$element
+   this.platformSelect.$element,
+   this.documentationLink.$element
);
this.$element
.addClass( 'oo-ui-demo' )
diff --git a/demos/demos.php b/demos/demos.php
index 489db07..c3022f3 100644
--- a/demos/demos.php
+++ b/demos/demos.php
@@ -87,6 +87,13 @@
] ),
]
] );
+
+   echo new OOUI\ButtonWidget( [
+   'label' => 'Docs',
+   'icon' => 'journal',
+   'href' => '../php/',
+   'flags' => [ 'progressive' ],
+   ] );
?>

https://gerrit.wikimedia.org/r/334496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7667f3128fcf4a8e3d07e861e6ccfbd66b5b8ce
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Migrate Swift role from upstart to systemd

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333888 )

Change subject: Migrate Swift role from upstart to systemd
..


Migrate Swift role from upstart to systemd

Bug: T154269
Change-Id: Iaf6e84c4b469e108099901a5121b0adf8b354995
---
M puppet/modules/apt/manifests/init.pp
A puppet/modules/apt/templates/backports.list.erb
M puppet/modules/role/templates/swift/apache2.conf.erb
M puppet/modules/swift/manifests/init.pp
M puppet/modules/swift/manifests/ring.pp
M puppet/modules/swift/manifests/service.pp
M puppet/modules/swift/templates/conf.php.erb
A puppet/modules/swift/templates/systemd/swift.erb
D puppet/modules/swift/templates/upstart.erb
9 files changed, 52 insertions(+), 25 deletions(-)

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



diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 0e17d91..9f50e87 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -32,6 +32,11 @@
 before  => Exec['apt-get update'],
 }
 
+file { '/etc/apt/sources.list.d/backports.list':
+content => template('apt/backports.list.erb'),
+before  => Exec['apt-get update'],
+}
+
 # T125760 - mw-vagrant only apt repo
 file { '/etc/apt/sources.list.d/mwv-apt.list':
 content => template('apt/mwv-apt.list.erb'),
diff --git a/puppet/modules/apt/templates/backports.list.erb 
b/puppet/modules/apt/templates/backports.list.erb
new file mode 100644
index 000..b692982
--- /dev/null
+++ b/puppet/modules/apt/templates/backports.list.erb
@@ -0,0 +1 @@
+deb http://ftp.debian.org/debian <%= scope['::lsbdistcodename'] %>-backports 
main
diff --git a/puppet/modules/role/templates/swift/apache2.conf.erb 
b/puppet/modules/role/templates/swift/apache2.conf.erb
index 188f778..68fd970 100644
--- a/puppet/modules/role/templates/swift/apache2.conf.erb
+++ b/puppet/modules/role/templates/swift/apache2.conf.erb
@@ -1,4 +1,4 @@
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
 LogLevel trace8
-ProxyPassMatch "^/images/(.*)$" "http://127.0.0.1:<%= scope['::swift::port'] 
%>/wiki/en/$1"
\ No newline at end of file
+ProxyPassMatch "^/images/(.*)$" "http://127.0.0.1:<%= scope['::swift::port'] 
%>/wiki/dev/$1"
\ No newline at end of file
diff --git a/puppet/modules/swift/manifests/init.pp 
b/puppet/modules/swift/manifests/init.pp
index fa74445..5365125 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -49,6 +49,30 @@
 include ::apache::mod::proxy
 include ::apache::mod::proxy_http
 
+apt::pin { 'python-swift-jessie-backports':
+package  => 'python-swift*',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
+
+apt::pin { 'python-eventlet-jessie-backports':
+package  => 'python-eventlet',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
+
+apt::pin { 'python-webob-jessie-backports':
+package  => 'python-webob',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
+
+apt::pin { 'swift-jessie-backports':
+package  => 'swift*',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
+
 require_package('swift')
 require_package('swift-account')
 require_package('swift-container')
diff --git a/puppet/modules/swift/manifests/ring.pp 
b/puppet/modules/swift/manifests/ring.pp
index 479abc3..152dbc0 100644
--- a/puppet/modules/swift/manifests/ring.pp
+++ b/puppet/modules/swift/manifests/ring.pp
@@ -40,7 +40,7 @@
 }
 
 exec { "${ring_type}/create_ring":
-command => "swift-ring-builder ${ring_type}.builder create 18 3 1",
+command => "swift-ring-builder ${ring_type}.builder create 18 1 1",
 user=> 'swift',
 cwd => '/etc/swift',
 notify  => Exec["${ring_type}/add_ring"],
diff --git a/puppet/modules/swift/manifests/service.pp 
b/puppet/modules/swift/manifests/service.pp
index 039c211..dccd97d 100644
--- a/puppet/modules/swift/manifests/service.pp
+++ b/puppet/modules/swift/manifests/service.pp
@@ -16,18 +16,13 @@
 define swift::service(
 $cfg_file,
 ) {
-file { "/etc/init/swift-${title}.conf":
-ensure  => present,
-content => template('swift/upstart.erb'),
-mode=> '0444',
-}
-
-service { "swift-${title}":
-ensure=> running,
-enable=> true,
-provider  => 'upstart',
-subscribe => File[$cfg_file],
-require   => File[$cfg_file, "/etc/init/swift-${title}.conf"],
+systemd::service { "swift-${title}":
+ensure => 'present',
+require=> File[$cfg_file],
+service_params => {
+subscribe =>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Further updates to .mailmap for the generation of CREDITS

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332722 )

Change subject: Further updates to .mailmap for the generation of CREDITS
..


Further updates to .mailmap for the generation of CREDITS

Mostly adding current and former WMF/WMDE employees, and a couple of
others, under the correct version of their full names.

Change-Id: I36ca297967125cc211705509466358d9d762e5c8
---
M .mailmap
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/.mailmap b/.mailmap
index 7aa3257..232824d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -209,6 +209,7 @@
 Jeff Hall  
 Jeff Hobson 
 Jeff Janes 
+Jeremy Baron 
 Jeremy Postlethwaite  

 Jeroen De Dauw 
 Jeroen De Dauw  
@@ -217,6 +218,7 @@
 Jimmy Collins  
 Joel Sahleen 
 John Du Hart  
+John Erling Blad 
 Jon Harald Søby  
 Jon Robson 
 Jon Robson  
@@ -272,6 +274,7 @@
 Matt Johnston  
 Matthew Britton  
 Matthew Flaschen 
+Matthew Walker 
 Matthias Mullie 
 Matthias Mullie  
 Matěj Grabovský  
@@ -288,7 +291,6 @@
 MrBlueSky 
 MrBlueSky  
 Mukunda Modell 
-Mwalker 
 MZMcBride 
 nadeesha  
 Namit 
@@ -311,10 +313,12 @@
 Owen Davis 
 Owen Davis  
 paladox 
+Patricio Molina 
 Patrick Reilly 
 Patrick Reilly  
 Patrick Westerhoff 
 Paul Copperman  
+Peter Coombe 
 Peter Coti 
 Peter Potrowl  
 Petr Kadlec 
@@ -399,10 +403,10 @@
 Stephen Liang 
 Steve Sanbeg  
 Steven Roddis 
+Steven Walling 
 Subramanya Sastry 
 Sucheta Ghoshal 
 Sumit Asthana 
-Swalling 
 Thalia Chan 
 Thiemo Mättig (WMDE) 
 Thiemo Mättig (WMDE)  
@@ -420,7 +424,6 @@
 Timo Tijhof  
 Timo Tijhof  
 Tina Johnson 
-Tjones 
 Tom Maaswinkel  
 Tomasz Finc  
 Tomasz W. Kozlowski 
@@ -431,9 +434,11 @@
 Trevor Parscal 
 Trevor Parscal  
 Trevor Parscal  
+Trey Jones 
 Tyler Cipriani 
 Tyler Romeo 
 Umherirrender 
+Victor Barbu 
 Victor Vasiliev 
 Victor Vasiliev  
 Victor Vasiliev  

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36ca297967125cc211705509466358d9d762e5c8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Jeremyb 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: John Erling Blad 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: Pcoombe

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Migrate Varnish role from upstart to systemd

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333870 )

Change subject: Migrate Varnish role from upstart to systemd
..


Migrate Varnish role from upstart to systemd

Bug: T154272
Change-Id: I77949e0b1c3fb41204b67adb0300db8915726a81
---
M puppet/modules/varnish/manifests/init.pp
A puppet/modules/varnish/templates/systemd/varnish.erb
D puppet/modules/varnish/templates/upstart.erb
3 files changed, 20 insertions(+), 25 deletions(-)

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



diff --git a/puppet/modules/varnish/manifests/init.pp 
b/puppet/modules/varnish/manifests/init.pp
index 3583484..0e73965 100644
--- a/puppet/modules/varnish/manifests/init.pp
+++ b/puppet/modules/varnish/manifests/init.pp
@@ -218,16 +218,9 @@
 user=> 'root',
 }
 
-file { '/etc/init/varnish.conf':
-ensure  => present,
-content => template('varnish/upstart.erb'),
-mode=> '0444',
-}
-
-service { 'varnish':
-ensure=> running,
-provider  => 'upstart',
-require   => [
+systemd::service { 'varnish':
+ensure => 'present',
+require=> [
 Exec[
 'build_varnish',
 'build_tbf',
@@ -235,11 +228,12 @@
 ],
 File[
 '/var/run/varnish',
-'/etc/init/varnish.conf',
 '/etc/varnish/secret',
 '/usr/local/var/varnish/mediawiki-vagrant'
 ],
 ],
-subscribe => File[$conf],
+service_params => {
+subscribe => File[$conf],
+},
 }
 }
diff --git a/puppet/modules/varnish/templates/systemd/varnish.erb 
b/puppet/modules/varnish/templates/systemd/varnish.erb
new file mode 100644
index 000..974c522
--- /dev/null
+++ b/puppet/modules/varnish/templates/systemd/varnish.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description=varnish service
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+User=varnish
+Group=varnish
+SyslogIdentifier=varnish
+ExecStart=/usr/local/sbin/varnishd -a :6081 -T localhost:6082 -f 
/etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m -F
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/puppet/modules/varnish/templates/upstart.erb 
b/puppet/modules/varnish/templates/upstart.erb
deleted file mode 100644
index da4e155..000
--- a/puppet/modules/varnish/templates/upstart.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-#
-
-description "Varnish"
-
-start on mediawiki-ready
-respawn
-
-setuid varnish
-setgid varnish
-
-exec /usr/local/sbin/varnishd -a :6081 -T localhost:6082 -f 
/etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m -F
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77949e0b1c3fb41204b67adb0300db8915726a81
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: Gilles 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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/vagrant[master]: Add a role for Commons Datasets

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333832 )

Change subject: Add a role for Commons Datasets
..


Add a role for Commons Datasets

Change-Id: I49e1952e15c96fa476f80c31d00b34b5f9faa19b
---
M puppet/hieradata/common.yaml
A puppet/modules/role/manifests/commons_datasets.pp
A puppet/modules/role/templates/commons_datasets/settings.php.erb
3 files changed, 64 insertions(+), 0 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index e2f6195..4bf4a2a 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -321,6 +321,7 @@
 
 role::commons::upload_dir: "%{hiera('mwv::files_dir')}/commonsimages"
 
+role::commons_datasets::commons_url: 
"http://commons%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/w/api.php"
 
 role::echo::shared_tracking_cluster: 
"%{hiera('mediawiki::multiwiki::extension_db_cluster')}"
 role::echo::shared_tracking_db: 
"%{hiera('mediawiki::multiwiki::extension_cluster_shared_db_name')}"
diff --git a/puppet/modules/role/manifests/commons_datasets.pp 
b/puppet/modules/role/manifests/commons_datasets.pp
new file mode 100644
index 000..d961037
--- /dev/null
+++ b/puppet/modules/role/manifests/commons_datasets.pp
@@ -0,0 +1,17 @@
+# class role::commons_datasets
+# Allows to store tabular/spatial data on Commons to be used by Kartographer
+# See https://www.mediawiki.org/wiki/Help:Tabular_Data
+#
+# [*commons_url*]
+#   Full URL to api.php of wiki to use as central repository for datasets
+#
+class role::commons_datasets (
+$commons_url,
+) {
+  include ::role::jsonconfig
+  include ::role::commons
+
+  mediawiki::settings { 'commons_datasets':
+  values => template('role/commons_datasets/settings.php.erb'),
+  }
+}
diff --git a/puppet/modules/role/templates/commons_datasets/settings.php.erb 
b/puppet/modules/role/templates/commons_datasets/settings.php.erb
new file mode 100644
index 000..aa4cf24
--- /dev/null
+++ b/puppet/modules/role/templates/commons_datasets/settings.php.erb
@@ -0,0 +1,46 @@
+/*https://www.mediawiki.org/wiki/Extension:JsonConfig#Configuration
+$wgJsonConfigModels['Tabular.JsonConfig'] = 'JsonConfig\JCTabularContent';
+$wgJsonConfigs['Tabular.JsonConfig'] = [
+   'namespace' => 486,
+   'nsName' => 'Data',
+   // page name must end in ".tab", and contain at least one symbol
+   'pattern' => '/.\.tab$/',
+   'license' => 'CC0-1.0+',
+   'isLocal' => false,
+];
+
+$wgJsonConfigModels['Map.JsonConfig'] = 'JsonConfig\JCMapDataContent';
+$wgJsonConfigs['Map.JsonConfig'] = [
+   'namespace' => 486,
+   'nsName' => 'Data',
+   // page name must end in ".map", and contain at least one symbol
+   'pattern' => '/.\.map$/',
+   'license' => 'CC0-1.0+',
+   'isLocal' => false,
+];
+
+if ( $wgDBname === 'commonswiki' ) {
+   // Ensure we have a stable cross-wiki title resolution
+   // See JCSingleton::parseTitle()
+   $wgJsonConfigInterwikiPrefix = "meta";
+   $wgJsonConfigs['Tabular.JsonConfig']['store'] = true;
+   $wgJsonConfigs['Map.JsonConfig']['store'] = true;
+} else {
+   $wgJsonConfigInterwikiPrefix = "commons";
+   $wgJsonConfigs['Tabular.JsonConfig']['remote'] = [
+   'url' => '<%= @commons_url %>'
+   ];
+   $wgJsonConfigs['Map.JsonConfig']['remote'] = [
+   'url' => '<%= @commons_url %>'
+   ];
+}
+
+$wgJsonConfigEnableLuaSupport = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49e1952e15c96fa476f80c31d00b34b5f9faa19b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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...TemplateData[master]: Further "custom format" spec tweaks.

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332569 )

Change subject: Further "custom format" spec tweaks.
..


Further "custom format" spec tweaks.

Change how newlines are handled in the EndFormat production.

Change-Id: Iae5181e65c7afe25810406a39f387f0c1f3cb1b3
---
M Specification.md
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/Specification.md b/Specification.md
index 57aea75..f0c3821 100644
--- a/Specification.md
+++ b/Specification.md
@@ -296,9 +296,9 @@
 
 Begin with `StartFormat`, and replace the `Hole` with the name of the template 
to create the "output string".  If `StartFormat` begins with a newline and 
template is already at the start of a line (the character preceding this 
template invocation is a newline or the template is at the start of the 
output), delete the initial newline from the output string.
 
-For each parameter, append the `ParameterFormat` to the output string after 
replacing the first `Hole` with the name of the parameter and the second `Hole` 
with the value of the parameter.
+For each parameter, if `ParameterFormat` begins with a newline and the last 
character in the output string is a newline, then delete the last character in 
the output string.  Then append `ParameterFormat` to the output string after 
replacing the first `Hole` with the name of the parameter and the second `Hole` 
with the value of the parameter.
 
-Finally, append the `EndFormat` to the output string.
+Finally, if `EndFormat` begins with a newline and the last character in the 
output string is a newline, then delete the last character in the output 
string.  Append the `EndFormat` to the output string.
 
 Some example format strings:
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae5181e65c7afe25810406a39f387f0c1f3cb1b3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jforrester 
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]: toolchecker: Add script to manage toolchecker* services

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334495 )

Change subject: toolchecker: Add script to manage toolchecker* services
..


toolchecker: Add script to manage toolchecker* services

Change-Id: Iae1c38c5abb405b38eac98bad8f75f66eb1874bb
---
A modules/toollabs/files/toolscheckerctl
M modules/toollabs/manifests/checker.pp
2 files changed, 41 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/files/toolscheckerctl 
b/modules/toollabs/files/toolscheckerctl
new file mode 100644
index 000..0a96b7c
--- /dev/null
+++ b/modules/toollabs/files/toolscheckerctl
@@ -0,0 +1,33 @@
+#!/usr/bin/python3
+
+import argparse
+import os
+import subprocess
+import sys
+
+services = [os.path.splitext(fname)[0] for fname in os.listdir('/etc/init')
+if (fname.startswith('toolschecker_') and fname.endswith('.conf'))]
+
+if __name__ == '__main__':
+
+if os.geteuid() != 0:
+print("Script needs to be run as root")
+sys.exit(1)
+
+argparser = argparse.ArgumentParser()
+
+argparser.add_argument(
+'action',
+choices=['start', 'stop', 'restart', 'status'],
+help="""
+start: Start all toolschecker services
+stop: Stop all toolschecker services
+restart: Restart all toolschecker services
+status: Print status for all toolschecker services
+"""
+)
+
+args = argparser.parse_args()
+
+for service in services:
+subprocess.check_call(['service', service, args.action])
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 88abdb6..c968e4e 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -154,6 +154,14 @@
 source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
 }
 
+file { '/usr/local/sbin/toolscheckerctl':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0655',
+source => 'puppet:///modules/toollabs/toolscheckerctl',
+}
+
 sudo::user { 'tools.toolschecker':
 privileges => [
 'ALL=(tools.toolschecker-k8s-ws) NOPASSWD: ALL',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae1c38c5abb405b38eac98bad8f75f66eb1874bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolchecker: Add script to manage toolchecker* services

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334495 )

Change subject: toolchecker: Add script to manage toolchecker* services
..

toolchecker: Add script to manage toolchecker* services

Change-Id: Iae1c38c5abb405b38eac98bad8f75f66eb1874bb
---
A modules/toollabs/files/toolscheckerctl
M modules/toollabs/manifests/checker.pp
2 files changed, 41 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/files/toolscheckerctl 
b/modules/toollabs/files/toolscheckerctl
new file mode 100644
index 000..0a96b7c
--- /dev/null
+++ b/modules/toollabs/files/toolscheckerctl
@@ -0,0 +1,33 @@
+#!/usr/bin/python3
+
+import argparse
+import os
+import subprocess
+import sys
+
+services = [os.path.splitext(fname)[0] for fname in os.listdir('/etc/init')
+if (fname.startswith('toolschecker_') and fname.endswith('.conf'))]
+
+if __name__ == '__main__':
+
+if os.geteuid() != 0:
+print("Script needs to be run as root")
+sys.exit(1)
+
+argparser = argparse.ArgumentParser()
+
+argparser.add_argument(
+'action',
+choices=['start', 'stop', 'restart', 'status'],
+help="""
+start: Start all toolschecker services
+stop: Stop all toolschecker services
+restart: Restart all toolschecker services
+status: Print status for all toolschecker services
+"""
+)
+
+args = argparser.parse_args()
+
+for service in services:
+subprocess.check_call(['service', service, args.action])
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 88abdb6..c968e4e 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -154,6 +154,14 @@
 source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
 }
 
+file { '/usr/local/sbin/toolscheckerctl':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0655',
+source => 'puppet:///modules/toollabs/toolscheckerctl',
+}
+
 sudo::user { 'tools.toolschecker':
 privileges => [
 'ALL=(tools.toolschecker-k8s-ws) NOPASSWD: ALL',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Allowing empty columns to have labels and descriptions

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334494 )

Change subject: Allowing empty columns to have labels and descriptions
..


Allowing empty columns to have labels and descriptions

Bug: T155661
Change-Id: I1b5171d97b290552215272db3e72e1f1dfa93df0
---
M includes/content/CollaborationListContent.php
1 file changed, 12 insertions(+), 8 deletions(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 12253d6..cdfea78 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -734,12 +734,12 @@
}
 
private static function convertFromHumanEditableColumn( $column ) {
+   // Adding newline so that HUMAN_COLUMN_SPLIT2 correctly triggers
+   $column = $column . "\n";
+
$columnItem = [ 'items' => [] ];
 
$columnContent = explode( self::HUMAN_COLUMN_SPLIT2, $column );
-   if ( count( $columnContent ) == 1 ) {
-   return $columnItem;
-   }
 
$parts = explode( "|", $columnContent[0] );
 
@@ -775,11 +775,15 @@
}
}
 
-   $listLines = explode( "\n", $columnContent[1] );
-   foreach ( $listLines as $line ) {
-   // Skip empty lines
-   if ( trim( $line ) !== '' ) {
-   $columnItem['items'][] = 
self::convertFromHumanEditableItemLine( $line );
+   if ( count( $columnContent ) == 1 ) {
+   return $columnItem;
+   } else {
+   $listLines = explode( "\n", $columnContent[1] );
+   foreach ( $listLines as $line ) {
+   // Skip empty lines
+   if ( trim( $line ) !== '' ) {
+   $columnItem['items'][] = 
self::convertFromHumanEditableItemLine( $line );
+   }
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b5171d97b290552215272db3e72e1f1dfa93df0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 
Gerrit-Reviewer: Harej 
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...CollaborationKit[master]: Allowing empty columns to have labels and descriptions

2017-01-26 Thread Harej (Code Review) 
Harej has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334494 )

Change subject: Allowing empty columns to have labels and descriptions
..

Allowing empty columns to have labels and descriptions

Bug: T155661
Change-Id: I1b5171d97b290552215272db3e72e1f1dfa93df0
---
M includes/content/CollaborationListContent.php
1 file changed, 12 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/94/334494/1

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 12253d6..cdfea78 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -734,12 +734,12 @@
}
 
private static function convertFromHumanEditableColumn( $column ) {
+   // Adding newline so that HUMAN_COLUMN_SPLIT2 correctly triggers
+   $column = $column . "\n";
+
$columnItem = [ 'items' => [] ];
 
$columnContent = explode( self::HUMAN_COLUMN_SPLIT2, $column );
-   if ( count( $columnContent ) == 1 ) {
-   return $columnItem;
-   }
 
$parts = explode( "|", $columnContent[0] );
 
@@ -775,11 +775,15 @@
}
}
 
-   $listLines = explode( "\n", $columnContent[1] );
-   foreach ( $listLines as $line ) {
-   // Skip empty lines
-   if ( trim( $line ) !== '' ) {
-   $columnItem['items'][] = 
self::convertFromHumanEditableItemLine( $line );
+   if ( count( $columnContent ) == 1 ) {
+   return $columnItem;
+   } else {
+   $listLines = explode( "\n", $columnContent[1] );
+   foreach ( $listLines as $line ) {
+   // Skip empty lines
+   if ( trim( $line ) !== '' ) {
+   $columnItem['items'][] = 
self::convertFromHumanEditableItemLine( $line );
+   }
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b5171d97b290552215272db3e72e1f1dfa93df0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Unify paddings and line-height of different PopupWidgets

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332733 )

Change subject: Unify paddings and line-height of different PopupWidgets
..


Unify paddings and line-height of different PopupWidgets

Previously, the popup contents of normal (padded) PopupButtonWidget,
FieldLayout's help PopupButtonWidget, and FieldsetLayout's help
PopupButtonWidget each had different styling.

FieldLayout and FieldsetLayout now use a padded PopupWidget.
Their custom popup wrappers and styling for them were removed.

The padded version of PopupWidget was changed to actually use 'margin'
rather than 'padding'. This allows it to behave reasonably both when
the contents are plain text (like in FieldLayout/FieldsetLayout) and
when they are wrapped in  etc. (like in PopupButtonWidget demos),
thanks to CSS's natural margin collapsing.

Additionally, override ClippableElement's min-height on PopupWidget
body, it was causing one-line popups to be higher than they should.

Bug: T155611
Change-Id: I7442ca7e1c6cc731ed3f5c92bc0ebdae25ff7131
---
M src/layouts/FieldLayout.js
M src/layouts/FieldsetLayout.js
M src/styles/layouts/FieldLayout.less
M src/styles/layouts/FieldsetLayout.less
M src/styles/widgets/PopupWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
7 files changed, 30 insertions(+), 30 deletions(-)

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



diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index e91bd09..06acc4e 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -39,7 +39,7 @@
  * @throws {Error} An error is thrown if no widget is specified
  */
 OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
-   var hasInputWidget, $div;
+   var hasInputWidget;
 
// Allow passing positional parameters inside the config object
if ( OO.isPlainObject( fieldWidget ) && config === undefined ) {
@@ -75,20 +75,18 @@
this.align = null;
if ( config.help ) {
this.popupButtonWidget = new OO.ui.PopupButtonWidget( {
+   popup: {
+   padded: true
+   },
classes: [ 'oo-ui-fieldLayout-help' ],
framed: false,
icon: 'info'
} );
-
-   $div = $( '' );
if ( config.help instanceof OO.ui.HtmlSnippet ) {
-   $div.html( config.help.toString() );
+   this.popupButtonWidget.getPopup().$body.html( 
config.help.toString() );
} else {
-   $div.text( config.help );
+   this.popupButtonWidget.getPopup().$body.text( 
config.help );
}
-   this.popupButtonWidget.getPopup().$body.append(
-   $div.addClass( 'oo-ui-fieldLayout-help-content' )
-   );
this.$help = this.popupButtonWidget.$element;
} else {
this.$help = $( [] );
diff --git a/src/layouts/FieldsetLayout.js b/src/layouts/FieldsetLayout.js
index 63253cf..b0b8727 100644
--- a/src/layouts/FieldsetLayout.js
+++ b/src/layouts/FieldsetLayout.js
@@ -44,8 +44,6 @@
  *  For important messages, you are advised to use `notices`, as they are 
always shown.
  */
 OO.ui.FieldsetLayout = function OoUiFieldsetLayout( config ) {
-   var $div;
-
// Configuration initialization
config = config || {};
 
@@ -61,20 +59,18 @@
this.$header = $( '' );
if ( config.help ) {
this.popupButtonWidget = new OO.ui.PopupButtonWidget( {
+   popup: {
+   padded: true
+   },
classes: [ 'oo-ui-fieldsetLayout-help' ],
framed: false,
icon: 'info'
} );
-
-   $div = $( '' );
if ( config.help instanceof OO.ui.HtmlSnippet ) {
-   $div.html( config.help.toString() );
+   this.popupButtonWidget.getPopup().$body.html( 
config.help.toString() );
} else {
-   $div.text( config.help );
+   this.popupButtonWidget.getPopup().$body.text( 
config.help );
}
-   this.popupButtonWidget.getPopup().$body.append(
-   $div.addClass( 'oo-ui-fieldsetLayout-help-content' )
-   );
this.$help = this.popupButtonWidget.$element;
} else {
this.$help = $( [] );
diff --git a/src/styles/layouts/FieldLayout.less 
b/src/styles/layouts/FieldLayout.less
index 974a29f..443675c 100644
--- a/src/styles/layouts/FieldLayout.less
+++ b/src/styles/layouts/FieldLayout.less
@@ -51,11 +51,6 @@
>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: add WANObjectCacheReaper for assuring purges

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/308310 )

Change subject: objectcache: add WANObjectCacheReaper for assuring purges
..


objectcache: add WANObjectCacheReaper for assuring purges

* This fixes keys based on some sort of change log.
  Updates are wrapped in a mutex and keep track of the
  last known good position.
* Make WANObjectReapUpdate class that cleans up title
  related keys using the recentchanges table. This triggers
  as a deferred updates on RC view.

Change-Id: I7f14b9ca2533032147e62b1a3cc004a23da86579
---
M autoload.php
M includes/DefaultSettings.php
M includes/cache/LinkCache.php
A includes/deferred/WANCacheReapUpdate.php
M includes/filerepo/file/LocalFile.php
M includes/libs/objectcache/WANObjectCache.php
A includes/libs/objectcache/WANObjectCacheReaper.php
M includes/page/WikiPage.php
M includes/specialpage/ChangesListSpecialPage.php
M includes/user/User.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
11 files changed, 516 insertions(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index e7c97ad..329cdb3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1541,7 +1541,9 @@
'ViewCLI' => __DIR__ . '/maintenance/view.php',
'VirtualRESTService' => __DIR__ . 
'/includes/libs/virtualrest/VirtualRESTService.php',
'VirtualRESTServiceClient' => __DIR__ . 
'/includes/libs/virtualrest/VirtualRESTServiceClient.php',
+   'WANCacheReapUpdate' => __DIR__ . 
'/includes/deferred/WANCacheReapUpdate.php',
'WANObjectCache' => __DIR__ . 
'/includes/libs/objectcache/WANObjectCache.php',
+   'WANObjectCacheReaper' => __DIR__ . 
'/includes/libs/objectcache/WANObjectCacheReaper.php',
'WantedCategoriesPage' => __DIR__ . 
'/includes/specials/SpecialWantedcategories.php',
'WantedFilesPage' => __DIR__ . 
'/includes/specials/SpecialWantedfiles.php',
'WantedPagesPage' => __DIR__ . 
'/includes/specials/SpecialWantedpages.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 086b615..58ddb69 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2343,6 +2343,19 @@
 ];
 
 /**
+ * Verify and enforce WAN cache purges using reliable DB sources as streams.
+ *
+ * These secondary cache purges are de-duplicated via simple cache mutexes.
+ * This improves consistency when cache purges are lost, which becomes more 
likely
+ * as more cache servers are added or if there are multiple datacenters. Only 
keys
+ * related to important mutable content will be checked.
+ *
+ * @var bool
+ * @since 1.29
+ */
+$wgEnableWANCacheReaper = false;
+
+/**
  * Main object stash type. This should be a fast storage system for storing
  * lightweight data like hit counters and user activity. Sites with multiple
  * data-centers should have this use a store that replicates all writes. The
diff --git a/includes/cache/LinkCache.php b/includes/cache/LinkCache.php
index 23cc26d..b720dec 100644
--- a/includes/cache/LinkCache.php
+++ b/includes/cache/LinkCache.php
@@ -278,6 +278,20 @@
return $id;
}
 
+   /**
+* @param WANObjectCache $cache
+* @param TitleValue $t
+* @return string[]
+* @since 1.28
+*/
+   public function getMutableCacheKeys( WANObjectCache $cache, TitleValue 
$t ) {
+   if ( $this->isCacheable( $t ) ) {
+   return [ $cache->makeKey( 'page', $t->getNamespace(), 
sha1( $t->getDBkey() ) ) ];
+   }
+
+   return [];
+   }
+
private function isCacheable( LinkTarget $title ) {
return ( $title->inNamespace( NS_TEMPLATE ) || 
$title->inNamespace( NS_FILE ) );
}
diff --git a/includes/deferred/WANCacheReapUpdate.php 
b/includes/deferred/WANCacheReapUpdate.php
new file mode 100644
index 000..33ddc59
--- /dev/null
+++ b/includes/deferred/WANCacheReapUpdate.php
@@ -0,0 +1,126 @@
+db = $db;
+   $this->logger = $logger;
+   }
+
+   function doUpdate() {
+   $reaper = new WANObjectCacheReaper(
+   ObjectCache::getMainWANInstance(),
+   ObjectCache::getLocalClusterInstance(),
+   [ $this, 'getTitleChangeEvents' ],
+   [ $this, 'getEventAffectedKeys' ],
+   [
+   'channel' => 'table:recentchanges:' . 
$this->db->getWikiID(),
+   'logger' => $this->logger
+   ]
+   );
+
+   $reaper->invoke( 100 );
+   }
+
+   /**
+* @see WANObjectCacheRepear
+*
+* @param int $start
+* @param int $id
+* @param int $end
+* @param int $limit
+* @return TitleValue[]
+

[MediaWiki-commits] [Gerrit] mediawiki...SimpleSAMLphp[master]: v 2.1 - Rename file to naming conventions

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334493 )

Change subject: v 2.1 - Rename file to naming conventions
..

v 2.1 - Rename file to naming conventions

Change-Id: Ia4bb4b707c5db57f442948439b35186e20e345b6
---
R SimpleSAMLphp.class.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SimpleSAMLphp 
refs/changes/93/334493/1

diff --git a/SimpleSAMLphp.php b/SimpleSAMLphp.class.php
similarity index 100%
rename from SimpleSAMLphp.php
rename to SimpleSAMLphp.class.php
diff --git a/extension.json b/extension.json
index b5c1f2f..6a9f601 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "SimpleSAMLphp",
-   "version": "2.0",
+   "version": "2.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],
@@ -13,7 +13,7 @@
]
},
"AutoloadClasses": {
-   "SimpleSAMLphp": "SimpleSAMLphp.php"
+   "SimpleSAMLphp": "SimpleSAMLphp.class.php"
},
"manifest_version": 1,
"config": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4bb4b707c5db57f442948439b35186e20e345b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleSAMLphp
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: DHCP: Add DHCP entries for mc2019-mc2036 Bug:T155755

2017-01-26 Thread Papaul (Code Review) 
Papaul has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334492 )

Change subject: DHCP: Add DHCP entries for mc2019-mc2036 Bug:T155755
..

DHCP: Add DHCP entries for mc2019-mc2036
Bug:T155755

Change-Id: Iccad560a18199ae849d713f7fe9e5366155cc269
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 90 insertions(+), 0 deletions(-)


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

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 4e37205..d3bec7f 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3508,6 +3508,96 @@
 fixed-address mc2018.codfw.wmnet;
 }
 
+host mc2019 {
+hardware ethernet 94:18:82:79:36:ac;
+fixed-address mc2019.codfw.wmnet;
+}
+
+host mc2020 {
+hardware ethernet 94:18:82:79:63:38;
+fixed-address mc2020.codfw.wmnet;
+}
+
+host mc2021 {
+hardware ethernet 94:18:82:75:af:8c;
+fixed-address mc2021.codfw.wmnet;
+}
+
+host mc2022 {
+hardware ethernet 94:18:82:79:a3:c4;
+fixed-address mc2022.codfw.wmnet;
+}
+
+host mc2023 {
+hardware ethernet 94:18:82:79:a3:48;
+fixed-address mc2023.codfw.wmnet;
+}
+
+host mc2024 {
+hardware ethernet 94:18:82:79:36:74;
+fixed-address mc2024.codfw.wmnet;
+}
+
+host mc2025 {
+hardware ethernet 94:18:82:79:83:88;
+fixed-address mc2025.codfw.wmnet;
+}
+
+host mc2026 {
+hardware ethernet 94:18:82:79:93:08;
+fixed-address mc2026.codfw.wmnet;
+}
+
+host mc2027 {
+hardware ethernet 94:18:82:79:93:a0;
+fixed-address mc2027.codfw.wmnet;
+}
+
+host mc2028 {
+hardware ethernet 94:18:82:79:36:44;
+fixed-address mc2028.codfw.wmnet;
+}
+
+host mc2029 {
+hardware ethernet 94:18:82:79:93:68;
+fixed-address mc2029.codfw.wmnet;
+}
+
+host mc2030 {
+hardware ethernet 94:18:82:79:93:54;
+fixed-address mc2030.codfw.wmnet;
+}
+
+host mc2031 {
+hardware ethernet 94:18:82:75:af:94;
+fixed-address mc2031.codfw.wmnet;
+}
+
+host mc2032 {
+hardware ethernet 94:18:82:79:a3:bc;
+fixed-address mc2032.codfw.wmnet;
+}
+
+host mc2033 {
+hardware ethernet 94:18:82:79:93:88;
+fixed-address mc2033.codfw.wmnet;
+}
+
+host mc2034 {
+hardware ethernet 94:18:82:77:05:34;
+fixed-address mc2034.codfw.wmnet;
+}
+
+host mc2035 {
+hardware ethernet 94:18:82:79:a3:8c;
+fixed-address mc2035.codfw.wmnet;
+}
+
+host mc2036 {
+hardware ethernet 94:18:82:79:c3:c4;
+fixed-address mc2036.codfw.wmnet;
+}
+
 host mira {
 hardware ethernet D4:AE:52:AD:59:99;
 fixed-address mira.codfw.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: [WIP] Enable Sister project search AB test

2017-01-26 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334491 )

Change subject: [WIP] Enable Sister project search AB test
..

[WIP] Enable Sister project search AB test

Sets up the AB test for sister project search. Collects information
about clicks to the sidebar.

Bug: T149806
Change-Id: I4ccbb887cfcdd28ccd07891f178f7e83abddb06c
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 50 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/91/334491/1

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 92a6d9c..ae6ee6e 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -115,14 +115,18 @@
var sessionId = session.get( 'sessionId' ),
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
+   // Currently unused, but 
provides a place
+   // to handle wiki-specific 
sampling
subTests = {
-   thwiki: {
-   // 1:5 overall 
sessions into test
-   test: 5,
-   // 1:39 of test 
sessions reserved for dashboard
-   // 38:39 
sessions split evenly between test buckets
-   subTest: 39
-   }
+   enwiki: {
+   // 1 in 200 
users search sessions will be recorded
+   // by event 
logging
+   test: 200
+   // 1 in 10 (of 
the 1 in 200) will be bucketed into
+   // the 
sub-test. The other 9 in 10 are reserved for
+   // dashboarding.
+   subTest: 10
+   
};
 
if ( subTests[ dbName ] ) {
@@ -184,10 +188,11 @@
return;
}
 
-   if ( sampleSize.subTest !== null && !oneIn( 
sampleSize.subTest ) ) {
+   if ( sampleSize.subTest !== null && oneIn( 
sampleSize.subTest ) ) {
session.set( 'subTest', chooseBucket( [
-   'bm25:control',
-   'bm25:inclinks_pv'
+   'recall_sidebar_results',
+   'random_sidebar_results',
+   'no_sidebar',
] ) );
}
}
@@ -562,6 +567,36 @@
search.wprovPrefix + 'dymo1'
) );
 
+   // Sister-search results
+   if ( session.has( 'subTest' ) ) {
+   $( '#mw-content-text' ).on(
+   'click',
+   '.mw-interwiki-results a.extiw, 
.mw-interwiki-results .iw-result__mini_gallery a',
+   function ( evt ) {
+   var $target = $( evt.target ),
+   href = $target.attr( 
'href' );
+
+   // Shouldn't happen, but just 
in case.
+   if ( href === undefined ) {
+   href = '';
+   }
+
+   logEvent( 'sisterclick', [
+   // This is a 
little bit of a lie, it's actually the
+   // position of 
the interwiki group, but

[MediaWiki-commits] [Gerrit] mediawiki...RandomImageByCategory[master]: v 1.3 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334490 )

Change subject: v 1.3 - Remove deprecated PHP entry point
..

v 1.3 - Remove deprecated PHP entry point

Change-Id: Ie40a75ee6dc906fbe42946760e040d45d3b08854
---
D RandomImageByCategory.php
M extension.json
2 files changed, 1 insertion(+), 28 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomImageByCategory 
refs/changes/90/334490/1

diff --git a/RandomImageByCategory.php b/RandomImageByCategory.php
deleted file mode 100644
index da3da68..000
--- a/RandomImageByCategory.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
- * Supported parameters: width, limit, categories
- *
- * @file
- * @ingroup Extensions
- * @author Aaron Wright 
- * @author David Pean 
- * @author Jack Phoenix 
- * @link https://www.mediawiki.org/wiki/Extension:RandomImageByCategory 
Documentation
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['parserhook'][] = array(
-   'name' => 'RandomImageByCategory',
-   'version' => '1.2',
-   'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
-   'description' => 'Displays a random image from a given category',
-   'url' => 
'https://www.mediawiki.org/wiki/Extension:RandomImageByCategory',
-);
-
-$wgAutoloadClasses['RandomImageByCategory'] = __DIR__ . 
'/RandomImageByCategory.class.php';
-
-$wgHooks['ParserFirstCallInit'][] = 'RandomImageByCategory::registerTag';
diff --git a/extension.json b/extension.json
index ab22a84..4a128ce 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "RandomImageByCategory",
-   "version": "1.2",
+   "version": "1.3",
"author": [
"Aaron Wright",
"David Pean",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie40a75ee6dc906fbe42946760e040d45d3b08854
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomImageByCategory
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Prezi[master]: v 1.2 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334489 )

Change subject: v 1.2 - Remove deprecated PHP entry point
..

v 1.2 - Remove deprecated PHP entry point

Change-Id: Ie60e7bfe68cad91b8e7b375c159a31b0502e70f9
---
D Prezi.php
M extension.json
2 files changed, 1 insertion(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Prezi 
refs/changes/89/334489/1

diff --git a/Prezi.php b/Prezi.php
deleted file mode 100644
index 1e1ab78..000
--- a/Prezi.php
+++ /dev/null
@@ -1,38 +0,0 @@
-http://www.mediawikiwidgets.org/Prezi
- *
- * Example usage:
- * 
- *
- * @file
- * @ingroup Extensions
- * @date 1 November 2014
- * @author Jack Phoenix 
- * @license https://en.wikipedia.org/wiki/Public_domain Public domain (code 
portions written by Jack Phoenix)
- * @link https://www.mediawiki.org/wiki/Extension:Prezi Documentation
- * @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=213
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die();
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['parserhook'][] = array(
-   'path' => __FILE__,
-   'name' => 'Prezi',
-   'version' => '1.1',
-   'author' => 'Jack Phoenix',
-   'descriptionmsg' => 'prezi-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:Prezi',
-);
-
-// Autoload the class & internationalization (i18n) and set up the  tag
-$wgAutoloadClasses['PreziTag'] = __DIR__ . '/PreziTag.class.php';
-$wgMessagesDirs['Prezi'] = __DIR__ . '/i18n';
-
-$wgHooks['ParserFirstCallInit'][] = 'PreziTag::registerHook';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 414f418..bce4758 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Prezi",
-   "version": "1.1",
+   "version": "1.2",
"author": "Jack Phoenix",
"url": "https://www.mediawiki.org/wiki/Extension:Prezi;,
"descriptionmsg": "prezi-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie60e7bfe68cad91b8e7b375c159a31b0502e70f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Prezi
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rcfeed: Add basic PHPUnit integration test

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331108 )

Change subject: rcfeed: Add basic PHPUnit integration test
..


rcfeed: Add basic PHPUnit integration test

Change-Id: Ifb5ddd4bda6cd1be050da7a5419ebe90f5ecf60f
---
M includes/changes/RecentChange.php
A tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php
2 files changed, 99 insertions(+), 0 deletions(-)

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



diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index 81f64a8..13a5fc7 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -451,6 +451,9 @@
throw new MWException( __FUNCTION__ . ": Unknown stream 
logger URI scheme: $scheme" );
}
 
+   if ( defined( 'MW_PHPUNIT_TEST' ) && is_object( 
$wgRCEngines[$scheme] ) ) {
+   return $wgRCEngines[$scheme];
+   }
return new $wgRCEngines[$scheme];
}
 
diff --git a/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php 
b/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php
new file mode 100644
index 000..97ea23c
--- /dev/null
+++ b/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php
@@ -0,0 +1,96 @@
+setMwGlobals( [
+   'wgCanonicalServer' => 'https://example.org',
+   'wgServerName' => 'example.org',
+   'wgScriptPath' => '/w',
+   'wgDBname' => 'example',
+   'wgDBprefix' => '',
+   'wgRCFeeds' => [],
+   'wgRCEngines' => [],
+   ] );
+   }
+
+   /**
+* @covers RecentChange::notifyRCFeeds
+* @covers RecentChange::getEngine
+* @covers RCFeedEngine
+* @covers JSONRCFeedFormatter::formatArray
+* @covers MachineReadableRCFeedFormatter::getLine
+*/
+   public function testNotify() {
+   $feed = $this->getMockBuilder( 'RCFeedEngine' )
+   ->setConstructorArgs( [ [ 'formatter' => 
'JSONRCFeedFormatter' ] ] )
+   ->setMethods( [ 'send' ] )
+   ->getMock();
+
+   $feed->method( 'send' )
+   ->willReturn( true );
+
+   $feed->expects( $this->once() )
+   ->method( 'send' )
+   ->with( $this->anything(), $this->callback( function ( 
$line ) {
+   $this->assertJsonStringEqualsJsonString(
+   json_encode( [
+   'id' => null,
+   'type' => 'log',
+   'namespace' => 0,
+   'title' => 'Example',
+   'comment' => '',
+   'timestamp' => 1301644800,
+   'user' => 'UTSysop',
+   'bot' => false,
+   'log_id' => 0,
+   'log_type' => 'move',
+   'log_action' => 'move',
+   'log_params' => [
+   'color' => 'green',
+   'nr' => 42,
+   'pet' => 'cat',
+   ],
+   'log_action_comment' => '',
+   'server_url' => 
'https://example.org',
+   'server_name' => 'example.org',
+   'server_script_path' => '/w',
+   'wiki' => 'example',
+   ] ),
+   $line
+   );
+   return true;
+   } ) );
+
+   $this->setMwGlobals( [
+   'wgRCFeeds' => [
+   'myfeed' => [
+   'uri' => 'test://localhost:1234',
+   'formatter' => 'JSONRCFeedFormatter',
+   ],
+   ],
+   'wgRCEngines' => [
+   'test' => $feed,
+   ],
+   ] );
+   $logpage = SpecialPage::getTitleFor( 'Log', 'move' );
+   $user =

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: v 2.1 - Rename file to naming conventions

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334488 )

Change subject: v 2.1 - Rename file to naming conventions
..

v 2.1 - Rename file to naming conventions

Change-Id: I51106e18cb55c7e4e1db700df37287130c9f798e
---
R PluggableAuth.class.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth 
refs/changes/88/334488/1

diff --git a/PluggableAuth.php b/PluggableAuth.class.php
similarity index 100%
rename from PluggableAuth.php
rename to PluggableAuth.class.php
diff --git a/extension.json b/extension.json
index 6015207..f592d98 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PluggableAuth",
-   "version": "2.0",
+   "version": "2.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],
@@ -16,7 +16,7 @@
]
},
"AutoloadClasses": {
-   "PluggableAuth": "PluggableAuth.php",
+   "PluggableAuth": "PluggableAuth.class.php",
"PluggableAuthHooks": "PluggableAuthHooks.php",
"PluggableAuthPrimaryAuthenticationProvider": 
"PluggableAuthPrimaryAuthenticationProvider.php",
"PluggableAuthBeginAuthenticationRequest": 
"PluggableAuthBeginAuthenticationRequest.php",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51106e18cb55c7e4e1db700df37287130c9f798e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageDisqus[master]: v 0.5 - Rename file to naming conventions

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334487 )

Change subject: v 0.5 - Rename file to naming conventions
..

v 0.5 - Rename file to naming conventions

Change-Id: I470478c279b0d707fd0dc62ea6602126eebef3a3
---
R PageDisqus.class.php
M extension.json
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageDisqus 
refs/changes/87/334487/1

diff --git a/PageDisqus.php b/PageDisqus.class.php
old mode 100755
new mode 100644
similarity index 99%
rename from PageDisqus.php
rename to PageDisqus.class.php
index a4249b5..1f0921a
--- a/PageDisqus.php
+++ b/PageDisqus.class.php
@@ -50,7 +50,7 @@
 
 Please enable JavaScript to view the comments powered by 
Disqus.
 HTML;
-   
+
 
return true;
}
diff --git a/extension.json b/extension.json
index 9666353..1aa9a1f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PageDisqus",
-   "version": "0.4",
+   "version": "0.5",
"author": [
"Michael Platzer",
"[[mw:User:Felipe Schenone|Felipe Schenone]]"
@@ -14,7 +14,7 @@
]
},
"AutoloadClasses": {
-   "PageDisqus": "PageDisqus.php"
+   "PageDisqus": "PageDisqus.class.php"
},
"Hooks": {
"SkinAfterContent": "PageDisqus::onSkinAfterContent",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I470478c279b0d707fd0dc62ea6602126eebef3a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageDisqus
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolchecker: Update path for k8s etcd check

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334486 )

Change subject: toolchecker: Update path for k8s etcd check
..


toolchecker: Update path for k8s etcd check

Change-Id: Ibd1d12bea6f8ba364bc3b85948e089fe014a4764
---
M modules/toollabs/manifests/checker.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 8323fb7..88abdb6 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -86,7 +86,7 @@
 path => '/etcd/flannel',
 },
 'kubernetes_etcd'=> {
-path => '/k8s/flannel',
+path => '/etcd/k8s',
 },
 'kubernetes_nodes_ready' => {
 path => '/k8s/nodes/ready',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd1d12bea6f8ba364bc3b85948e089fe014a4764
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolchecker: Update path for k8s etcd check

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334486 )

Change subject: toolchecker: Update path for k8s etcd check
..

toolchecker: Update path for k8s etcd check

Change-Id: Ibd1d12bea6f8ba364bc3b85948e089fe014a4764
---
M modules/toollabs/manifests/checker.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 8323fb7..88abdb6 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -86,7 +86,7 @@
 path => '/etcd/flannel',
 },
 'kubernetes_etcd'=> {
-path => '/k8s/flannel',
+path => '/etcd/k8s',
 },
 'kubernetes_nodes_ready' => {
 path => '/k8s/nodes/ready',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenIDConnect[master]: v 3.1 - Rename file to naming conventions

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334485 )

Change subject: v 3.1 - Rename file to naming conventions
..

v 3.1 - Rename file to naming conventions

Change-Id: I35c75af171ce2b1518ea7a15aeffd5a3c28b6c8a
---
R OpenIDConnect.class.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenIDConnect 
refs/changes/85/334485/1

diff --git a/OpenIDConnect.php b/OpenIDConnect.class.php
similarity index 100%
rename from OpenIDConnect.php
rename to OpenIDConnect.class.php
diff --git a/extension.json b/extension.json
index f0791b4..fc547a2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "OpenID Connect",
-   "version": "3.0",
+   "version": "3.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],
@@ -22,7 +22,7 @@
"SelectOpenIDConnectIssuerAlias": 
"SelectOpenIDConnectIssuer.alias.php"
},
"AutoloadClasses": {
-   "OpenIDConnect": "OpenIDConnect.php",
+   "OpenIDConnect": "OpenIDConnect.class.php",
"SelectOpenIDConnectIssuer": "SelectOpenIDConnectIssuer.php"
},
"Hooks": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35c75af171ce2b1518ea7a15aeffd5a3c28b6c8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenIDConnect
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...NoBogusUserpages[master]: v 1.1.1 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334484 )

Change subject: v 1.1.1 - Remove deprecated PHP entry point
..

v 1.1.1 - Remove deprecated PHP entry point

Change-Id: I1ecc9e372590b8449dc57e151a1d028d5e089b21
---
D NoBogusUserpages.php
M extension.json
2 files changed, 1 insertion(+), 50 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NoBogusUserpages 
refs/changes/84/334484/1

diff --git a/NoBogusUserpages.php b/NoBogusUserpages.php
deleted file mode 100644
index 02ba7ab..000
--- a/NoBogusUserpages.php
+++ /dev/null
@@ -1,49 +0,0 @@
-https://www.mediawiki.org/wiki/Extension:NoBogusUserpages 
Documentation
- * @link https://www.mediawiki.org/wiki/Extension_talk:NoBogusUserpages Support
- * @link 
https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FNoBogusUserpages.git 
Source Code
- *
- * @file
- * @ingroup Extensions
- * @package MediaWiki
- *
- * @author Daniel Friesen (Dantman) 
- *
- * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-// Ensure that the script cannot be executed outside of MediaWiki
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( "This is an extension to MediaWiki and cannot be run standalone." 
);
-}
-
-// Display extension's information on "Special:Version"
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'NoBogusUserpages',
-   'version' => '1.1.0',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:NoBogusUserpages',
-   'author' => array(
-   '[https://www.mediawiki.org/wiki/User:Dantman Daniel Friesen]',
-   '...'
-   ),
-   'descriptionmsg' => 'nobogususerpages-desc',
-   'license-name' => 'GPL-2.0+'
-);
-
-// Load extension's class
-$wgAutoloadClasses['NoBogusUserpages'] = __DIR__ . 
'/NoBogusUserpages.class.php';
-
-// Load internationalization files
-$wgMessagesDirs['NoBogusUserpages'] = __DIR__ . '/i18n';
-
-// Add user permission
-$wgAvailableRights[] = 'createbogususerpage';
-$wgGroupPermissions['sysop']['createbogususerpage'] = true;
-
-// Register hook
-$wgHooks['getUserPermissionsErrors'][] = 
'NoBogusUserpages::onGetUserPermissionsErrors';
diff --git a/extension.json b/extension.json
index 3e144d9..d47c91b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "NoBogusUserpages",
-   "version": "1.1.0",
+   "version": "1.1.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Dantman Daniel Friesen]"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ecc9e372590b8449dc57e151a1d028d5e089b21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NoBogusUserpages
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix upstart conf files path

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334482 )

Change subject: toolschecker: Fix upstart conf files path
..


toolschecker: Fix upstart conf files path

Change-Id: I547eb3611a63ccb4c78780c9bc5b5728c6205fd4
---
M modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
2 files changed, 1 insertion(+), 9 deletions(-)

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



diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
index e3ba7b1..e35ec94 100644
--- a/modules/toollabs/manifests/check.pp
+++ b/modules/toollabs/manifests/check.pp
@@ -7,7 +7,7 @@
 # cheap way to ensure uniqueness across resources
 toollabs::check::path {$path: }
 
-file { "/etc/init/toolschecker/toolschecker_${check_name}.conf":
+file { "/etc/init/toolschecker_${check_name}.conf":
 ensure  => present,
 content => template('toollabs/toolschecker.upstart.erb'),
 owner   => 'root',
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index d67a491..8323fb7 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -109,14 +109,6 @@
 before => Toollabs::Check[keys($checks)],
 }
 
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
-before => Toollabs::Check[keys($checks)],
-}
-
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,
 owner  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I547eb3611a63ccb4c78780c9bc5b5728c6205fd4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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...NewestPages[master]: v 1.21 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334483 )

Change subject: v 1.21 - Remove deprecated PHP entry point
..

v 1.21 - Remove deprecated PHP entry point

Change-Id: Idb367607d506d8fa9f4bc5ac2ce7966e948bf2af
---
D NewestPages.php
M extension.json
2 files changed, 1 insertion(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewestPages 
refs/changes/83/334483/1

diff --git a/NewestPages.php b/NewestPages.php
deleted file mode 100644
index 2a9900c..000
--- a/NewestPages.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- * @copyright © 2006 Rob Church
- * @licence GNU General Public Licence 2.0
- */
-
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'name' => 'Newest Pages',
-   'version' => '1.20',
-   'author' => 'Rob Church',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:Newest_Pages',
-   'descriptionmsg' => 'newestpages-desc',
-);
-
-$wgNewestPagesLimit = 50;
-
-$wgMessagesDirs['NewestPages'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['NewestPagesAlias'] = __DIR__ . 
'/NewestPages.alias.php';
-$wgAutoloadClasses['NewestPages'] = __DIR__ . '/NewestPages.page.php';
-$wgSpecialPages['NewestPages'] = 'NewestPages';
diff --git a/extension.json b/extension.json
index 5bddc23..c1aec31 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Newest Pages",
-   "version": "1.20",
+   "version": "1.21",
"author": [
"Rob Church"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb367607d506d8fa9f4bc5ac2ce7966e948bf2af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewestPages
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix upstart conf files path

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334482 )

Change subject: toolschecker: Fix upstart conf files path
..

toolschecker: Fix upstart conf files path

Change-Id: I547eb3611a63ccb4c78780c9bc5b5728c6205fd4
---
M modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
2 files changed, 1 insertion(+), 9 deletions(-)


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

diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
index e3ba7b1..e35ec94 100644
--- a/modules/toollabs/manifests/check.pp
+++ b/modules/toollabs/manifests/check.pp
@@ -7,7 +7,7 @@
 # cheap way to ensure uniqueness across resources
 toollabs::check::path {$path: }
 
-file { "/etc/init/toolschecker/toolschecker_${check_name}.conf":
+file { "/etc/init/toolschecker_${check_name}.conf":
 ensure  => present,
 content => template('toollabs/toolschecker.upstart.erb'),
 owner   => 'root',
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index d67a491..8323fb7 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -109,14 +109,6 @@
 before => Toollabs::Check[keys($checks)],
 }
 
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
-before => Toollabs::Check[keys($checks)],
-}
-
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,
 owner  => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: v 3.1 - Remove deprecated PHP entry point and deprecated PHP...

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334481 )

Change subject: v 3.1 - Remove deprecated PHP entry point and deprecated 
PHP-based i18n
..

v 3.1 - Remove deprecated PHP entry point and deprecated PHP-based i18n

Change-Id: I3dc942e39bd1794a26831d9003f6f0cbf80683b1
---
D MultiUpload.i18n.php
D MultiUpload.php
M extension.json
3 files changed, 1 insertion(+), 201 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiUpload 
refs/changes/81/334481/1

diff --git a/MultiUpload.i18n.php b/MultiUpload.i18n.php
deleted file mode 100644
index d252b1c..000
--- a/MultiUpload.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim97d1b12e3cd5e296' ) ) {
-   function wfJsonI18nShim97d1b12e3cd5e296( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim97d1b12e3cd5e296';
-}
diff --git a/MultiUpload.php b/MultiUpload.php
deleted file mode 100644
index 11560d2..000
--- a/MultiUpload.php
+++ /dev/null
@@ -1,165 +0,0 @@
-
- * @version 3.0
- * @date 19 August 2014
- * @copyright Copyright © Lee Worden 
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- *
- * 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.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/**
- * Protect against register_globals vulnerabilities.
- * This line must be present before any global variable is referenced.
- */
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This is an extension to the MediaWiki package and cannot be run 
standalone.\n" );
-   die( -1 );
-}
-
-# = Extension credits that will show up on Special:Version =
-$wgExtensionCredits['specialpage'][] = array(
-   'name' => 'MultiUpload',
-   'version'  => '3.0',
-   'author'   => array( 'Travis Derouin', 'Lee Worden' ),
-   'url'  => 
'https://www.mediawiki.org/wiki/Extension:MultiUpload',
-   'descriptionmsg' => 'multiupload-desc',
-);
-
-# = Configuration variables =
-
-# start with 1 file selector shown
-$wgMultiUploadInitialNumberOfImportRows = 1;
-
-# Can't have a huge number of files to upload on the single form -
-# for instance, because of PHP restrictions on number
-# and length of POST values
-# $wgMultiUploadMaxImportFilesPerPage = 20;
-
-# where we unpack .tar and .zip files
-$wgMultiUploadTempDir = '/tmp';
-
-# = Register the special page =
-$wgSpecialPages['MultiUpload'] = 'SpecialMultiUpload';
-$wgAutoloadClasses['SpecialMultiUpload'] = __DIR__ . '/SpecialMultiUpload.php';
-$wgAutoloadClasses['MultiUploadForm'] = __DIR__ . '/SpecialMultiUpload.php';
-$wgAutoloadClasses['FauxWebRequestUpload'] = __DIR__ .

[MediaWiki-commits] [Gerrit] mediawiki...MsWikiEditor[master]: v 3.1 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334480 )

Change subject: v 3.1 - Remove deprecated PHP entry point
..

v 3.1 - Remove deprecated PHP entry point

Change-Id: Idd873a358b13c55c3b9ef5e8e2e956e387b61df7
---
D MsWikiEditor.php
M extension.json
2 files changed, 1 insertion(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsWikiEditor 
refs/changes/80/334480/1

diff --git a/MsWikiEditor.php b/MsWikiEditor.php
deleted file mode 100755
index cc86f48..000
--- a/MsWikiEditor.php
+++ /dev/null
@@ -1,30 +0,0 @@
- 'MsWikiEditor',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MsWikiEditor',
-   'version' => '3.0',
-   'descriptionmsg' => 'mswe-desc',
-   'license-name' => 'GPL-2.0+',
-   'author' => array(
-   '[mailto:w...@ratin.de Martin Schwindl]',
-   '[mailto:w...@keyler-consult.de Martin Keyler]',
-   '[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis 
Felipe Schenone]'
-   ),
-);
-
-$wgResourceModules['ext.MsWikiEditor'] = array(
-   'scripts' => 'MsWikiEditor.js',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'MsWikiEditor',
-);
-
-$wgAutoloadClasses['MsWikiEditor'] = __DIR__ . '/MsWikiEditor.body.php';
-
-$wgMessagesDirs['MsWikiEditor'] = __DIR__ . '/i18n';
-
-$wgHooks['EditPage::showEditForm:initial'][] = 'MsWikiEditor::start';
-
-// Default configuration
-$wgMSWE_add = array();
-$wgMSWE_remove = array();
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 6d5361b..4c32dba 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MsWikiEditor",
-   "version": "3.0",
+   "version": "3.1",
"author": [
"[mailto:w...@ratin.de Martin Schwindl]",
"[mailto:w...@keyler-consult.de Martin Keyler]",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd873a358b13c55c3b9ef5e8e2e956e387b61df7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsWikiEditor
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...MsInsert[master]: v 3.2 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334479 )

Change subject: v 3.2 - Remove deprecated PHP entry point
..

v 3.2 - Remove deprecated PHP entry point

Change-Id: I0ebde2cb747274b1949dd7cace52bca1f31c31f6
---
D MsInsert.php
M extension.json
2 files changed, 1 insertion(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsInsert 
refs/changes/79/334479/1

diff --git a/MsInsert.php b/MsInsert.php
deleted file mode 100755
index 6f1aa59..000
--- a/MsInsert.php
+++ /dev/null
@@ -1,29 +0,0 @@
- 'MsInsert',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MsInsert',
-   'version' => '3.1',
-   'descriptionmsg' => 'msi-desc',
-   'license-name' => 'GPL-2.0+',
-   'author' => array( '[mailto:w...@ratin.de Martin Schwindl]', 
'[mailto:w...@keyler-consult.de Martin Keyler]', 
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe 
Schenone]' ),
-);
-
-$wgResourceModules['ext.MsInsert'] = array(
-   'scripts' => 'MsInsert.js',
-   'messages' => array(
-   'msi-insert-template',
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'MsInsert',
-);
-
-$wgAutoloadClasses['MsInsert'] = __DIR__ . '/MsInsert.body.php';
-
-$wgExtensionMessagesFiles['MsInsert'] = __DIR__ . '/MsInsert.i18n.php';
-$wgMessagesDirs['MsInsert'] = __DIR__ . '/i18n';
-
-$wgHooks['EditPage::showEditForm:initial'][] = 'MsInsert::start';
-
-// Default configuration
-$wgTemplates = array();
\ No newline at end of file
diff --git a/extension.json b/extension.json
index bc9e8eb..ffef9dc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MsInsert",
-   "version": "3.1",
+   "version": "3.2",
"author": [
"[mailto:w...@ratin.de Martin Schwindl]",
"[mailto:w...@keyler-consult.de Martin Keyler]",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ebde2cb747274b1949dd7cace52bca1f31c31f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsInsert
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...MolHandler[master]: v 0.1.1 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334478 )

Change subject: v 0.1.1 - Remove deprecated PHP entry point
..

v 0.1.1 - Remove deprecated PHP entry point

Change-Id: I2ba208a57794096897bd26a08495f452fff6ee79
---
D MolHandler.php
M extension.json
2 files changed, 1 insertion(+), 78 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MolHandler 
refs/changes/78/334478/1

diff --git a/MolHandler.php b/MolHandler.php
deleted file mode 100644
index 745c8ff..000
--- a/MolHandler.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- * @license GPL.v2 or later
- * @version 0.1
- */
-
-# Not a valid entry point, skip unless MEDIAWIKI is defined
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo 'MolHandler is a MediaWiki extension.';
-   exit( 1 );
-}
-
-// Credits
-$wgExtensionCredits['media'][] = [
-   'path' => __FILE__,
-   'name' => 'Mol Handler',
-   'author' => [
-   'Rainer Rillke',
-   ],
-   'version' => '0.1.0',
-   'descriptionmsg' => 'molhandler-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MolHandler',
-   'license-name' => 'GPL-2.0+',
-];
-
-/* Configuration */
-$wgMolHandlerDir = __DIR__ . '/';
-$wgMessagesDirs['MolHandler'] = $wgMolHandlerDir . 'i18n';
-
-# Converter. Note that babel is not yet able to convert reactions
-$wgMolConverterPath = '/usr/bin';
-$wgMolConvertCommands = [
-   'babel' => [
-   'command' => '$path/babel -i$format $input $output',
-   'supportedFormats' => [ 'mol' ],
-   'memory' => 204800
-   ],
-   'indigo' => [
-   'command' => '$path/indigo-depict $input $output',
-   'supportedFormats' => [ 'mol', 'rxn' ],
-   // 200 MiB - indigo-depict required about 40 MiB with all 
libraries in
-   // tests but sometimes seems to need much more; no errors with 
200 MiB
-   // on the test wiki so far; See Bug 67074.
-   'memory' => 204800
-   ],
-];
-$wgMolConverter = 'indigo';
-
-$wgMediaHandlers['chemical/x-mdl-molfile'] = 'MolMediaHandler';
-$wgMediaHandlers['chemical/x-mdl-rxnfile'] = 'RxnMediaHandler';
-
-# Register modules
-$wgAutoloadClasses['MolHandlerHooks'] = $wgMolHandlerDir . 
'MolHandlerHooks.php';
-$wgAutoloadClasses['MolHandlerMime']  = $wgMolHandlerDir . 
'MolHandler.mime.php';
-$wgAutoloadClasses['MolHandler']  = $wgMolHandlerDir . 
'MolHandler_body.php';
-$wgAutoloadClasses['MolMediaHandler'] = $wgMolHandlerDir . 
'MolMediaHandler.php';
-$wgAutoloadClasses['RxnMediaHandler'] = $wgMolHandlerDir . 
'RxnMediaHandler.php';
-
-# Hook-up MIME type detection
-$wgHooks['MimeMagicInit'][] = 
'MolHandlerMime::onMimeMagicInit';
-$wgHooks['MimeMagicImproveFromExtension'][] = 
'MolHandlerMime::onMimeMagicImproveFromExtension';
-$wgHooks['MimeMagicGuessFromContent'][] = 
'MolHandlerMime::onMimeMagicGuessFromContent';
-
-# Hook-up tests
-$wgHooks['UnitTestsList'][] = 'MolHandlerHooks::onUnitTestsList';
diff --git a/extension.json b/extension.json
index 4f7d582..1516c6b 100644
--- a/extension.json
+++ b/extension.json
@@ -4,7 +4,7 @@
"Rainer Rillke"
],
"url": "https://www.mediawiki.org/wiki/Extension:MolHandler;,
-   "version": "0.1.0",
+   "version": "0.1.1",
"descriptionmsg": "molhandler-desc",
"license-name": "GPL-2.0+",
"requires": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ba208a57794096897bd26a08495f452fff6ee79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MolHandler
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: v 0.3.1 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334477 )

Change subject: v 0.3.1 - Remove deprecated PHP entry point
..

v 0.3.1 - Remove deprecated PHP entry point

Change-Id: Id34c38d41dbf85fef5dfed9a93fec114c91f98cd
---
D MediaWikiFarm.php
M extension.json
2 files changed, 1 insertion(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/77/334477/1

diff --git a/MediaWikiFarm.php b/MediaWikiFarm.php
deleted file mode 100644
index 99e9575..000
--- a/MediaWikiFarm.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
- * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
- */
-// @codeCoverageIgnoreStart
-
-# Protect against web entry
-if( !defined( 'MEDIAWIKI' ) && PHP_SAPI != 'cli' && PHP_SAPI != 'phpdbg' ) {
-   exit;
-}
-
-# Load MediaWiki configuration
-if( defined( 'MEDIAWIKI' ) ) {
-
-   # Load class definition
-   if( !class_exists( 'MediaWikiFarm' ) ) {
-   require_once dirname( __FILE__ ) . '/src/MediaWikiFarm.php';
-   }
-
-   # Load MediaWikiFarm
-   MediaWikiFarm::load();
-
-   # Load MediaWiki configuration
-   require_once $wgMediaWikiFarm->getConfigFile();
-}
-// @codeCoverageIgnoreEnd
diff --git a/extension.json b/extension.json
index c3c85c8..acf4451 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiFarm",
-   "version": "0.3.0",
+   "version": "0.3.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Seb35 Seb35]"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id34c38d41dbf85fef5dfed9a93fec114c91f98cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Maintenance[master]: v 2.3.1 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334476 )

Change subject: v 2.3.1 - Remove deprecated PHP entry point
..

v 2.3.1 - Remove deprecated PHP entry point

Change-Id: I97801aaece337c0ff4d310155a30584694e4c73b
---
D Maintenance.php
M extension.json
2 files changed, 1 insertion(+), 49 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Maintenance 
refs/changes/76/334476/1

diff --git a/Maintenance.php b/Maintenance.php
deleted file mode 100644
index 258b49d..000
--- a/Maintenance.php
+++ /dev/null
@@ -1,48 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link http://www.mediawiki.org/wiki/Extension:Maintenance Documentation
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo "This file is an extension to the MediaWiki software and is not a 
valid access point";
-   die( 1 );
-}
-
-// !
-// BEGIN EXTENSION CONFIGURATION SECTION
-// !
-
-// Whether or not to show the "Output globals at the end of processing for 
debugging" checkbox
-// NOTE: enabling this can reveal system information such as environment 
variables
-$wgMaintenanceDebug = false;
-
-// !
-// END EXTENSION CONFIGURATION SECTION
-// !
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'name' => 'Maintenance',
-   'author' => 'Ryan Schmidt',
-   'version' => '2.3.0',
-   'descriptionmsg' => 'maintenance-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:Maintenance',
-);
-
-// Set up the new special page
-$wgMessagesDirs['Maintenance'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MaintenanceAlias'] = __DIR__ . 
'/Maintenance.alias.php';
-$wgAutoloadClasses['SpecialMaintenance'] = __DIR__ . '/Maintenance_body.php';
-$wgAutoloadClasses['SpecialMaintenanceException'] = __DIR__ . 
'/Maintenance_body.php';
-
-$wgSpecialPages['Maintenance'] = 'SpecialMaintenance';
-
-// New user right - required to access Special:Maintenance
-$wgAvailableRights[] = 'maintenance';
diff --git a/extension.json b/extension.json
index a666751..fc0d3e7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Maintenance",
-   "version": "2.3.0",
+   "version": "2.3.1",
"author": [
"Ryan Schmidt"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97801aaece337c0ff4d310155a30584694e4c73b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Maintenance
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: WIP PayPal verification uses OutboundRequest

2017-01-26 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334475 )

Change subject: WIP PayPal verification uses OutboundRequest
..

WIP PayPal verification uses OutboundRequest

Change-Id: I6cc8c5ba38c8802805984516eee71f842d70714a
TODO: figure our exactly how we want to mock the thing.
---
M PaymentProviders/PayPal/PayPalPaymentsAPI.php
1 file changed, 14 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/75/334475/1

diff --git a/PaymentProviders/PayPal/PayPalPaymentsAPI.php 
b/PaymentProviders/PayPal/PayPalPaymentsAPI.php
index f46939c..cea1b9a 100644
--- a/PaymentProviders/PayPal/PayPalPaymentsAPI.php
+++ b/PaymentProviders/PayPal/PayPalPaymentsAPI.php
@@ -1,17 +1,12 @@
 https://www.paypal-knowledge.com/infocenter/index?page=content=FAQ1336=LIST
// PayPal randomly fails to validate messages, so try a few 
times.
$max_attempts = 7;
+   $post_fields['cmd'] = '_notify-validate';
 
for ( $i = 0; $i < $max_attempts; $i++ ) {
$url = Configuration::getDefaultConfig()->val( 
'postback-url' );
-   $ch = curl_init();
-   curl_setopt( $ch, CURLOPT_URL, $url );
-   curl_setopt( $ch, CURLOPT_HEADER, 0 );
-   curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 0 );
-   curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-   curl_setopt( $ch, CURLOPT_POST, 1 );
-   // TODO we can put VERIFIED in config and generalize 
this
+   $request = new OutboundRequest( $url, 'POST' );
 
-   // Always capture the cURL output
-   $curlDebugLog = fopen( 'php://temp', 'r+' );
-   curl_setopt( $ch, CURLOPT_VERBOSE, true );
-   curl_setopt( $ch, CURLOPT_STDERR, $curlDebugLog );
+   try {
+   $response = $request->execute( $post_fields );
 
-   $response = $this->curl( $ch, $post_fields );
-
-   // Read the logging output
-   rewind( $curlDebugLog );
-   $logged = fread( $curlDebugLog, 8192 );
-   fclose( $curlDebugLog );
-   Logger::debug( "cURL verbose logging: $logged" );
-
-   if ( $response === 'VERIFIED' ) {
-   return true;
-   } elseif ( $response === 'INVALID' ) {
-   return false;
+   if ( $response['body'] === 'VERIFIED' ) {
+   return true;
+   } elseif ( $response['body'] === 'INVALID' ) {
+   return false;
+   }
+   // Must be an HTML page, keep trying.
+   } catch( HttpRuntimeException $ex ) {
+   Logger::debug( "Validation POST trouble on 
attempt $i" );
}
-   // Must be an HTML page, keep trying.
}
 
throw new RuntimeException( 'Failed to validate message after ' 
.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cc8c5ba38c8802805984516eee71f842d70714a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...MP3MediaHandler[master]: v 1.1 - Make file purely a class instead of also a PHP entry...

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334474 )

Change subject: v 1.1 - Make file purely a class instead of also a PHP entry 
point
..

v 1.1 - Make file purely a class instead of also a PHP entry point

Change-Id: I213fa6159cbb8246652d68eccce0caf8c7becdad
---
R MP3MediaHandler.class.php
M extension.json
2 files changed, 3 insertions(+), 15 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MP3MediaHandler 
refs/changes/74/334474/1

diff --git a/MP3MediaHandler.php b/MP3MediaHandler.class.php
similarity index 89%
rename from MP3MediaHandler.php
rename to MP3MediaHandler.class.php
index 2fc50b0..5ccf0dc 100644
--- a/MP3MediaHandler.php
+++ b/MP3MediaHandler.class.php
@@ -2,18 +2,6 @@
 
 # Stream MP3 using HTML5  tag
 
-$wgMediaHandlers['audio/mp3'] = 'MP3MediaHandler';
-$wgMediaHandlers['audio/mpeg'] = 'MP3MediaHandler';
-$wgFileExtensions[] = 'mp3';
-
-$wgExtensionCredits['parserhook'][] = array(
-   'name' => 'MP3MediaHandler',
-   'descriptionmsg' => 'mp3mediahandler-desc',
-   'author' => "Mark Clements (HappyDog)",
-   'version' => '1.0',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MP3MediaHandler'
-);
-
 class MP3MediaHandler extends MediaHandler {
 
function validateParam( $name, $value ) { return true; }
diff --git a/extension.json b/extension.json
index a4bbb9e..7d49d23 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MP3MediaHandler",
-   "version": "1.0",
+   "version": "1.1",
"author": [
"Mark Clements (HappyDog)",
"Sylvain Machefert",
@@ -11,8 +11,8 @@
"descriptionmsg": "mp3mediahandler-desc",
"type": "parserhook",
"AutoloadClasses": {
-   "MP3MediaHandler": "MP3MediaHandler.php",
-   "MP3OutputRenderer": "MP3MediaHandler.php"
+   "MP3MediaHandler": "MP3MediaHandler.class.php",
+   "MP3OutputRenderer": "MP3MediaHandler.class.php"
},
"MediaHandlers": {
"audio/mp3": "MP3MediaHandler",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I213fa6159cbb8246652d68eccce0caf8c7becdad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MP3MediaHandler
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolchecker: Fix directory dependencies

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334473 )

Change subject: toolchecker: Fix directory dependencies
..


toolchecker: Fix directory dependencies

Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
---
M modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
index 73d7476..e3ba7b1 100644
--- a/modules/toollabs/manifests/check.pp
+++ b/modules/toollabs/manifests/check.pp
@@ -13,7 +13,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0644',
-require => File['etc/init/toolschecker'],
 notify  => Service["toolschecker_${check_name}"],
 }
 
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 4a2dad9..d67a491 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -109,6 +109,14 @@
 before => Toollabs::Check[keys($checks)],
 }
 
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+before => Toollabs::Check[keys($checks)],
+}
+
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,
 owner  => 'root',
@@ -134,13 +142,6 @@
 mode   => '0555',
 source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
 notify => Toollabs::Check[keys($checks)],
-}
-
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
 }
 
 # We need this host's puppet cert and key (readable) so we can check

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolchecker: Fix directory dependencies

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334473 )

Change subject: toolchecker: Fix directory dependencies
..

toolchecker: Fix directory dependencies

Change-Id: I957faaf3ab074d1e5fafdfaeec9aaf4fe9a348ad
---
M modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
index 73d7476..e3ba7b1 100644
--- a/modules/toollabs/manifests/check.pp
+++ b/modules/toollabs/manifests/check.pp
@@ -13,7 +13,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0644',
-require => File['etc/init/toolschecker'],
 notify  => Service["toolschecker_${check_name}"],
 }
 
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 4a2dad9..d67a491 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -109,6 +109,14 @@
 before => Toollabs::Check[keys($checks)],
 }
 
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+before => Toollabs::Check[keys($checks)],
+}
+
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,
 owner  => 'root',
@@ -134,13 +142,6 @@
 mode   => '0555',
 source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
 notify => Toollabs::Check[keys($checks)],
-}
-
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
 }
 
 # We need this host's puppet cert and key (readable) so we can check

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LookupUser[master]: v 1.5 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334472 )

Change subject: v 1.5 - Remove deprecated PHP entry point
..

v 1.5 - Remove deprecated PHP entry point

Change-Id: Idb37fcc4070a4bea73fb077e21047c6fe4888968
---
D LookupUser.php
M extension.json
2 files changed, 1 insertion(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LookupUser 
refs/changes/72/334472/1

diff --git a/LookupUser.php b/LookupUser.php
deleted file mode 100644
index 0986833..000
--- a/LookupUser.php
+++ /dev/null
@@ -1,32 +0,0 @@
- __FILE__,
-   'name' => 'Lookup User',
-   'version' => '1.4',
-   'author' => 'Tim Starling',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:LookupUser',
-   'descriptionmsg' => 'lookupuser-desc',
-);
-
-// Set up the new special page
-$wgMessagesDirs['LookupUser'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['LookupUserAlias'] = __DIR__ . 
'/LookupUser.alias.php';
-$wgAutoloadClasses['LookupUserPage'] = __DIR__ . '/LookupUser.body.php';
-$wgSpecialPages['LookupUser'] = 'LookupUserPage';
-
-// New user right, required to use the special page
-$wgAvailableRights[] = 'lookupuser';
-
-// Hooked function
-$wgHooks['ContributionsToolLinks'][] = 
'LookupUserPage::onContributionsToolLinks';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 042bfb4..1e8561d 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "LookupUser",
-   "version": "1.4",
+   "version": "1.5",
"author": [
"Tim Starling"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb37fcc4070a4bea73fb077e21047c6fe4888968
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LookupUser
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkSuggest[master]: v 2.0 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334471 )

Change subject: v 2.0 - Remove deprecated PHP entry point
..

v 2.0 - Remove deprecated PHP entry point

Change-Id: I1e89a184b367d5089a2eadc4506ee5639a85fd2f
---
D LinkSuggest.php
M extension.json
2 files changed, 1 insertion(+), 55 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkSuggest 
refs/changes/71/334471/1

diff --git a/LinkSuggest.php b/LinkSuggest.php
deleted file mode 100644
index 69c4ffd..000
--- a/LinkSuggest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- * @author Bartek Łapiński 
- * @author Łukasz Garczewski (TOR) 
- * @author Maciej Brencz 
- * @author Jesús Martínez Novo 
- * @author Jack Phoenix 
- * @copyright Copyright © 2008-2009, Wikia Inc.
- * @copyright Copyright © 2011 Jesús Martínez Novo
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link https://www.mediawiki.org/wiki/Extension:LinkSuggest Documentation
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'LinkSuggest',
-   'version' => '1.9',
-   'author' => array(
-   'Inez Korczyński', 'Bartek Łapiński', 'Łukasz Garczewski', 
'Maciej Brencz',
-   'Jesús Martínez Novo', 'Jack Phoenix'
-   ),
-   'descriptionmsg' => 'linksuggest-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:LinkSuggest',
-);
-
-// Internationalization stuff
-$wgMessagesDirs['LinkSuggest'] = __DIR__ . '/i18n';
-
-// ResourceLoader support (MW 1.17+)
-$wgResourceModules['ext.LinkSuggest'] = array(
-   'scripts' => 'jquery.mw.linksuggest.js',
-   'dependencies' => array( 'jquery.ui.autocomplete', 'mediawiki.api' ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'LinkSuggest'
-);
-
-// Autoload the class file which contains everything (from the PHP side, that 
is)
-$wgAutoloadClasses['LinkSuggest'] = __DIR__ . '/LinkSuggest.class.php';
-
-// Hooked functions
-$wgHooks['EditPage::showEditForm:initial'][] = 'LinkSuggest::onEditPage';
-$wgHooks['GetPreferences'][] = 'LinkSuggest::onGetPreferences';
-
-// Load the API module
-$wgAutoloadClasses['ApiLinkSuggest'] = __DIR__ . '/ApiLinkSuggest.php';
-$wgAPIModules['linksuggest'] = 'ApiLinkSuggest';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index fc95320..ee83e89 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "LinkSuggest",
-   "version": "1.9",
+   "version": "2.0",
"author": [
"Inez Korczyński",
"Bartek Łapiński",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e89a184b367d5089a2eadc4506ee5639a85fd2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkSuggest
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...ImportArticles[master]: v 1.4 - Remove deprecated PHP entry point and deprecated PHP...

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334470 )

Change subject: v 1.4 - Remove deprecated PHP entry point and deprecated 
PHP-based i18n
..

v 1.4 - Remove deprecated PHP entry point and deprecated PHP-based i18n

Change-Id: Ia7a56bbbaa370c8a5dd2637d3faf5881f37b3263
---
D ImportArticles.i18n.php
D ImportArticles.php
M extension.json
3 files changed, 1 insertion(+), 76 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImportArticles 
refs/changes/70/334470/1

diff --git a/ImportArticles.i18n.php b/ImportArticles.i18n.php
deleted file mode 100644
index 844fe79..000
--- a/ImportArticles.i18n.php
+++ /dev/null
@@ -1,33 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimefa4e861731a8843' ) ) {
-   function wfJsonI18nShimefa4e861731a8843( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimefa4e861731a8843';
-}
\ No newline at end of file
diff --git a/ImportArticles.php b/ImportArticles.php
deleted file mode 100644
index be98a5f..000
--- a/ImportArticles.php
+++ /dev/null
@@ -1,42 +0,0 @@
-http://www.gnu.org/licenses/gpl.html
- * @package: ImportArticles
- * @link: https://mediawiki.org/wiki/Extension:ImportArticles
- */
-
-# Only run if included by MediaWiki
-if ( !defined( 'MEDIAWIKI' ) ) die( 'Invalid entry point.' );
-
-$wgExtensionCredits['other'][] = array(
-   'path'  => __FILE__,
-'name' => 'ImportArticles',
-   'descriptionmsg'=> 'importarticles-desc',
-'author'   => 'Kris Blair (Cblair91)', 
-   'url'   => 
'https://mediawiki.org/wiki/Extension:ImportArticles',
-'description'  => 'Allow the usage of ImportArticles 
JavaScript to import multiple pages at once',
-'version'  => '1.3',
-   'licence-name'  => 'GPL-3.0'
-);
-
-$dir = dirname( __FILE__ ) . '/';
-
-# Register hooks
-$wgAutoloadClasses['ImportArticles']   = $dir . 
'ImportArticles.hooks.php';
-$wgHooks['BeforePageDisplay'][]= 
'ImportArticles::onBeforePageDisplay';
-
-# Register messages
-$wgMessagesDir['ImportArticles']   = $dir . 'i18n';
-$wgExtensionMessagesFiles['ImportArticles']= $dir . 
'ImportArticles.i18n.php';
-
-# Register modules
-$wgResourceModules['ext.importarticles'] = array(
-   'scripts'   => array( 'resources/importarticles.js' ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'ImportArticles',
-   'dependencies'  => array()
-);
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 7d6263b..d75d887 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "ImportArticles",
-   "version": "1.3",
+   "version": "1.4",
"author": "Kris Blair (Cblair91)",
"descriptionmsg": "importarticles-desc",
"license-name": "GPL-3.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7a56bbbaa370c8a5dd2637d3faf5881f37b3263
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImportArticles
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

___

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Open external links in new window

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333716 )

Change subject: Open external links in new window
..


Open external links in new window

Bug: T156060
Change-Id: I14f35dae9b9f9e7594c37ca7660a02fa8bb4c964
---
M templates/dialog-sidebar-externalservices.mustache
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/dialog-sidebar-externalservices.mustache 
b/templates/dialog-sidebar-externalservices.mustache
index 93b43a2..e5be34e 100644
--- a/templates/dialog-sidebar-externalservices.mustache
+++ b/templates/dialog-sidebar-externalservices.mustache
@@ -13,7 +13,7 @@
 {{name}}
 
 
-{{linkLabel}}
+{{linkLabel}}
 
 
 {{/services}}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14f35dae9b9f9e7594c37ca7660a02fa8bb4c964
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: JGirault 
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] apps...wikipedia[master]: Show link previews for (Wikipedia) links in gallery item des...

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/17 )

Change subject: Show link previews for (Wikipedia) links in gallery item 
descriptions
..


Show link previews for (Wikipedia) links in gallery item descriptions

Note that many links in gallery item descriptions are for Commons pages
and will not be handled in-app (see T156018).

Bug: T142024
Change-Id: If7ce774861176ba71af4345742a3eee99955dea3
---
M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/history/HistoryEntry.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/page/ExclusiveBottomSheetPresenter.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
6 files changed, 62 insertions(+), 18 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java 
b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
index 631f31f..16f9842 100644
--- a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
@@ -38,14 +38,19 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.json.GsonMarshaller;
 import org.wikipedia.json.GsonUnmarshaller;
+import org.wikipedia.page.ExclusiveBottomSheetPresenter;
 import org.wikipedia.page.LinkMovementMethodExt;
 import org.wikipedia.page.Page;
 import org.wikipedia.page.PageActivity;
 import org.wikipedia.page.PageCache;
 import org.wikipedia.page.PageTitle;
+import org.wikipedia.page.linkpreview.LinkPreviewDialog;
+import org.wikipedia.readinglist.AddToReadingListDialog;
 import org.wikipedia.theme.Theme;
+import org.wikipedia.util.ClipboardUtil;
 import org.wikipedia.util.FeedbackUtil;
 import org.wikipedia.util.GradientUtil;
+import org.wikipedia.util.ShareUtil;
 import org.wikipedia.util.StringUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.views.ViewAnimations;
@@ -60,8 +65,8 @@
 import static org.wikipedia.util.UriUtil.handleExternalLink;
 import static org.wikipedia.util.UriUtil.resolveProtocolRelativeUrl;
 
-public class GalleryActivity extends ThemedActionBarActivity {
-public static final int ACTIVITY_RESULT_FILEPAGE_SELECT = 1;
+public class GalleryActivity extends ThemedActionBarActivity implements 
LinkPreviewDialog.Callback {
+public static final int ACTIVITY_RESULT_PAGE_SELECTED = 1;
 
 public static final String EXTRA_PAGETITLE = "pageTitle";
 public static final String EXTRA_FILENAME = "filename";
@@ -71,6 +76,7 @@
 public static final String EXTRA_FEATURED_IMAGE_AGE = "featuredImageAge";
 
 @NonNull private WikipediaApp app = WikipediaApp.getInstance();
+@NonNull private ExclusiveBottomSheetPresenter bottomSheetPresenter = new 
ExclusiveBottomSheetPresenter();
 @Nullable private PageTitle pageTitle;
 @Nullable private Page page;
 private boolean cacheOnLoad;
@@ -369,6 +375,11 @@
 setControlsShowing(!controlsShowing);
 }
 
+public void showLinkPreview(@NonNull PageTitle title) {
+bottomSheetPresenter.show(getSupportFragmentManager(),
+LinkPreviewDialog.newInstance(title, 
HistoryEntry.SOURCE_GALLERY, null));
+}
+
 /**
  * LinkMovementMethod for handling clicking of links in the description or 
metadata
  * text fields. For internal links, this activity will close, and pass the 
page title as
@@ -383,14 +394,14 @@
 WikiSite appWikiSite = app.getWikiSite();
 if (url.startsWith("/wiki/")) {
 PageTitle title = appWikiSite.titleForInternalLink(url);
-finishWithPageResult(title);
+showLinkPreview(title);
 } else {
 Uri uri = Uri.parse(url);
 String authority = uri.getAuthority();
 if (authority != null && WikiSite.supportedAuthority(authority)
 && uri.getPath().startsWith("/wiki/")) {
 PageTitle title = appWikiSite.titleForUri(uri);
-finishWithPageResult(title);
+showLinkPreview(title);
 } else {
 // if it's a /w/ URI, turn it into a full URI and go 
external
 if (url.startsWith("/w/")) {
@@ -407,14 +418,33 @@
  * by the activity that originally launched us.
  * @param resultTitle PageTitle to pass as the activity result.
  */
-public void finishWithPageResult(PageTitle resultTitle) {
-HistoryEntry historyEntry = new HistoryEntry(resultTitle,
-HistoryEntry.SOURCE_INTERNAL_LINK);
+public void finishWithPageResult(@NonNull PageTitle resultTitle) {
+finishWithPageResult(resultTitle, new HistoryEntry(resultTitle,

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix service dependencies

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334461 )

Change subject: toolschecker: Fix service dependencies
..


toolschecker: Fix service dependencies

Change-Id: I95752b3d5b888efa81212c0480541866ecb38082
---
M modules/toollabs/manifests/checker.pp
1 file changed, 69 insertions(+), 70 deletions(-)

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



diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 25bd1e9..4a2dad9 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -21,72 +21,6 @@
 ensure => latest,
 }
 
-file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/toollabs/toolschecker.py',
-notify => Service['toolschecker'],
-}
-
-file { '/data/project/toolschecker/www/python/src/app.py':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/toollabs/toolschecker_generic_service.py',
-notify => Service['toolschecker'],
-}
-
-file { '/data/project/toolschecker/public_html/index.php':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
-notify => Service['toolschecker'],
-}
-
-file { ['/run/toolschecker', '/var/lib/toolschecker', 
'/var/lib/toolschecker/puppetcerts']:
-ensure => directory,
-owner  => "${::labsproject}.toolschecker",
-group  => 'www-data',
-mode   => '0755',
-}
-
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
-}
-
-# We need this host's puppet cert and key (readable) so we can check
-#  puppet status
-file { '/var/lib/toolschecker/puppetcerts/cert.pem':
-ensure => present,
-owner  => "${::labsproject}.toolschecker",
-group  => 'www-data',
-mode   => '0400',
-source => "/var/lib/puppet/ssl/certs/${::fqdn}.pem",
-}
-
-file { '/var/lib/toolschecker/puppetcerts/key.pem':
-ensure => present,
-owner  => "${::labsproject}.toolschecker",
-group  => 'www-data',
-mode   => '0400',
-source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
-}
-
-sudo::user { 'tools.toolschecker':
-privileges => [
-'ALL=(tools.toolschecker-k8s-ws) NOPASSWD: ALL',
-'ALL=(tools.toolschecker-ge-ws) NOPASSWD: ALL',
-],
-}
-
 $checks = {
 'self'   => {
 path => '/self'
@@ -167,11 +101,76 @@
 
 create_resources(toollabs::check, $checks)
 
-nginx::site { 'toolschecker-nginx':
-require => Service['toolschecker'],
-content => template('toollabs/toolschecker.nginx.erb'),
+file { ['/run/toolschecker', '/var/lib/toolschecker', 
'/var/lib/toolschecker/puppetcerts']:
+ensure => directory,
+owner  => "${::labsproject}.toolschecker",
+group  => 'www-data',
+mode   => '0755',
+before => Toollabs::Check[keys($checks)],
 }
 
-File['/run/toolschecker'] -> Toollabs::Check[keys($checks)] -> 
Nginx::Site['toolschecker-nginx']
+file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => 'puppet:///modules/toollabs/toolschecker.py',
+notify => Toollabs::Check[keys($checks)],
+}
+
+file { '/data/project/toolschecker/www/python/src/app.py':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/toollabs/toolschecker_generic_service.py',
+notify => Toollabs::Check[keys($checks)],
+}
+
+file { '/data/project/toolschecker/public_html/index.php':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
+notify => Toollabs::Check[keys($checks)],
+}
+
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+}
+
+# We need this host's puppet cert and key (readable) so we can check
+#  puppet status
+file { '/var/lib/toolschecker/puppetcerts/cert.pem':
+ensure => present,
+owner  => "${::labsproject}.toolschecker",
+group  => 'www-data',
+

[MediaWiki-commits] [Gerrit] mediawiki...GoogleDocs4MW[master]: v 1.3 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334469 )

Change subject: v 1.3 - Remove deprecated PHP entry point
..

v 1.3 - Remove deprecated PHP entry point

Change-Id: I50a5609ab5dbf72588e51051edf7970e3f2eaa8a
---
D GoogleDocs4MW.php
M extension.json
2 files changed, 1 insertion(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleDocs4MW 
refs/changes/69/334469/1

diff --git a/GoogleDocs4MW.php b/GoogleDocs4MW.php
deleted file mode 100644
index ab3eeb3..000
--- a/GoogleDocs4MW.php
+++ /dev/null
@@ -1,27 +0,0 @@
- tag for displaying
- * Google Docs' spreadsheets
- *
- * @file
- * @ingroup Extensions
- * @version 1.2
- * @author Jack Phoenix 
- * @copyright © 2008-2015 Jack Phoenix
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-// Add extension credits that show up on Special:Version
-$wgExtensionCredits['parserhook'][] = array(
-   'name' => 'GoogleDocs4MW',
-   'version' => '1.2',
-   'author' => 'Jack Phoenix',
-   'descriptionmsg' => 'googledocs4mw-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:GoogleDocs4MW'
-);
-
-$wgMessagesDirs['GoogleDocs4MW'] = __DIR__ . '/i18n';
-
-// Set up the parser hook
-$wgAutoloadClasses['GoogleDocs4MW'] = __DIR__ . '/GoogleDocs4MW.class.php';
-$wgHooks['ParserFirstCallInit'][] = 'GoogleDocs4MW::registerTag';
diff --git a/extension.json b/extension.json
index 3ca2505..1131709 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "GoogleDocs4MW",
-   "version": "1.2",
+   "version": "1.3",
"author": [
"Jack Phoenix"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50a5609ab5dbf72588e51051edf7970e3f2eaa8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleDocs4MW
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...GoogleAnalyticsMetrics[master]: v 0.2.1 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334468 )

Change subject: v 0.2.1 - Remove deprecated PHP entry point
..

v 0.2.1 - Remove deprecated PHP entry point

Change-Id: I00450e999bd1a3376d19db4d3873e470b2e16fd9
---
D GoogleAnalyticsMetrics.php
M extension.json
2 files changed, 1 insertion(+), 30 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleAnalyticsMetrics 
refs/changes/68/334468/1

diff --git a/GoogleAnalyticsMetrics.php b/GoogleAnalyticsMetrics.php
deleted file mode 100644
index 95670ca..000
--- a/GoogleAnalyticsMetrics.php
+++ /dev/null
@@ -1,29 +0,0 @@
- __FILE__,
-   'name' => 'GoogleAnalyticsMetrics',
-   'author' => 'Ike Hecht',
-   'url' => 
'https://www.mediawiki.org/wiki/Extension:GoogleAnalyticsMetrics',
-   'descriptionmsg' => 'google-analytics-metrics-desc',
-   'version' => '0.2.0 beta',
-   'license-name' => 'GPL-2.0+'
-);
-
-$wgMessagesDirs['GoogleAnalyticsMetrics'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['GoogleAnalyticsMetricsHooksMagic'] = __DIR__ .
-   '/GoogleAnalyticsMetrics.i18n.magic.php';
-
-$wgAutoloadClasses['GoogleAnalyticsMetricsHooks'] = __DIR__ . 
'/GoogleAnalyticsMetrics.hooks.php';
-$wgAutoloadClasses['GoogleAnalyticsMetricsCache'] = __DIR__ . 
'/GoogleAnalyticsMetricsCache.php';
-
-$wgHooks['ParserFirstCallInit'][] = 
'GoogleAnalyticsMetricsHooks::onParserFirstCallInit';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'GoogleAnalyticsMetricsHooks::onLoadExtensionSchemaUpdates';
-
-$wgGoogleAnalyticsMetricsAllowed = '*';
-$wgGoogleAnalyticsMetricsEmail = null;
-$wgGoogleAnalyticsMetricsPath = null;
-$wgGoogleAnalyticsMetricsExpiry = 600; //10 minutes
\ No newline at end of file
diff --git a/extension.json b/extension.json
index e88eedb..cd9e901 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "GoogleAnalyticsMetrics",
-   "version": "0.2.0 beta",
+   "version": "0.2.1 beta",
"author": [
"Ike Hecht"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00450e999bd1a3376d19db4d3873e470b2e16fd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleAnalyticsMetrics
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo/rsync: flip the "if"-logic around instead of a negation

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334467 )

Change subject: aptrepo/rsync: flip the "if"-logic around instead of a negation
..

aptrepo/rsync: flip the "if"-logic around instead of a negation

Change-Id: I95bf8b121870a4a8b2be9268e881c57e6da86f5b
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/334467/1

diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index a7cb732..04ad9e2 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -5,8 +5,13 @@
 $primary_server = hiera('install_server', 'install1001.wikimedia.org')
 $secondary_server = hiera('install_server_failover', 
'install2001.wikimedia.org')
 
-# only activate rsync/firewall hole on the server that is NOT active
-if $::fqdn != $primary_server {
+if $::fqdn == $primary_server {
+
+$ensure_ferm = 'absent'
+$ensure_cron = 'present'
+$ensure_sync = 'absent'
+
+} else {
 
 $ensure_ferm = 'present'
 $ensure_cron = 'absent'
@@ -20,10 +25,6 @@
 read_only   => 'no',
 hosts_allow => $primary_server,
 }
-} else {
-$ensure_ferm = 'absent'
-$ensure_cron = 'present'
-$ensure_sync = 'absent'
 }
 
 ferm::service { 'aptrepo-rsync':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95bf8b121870a4a8b2be9268e881c57e6da86f5b
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...GlobalNotice[master]: v 0.5 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334466 )

Change subject: v 0.5 - Remove deprecated PHP entry point
..

v 0.5 - Remove deprecated PHP entry point

Change-Id: I7254697634f05f126ae22a4e40b6c3a469862eb6
---
D GlobalNotice.php
M extension.json
2 files changed, 1 insertion(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalNotice 
refs/changes/66/334466/1

diff --git a/GlobalNotice.php b/GlobalNotice.php
deleted file mode 100644
index 04b9513..000
--- a/GlobalNotice.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- * @author Jack Phoenix 
- * @copyright Copyright © 2010 Misza
- * @copyright Copyright © 2010-2015 Jack Phoenix
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link https://www.mediawiki.org/wiki/Extension:GlobalNotice Documentation
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'name' => 'GlobalNotice',
-   'version' => '0.4',
-   'author' => array( 'Misza', 'Jack Phoenix' ),
-   'descriptionmsg' => 'globalnotice-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:GlobalNotice',
-   'license-name' => 'GPL-2.0+',
-);
-
-$wgMessagesDirs['GlobalNotice'] = __DIR__ . '/i18n';
-
-$wgAutoloadClasses['GlobalNotice'] = __DIR__ . '/GlobalNotice.class.php';
-
-$wgHooks['SiteNoticeAfter'][] = 'GlobalNotice::onSiteNoticeAfter';
-//$wgHooks['EditPage::showEditForm:initial'][] = 
'GlobalNotice::displayNoticeOnEditPage';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 5ee2dce..60d06c4 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "GlobalNotice",
-   "version": "0.4",
+   "version": "0.5",
"author": [
"Misza",
"Jack Phoenix"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7254697634f05f126ae22a4e40b6c3a469862eb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalNotice
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...EditAccount[master]: v 1.3.3 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334464 )

Change subject: v 1.3.3 - Remove deprecated PHP entry point
..

v 1.3.3 - Remove deprecated PHP entry point

Change-Id: I98b4adfde7c0509a4979cea2df7bba63d4403c16
---
D EditAccount.php
M extension.json
2 files changed, 1 insertion(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditAccount 
refs/changes/64/334464/1

diff --git a/EditAccount.php b/EditAccount.php
deleted file mode 100644
index 2603f84..000
--- a/EditAccount.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- * @date 22 March 2013 
(https://github.com/Wikia/app/commit/bb114fdb72c3be76594ff8bc46384093733c62e4, 
save for the i18n changes)
- * @copyright Copyright © 2008 Łukasz Garczewski, Wikia Inc.
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo "This is a MediaWiki extension named EditAccount.\n";
-   exit( 1 );
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'name' => 'EditAccount',
-   'version' => '1.3.2',
-   'author' => array( 'Łukasz Garczewski', 'Jack Phoenix' ),
-   'descriptionmsg' => 'editaccount-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:EditAccount'
-);
-
-// New user right, required to use the extension.
-$wgAvailableRights[] = 'editaccount';
-$wgGroupPermissions['*']['editaccount'] = false;
-$wgGroupPermissions['staff']['editaccount'] = true;
-
-// Log definition
-$wgLogTypes[] = 'editaccnt';
-$wgLogActionsHandlers['editaccnt/*'] = 'LogFormatter';
-$wgLogRestrictions['editaccnt'] = 'editaccount';
-
-// Set up the new special pages
-$wgMessagesDirs['EditAccount'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['EditAccountAliases'] = __DIR__ . 
'/EditAccount.alias.php';
-
-$wgAutoloadClasses['EditAccount'] = __DIR__ . '/SpecialEditAccount_body.php';
-$wgSpecialPages['EditAccount'] = 'EditAccount';
-
-$wgAutoloadClasses['CloseAccount'] = __DIR__ . '/SpecialCloseAccount.body.php';
-$wgSpecialPages['CloseAccount'] = 'CloseAccount';
diff --git a/extension.json b/extension.json
index fc14b7e..06c69fb 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "EditAccount",
-   "version": "1.3.2",
+   "version": "1.3.3",
"author": [
"Łukasz Garczewski",
"Jack Phoenix"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98b4adfde7c0509a4979cea2df7bba63d4403c16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditAccount
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: add second rsync module for entire /srv/

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334465 )

Change subject: aptrepo: add second rsync module for entire /srv/
..

aptrepo: add second rsync module for entire /srv/

To also sync things like /srv/junos, /srv/megacli and
others that are not inside /srv/wikimedia.

The question is if these technically belong in the aptrepo module
but at least sync them once before shutting down carbon.

Bug: T132757
Change-Id: Ief81c69d8d2c473e6e35ac9efb2a1346e6076e22
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/334465/1

diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index b56ffd7..7876755 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -16,6 +16,14 @@
 read_only   => 'no',
 hosts_allow => "@resolve(${primary_server})",
 }
+
+rsync::server::module { 'install-srv':
+ensure  => $aptrepo::rsync::ensure,
+path=> '/srv',
+read_only   => 'no',
+hosts_allow => "@resolve(${primary_server})",
+   }
+
 } else {
 $ensure = 'absent'
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief81c69d8d2c473e6e35ac9efb2a1346e6076e22
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...Graph[master]: Graph: cleanup styles a bit

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331910 )

Change subject: Graph: cleanup styles a bit
..


Graph: cleanup styles a bit

- properly divide into agnostic vs client-js vs client-nojs
- remove duplicate display:block; on mw-graph-layover
- hide all layover content (play button, title, loader) when we don't
  have JS.

Change-Id: I1c2b6b0308f77d977b7dc5fcef05833bb600f5ec
Bug: T156443
---
M styles/common.less
1 file changed, 65 insertions(+), 59 deletions(-)

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



diff --git a/styles/common.less b/styles/common.less
index 94c232e..e4c7677 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -8,42 +8,45 @@
 /* TODO: This file has a lot of descending specificity and needs a cleanup */
 /* stylelint-disable no-descending-specificity */
 
-.client-js {
+.mw-graph {
+   display: inline-block;
+   border: 1px solid transparent;
+   position: relative;
 
-   .mw-graph {
+   .mw-graph-img,
+   canvas {
display: inline-block;
-   border: 1px solid transparent;
-   position: relative;
+   vertical-align: middle;
+   }
+}
 
-   .mw-graph-img,
-   canvas {
-   display: inline-block;
-   vertical-align: middle;
-   }
+.client-nojs {
+   .mw-graph-layover {
+   display: none;
+   }
+}
 
-   &.mw-graph-interactable {
-   &:hover {
-   cursor: pointer;
+.client-js {
+   .mw-graph-interactable {
+   &:hover {
+   cursor: pointer;
 
-   .mw-graph-hover-title {
-   display: block;
+   .mw-graph-hover-title {
+   display: block;
+   }
+
+   .mw-graph-layover {
+   background-color: @colorWhiteOpac;
+   }
+
+   .mw-graph-switch {
+   &.mw-graph-loading {
+   background-color: @colorWhite;
}
 
-   .mw-graph-layover {
-   display: block;
-   background-color: @colorWhiteOpac;
+   &:hover {
+   background-color: @colorWhite;
}
-
-   .mw-graph-switch {
-   &.mw-graph-loading {
-   background-color: @colorWhite;
-   }
-
-   &:hover {
-   background-color: @colorWhite;
-   }
-   }
-
}
}
}
@@ -58,59 +61,62 @@
bottom: 0;
z-index: 1;
.transition( ~'background-color 250ms ease-out' );
+   }
 
-   /* center the container vertically */
-   & > div {
-   position: absolute;
-   left: 10px;
-   top: 10px;
-   }
-
-   .mw-graph-hover-title {
-   display: none;
-   position: absolute;
-   top: ~'calc( 50% - 17px )';
-   left: 1em;
-   right: 1em;
-   text-align: center;
-   font-size: 150%;
-   background-color: @colorWhite;
-   }
+   .mw-graph-hover-title {
+   display: none;
+   position: absolute;
+   top: ~'calc( 50% - 17px )';
+   left: 1em;
+   right: 1em;
+   text-align: center;
+   font-size: 150%;
+   background-color: @colorWhite;
}
 
/* common button style */
.mw-graph-switch {
-   font: inherit;
+   .transition( ~'background-color 100ms, color 100ms, 
border-color 100ms, box-shadow 100ms' );
+
+   background-color: @colorWhiteOpac;
+
+   display: inline-block;
+
+   position: absolute;
+   left: 1em;
+   top: 1em;
+
min-height: 1.2em;
min-width: 1em;
-   .transition( ~'background-color 100ms, color 100ms, 
border-color 100ms, box-shadow 100ms' );
-   font-weight: bold;
-   text-decoration: none;
-   display: inline-block;
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove unused top6-wikipedia.dblist

2017-01-26 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334463 )

Change subject: Remove unused top6-wikipedia.dblist
..

Remove unused top6-wikipedia.dblist

Follows-up c2a73c5b22e1, 9e7c5c8046297.

Change-Id: Idf527bcd3e8c5a9a1a1155fa878e6f1154e3acda
---
D dblists/top6-wikipedia.dblist
M tests/cirrusTest.php
M wmf-config/CommonSettings.php
3 files changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/dblists/top6-wikipedia.dblist b/dblists/top6-wikipedia.dblist
deleted file mode 100644
index e2c80b9..000
--- a/dblists/top6-wikipedia.dblist
+++ /dev/null
@@ -1,6 +0,0 @@
-ruwiki
-frwiki
-dewiki
-eswiki
-jawiki
-enwiki
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index eec305a..500a060 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -107,7 +107,6 @@
'large', 'wikimania', 'wikidata', 
'wikidataclient', 'visualeditor-nondefault',
'commonsuploads', 'nonbetafeatures', 'group0', 
'group1', 'group2', 'wikipedia', 'nonglobal',
'wikitech', 'nonecho', 'mobilemainpagelegacy', 
'compact-language-links', 'nowikidatadescriptiontaglines',
-   'top6-wikipedia'
] as $tag ) {
$dblist = MWWikiversions::readDbListFile( $tag );
if ( in_array( $wgDBname, $dblist ) ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7514e16..ac82864 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -168,7 +168,6 @@
'commonsuploads', 'nonbetafeatures', 'group0', 
'group1', 'group2', 'wikipedia', 'nonglobal',
'wikitech', 'nonecho', 'mobilemainpagelegacy', 
'compact-language-links', 'nowikidatadescriptiontaglines',
'related-articles-footer-blacklisted-skins',
-   'top6-wikipedia'
] as $tag ) {
$dblist = MWWikiversions::readDbListFile( $tag );
if ( in_array( $wgDBname, $dblist ) ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Update notification and search icons

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334427 )

Change subject: Update notification and search icons
..


Update notification and search icons

Bug: T152458
Bug: T152457
Change-Id: I76ba49dc4fa8409fe97e51da2b6fe453163e3434
---
M resources/skins.minerva.icons.images/bell.svg
M resources/skins.minerva.icons.images/magnifying-glass.svg
2 files changed, 29 insertions(+), 15 deletions(-)

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



diff --git a/resources/skins.minerva.icons.images/bell.svg 
b/resources/skins.minerva.icons.images/bell.svg
index 39eb8c8..7bff9e5 100644
--- a/resources/skins.minerva.icons.images/bell.svg
+++ b/resources/skins.minerva.icons.images/bell.svg
@@ -1,4 +1,22 @@
-
-http://www.w3.org/2000/svg; width="48" height="48" 
viewBox="-282.375 419.5 48 48">
-
-
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+icon-export
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images/magnifying-glass.svg 
b/resources/skins.minerva.icons.images/magnifying-glass.svg
index 660281c..6062804 100644
--- a/resources/skins.minerva.icons.images/magnifying-glass.svg
+++ b/resources/skins.minerva.icons.images/magnifying-glass.svg
@@ -1,17 +1,13 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-7C4F4673-7738-4B60-92D8-DB9437F6B241
-Created with sketchtool.
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+icon-export
+Created with Sketch.
 
 
-
-
-
-
-
-
-
+
+
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76ba49dc4fa8409fe97e51da2b6fe453163e3434
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
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]: Don't use computed dblist in production (nowikidatadescripti...

2017-01-26 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334462 )

Change subject: Don't use computed dblist in production 
(nowikidatadescriptiontaglines)
..

Don't use computed dblist in production (nowikidatadescriptiontaglines)

Follows-up c6132ec7 which introduced the use of dblist expressions
without a separate -computed dblist that is expanded before deployment.

For performance reasons, computed dblists should be expanded before deployment
and to avoid bypassing detection, the files should be named as such.

dblist expression are mainly for command-line usage (e.g. in foreachwikiindblist
or cron scripts) and have mostly been avoided in wmf-config in favour of
more maintainable values in InitialiseSettings directly (e.g. default false,
wikipedia true, testwiki false; doesn't require a computed dblist).

In one case (flow.dblist) a computed list is used (flow-computed.dblist).
Convert nowikidatadescriptiontaglines to the same format.

Change-Id: I67194fceffd3f61e088e237f50e5c91383bcfe2e
---
A dblists/nowikidatadescriptiontaglines-computed.dblist
M dblists/nowikidatadescriptiontaglines.dblist
2 files changed, 473 insertions(+), 1 deletion(-)


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

diff --git a/dblists/nowikidatadescriptiontaglines-computed.dblist 
b/dblists/nowikidatadescriptiontaglines-computed.dblist
new file mode 100644
index 000..fdeac05
--- /dev/null
+++ b/dblists/nowikidatadescriptiontaglines-computed.dblist
@@ -0,0 +1 @@
+%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
\ No newline at end of file
diff --git a/dblists/nowikidatadescriptiontaglines.dblist 
b/dblists/nowikidatadescriptiontaglines.dblist
index fdeac05..f9a9967 100644
--- a/dblists/nowikidatadescriptiontaglines.dblist
+++ b/dblists/nowikidatadescriptiontaglines.dblist
@@ -1 +1,472 @@
-%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
\ No newline at end of file
+aawikibooks
+aawiktionary
+abwiktionary
+advisorywiki
+afwikibooks
+afwiktionary
+akwikibooks
+akwiktionary
+alswikibooks
+alswiktionary
+amwiktionary
+angwikibooks
+angwikisource
+angwiktionary
+anwiktionary
+arbcom_cswiki
+arbcom_dewiki
+arbcom_enwiki
+arbcom_fiwiki
+arbcom_nlwiki
+arwikibooks
+arwikinews
+arwikisource
+arwikiversity
+arwiktionary
+astwikibooks
+astwiktionary
+aswikibooks
+aswikisource
+aswiktionary
+auditcomwiki
+avwiktionary
+aywikibooks
+aywiktionary
+azwikibooks
+azwikisource
+azwiktionary
+bawikibooks
+betawikiversity
+bewikibooks
+bewikisource
+bewiktionary
+bgwikibooks
+bgwikinews
+bgwikisource
+bgwiktionary
+bhwiktionary
+biwikibooks
+biwiktionary
+bmwikibooks
+bmwiktionary
+bnwikibooks
+bnwikisource
+bnwiktionary
+boardgovcomwiki
+boardwiki
+bowikibooks
+bowiktionary
+brwikisource
+brwiktionary
+bswikibooks
+bswikinews
+bswikisource
+bswiktionary
+cawikibooks
+cawikinews
+cawikisource
+cawiktionary
+chairwiki
+chapcomwiki
+checkuserwiki
+chrwiktionary
+chwikibooks
+chwiktionary
+collabwiki
+cowikibooks
+cowiktionary
+crwiktionary
+csbwiktionary
+cswikibooks
+cswikinews
+cswikisource
+cswikiversity
+cswiktionary
+cvwikibooks
+cywikibooks
+cywikisource
+cywiktionary
+dawikibooks
+dawikisource
+dawiktionary
+dewikibooks
+dewikinews
+dewikisource
+dewikiversity
+dewiktionary
+donatewiki
+dvwiktionary
+dzwiktionary
+elwikibooks
+elwikinews
+elwikisource
+elwikiversity
+elwiktionary
+enwikibooks
+enwikinews
+enwikisource
+enwikiversity
+enwiktionary
+eowikibooks
+eowikinews
+eowikisource
+eowiktionary
+eswikibooks
+eswikinews
+eswikisource
+eswikiversity
+eswiktionary
+etwikibooks
+etwikisource
+etwiktionary
+euwikibooks
+euwiktionary
+execwiki
+fawikibooks
+fawikinews
+fawikisource
+fawiktionary
+fdcwiki
+fiwikibooks
+fiwikinews
+fiwikisource
+fiwikiversity
+fiwiktionary
+fjwiktionary
+foundationwiki
+fowikisource
+fowiktionary
+frwikibooks
+frwikinews
+frwikisource
+frwikiversity
+frwiktionary
+fywikibooks
+fywiktionary
+gawikibooks
+gawiktionary
+gdwiktionary
+glwikibooks
+glwikisource
+glwiktionary
+gnwikibooks
+gnwiktionary
+gotwikibooks
+grantswiki
+guwikibooks
+guwikisource
+guwiktionary
+gvwiktionary
+hawiktionary
+hewikibooks
+hewikinews
+hewikisource
+hewiktionary
+hiwikibooks
+hiwiktionary
+hrwikibooks
+hrwikisource
+hrwiktionary
+hsbwiktionary
+htwikisource
+huwikibooks
+huwikinews
+huwikisource
+huwiktionary
+hywikibooks
+hywikisource
+hywiktionary
+iawikibooks
+iawiktionary
+idwikibooks
+idwikisource
+idwiktionary
+iegcomwiki
+iewikibooks
+iewiktionary
+ikwiktionary
+incubatorwiki
+internalwiki
+iowiktionary
+iswikibooks
+iswikisource
+iswiktionary
+itwikibooks
+itwikinews
+itwikisource
+itwikiversity
+itwiktionary
+iuwiktionary
+jawikibooks
+jawikinews
+jawikisource
+jawikiversity
+jawiktionary
+jbowiktionary
+jvwiktionary

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix service dependencies

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334461 )

Change subject: toolschecker: Fix service dependencies
..

toolschecker: Fix service dependencies

Change-Id: I95752b3d5b888efa81212c0480541866ecb38082
---
M modules/toollabs/manifests/checker.pp
1 file changed, 68 insertions(+), 69 deletions(-)


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

diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 25bd1e9..af0bce2 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -21,72 +21,6 @@
 ensure => latest,
 }
 
-file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/toollabs/toolschecker.py',
-notify => Service['toolschecker'],
-}
-
-file { '/data/project/toolschecker/www/python/src/app.py':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/toollabs/toolschecker_generic_service.py',
-notify => Service['toolschecker'],
-}
-
-file { '/data/project/toolschecker/public_html/index.php':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
-notify => Service['toolschecker'],
-}
-
-file { ['/run/toolschecker', '/var/lib/toolschecker', 
'/var/lib/toolschecker/puppetcerts']:
-ensure => directory,
-owner  => "${::labsproject}.toolschecker",
-group  => 'www-data',
-mode   => '0755',
-}
-
-file { '/etc/init/toolschecker':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
-}
-
-# We need this host's puppet cert and key (readable) so we can check
-#  puppet status
-file { '/var/lib/toolschecker/puppetcerts/cert.pem':
-ensure => present,
-owner  => "${::labsproject}.toolschecker",
-group  => 'www-data',
-mode   => '0400',
-source => "/var/lib/puppet/ssl/certs/${::fqdn}.pem",
-}
-
-file { '/var/lib/toolschecker/puppetcerts/key.pem':
-ensure => present,
-owner  => "${::labsproject}.toolschecker",
-group  => 'www-data',
-mode   => '0400',
-source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
-}
-
-sudo::user { 'tools.toolschecker':
-privileges => [
-'ALL=(tools.toolschecker-k8s-ws) NOPASSWD: ALL',
-'ALL=(tools.toolschecker-ge-ws) NOPASSWD: ALL',
-],
-}
-
 $checks = {
 'self'   => {
 path => '/self'
@@ -165,13 +99,78 @@
 },
 }
 
+file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => 'puppet:///modules/toollabs/toolschecker.py',
+notify => Toollabs::Check[keys($checks)],
+}
+
+file { '/data/project/toolschecker/www/python/src/app.py':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/toollabs/toolschecker_generic_service.py',
+notify => Toollabs::Check[keys($checks)],
+}
+
+file { '/data/project/toolschecker/public_html/index.php':
+ensure => file,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/toollabs/toolschecker_lighttpd_service.php',
+notify => Toollabs::Check[keys($checks)],
+}
+
+file { ['/run/toolschecker', '/var/lib/toolschecker', 
'/var/lib/toolschecker/puppetcerts']:
+ensure => directory,
+owner  => "${::labsproject}.toolschecker",
+group  => 'www-data',
+mode   => '0755',
+before => Toollabs::Check[keys($checks)],
+}
+
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+}
+
+# We need this host's puppet cert and key (readable) so we can check
+#  puppet status
+file { '/var/lib/toolschecker/puppetcerts/cert.pem':
+ensure => present,
+owner  => "${::labsproject}.toolschecker",
+group  => 'www-data',
+mode   => '0400',
+source => "/var/lib/puppet/ssl/certs/${::fqdn}.pem",
+}
+
+file { '/var/lib/toolschecker/puppetcerts/key.pem':
+ensure => present,
+owner  => "${::labsproject}.toolschecker",
+group  => 'www-data',
+mode   =>

[MediaWiki-commits] [Gerrit] mediawiki...AutomaticBoardWelcome[master]: v 0.4.2 - Remove deprecated PHP entry point

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334458 )

Change subject: v 0.4.2 - Remove deprecated PHP entry point
..


v 0.4.2 - Remove deprecated PHP entry point

Change-Id: I7cb46147ca847981e5b98d0a910ee6d0a657fb48
---
D AutomaticBoardWelcome.php
M extension.json
2 files changed, 1 insertion(+), 33 deletions(-)

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



diff --git a/AutomaticBoardWelcome.php b/AutomaticBoardWelcome.php
deleted file mode 100644
index ac9b5a3..000
--- a/AutomaticBoardWelcome.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- * @license http://en.wikipedia.org/wiki/Public_domain Public domain
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'Automatic Board Welcome',
-   'version' => '0.4.1',
-   'author' => 'Jack Phoenix',
-   'descriptionmsg' => 'automaticboardwelcome-desc',
-   'url' => 
'https://www.mediawiki.org/wiki/Extension:Automatic_Board_Welcome',
-);
-
-$wgAutomaticBoardWelcomeAutowelcomeAutocreated = false;
-
-$wgMessagesDirs['AutomaticBoardWelcome'] = __DIR__ . '/i18n';
-
-$wgAutoloadClasses['AutomaticBoardWelcome'] = __DIR__ . 
'/AutomaticBoardWelcome.class.php';
-
-$wgHooks['LocalUserCreated'][] = 
'AutomaticBoardWelcome::sendUserBoardMessageOnRegistration';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 04d1fae..7930d95 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Automatic Board Welcome",
-   "version": "0.4.1",
+   "version": "0.4.2",
"author": "Jack Phoenix",
"license-name": "CC0-1.0",
"url": "https://www.mediawiki.org/wiki/Extension:AutomaticBoardWelcome;,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cb46147ca847981e5b98d0a910ee6d0a657fb48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AutomaticBoardWelcome
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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]: toolschecker: Split each check into a separate uwsgi applica...

2017-01-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334433 )

Change subject: toolschecker: Split each check into a separate uwsgi application
..


toolschecker: Split each check into a separate uwsgi application

Change-Id: I4095763b46b38b3c4e3900cd1b9fcbea43713f9f
---
A modules/toollabs/manifests/check.pp
M modules/toollabs/manifests/checker.pp
M modules/toollabs/templates/toolschecker.nginx.erb
M modules/toollabs/templates/toolschecker.upstart.erb
4 files changed, 126 insertions(+), 19 deletions(-)

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



diff --git a/modules/toollabs/manifests/check.pp 
b/modules/toollabs/manifests/check.pp
new file mode 100644
index 000..73d7476
--- /dev/null
+++ b/modules/toollabs/manifests/check.pp
@@ -0,0 +1,29 @@
+define toollabs::check (
+$path,
+) {
+
+$check_name = $title
+
+# cheap way to ensure uniqueness across resources
+toollabs::check::path {$path: }
+
+file { "/etc/init/toolschecker/toolschecker_${check_name}.conf":
+ensure  => present,
+content => template('toollabs/toolschecker.upstart.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+require => File['etc/init/toolschecker'],
+notify  => Service["toolschecker_${check_name}"],
+}
+
+service { "toolschecker_${check_name}":
+ensure  => running,
+}
+}
+
+# lint:ignore:autoloader_layout
+define toollabs::check::path {
+}
+
+# lint:endignore
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index c9125bd..25bd1e9 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -55,6 +55,13 @@
 mode   => '0755',
 }
 
+file { '/etc/init/toolschecker':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+}
+
 # We need this host's puppet cert and key (readable) so we can check
 #  puppet status
 file { '/var/lib/toolschecker/puppetcerts/cert.pem':
@@ -73,15 +80,6 @@
 source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
 }
 
-file { '/etc/init/toolschecker.conf':
-ensure  => present,
-content => template('toollabs/toolschecker.upstart.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-notify  => Service['toolschecker'],
-}
-
 sudo::user { 'tools.toolschecker':
 privileges => [
 'ALL=(tools.toolschecker-k8s-ws) NOPASSWD: ALL',
@@ -89,14 +87,91 @@
 ],
 }
 
-service { 'toolschecker':
-ensure  => running,
-require => File['/run/toolschecker'],
+$checks = {
+'self'   => {
+path => '/self'
+},
+'puppet_catalog' => {
+path => '/labs-puppetmaster/eqiad',
+},
+'labs_private'   => {
+path => '/labs-dns/private',
+},
+'nfs_showmount'  => {
+path => '/nfs/showmount',
+},
+'ldap'   => {
+path => '/ldap',
+},
+'nfs_home'   => {
+path => '/nfs/home',
+},
+'redis'  => {
+path => '/redis',
+},
+'labsdb_labsdb1001'  => {
+path => '/labsdb/labsdb1001',
+},
+'labsdb_labsdb1003'  => {
+path => '/labsdb/labsdb1003',
+},
+'labsdb_labsdb1005'  => {
+path => '/labsdb/labsdb1005',
+},
+'labsdb_labsdb1001rw'=> {
+path => '/labsdb/labsdb1001rw',
+},
+'labsdb_labsdb1003rw'=> {
+path => '/labsdb/labsdb1003rw',
+},
+'labsdb_labsdb1004rw'=> {
+path => '/labsdb/labsdb1004rw',
+},
+'toolsdb'=> {
+path => '/toolsdb',
+},
+'dumps'  => {
+path => '/dumps',
+},
+'continuous_job_trusty'  => {
+path => '/continuous/trusty',
+},
+'continuous_job_precise' => {
+path => '/continuous/precise',
+},
+'grid_start_trusty'  => {
+path => '/grid/start/trusty',
+},
+'grid_start_precise' => {
+path => '/grid/start/precise',
+},
+'cron'   => {
+path => '/toolscron',
+},
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: multiversion: add bin/expanddblist

2017-01-26 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334459 )

Change subject: multiversion: add bin/expanddblist
..

multiversion: add bin/expanddblist

This makes it easier to draft commits locally. Especially when doing
mandatory recomputing of computed dblists. Right now this script is
in "puppet://modules/scap" and only available when logging into prod.

It's logic is stateless however and works fine with a clean checkout
of the mediawiki-config repo.

Change-Id: Ib8df32fe9ef8d48cca749be88de6e77047507d09
---
A multiversion/bin/expanddblist
1 file changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/multiversion/bin/expanddblist b/multiversion/bin/expanddblist
new file mode 100755
index 000..29c4fa6
--- /dev/null
+++ b/multiversion/bin/expanddblist
@@ -0,0 +1,18 @@
+#!/usr/bin/php
+ or ]";
+   exit( 1 );
+}
+if ( !strpos( $param, ' ') ) {
+   // dblist (Let readDbListFile read and expand the file)
+   $wikis = MWWikiversions::readDbListFile( $param );
+} else {
+   // expression
+   $wikis = MWWikiversions::evalDbListExpression( $param );
+}
+foreach ( $wikis as $wiki ) {
+   echo "$wiki\n";
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: (no-op) Move comment about flow.dblist in settings to the db...

2017-01-26 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334460 )

Change subject: (no-op) Move comment about flow.dblist in settings to the dblist
..

(no-op) Move comment about flow.dblist in settings to the dblist

Change-Id: Idbb21564fa79ee4af3e0c243d9303d7bc70c0d1e
---
M dblists/flow-computed.dblist
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/dblists/flow-computed.dblist b/dblists/flow-computed.dblist
index ec746e9..eaeb03d 100644
--- a/dblists/flow-computed.dblist
+++ b/dblists/flow-computed.dblist
@@ -1 +1,6 @@
+# + all (reglar public wikis enabled by default)
+# - nonflow.dblist (opt-out public wikis)
+# - private.dblist (non-public wikis disabled by default)
+# - fishbowl.dblist (non-public wikis disabled by default)
+# + flowprivate.dblist (opt-in private wikis)
 %% all.dblist - nonflow.dblist - private.dblist - fishbowl.dblist + 
flowprivate.dblist
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 69e077a..05d7a0e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16172,12 +16172,7 @@
 
 'wmgUseFlow' => [
'default' => false,
-   // To update flow.dblist, regenerate it (with expanddblist) from
-   // flow-computed.dblist.
-   //
-   // as all - "a specific list" (nonflow.dblist)
-   // - "all private wikis" (private.dblist) - "all fishbowl wikis" 
(fishbowl.dblist)
-   // + "private wikis with Flow" (flowprivate.dblist)
+   // To update flow.dblist, regenerate it from flow-computed.dblist using 
expanddblist
'flow' => true,
 ],
 'wmgFlowEnglishNamespaceOnly' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AutomaticBoardWelcome[master]: v 0.4.2 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334458 )

Change subject: v 0.4.2 - Remove deprecated PHP entry point
..

v 0.4.2 - Remove deprecated PHP entry point

Change-Id: I7cb46147ca847981e5b98d0a910ee6d0a657fb48
---
D AutomaticBoardWelcome.php
M extension.json
2 files changed, 1 insertion(+), 33 deletions(-)


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

diff --git a/AutomaticBoardWelcome.php b/AutomaticBoardWelcome.php
deleted file mode 100644
index ac9b5a3..000
--- a/AutomaticBoardWelcome.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- * @license http://en.wikipedia.org/wiki/Public_domain Public domain
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'Automatic Board Welcome',
-   'version' => '0.4.1',
-   'author' => 'Jack Phoenix',
-   'descriptionmsg' => 'automaticboardwelcome-desc',
-   'url' => 
'https://www.mediawiki.org/wiki/Extension:Automatic_Board_Welcome',
-);
-
-$wgAutomaticBoardWelcomeAutowelcomeAutocreated = false;
-
-$wgMessagesDirs['AutomaticBoardWelcome'] = __DIR__ . '/i18n';
-
-$wgAutoloadClasses['AutomaticBoardWelcome'] = __DIR__ . 
'/AutomaticBoardWelcome.class.php';
-
-$wgHooks['LocalUserCreated'][] = 
'AutomaticBoardWelcome::sendUserBoardMessageOnRegistration';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 04d1fae..7930d95 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Automatic Board Welcome",
-   "version": "0.4.1",
+   "version": "0.4.2",
"author": "Jack Phoenix",
"license-name": "CC0-1.0",
"url": "https://www.mediawiki.org/wiki/Extension:AutomaticBoardWelcome;,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cb46147ca847981e5b98d0a910ee6d0a657fb48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AutomaticBoardWelcome
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix throttle rule for Her Girl Friday + Lenny Unconference

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334456 )

Change subject: Fix throttle rule for Her Girl Friday + Lenny Unconference
..


Fix throttle rule for Her Girl Friday + Lenny Unconference

Bug: T156278
Change-Id: I23dcd3b6477144ed556d575a9c55ccb12198ae18
---
M wmf-config/throttle.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index f784916..7b33eeb 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -89,7 +89,11 @@
 $wmgThrottlingExceptions[] = [ // T156278
'from' => '2017-01-28T09:00 -5:00',
'to' => '2017-01-28T18:00 -5:00',
-   'IP' => '104.130.254.117',
+   'IP' => [
+   '104.130.254.117',
+   '207.87.175.130',
+   '4.15.214.210',
+   ],
'dbname' => [ 'enwiki' ],
'value' => 250 // max 200 expected
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23dcd3b6477144ed556d575a9c55ccb12198ae18
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Dereckson 
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...AjaxLogin[master]: v 2.5 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334457 )

Change subject: v 2.5 - Remove deprecated PHP entry point
..

v 2.5 - Remove deprecated PHP entry point

Change-Id: I0e3b4b1df48f23ce0641973b065c0a706eefd5e5
---
D AjaxLogin.php
M extension.json
2 files changed, 1 insertion(+), 69 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AjaxLogin 
refs/changes/57/334457/1

diff --git a/AjaxLogin.php b/AjaxLogin.php
deleted file mode 100644
index df9d2ce..000
--- a/AjaxLogin.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- * @author Jack Phoenix 
- * @author Ryan Schmidt 
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link https://www.mediawiki.org/wiki/Extension:AjaxLogin Documentation
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( "This is not a valid entry point.\n" );
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = [
-   'path' => __FILE__,
-   'name' => 'AjaxLogin',
-   'version' => '2.4',
-   'author' => [ 'Inez Korczyński', 'Jack Phoenix', 'Ryan Schmidt' ],
-   'url' => 'https://www.mediawiki.org/wiki/Extension:AjaxLogin',
-   'descriptionmsg' => 'ajaxlogin-desc',
-   'license-name' => 'GPL-2.0+',
-];
-
-// ResourceLoader support for MediaWiki 1.17+
-$wgResourceModules['ext.ajaxLogin.css'] = [
-   'styles' => 'AjaxLogin.css',
-   'position' => 'top',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'AjaxLogin'
-];
-
-$wgResourceModules['ext.ajaxLogin.js'] = [
-   'scripts' => [ 'lib/jqModal.js', 'AjaxLogin.js' ],
-   'messages' => [ 'ajaxLogin1', 'ajaxLogin2' ],
-   'position' => 'bottom',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'AjaxLogin'
-];
-
-// Array of skins for which AjaxLogin is enabled.
-// Key is: 'skinname' => (true or false)
-$wgEnableAjaxLogin = [
-   'cologneblue' => true,
-   'modern' => true,
-   'monobook' => true,
-   'vector' => true
-];
-
-// Autoload AjaxLogin API interface
-$wgAutoloadClasses['ApiAjaxLogin'] = __DIR__ . '/ApiAjaxLogin.php';
-$wgAPIModules['ajaxlogin'] = 'ApiAjaxLogin';
-
-// Internationalization file
-$wgMessagesDirs['AjaxLogin'] = __DIR__ . '/i18n';
-
-// Main PHP class, which contains all the hooked functions
-$wgAutoloadClasses['AjaxLogin'] = __DIR__ . '/AjaxLogin.class.php';
-
-// Hook things up
-$wgHooks['BeforePageDisplay'][] = 'AjaxLogin::loadAssets';
-$wgHooks['SkinAfterContent'][] = 'AjaxLogin::onSkinAfterContent';
-$wgHooks['ResourceLoaderGetConfigVars'][] = 'AjaxLogin::addJSVariable';
-$wgHooks['EditPage::showEditForm:fields'][] = 'AjaxLogin::onEditPage';
diff --git a/extension.json b/extension.json
index 8aa21f8..51a06ca 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "AjaxLogin",
-   "version": "2.4",
+   "version": "2.5",
"author": [
"Inez Korczyński",
"Jack Phoenix",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e3b4b1df48f23ce0641973b065c0a706eefd5e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AjaxLogin
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix throttle rule for Her Girl Friday + Lenny Unconference

2017-01-26 Thread Dereckson (Code Review) 
Dereckson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334456 )

Change subject: Fix throttle rule for Her Girl Friday + Lenny Unconference
..

Fix throttle rule for Her Girl Friday + Lenny Unconference

Bug: T156278
Change-Id: I23dcd3b6477144ed556d575a9c55ccb12198ae18
---
M wmf-config/throttle.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index f784916..7b33eeb 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -89,7 +89,11 @@
 $wmgThrottlingExceptions[] = [ // T156278
'from' => '2017-01-28T09:00 -5:00',
'to' => '2017-01-28T18:00 -5:00',
-   'IP' => '104.130.254.117',
+   'IP' => [
+   '104.130.254.117',
+   '207.87.175.130',
+   '4.15.214.210',
+   ],
'dbname' => [ 'enwiki' ],
'value' => 250 // max 200 expected
 ];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AJAXPoll[master]: v 1.88.2 - Remove deprecated PHP entry point

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334455 )

Change subject: v 1.88.2 - Remove deprecated PHP entry point
..


v 1.88.2 - Remove deprecated PHP entry point

Change-Id: I4292dcb8489adabd072df02e55e0bfab74a633dd
---
D AJAXPoll.php
M extension.json
2 files changed, 1 insertion(+), 111 deletions(-)

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



diff --git a/AJAXPoll.php b/AJAXPoll.php
deleted file mode 100644
index 3286011..000
--- a/AJAXPoll.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- * Question
- * Answer 1
- * Answer 2
- * Answer ...
- * Answer n
- * 
- *
- * to allow the viewing of the poll results even without having voted
- * 
- * Question
- * Answer 1
- * Answer 2
- * Answer ...
- * Answer n
- * 
- *
- * If the first line after  is "STATS",
- * then some statistics about the wiki and its polls will be displayed.
- * These statistics are not localizable and this whole feature will probably be
- * removed (or at least refactored, but probably removed) in the future.
- * 
- * STATS
- * 
- *
- * @file
- * @ingroup Extensions
- * @author Dariusz Siedlecki 
- * @author Jack Phoenix 
- * @author Thomas Gries
- * @maintainer Thomas Gries
- * @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( "This is not a valid entry point.\n" );
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['parserhook'][] = [
-   'path' => __FILE__,
-   'name' => 'AJAX Poll',
-   'version' => '1.89.0 20150928',
-   'author' => [ 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries' ],
-   'descriptionmsg' => 'ajaxpoll-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
-];
-
-// Internationalization + AJAX function
-$wgMessagesDirs['AJAXPoll'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['AJAXPoll'] = __DIR__ . '/AJAXPoll_body.php';
-$wgAjaxExportList[] = 'AJAXPoll::submitVote';
-$wgHooks['ParserFirstCallInit'][] = 'AJAXPoll::onParserInit';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'AJAXPoll::onLoadExtensionSchemaUpdates';
-
-$myResourceTemplate = [
-   'localBasePath' => __DIR__ . '/resources',
-   'remoteExtPath' => 'AJAXPoll/resources',
-   'group' => 'ext.ajaxpoll',
-];
-$wgResourceModules['ext.ajaxpoll'] = $myResourceTemplate + [
-   'scripts' => [
-   'ajaxpoll.js',
-   ],
-   'styles' => [
-   'ajaxpoll.css',
-   ],
-   'dependencies' => [],
-   'messages' => [
-   'ajaxpoll-submitting',
-   ]
-   ];
-
-# new user rights
-$wgAvailableRights[] = 'ajaxpoll-vote';
-$wgAvailableRights[] = 'ajaxpoll-view-results';
-$wgAvailableRights[] = 'ajaxpoll-view-results-before-vote';
-
-# The 'ajaxpoll-view-results-before-vote' group permission allows the specified
-# group members to view poll results even without having voted
-# but only if the high-level group permission 'ajaxpoll-vote' allows to view
-# results in general.
-
-# This 'ajaxpoll-view-results-before-vote' can be overwritten with the specific
-# per-poll setting "show-results-before-voting" which takes precedence over the
-# group permission.
-
-# permission 'ajaxpoll-view-results' >>
-# >> per-poll setting "show-results-before-voting" (if present)
-# >> permission 'ajaxpoll-view-results-before-vote'
-
-# anons
-# default: anons cannot vote and will never see results
-$wgGroupPermissions['*']['ajaxpoll-vote'] = false;
-$wgGroupPermissions['*']['ajaxpoll-view-results'] = false;
-$wgGroupPermissions['*']['ajaxpoll-view-results-before-vote'] = false;
-
-# users
-# default: users can vote and can see poll results - when they have voted
-$wgGroupPermissions['user']['ajaxpoll-vote'] = true;
-$wgGroupPermissions['user']['ajaxpoll-view-results'] = true;
-
-# tracking category for Special:TrackingCategories
-$wgTrackingCategories[] = 'ajaxpoll-tracking-category';
diff --git a/extension.json b/extension.json
index c32ce8a..e712708 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "AJAX Poll",
-   "version": "1.88.1",
+   "version": "1.88.2",
"author": [
"Dariusz Siedlecki",
"Jack Phoenix",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4292dcb8489adabd072df02e55e0bfab74a633dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing

[MediaWiki-commits] [Gerrit] mediawiki...AJAXPoll[master]: v 1.88.2 - Remove deprecated PHP entry point

2017-01-26 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334455 )

Change subject: v 1.88.2 - Remove deprecated PHP entry point
..

v 1.88.2 - Remove deprecated PHP entry point

Change-Id: I4292dcb8489adabd072df02e55e0bfab74a633dd
---
D AJAXPoll.php
M extension.json
2 files changed, 1 insertion(+), 111 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll 
refs/changes/55/334455/1

diff --git a/AJAXPoll.php b/AJAXPoll.php
deleted file mode 100644
index 3286011..000
--- a/AJAXPoll.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- * Question
- * Answer 1
- * Answer 2
- * Answer ...
- * Answer n
- * 
- *
- * to allow the viewing of the poll results even without having voted
- * 
- * Question
- * Answer 1
- * Answer 2
- * Answer ...
- * Answer n
- * 
- *
- * If the first line after  is "STATS",
- * then some statistics about the wiki and its polls will be displayed.
- * These statistics are not localizable and this whole feature will probably be
- * removed (or at least refactored, but probably removed) in the future.
- * 
- * STATS
- * 
- *
- * @file
- * @ingroup Extensions
- * @author Dariusz Siedlecki 
- * @author Jack Phoenix 
- * @author Thomas Gries
- * @maintainer Thomas Gries
- * @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( "This is not a valid entry point.\n" );
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['parserhook'][] = [
-   'path' => __FILE__,
-   'name' => 'AJAX Poll',
-   'version' => '1.89.0 20150928',
-   'author' => [ 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries' ],
-   'descriptionmsg' => 'ajaxpoll-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
-];
-
-// Internationalization + AJAX function
-$wgMessagesDirs['AJAXPoll'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['AJAXPoll'] = __DIR__ . '/AJAXPoll_body.php';
-$wgAjaxExportList[] = 'AJAXPoll::submitVote';
-$wgHooks['ParserFirstCallInit'][] = 'AJAXPoll::onParserInit';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'AJAXPoll::onLoadExtensionSchemaUpdates';
-
-$myResourceTemplate = [
-   'localBasePath' => __DIR__ . '/resources',
-   'remoteExtPath' => 'AJAXPoll/resources',
-   'group' => 'ext.ajaxpoll',
-];
-$wgResourceModules['ext.ajaxpoll'] = $myResourceTemplate + [
-   'scripts' => [
-   'ajaxpoll.js',
-   ],
-   'styles' => [
-   'ajaxpoll.css',
-   ],
-   'dependencies' => [],
-   'messages' => [
-   'ajaxpoll-submitting',
-   ]
-   ];
-
-# new user rights
-$wgAvailableRights[] = 'ajaxpoll-vote';
-$wgAvailableRights[] = 'ajaxpoll-view-results';
-$wgAvailableRights[] = 'ajaxpoll-view-results-before-vote';
-
-# The 'ajaxpoll-view-results-before-vote' group permission allows the specified
-# group members to view poll results even without having voted
-# but only if the high-level group permission 'ajaxpoll-vote' allows to view
-# results in general.
-
-# This 'ajaxpoll-view-results-before-vote' can be overwritten with the specific
-# per-poll setting "show-results-before-voting" which takes precedence over the
-# group permission.
-
-# permission 'ajaxpoll-view-results' >>
-# >> per-poll setting "show-results-before-voting" (if present)
-# >> permission 'ajaxpoll-view-results-before-vote'
-
-# anons
-# default: anons cannot vote and will never see results
-$wgGroupPermissions['*']['ajaxpoll-vote'] = false;
-$wgGroupPermissions['*']['ajaxpoll-view-results'] = false;
-$wgGroupPermissions['*']['ajaxpoll-view-results-before-vote'] = false;
-
-# users
-# default: users can vote and can see poll results - when they have voted
-$wgGroupPermissions['user']['ajaxpoll-vote'] = true;
-$wgGroupPermissions['user']['ajaxpoll-view-results'] = true;
-
-# tracking category for Special:TrackingCategories
-$wgTrackingCategories[] = 'ajaxpoll-tracking-category';
diff --git a/extension.json b/extension.json
index c32ce8a..e712708 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "AJAX Poll",
-   "version": "1.88.1",
+   "version": "1.88.2",
"author": [
"Dariusz Siedlecki",
"Jack Phoenix",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4292dcb8489adabd072df02e55e0bfab74a633dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Testreduce: allow to decide the state of the services

2017-01-26 Thread Volans (Code Review) 
Volans has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334452 )

Change subject: Testreduce: allow to decide the state of the services
..


Testreduce: allow to decide the state of the services

* Temporary stop parsoid-vd and parsoid-vd-client services

Bug: T156177
Change-Id: I5dab4415739fcda1f5c27b82ef13c0fab9efdc1e
---
M modules/role/manifests/parsoid/vd_client.pp
M modules/role/manifests/parsoid/vd_server.pp
M modules/testreduce/manifests/client.pp
M modules/testreduce/manifests/server.pp
4 files changed, 11 insertions(+), 7 deletions(-)

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



diff --git a/modules/role/manifests/parsoid/vd_client.pp 
b/modules/role/manifests/parsoid/vd_client.pp
index bc7cb3d..9277c17 100644
--- a/modules/role/manifests/parsoid/vd_client.pp
+++ b/modules/role/manifests/parsoid/vd_client.pp
@@ -5,5 +5,6 @@
 
 testreduce::client { 'parsoid-vd-client':
 instance_name => 'parsoid-vd-client',
+service_state => stopped,
 }
 }
diff --git a/modules/role/manifests/parsoid/vd_server.pp 
b/modules/role/manifests/parsoid/vd_server.pp
index 6d40184..821382c 100644
--- a/modules/role/manifests/parsoid/vd_server.pp
+++ b/modules/role/manifests/parsoid/vd_server.pp
@@ -13,6 +13,7 @@
 db_pass   => $passwords::testreduce::mysql::db_pass,
 webapp_port   => 8010,
 coord_port=> 8011,
+service_state => stopped,
 }
 
 }
diff --git a/modules/testreduce/manifests/client.pp 
b/modules/testreduce/manifests/client.pp
index ffcf516..3059b18 100644
--- a/modules/testreduce/manifests/client.pp
+++ b/modules/testreduce/manifests/client.pp
@@ -6,7 +6,8 @@
 #   Name of the testreduce client service
 #
 define testreduce::client(
-$instance_name
+$instance_name,
+$service_state = running,
 ) {
 file { "/etc/testreduce/${instance_name}.config.js":
 content => template("testreduce/${instance_name}.config.js.erb"),
@@ -25,6 +26,6 @@
 }
 
 service { $instance_name:
-ensure => running,
+ensure => $service_state,
 }
 }
diff --git a/modules/testreduce/manifests/server.pp 
b/modules/testreduce/manifests/server.pp
index e06554a..8992f36 100644
--- a/modules/testreduce/manifests/server.pp
+++ b/modules/testreduce/manifests/server.pp
@@ -29,10 +29,11 @@
 $db_name,
 $db_user,
 $db_pass,
-$db_host = 'localhost',
-$db_port = 3306,
-$coord_port  = 8002,
-$webapp_port = 8003,
+$db_host   = 'localhost',
+$db_port   = 3306,
+$coord_port= 8002,
+$webapp_port   = 8003,
+$service_state = running,
 ) {
 file { "/etc/testreduce/${instance_name}.settings.js":
 # FIXME: Ideally this would be testreduce/settings.js.rb
@@ -54,7 +55,7 @@
 }
 
 service { $instance_name:
-ensure  => running,
+ensure  => $service_state,
 require => [
 File["/etc/testreduce/${instance_name}.settings.js"],
 File["/lib/systemd/system/${instance_name}.service"],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5dab4415739fcda1f5c27b82ef13c0fab9efdc1e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Volans 
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...BlogPage[master]: Remove unused wgSupress* globals and duplicate heading

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333809 )

Change subject: Remove unused wgSupress* globals and duplicate heading
..


Remove unused wgSupress* globals and duplicate heading

Bug: T143145
Change-Id: I28ad3f0a32691ed6d77cc42a5034326427c461f4
---
M BlogPageClass.php
M BlogPageHooks.php
M SpecialArticleLists.php
M SpecialArticlesHome.php
M extension.json
M resources/css/ext.blogpage.articleshome.css
M resources/css/ext.blogpage.blogpage.css
7 files changed, 14 insertions(+), 28 deletions(-)

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



diff --git a/BlogPageClass.php b/BlogPageClass.php
index 6ca8191..eb480e2 100644
--- a/BlogPageClass.php
+++ b/BlogPageClass.php
@@ -66,9 +66,6 @@
 
wfDebugLog( 'BlogPage', __METHOD__ );
 
-   $output->setHTMLTitle( $this->getTitle()->getText() );
-   $output->setPageTitle( $this->getTitle()->getText() );
-
// Don't throw a bunch of E_NOTICEs when we're viewing the page 
of a
// nonexistent blog post
if ( !$this->getID() ) {
@@ -111,12 +108,21 @@
$output->addHTML( "\t\t\t" . '' . 
"\n" );
 
$output->addHTML( '' . "\n" );
-   $output->addHTML( "{$this->getTitle()->getText()}\n" );
$output->addHTML( $this->getByLine() );
 
$output->addHTML( "\n\n" );
parent::view();
 
+   /**
+* The page title is being set here before the Article::view()
+* call above, which overrides whatever we set if we set the 
title
+* above that line.
+*
+* @see https://phabricator.wikimedia.org/T143145
+*/
+   $output->setHTMLTitle( $this->getTitle()->getText() );
+   $output->setPageTitle( $this->getTitle()->getText() );
+
// Get categories
$cat = $sk->getCategoryLinks();
if ( $cat ) {
diff --git a/BlogPageHooks.php b/BlogPageHooks.php
index 559e0ce..5568fbf 100644
--- a/BlogPageHooks.php
+++ b/BlogPageHooks.php
@@ -16,16 +16,9 @@
 * @return bool
 */
public static function blogFromTitle( &$title, &$article ) {
-   global $wgHooks, $wgOut, $wgRequest, $wgSupressPageTitle, 
$wgSupressSubTitle, $wgSupressPageCategories;
+   global $wgHooks, $wgOut;
 
if ( $title->getNamespace() == NS_BLOG ) {
-   if ( !$wgRequest->getVal( 'action' ) ) {
-   $wgSupressPageTitle = true;
-   }
-
-   $wgSupressSubTitle = true;
-   $wgSupressPageCategories = true;
-
// This will suppress category links in 
SkinTemplate-based skins
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 
function( $sk, $tpl ) {
$tpl->set( 'catlinks', '' );
diff --git a/SpecialArticleLists.php b/SpecialArticleLists.php
index cffe104..4d5f4d3 100644
--- a/SpecialArticleLists.php
+++ b/SpecialArticleLists.php
@@ -41,8 +41,6 @@
 
$output = '';
if ( !$this->including() ) {
-   $output .= '' . $this->msg( 'ah-new-articles' 
)->escaped() . '';
-
$descMsg = $this->msg( 'ah-new-articles-summary' );
if ( !$descMsg->isDisabled() ) {
$output .= Xml::tags('div', array(
diff --git a/SpecialArticlesHome.php b/SpecialArticlesHome.php
index 608149c..a69af2e 100644
--- a/SpecialArticlesHome.php
+++ b/SpecialArticlesHome.php
@@ -25,9 +25,7 @@
 * @param string $type What kind of articles to show? Default is 
'popular'
 */
public function execute( $type ) {
-   global $wgContLang, $wgSupressPageTitle;
-
-   $wgSupressPageTitle = true;
+   global $wgContLang;
 
$out = $this->getOutput();
// Add CSS
@@ -63,7 +61,6 @@
// Start building the HTML output
$output = '';
$output .= '';
-   $output .= '' . $name->escaped() . '';
$output .= '' .
$this->msg( 'ah-write-article' )->escaped() . ' - 
https://gerrit.wikimedia.org/r/333809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I28ad3f0a32691ed6d77cc42a5034326427c461f4
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: SamanthaNguyen

[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker: Linting fixes

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334280 )

Change subject: docker: Linting fixes
..


docker: Linting fixes

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: Ic24d47d92cb9c5d63f5ba298a3728897ae07a3ae
---
M modules/docker/manifests/engine.pp
M modules/docker/manifests/registry.pp
M modules/docker/manifests/registry/web.pp
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/docker/manifests/engine.pp 
b/modules/docker/manifests/engine.pp
index ac3e07b..120bf49 100644
--- a/modules/docker/manifests/engine.pp
+++ b/modules/docker/manifests/engine.pp
@@ -30,7 +30,7 @@
 require => [
 Apt::Repository['docker'],
 File['/usr/local/bin/setup-docker']
-]
+],
 }
 
 if $declare_service {
diff --git a/modules/docker/manifests/registry.pp 
b/modules/docker/manifests/registry.pp
index c0a6539..5aee8df 100644
--- a/modules/docker/manifests/registry.pp
+++ b/modules/docker/manifests/registry.pp
@@ -32,7 +32,7 @@
 'container' => $swift_container,
 },
 'cache' => {
-'blobdescriptor' => 'inmemory'
+'blobdescriptor' => 'inmemory',
 },
 }
 }
@@ -69,6 +69,6 @@
 require => File[
 '/etc/docker',
 '/etc/docker/registry/config.yml'
-]
+],
 }
 }
diff --git a/modules/docker/manifests/registry/web.pp 
b/modules/docker/manifests/registry/web.pp
index 6f3fa19..4e97522 100644
--- a/modules/docker/manifests/registry/web.pp
+++ b/modules/docker/manifests/registry/web.pp
@@ -34,7 +34,7 @@
 
 if $http_endpoint {
 nginx::site { 'registry-http':
-content => template('docker/registry-http-nginx.conf.erb')
+content => template('docker/registry-http-nginx.conf.erb'),
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic24d47d92cb9c5d63f5ba298a3728897ae07a3ae
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Dzahn 
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]: Update: allow OkHttp Cache to serve stale responses

2017-01-26 Thread Niedzielski (Code Review) 
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334454 )

Change subject: Update: allow OkHttp Cache to serve stale responses
..

Update: allow OkHttp Cache to serve stale responses

Bug: T148675
Change-Id: Ie4a99141462497c13ff63dee666ed4948e7c5421
---
M app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
1 file changed, 69 insertions(+), 10 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java 
b/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
index 51febf2..eb21de5 100644
--- a/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
@@ -11,8 +11,10 @@
 import java.net.HttpURLConnection;
 import java.net.Proxy;
 import java.net.URL;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Cache;
+import okhttp3.CacheControl;
 import okhttp3.CookieJar;
 import okhttp3.Interceptor;
 import okhttp3.JavaNetCookieJar;
@@ -24,8 +26,13 @@
 
 public class OkHttpConnectionFactory implements HttpRequest.ConnectionFactory {
 private static final long HTTP_CACHE_SIZE = 64 * 1024 * 1024;
-private static final Cache HTTP_CACHE = new 
Cache(WikipediaApp.getInstance().getCacheDir(), HTTP_CACHE_SIZE);
-private static OkHttpClient CLIENT;
+@NonNull private static final Cache HTTP_CACHE = new 
Cache(WikipediaApp.getInstance().getCacheDir(),
+HTTP_CACHE_SIZE);
+@NonNull private static final OkHttpClient CLIENT = createClient();
+
+@NonNull public static OkHttpClient getClient() {
+return CLIENT;
+}
 
 @Override
 public HttpURLConnection create(URL url) throws IOException {
@@ -36,14 +43,6 @@
 public HttpURLConnection create(URL url, Proxy proxy) throws IOException {
 throw new UnsupportedOperationException(
 "Per-connection proxy is not supported. Use OkHttpClient's 
setProxy instead.");
-}
-
-@NonNull
-public static OkHttpClient getClient() {
-if (CLIENT == null) {
-CLIENT = createClient();
-}
-return CLIENT;
 }
 
 @NonNull
@@ -60,9 +59,69 @@
 .cache(HTTP_CACHE)
 .addInterceptor(loggingInterceptor)
 .addInterceptor(new CommonHeaderInterceptor())
+.addInterceptor(new DefaultMaxStaleInterceptor())
+.addNetworkInterceptor(new CacheResponseInterceptor())
 .build();
 }
 
+/** Sets a default max-stale cache-control argument on all requests that 
do not specify one */
+private static class DefaultMaxStaleInterceptor implements Interceptor {
+@Override public Response intercept(Interceptor.Chain chain) throws 
IOException {
+Request req = chain.request();
+
+int maxStaleSeconds = req.cacheControl().maxStaleSeconds() < 0
+? Integer.MAX_VALUE
+: req.cacheControl().maxStaleSeconds();
+CacheControl cacheControl = 
newCacheControlBuilder(req.cacheControl())
+.maxStale(maxStaleSeconds, TimeUnit.SECONDS)
+.build();
+req = req.newBuilder().cacheControl(cacheControl).build();
+
+return chain.proceed(req);
+}
+
+private CacheControl.Builder newCacheControlBuilder(CacheControl 
cacheControl) {
+CacheControl.Builder builder = new CacheControl.Builder();
+if (cacheControl.noCache()) {
+builder.noCache();
+}
+if (cacheControl.noStore()) {
+builder.noStore();
+}
+if (cacheControl.maxAgeSeconds() >= 0) {
+builder.maxAge(cacheControl.maxAgeSeconds(), TimeUnit.SECONDS);
+}
+if (cacheControl.maxStaleSeconds() >= 0) {
+builder.maxStale(cacheControl.maxStaleSeconds(), 
TimeUnit.SECONDS);
+}
+if (cacheControl.minFreshSeconds() >= 0) {
+builder.minFresh(cacheControl.minFreshSeconds(), 
TimeUnit.SECONDS);
+}
+if (cacheControl.onlyIfCached()) {
+builder.onlyIfCached();
+}
+if (cacheControl.noTransform()) {
+builder.noTransform();
+}
+return builder;
+}
+}
+
+/** Allow response caching expressly strictly forbidden */
+private static class CacheResponseInterceptor implements Interceptor {
+@Override public Response intercept(Interceptor.Chain chain) throws 
IOException {
+Request req = chain.request();
+Response rsp = chain.proceed(req);
+// todo: add !rsp.cacheControl().mustRevalidate() when 
mobile-sections-*

[MediaWiki-commits] [Gerrit] operations/puppet[production]: monitoring: linting changes

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334297 )

Change subject: monitoring: linting changes
..


monitoring: linting changes

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: I2a9448bb478ddbb5af5b75cd22360c2f79d823d7
---
M modules/monitoring/manifests/host.pp
M modules/monitoring/manifests/icinga/git_merge.pp
M modules/monitoring/manifests/service.pp
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/monitoring/manifests/host.pp 
b/modules/monitoring/manifests/host.pp
index dc33d3d..f13e20a 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -63,7 +63,7 @@
 icon_image=> $icon_image,
 vrml_image=> $vrml_image,
 statusmap_image   => $statusmap_image,
-}
+},
 }
 # This is a hack. We detect if we are running on the scope of an icinga
 # host and avoid exporting the resource if yes
diff --git a/modules/monitoring/manifests/icinga/git_merge.pp 
b/modules/monitoring/manifests/icinga/git_merge.pp
index 56d6288..5d03a88 100644
--- a/modules/monitoring/manifests/icinga/git_merge.pp
+++ b/modules/monitoring/manifests/icinga/git_merge.pp
@@ -19,14 +19,14 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-content => template('monitoring/check_git-needs-merge.erb')
+content => template('monitoring/check_git-needs-merge.erb'),
 }
 
 nrpe::monitor_service { "${sane_title}_merged":
 description  => "Unmerged changes on repository ${title}",
 nrpe_command => "/usr/bin/sudo ${filename}",
 retries  => $interval,
-require  => File[$file_resource]
+require  => File[$file_resource],
 }
 
 file { "sudo_nagios_${sane_title}":
diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index 11dcf3f..3ddcfb0 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -93,7 +93,7 @@
 check_freshness=> $check_fresh,
 freshness_threshold=> $is_fresh,
 event_handler  => $event_handler,
-}
+},
 }
 # This is a hack. We detect if we are running on the scope of an icinga
 # host and avoid exporting the resource if yes

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a9448bb478ddbb5af5b75cd22360c2f79d823d7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Dzahn 
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]: Add cURL wrapper

2017-01-26 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334453 )

Change subject: Add cURL wrapper
..

Add cURL wrapper

Moves the curl_transaction logic down into SmashPig, in preparation
for making API calls without using processor SDKs

Change-Id: I6710c327c39866367b169922df4a25df3e4127c4
---
A Core/Http/OutboundRequest.php
1 file changed, 177 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/53/334453/1

diff --git a/Core/Http/OutboundRequest.php b/Core/Http/OutboundRequest.php
new file mode 100644
index 000..f76f32c
--- /dev/null
+++ b/Core/Http/OutboundRequest.php
@@ -0,0 +1,177 @@
+config = Context::get()->getConfiguration();
+   $this->url = $url;
+   $this->method = $method;
+   }
+
+   public function setHeader( $name, $value ) {
+   $this->headers[$name] = $value;
+   }
+
+   public function getHeaders() {
+   return $this->headers;
+   }
+
+   public function execute( $data = null ) {
+   $loopCount = $this->config->val( 'api_repeat' );
+
+   Logger::info( "Initiating cURL" );
+   $ch = curl_init();
+   // Always capture the cURL output
+   $curlDebugLog = fopen( 'php://temp', 'r+' );
+
+   $curlOptions = $this->getCurlOptions( $data );
+   curl_setopt_array( $ch, $curlOptions );
+   // TODO: log timing
+
+   $tries = 0;
+   do {
+   Logger::info(
+   "Preparing to send {$this->method} request to 
{$this->url}"
+   );
+
+   // Execute the cURL operation
+   $response = curl_exec( $ch );
+
+   // Always read the verbose output
+   rewind( $curlDebugLog );
+   $logged = fread( $curlDebugLog, 4096 );
+
+   if ( $response !== false ) {
+   // The cURL operation was at least successful, 
what happened in it?
+   Logger::debug( "cURL verbose logging: $logged" 
);
+
+   $headers = curl_getinfo( $ch );
+   $httpCode = $headers['http_code'];
+
+   switch ( $httpCode ) {
+   case 200:   // Everything is AWESOME
+   $continue = false;
+
+   Logger::debug( "Successful 
transaction to $this->url" );
+   break;
+
+   case 400:   // Oh noes! Bad request.. 
BAD CODE, BAD BAD CODE!
+   $continue = false;
+   Logger::error( "{$this->url} 
returned (400) BAD REQUEST: $response" );
+   break;
+
+   case 403:   // Hmm, forbidden? Maybe if 
we ask it nicely again...
+   $continue = true;
+   Logger::alert( "{$this->url} 
returned (403) FORBIDDEN: $response" );
+   break;
+
+   default:// No clue what happened... 
break out and log it
+   $continue = false;
+   Logger::error( "{$this->url} 
failed remotely and returned ($httpCode): $response" );
+   break;
+   }
+   } else {
+   // Well the cURL transaction failed for some 
reason or another. Try again!
+   $continue = true;
+
+   $errno = curl_errno( $ch );
+   $err = curl_error( $ch );
+
+   Logger::alert(
+   "cURL transaction to {$this->url} 
failed: ($errno) $err.  " .
+   "cURL verbose logging: $logged"
+   );
+   }
+   $tries++;
+   if ( $tries >= $loopCount ) {
+   $continue = false;
+   }
+   if ( $continue ) {
+   // If we're going to try again, reset the debug 
log.
+   // TODO: log timing for this particular curl 
attempt
+   rewind( $curlDebugLog );
+   }
+   } while ( $continue ); // End while

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add index to nick_name field.

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334236 )

Change subject: Add index to nick_name field.
..


Add index to nick_name field.

Bug: T115044
Change-Id: I86b1e82503f71636c74de984c1595b84ec723caa
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 96d1c9a..80f6a23 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2482,3 +2482,19 @@
   wmf_civicrm_update_7310();
   wmf_civicrm_update_7320();
 }
+
+/**
+ * Add index to nick_name column as we have decided to use it for imports.
+ *
+ * We have decided the Benevity Import should accept org matches on nick_name
+ * or organization_name in order to provide the option to refer to them with
+ * 2 names. In order to use it it must be indexed. Note that I believe the 
index size
+ * is relative to the number of values in it (currently a few hundred).
+ *
+ * Bug: T115044
+ */
+function wmf_civicrm_update_7455() {
+  civicrm_initialize();
+  $tables = array('civicrm_contact' => array('nick_name'));
+  CRM_Core_BAO_SchemaHandler::createIndexes($tables);
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86b1e82503f71636c74de984c1595b84ec723caa
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]: Testreduce: allow to decide the state of the services

2017-01-26 Thread Volans (Code Review) 
Volans has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334452 )

Change subject: Testreduce: allow to decide the state of the services
..

Testreduce: allow to decide the state of the services

* Temporary stop parsoid-vd and parsoid-vd-client services

Bug: T156177
Change-Id: I5dab4415739fcda1f5c27b82ef13c0fab9efdc1e
---
M modules/role/manifests/parsoid/vd_client.pp
M modules/role/manifests/parsoid/vd_server.pp
M modules/testreduce/manifests/client.pp
M modules/testreduce/manifests/server.pp
4 files changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/334452/1

diff --git a/modules/role/manifests/parsoid/vd_client.pp 
b/modules/role/manifests/parsoid/vd_client.pp
index bc7cb3d..9277c17 100644
--- a/modules/role/manifests/parsoid/vd_client.pp
+++ b/modules/role/manifests/parsoid/vd_client.pp
@@ -5,5 +5,6 @@
 
 testreduce::client { 'parsoid-vd-client':
 instance_name => 'parsoid-vd-client',
+service_state => stopped,
 }
 }
diff --git a/modules/role/manifests/parsoid/vd_server.pp 
b/modules/role/manifests/parsoid/vd_server.pp
index 6d40184..821382c 100644
--- a/modules/role/manifests/parsoid/vd_server.pp
+++ b/modules/role/manifests/parsoid/vd_server.pp
@@ -13,6 +13,7 @@
 db_pass   => $passwords::testreduce::mysql::db_pass,
 webapp_port   => 8010,
 coord_port=> 8011,
+service_state => stopped,
 }
 
 }
diff --git a/modules/testreduce/manifests/client.pp 
b/modules/testreduce/manifests/client.pp
index ffcf516..3059b18 100644
--- a/modules/testreduce/manifests/client.pp
+++ b/modules/testreduce/manifests/client.pp
@@ -6,7 +6,8 @@
 #   Name of the testreduce client service
 #
 define testreduce::client(
-$instance_name
+$instance_name,
+$service_state = running,
 ) {
 file { "/etc/testreduce/${instance_name}.config.js":
 content => template("testreduce/${instance_name}.config.js.erb"),
@@ -25,6 +26,6 @@
 }
 
 service { $instance_name:
-ensure => running,
+ensure => $service_state,
 }
 }
diff --git a/modules/testreduce/manifests/server.pp 
b/modules/testreduce/manifests/server.pp
index e06554a..8992f36 100644
--- a/modules/testreduce/manifests/server.pp
+++ b/modules/testreduce/manifests/server.pp
@@ -29,10 +29,11 @@
 $db_name,
 $db_user,
 $db_pass,
-$db_host = 'localhost',
-$db_port = 3306,
-$coord_port  = 8002,
-$webapp_port = 8003,
+$db_host   = 'localhost',
+$db_port   = 3306,
+$coord_port= 8002,
+$webapp_port   = 8003,
+$service_state = running,
 ) {
 file { "/etc/testreduce/${instance_name}.settings.js":
 # FIXME: Ideally this would be testreduce/settings.js.rb
@@ -54,7 +55,7 @@
 }
 
 service { $instance_name:
-ensure  => running,
+ensure  => $service_state,
 require => [
 File["/etc/testreduce/${instance_name}.settings.js"],
 File["/lib/systemd/system/${instance_name}.service"],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jenkins: Linting fixes

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334288 )

Change subject: jenkins: Linting fixes
..


jenkins: Linting fixes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: If0b44623322c486eea69f173c65ac5b0ec28b716
---
M modules/jenkins/manifests/init.pp
M modules/jenkins/manifests/slave.pp
M modules/jenkins/manifests/user.pp
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/jenkins/manifests/init.pp 
b/modules/jenkins/manifests/init.pp
index f5768bc..37f5140 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -18,8 +18,8 @@
 $service_enable = true,
 )
 {
-require jenkins::user
-require jenkins::group
+require ::jenkins::user
+require ::jenkins::group
 
 # We want to run Jenkins under Java 7.
 ensure_packages(['openjdk-7-jre-headless'])
@@ -85,7 +85,7 @@
 nrpe::monitor_service { 'jenkins':
 description   => 'jenkins_service_running',
 contact_group => 'contint',
-nrpe_command  => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'"
+nrpe_command  => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'",
 }
 
 file { '/var/lib/jenkins':
diff --git a/modules/jenkins/manifests/slave.pp 
b/modules/jenkins/manifests/slave.pp
index a6b3ea9..f07e3dd 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -6,7 +6,7 @@
 $workdir = '/var/lib/jenkins-slave',
 ) {
 
-include jenkins::slave::requisites
+include ::jenkins::slave::requisites
 
 group { $user:
 ensure => present,
diff --git a/modules/jenkins/manifests/user.pp 
b/modules/jenkins/manifests/user.pp
index bfae8e0..22b5d0f 100644
--- a/modules/jenkins/manifests/user.pp
+++ b/modules/jenkins/manifests/user.pp
@@ -1,6 +1,6 @@
 class jenkins::user {
 
-include jenkins::group
+include ::jenkins::group
 
 user { 'jenkins':
 home   => '/var/lib/jenkins',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0b44623322c486eea69f173c65ac5b0ec28b716
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
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]: group2 wikis to 1.29.0-wmf.8

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334451 )

Change subject: group2 wikis to 1.29.0-wmf.8
..


group2 wikis to 1.29.0-wmf.8

Change-Id: If69401c2f7337b32b60bb10025e95e7444be2dea
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 090c6e5..f650c88 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.9",
+"aawiki": "php-1.29.0-wmf.8",
 "aawikibooks": "php-1.29.0-wmf.9",
 "aawiktionary": "php-1.29.0-wmf.9",
-"abwiki": "php-1.29.0-wmf.9",
+"abwiki": "php-1.29.0-wmf.8",
 "abwiktionary": "php-1.29.0-wmf.9",
-"acewiki": "php-1.29.0-wmf.9",
+"acewiki": "php-1.29.0-wmf.8",
 "advisorywiki": "php-1.29.0-wmf.9",
-"adywiki": "php-1.29.0-wmf.9",
-"afwiki": "php-1.29.0-wmf.9",
+"adywiki": "php-1.29.0-wmf.8",
+"afwiki": "php-1.29.0-wmf.8",
 "afwikibooks": "php-1.29.0-wmf.9",
 "afwikiquote": "php-1.29.0-wmf.9",
 "afwiktionary": "php-1.29.0-wmf.9",
-"akwiki": "php-1.29.0-wmf.9",
+"akwiki": "php-1.29.0-wmf.8",
 "akwikibooks": "php-1.29.0-wmf.9",
 "akwiktionary": "php-1.29.0-wmf.9",
-"alswiki": "php-1.29.0-wmf.9",
+"alswiki": "php-1.29.0-wmf.8",
 "alswikibooks": "php-1.29.0-wmf.9",
 "alswikiquote": "php-1.29.0-wmf.9",
 "alswiktionary": "php-1.29.0-wmf.9",
-"amwiki": "php-1.29.0-wmf.9",
+"amwiki": "php-1.29.0-wmf.8",
 "amwikiquote": "php-1.29.0-wmf.9",
 "amwiktionary": "php-1.29.0-wmf.9",
-"angwiki": "php-1.29.0-wmf.9",
+"angwiki": "php-1.29.0-wmf.8",
 "angwikibooks": "php-1.29.0-wmf.9",
 "angwikiquote": "php-1.29.0-wmf.9",
 "angwikisource": "php-1.29.0-wmf.9",
 "angwiktionary": "php-1.29.0-wmf.9",
-"anwiki": "php-1.29.0-wmf.9",
+"anwiki": "php-1.29.0-wmf.8",
 "anwiktionary": "php-1.29.0-wmf.9",
-"arbcom_cswiki": "php-1.29.0-wmf.9",
-"arbcom_dewiki": "php-1.29.0-wmf.9",
-"arbcom_enwiki": "php-1.29.0-wmf.9",
-"arbcom_fiwiki": "php-1.29.0-wmf.9",
-"arbcom_nlwiki": "php-1.29.0-wmf.9",
-"arcwiki": "php-1.29.0-wmf.9",
-"arwiki": "php-1.29.0-wmf.9",
+"arbcom_cswiki": "php-1.29.0-wmf.8",
+"arbcom_dewiki": "php-1.29.0-wmf.8",
+"arbcom_enwiki": "php-1.29.0-wmf.8",
+"arbcom_fiwiki": "php-1.29.0-wmf.8",
+"arbcom_nlwiki": "php-1.29.0-wmf.8",
+"arcwiki": "php-1.29.0-wmf.8",
+"arwiki": "php-1.29.0-wmf.8",
 "arwikibooks": "php-1.29.0-wmf.9",
 "arwikimedia": "php-1.29.0-wmf.9",
 "arwikinews": "php-1.29.0-wmf.9",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.9",
 "arwikiversity": "php-1.29.0-wmf.9",
 "arwiktionary": "php-1.29.0-wmf.9",
-"arzwiki": "php-1.29.0-wmf.9",
-"astwiki": "php-1.29.0-wmf.9",
+"arzwiki": "php-1.29.0-wmf.8",
+"astwiki": "php-1.29.0-wmf.8",
 "astwikibooks": "php-1.29.0-wmf.9",
 "astwikiquote": "php-1.29.0-wmf.9",
 "astwiktionary": "php-1.29.0-wmf.9",
-"aswiki": "php-1.29.0-wmf.9",
+"aswiki": "php-1.29.0-wmf.8",
 "aswikibooks": "php-1.29.0-wmf.9",
 "aswikisource": "php-1.29.0-wmf.9",
 "aswiktionary": "php-1.29.0-wmf.9",
 "auditcomwiki": "php-1.29.0-wmf.9",
-"avwiki": "php-1.29.0-wmf.9",
+"avwiki": "php-1.29.0-wmf.8",
 "avwiktionary": "php-1.29.0-wmf.9",
-"aywiki": "php-1.29.0-wmf.9",
+"aywiki": "php-1.29.0-wmf.8",
 "aywikibooks": "php-1.29.0-wmf.9",
 "aywiktionary": "php-1.29.0-wmf.9",
-"azbwiki": "php-1.29.0-wmf.9",
-"azwiki": "php-1.29.0-wmf.9",
+"azbwiki": "php-1.29.0-wmf.8",
+"azwiki": "php-1.29.0-wmf.8",
 "azwikibooks": "php-1.29.0-wmf.9",
 "azwikiquote": "php-1.29.0-wmf.9",
 "azwikisource": "php-1.29.0-wmf.9",
 "azwiktionary": "php-1.29.0-wmf.9",
-"barwiki": "php-1.29.0-wmf.9",
-"bat_smgwiki": "php-1.29.0-wmf.9",
-"bawiki": "php-1.29.0-wmf.9",
+"barwiki": "php-1.29.0-wmf.8",
+"bat_smgwiki": "php-1.29.0-wmf.8",
+"bawiki": "php-1.29.0-wmf.8",
 "bawikibooks": "php-1.29.0-wmf.9",
-"bclwiki": "php-1.29.0-wmf.9",
+"bclwiki": "php-1.29.0-wmf.8",
 "bdwikimedia": "php-1.29.0-wmf.9",
-"be_x_oldwiki": "php-1.29.0-wmf.9",
+"be_x_oldwiki": "php-1.29.0-wmf.8",
 "betawikiversity": "php-1.29.0-wmf.9",
-"bewiki": "php-1.29.0-wmf.9",
+"bewiki": "php-1.29.0-wmf.8",
 "bewikibooks": "php-1.29.0-wmf.9",
 "bewikimedia": "php-1.29.0-wmf.9",
 "bewikiquote": "php-1.29.0-wmf.9",
 "bewikisource": "php-1.29.0-wmf.9",
 "bewiktionary": "php-1.29.0-wmf.9",
-"bgwiki": "php-1.29.0-wmf.9",
+"bgwiki": "php-1.29.0-wmf.8",
 "bgwikibooks": "php-1.29.0-wmf.9",
 "bgwikinews": "php-1.29.0-wmf.9",
 "bgwikiquote": "php-1.29.0-wmf.9",
 "bgwikisource": "php-1.29.0-wmf.9",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group2 wikis to 1.29.0-wmf.8

2017-01-26 Thread 20after4 (Code Review) 
20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334451 )

Change subject: group2 wikis to 1.29.0-wmf.8
..

group2 wikis to 1.29.0-wmf.8

Change-Id: If69401c2f7337b32b60bb10025e95e7444be2dea
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 090c6e5..f650c88 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.9",
+"aawiki": "php-1.29.0-wmf.8",
 "aawikibooks": "php-1.29.0-wmf.9",
 "aawiktionary": "php-1.29.0-wmf.9",
-"abwiki": "php-1.29.0-wmf.9",
+"abwiki": "php-1.29.0-wmf.8",
 "abwiktionary": "php-1.29.0-wmf.9",
-"acewiki": "php-1.29.0-wmf.9",
+"acewiki": "php-1.29.0-wmf.8",
 "advisorywiki": "php-1.29.0-wmf.9",
-"adywiki": "php-1.29.0-wmf.9",
-"afwiki": "php-1.29.0-wmf.9",
+"adywiki": "php-1.29.0-wmf.8",
+"afwiki": "php-1.29.0-wmf.8",
 "afwikibooks": "php-1.29.0-wmf.9",
 "afwikiquote": "php-1.29.0-wmf.9",
 "afwiktionary": "php-1.29.0-wmf.9",
-"akwiki": "php-1.29.0-wmf.9",
+"akwiki": "php-1.29.0-wmf.8",
 "akwikibooks": "php-1.29.0-wmf.9",
 "akwiktionary": "php-1.29.0-wmf.9",
-"alswiki": "php-1.29.0-wmf.9",
+"alswiki": "php-1.29.0-wmf.8",
 "alswikibooks": "php-1.29.0-wmf.9",
 "alswikiquote": "php-1.29.0-wmf.9",
 "alswiktionary": "php-1.29.0-wmf.9",
-"amwiki": "php-1.29.0-wmf.9",
+"amwiki": "php-1.29.0-wmf.8",
 "amwikiquote": "php-1.29.0-wmf.9",
 "amwiktionary": "php-1.29.0-wmf.9",
-"angwiki": "php-1.29.0-wmf.9",
+"angwiki": "php-1.29.0-wmf.8",
 "angwikibooks": "php-1.29.0-wmf.9",
 "angwikiquote": "php-1.29.0-wmf.9",
 "angwikisource": "php-1.29.0-wmf.9",
 "angwiktionary": "php-1.29.0-wmf.9",
-"anwiki": "php-1.29.0-wmf.9",
+"anwiki": "php-1.29.0-wmf.8",
 "anwiktionary": "php-1.29.0-wmf.9",
-"arbcom_cswiki": "php-1.29.0-wmf.9",
-"arbcom_dewiki": "php-1.29.0-wmf.9",
-"arbcom_enwiki": "php-1.29.0-wmf.9",
-"arbcom_fiwiki": "php-1.29.0-wmf.9",
-"arbcom_nlwiki": "php-1.29.0-wmf.9",
-"arcwiki": "php-1.29.0-wmf.9",
-"arwiki": "php-1.29.0-wmf.9",
+"arbcom_cswiki": "php-1.29.0-wmf.8",
+"arbcom_dewiki": "php-1.29.0-wmf.8",
+"arbcom_enwiki": "php-1.29.0-wmf.8",
+"arbcom_fiwiki": "php-1.29.0-wmf.8",
+"arbcom_nlwiki": "php-1.29.0-wmf.8",
+"arcwiki": "php-1.29.0-wmf.8",
+"arwiki": "php-1.29.0-wmf.8",
 "arwikibooks": "php-1.29.0-wmf.9",
 "arwikimedia": "php-1.29.0-wmf.9",
 "arwikinews": "php-1.29.0-wmf.9",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.9",
 "arwikiversity": "php-1.29.0-wmf.9",
 "arwiktionary": "php-1.29.0-wmf.9",
-"arzwiki": "php-1.29.0-wmf.9",
-"astwiki": "php-1.29.0-wmf.9",
+"arzwiki": "php-1.29.0-wmf.8",
+"astwiki": "php-1.29.0-wmf.8",
 "astwikibooks": "php-1.29.0-wmf.9",
 "astwikiquote": "php-1.29.0-wmf.9",
 "astwiktionary": "php-1.29.0-wmf.9",
-"aswiki": "php-1.29.0-wmf.9",
+"aswiki": "php-1.29.0-wmf.8",
 "aswikibooks": "php-1.29.0-wmf.9",
 "aswikisource": "php-1.29.0-wmf.9",
 "aswiktionary": "php-1.29.0-wmf.9",
 "auditcomwiki": "php-1.29.0-wmf.9",
-"avwiki": "php-1.29.0-wmf.9",
+"avwiki": "php-1.29.0-wmf.8",
 "avwiktionary": "php-1.29.0-wmf.9",
-"aywiki": "php-1.29.0-wmf.9",
+"aywiki": "php-1.29.0-wmf.8",
 "aywikibooks": "php-1.29.0-wmf.9",
 "aywiktionary": "php-1.29.0-wmf.9",
-"azbwiki": "php-1.29.0-wmf.9",
-"azwiki": "php-1.29.0-wmf.9",
+"azbwiki": "php-1.29.0-wmf.8",
+"azwiki": "php-1.29.0-wmf.8",
 "azwikibooks": "php-1.29.0-wmf.9",
 "azwikiquote": "php-1.29.0-wmf.9",
 "azwikisource": "php-1.29.0-wmf.9",
 "azwiktionary": "php-1.29.0-wmf.9",
-"barwiki": "php-1.29.0-wmf.9",
-"bat_smgwiki": "php-1.29.0-wmf.9",
-"bawiki": "php-1.29.0-wmf.9",
+"barwiki": "php-1.29.0-wmf.8",
+"bat_smgwiki": "php-1.29.0-wmf.8",
+"bawiki": "php-1.29.0-wmf.8",
 "bawikibooks": "php-1.29.0-wmf.9",
-"bclwiki": "php-1.29.0-wmf.9",
+"bclwiki": "php-1.29.0-wmf.8",
 "bdwikimedia": "php-1.29.0-wmf.9",
-"be_x_oldwiki": "php-1.29.0-wmf.9",
+"be_x_oldwiki": "php-1.29.0-wmf.8",
 "betawikiversity": "php-1.29.0-wmf.9",
-"bewiki": "php-1.29.0-wmf.9",
+"bewiki": "php-1.29.0-wmf.8",
 "bewikibooks": "php-1.29.0-wmf.9",
 "bewikimedia": "php-1.29.0-wmf.9",
 "bewikiquote": "php-1.29.0-wmf.9",
 "bewikisource": "php-1.29.0-wmf.9",
 "bewiktionary": "php-1.29.0-wmf.9",
-"bgwiki": "php-1.29.0-wmf.9",
+"bgwiki": "php-1.29.0-wmf.8",
 "bgwikibooks": "php-1.29.0-wmf.9",
 "bgwikinews": "php-1.29.0-wmf.9",
 "bgwikiquote": "php-1.29.0-wmf.9",
 "bgwikisource": "php-1.29.0-wmf.9",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Drop www.*.org symlinks to wwwportal

2017-01-26 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334450 )

Change subject: Drop www.*.org symlinks to wwwportal
..

Drop www.*.org symlinks to wwwportal

These symlinks just confuse things, and apache already uses
the target wwwportal directly

Change-Id: I252c39f23fa5f43ef1e6077301276aedcf3e1fe1
---
D docroot/www.wikibooks.org
D docroot/www.wikimedia.org
D docroot/www.wikinews.org
D docroot/www.wikipedia.org
D docroot/www.wikiquote.org
D docroot/www.wikiversity.org
D docroot/www.wikivoyage.org
D docroot/www.wiktionary.org
8 files changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/docroot/www.wikibooks.org b/docroot/www.wikibooks.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikibooks.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wikimedia.org b/docroot/www.wikimedia.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikimedia.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wikinews.org b/docroot/www.wikinews.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikinews.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wikipedia.org b/docroot/www.wikipedia.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikipedia.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wikiquote.org b/docroot/www.wikiquote.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikiquote.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wikiversity.org b/docroot/www.wikiversity.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikiversity.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wikivoyage.org b/docroot/www.wikivoyage.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wikivoyage.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file
diff --git a/docroot/www.wiktionary.org b/docroot/www.wiktionary.org
deleted file mode 12
index 6261a39..000
--- a/docroot/www.wiktionary.org
+++ /dev/null
@@ -1 +0,0 @@
-wwwportal
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Beta: Just use standard docroot directly for most sites

2017-01-26 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334449 )

Change subject: Beta: Just use standard docroot directly for most sites
..

Beta: Just use standard docroot directly for most sites

Change-Id: Ic9b02b3b7c4765ba8b9f2e44a3a0ab40a885fc5b
---
M modules/mediawiki/files/apache/beta/sites/wikibooks.conf
M modules/mediawiki/files/apache/beta/sites/wikidata.conf
M modules/mediawiki/files/apache/beta/sites/wikinews.conf
M modules/mediawiki/files/apache/beta/sites/wikiquote.conf
M modules/mediawiki/files/apache/beta/sites/wikisource.conf
M modules/mediawiki/files/apache/beta/sites/wikiversity.conf
M modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
M modules/mediawiki/files/apache/beta/sites/wiktionary.conf
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/remnant.conf
10 files changed, 246 insertions(+), 246 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/334449/1

diff --git a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf 
b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
index 0bd7de1..38bc582 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
@@ -2,32 +2,32 @@
 ServerName wikibooks
 ServerAlias *.wikibooks.beta.wmflabs.org
 UseCanonicalName off
-DocumentRoot "/srv/mediawiki/docroot/wikibooks.org"
+DocumentRoot "/srv/mediawiki/docroot/standard-docroot"
 
 AllowEncodedSlashes On
 RewriteEngine On
 
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php retry=0
+ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
 ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/$1
-ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php retry=0
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/favicon.php  [P]
+ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/$1
+ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php retry=0
+RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/index.php[P]
+RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/robots.php   [P]
+RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/standard-docroot/w/favicon.php  [P]
 
 # Primary wiki redirector
-Alias /wiki /srv/mediawiki/docroot/wikibooks.org/w/index.php
+Alias /wiki /srv/mediawiki/docroot/standard-docroot/w/index.php
 Include "sites-enabled/public-wiki-rewrites.incl"
 
 # Variant aliases
-Alias /sr /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /sr-ec /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /sr-el /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh-hans /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh-hant /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh-cn /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh-hk /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh-sg /srv/mediawiki/docroot/wikibooks.org/w/index.php
-Alias /zh-tw /srv/mediawiki/docroot/wikibooks.org/w/index.php
+Alias /sr /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /sr-ec /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /sr-el /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh-hans /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh-hant /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh-cn /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh-hk /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh-sg /srv/mediawiki/docroot/standard-docroot/w/index.php
+Alias /zh-tw /srv/mediawiki/docroot/standard-docroot/w/index.php
 
diff --git a/modules/mediawiki/files/apache/beta/sites/wikidata.conf 
b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
index 5a7d70f..e836af4 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikidata.conf

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit/git/graphite: Linting fixes

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334285 )

Change subject: gerrit/git/graphite: Linting fixes
..


gerrit/git/graphite: Linting fixes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: Ide7a42c5815dfbd0efa255b0a5c63dc9cf3baaaf
---
M modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/jetty.pp
M modules/git/manifests/install.pp
M modules/git/manifests/userconfig.pp
M modules/graphite/manifests/monitoring/graphite.pp
5 files changed, 13 insertions(+), 13 deletions(-)

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



diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index b897735..541fec2 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -11,16 +11,16 @@
 default => true
 }
 
-class { 'gerrit::jetty':
+class { '::gerrit::jetty':
 slave => $slave,
 }
 
 if !$slave {
-class { 'gerrit::proxy':
+class { '::gerrit::proxy':
 require => Class['gerrit::jetty'],
 }
 
-class { 'gerrit::crons':
+class { '::gerrit::crons':
 require => Class['gerrit::jetty'],
 }
 }
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 67eed6c..0e7c92f 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -13,16 +13,16 @@
 $log_port = '4560'
 ) {
 
-include nrpe
+include ::nrpe
 
 # Private config
-include passwords::gerrit
+include ::passwords::gerrit
 $email_key = $passwords::gerrit::gerrit_email_key
 $db_pass = $passwords::gerrit::gerrit_db_pass
 $phab_cert = $passwords::gerrit::gerrit_phab_cert
 
 # Setup LDAP
-include ldap::role::config::labs
+include ::ldap::role::config::labs
 $ldapconfig = $ldap::role::config::labs::ldapconfig
 
 $ldap_hosts = $ldapconfig['servernames']
diff --git a/modules/git/manifests/install.pp b/modules/git/manifests/install.pp
index ff865d8..8e4c1bc 100644
--- a/modules/git/manifests/install.pp
+++ b/modules/git/manifests/install.pp
@@ -72,7 +72,7 @@
 source  => $post_checkout,
 owner   => $owner,
 group   => $group,
-require => Git::Clone[$title]
+require => Git::Clone[$title],
 }
 }
 
@@ -98,7 +98,7 @@
 cwd => $directory,
 user=> $owner,
 path=> '/usr/bin/',
-refreshonly => true
+refreshonly => true,
 }
 }
 }
diff --git a/modules/git/manifests/userconfig.pp 
b/modules/git/manifests/userconfig.pp
index 4d2f36d..331ad41 100644
--- a/modules/git/manifests/userconfig.pp
+++ b/modules/git/manifests/userconfig.pp
@@ -27,7 +27,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template( 'git/gitconfig.erb' )
+content => template( 'git/gitconfig.erb' ),
   }
 
 }
diff --git a/modules/graphite/manifests/monitoring/graphite.pp 
b/modules/graphite/manifests/monitoring/graphite.pp
index 9775ef8..1bff44f 100644
--- a/modules/graphite/manifests/monitoring/graphite.pp
+++ b/modules/graphite/manifests/monitoring/graphite.pp
@@ -14,7 +14,7 @@
 from=> '10minutes',
 warning => 200,
 critical=> 1000,
-nagios_critical => false
+nagios_critical => false,
 }
 
 # is carbon-cache able to write to disk (e.g. permissions)
@@ -24,7 +24,7 @@
 from=> '10minutes',
 warning => 1,
 critical=> 8,
-nagios_critical => false
+nagios_critical => false,
 }
 
 # are carbon-cache queues overflowing their capacity?
@@ -34,7 +34,7 @@
 from=> '10minutes',
 warning => 1,
 critical=> 8,
-nagios_critical => false
+nagios_critical => false,
 }
 
 # are we creating too many metrics?
@@ -44,6 +44,6 @@
 from=> '1hour',
 warning => 500,
 critical=> 1000,
-nagios_critical => false
+nagios_critical => false,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide7a42c5815dfbd0efa255b0a5c63dc9cf3baaaf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar

[MediaWiki-commits] [Gerrit] operations/puppet[production]: archiva.w.o converted to le

2017-01-26 Thread RobH (Code Review) 
RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334448 )

Change subject: archiva.w.o converted to le
..


archiva.w.o converted to le

removing the old certificate

Bug:T154942
Change-Id: I11813b3e2d6123e8bcd3d85de5b86c400bc18139
---
D files/ssl/archiva.wikimedia.org.crt
1 file changed, 0 insertions(+), 31 deletions(-)

Approvals:
  RobH: Verified; Looks good to me, approved



diff --git a/files/ssl/archiva.wikimedia.org.crt 
b/files/ssl/archiva.wikimedia.org.crt
deleted file mode 100644
index 304c228..000
--- a/files/ssl/archiva.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFTDCCBDSgAwIBAgISESFAxAeRLQrripBOBRChLwhYMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTYwMzEwMjE0MTA1WhcNMTcwNTA4MTUxNjAyWjB/MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHjAcBgNV
-BAMTFWFyY2hpdmEud2lraW1lZGlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMfKHJ2gipxkKo3tl9AZUfrMCmcbZ9uBlRR6cP7ChmHRQyj8Lwgv
-jjRsRupzcNHaUfYlEO4UryLXR4mH+Dou6O16frW1mJuoLxsjLu7o/d6Ljh5v8lQs
-UefR83g8lCf3ds0edpP8+w+a4Qj7ckB4tjtIvdiWVyuXdkiguv2abBoU55cWC7Tm
-Rs3HxrZ/pOJBNd9rVDfd6qfrMtU7s82GK5KGO+NJWP5ai+cCDY0jFTeVp8vPlaJh
-s61sJbovrF0UN5gYcf7aXZgNv29fHfJ0NwBTgMYqy3CUao1LygDBtl2GYqL2K1ZU
-ILu0m46LCz0UHyTtWIfHjjmfejj3BXVU6BMCAwEAAaOCAdkwggHVMA4GA1UdDwEB
-/wQEAwIFoDBJBgNVHSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAgBgNVHREEGTAXghVh
-cmNoaXZhLndpa2ltZWRpYS5vcmcwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9i
-YWxzaWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsG
-AQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNp
-Z24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/Bggr
-BgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0
-aW9udmFsc2hhMmcyMB0GA1UdDgQWBBQqh4XRpNpOY9eLaGUabhTCqhYrgzAfBgNV
-HSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEA
-GyDveQavIe2IuApYHggo2UnKuOPZ8iEOdKOyPF4IVKpL8WacnkKuLRriF9SBTXNb
-dbAL40wQ6r0KDoiBanSAGFIxNPhjkE4nGAB7z5imRFBxSEFly8QTvhJ7H2ROUjqx
-8upbGzuYd+P7lm+Nj140655MSa+8eG0hDE67iGEqZk1cryeXJsf8VXrsKW6UpPi1
-oumaKTqF8bVdxj9+jdSsKV7wCjsxhoY+YcuP88M5DoyKROileLZs6YumjcFwVf1O
-XMo/6/4M3O/6zv2lfHFgPNDr7bTYpd+Daa/yyawxjBuSB6feogPnS3JEiHYCKlZe
-WEqrLgVJjjpti1Sy1o5n+Q==
--END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11813b3e2d6123e8bcd3d85de5b86c400bc18139
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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]: archiva.w.o converted to le

2017-01-26 Thread RobH (Code Review) 
RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334448 )

Change subject: archiva.w.o converted to le
..

archiva.w.o converted to le

removing the old certificate

Bug:T154942
Change-Id: I11813b3e2d6123e8bcd3d85de5b86c400bc18139
---
D files/ssl/archiva.wikimedia.org.crt
1 file changed, 0 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/334448/1

diff --git a/files/ssl/archiva.wikimedia.org.crt 
b/files/ssl/archiva.wikimedia.org.crt
deleted file mode 100644
index 304c228..000
--- a/files/ssl/archiva.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFTDCCBDSgAwIBAgISESFAxAeRLQrripBOBRChLwhYMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTYwMzEwMjE0MTA1WhcNMTcwNTA4MTUxNjAyWjB/MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHjAcBgNV
-BAMTFWFyY2hpdmEud2lraW1lZGlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMfKHJ2gipxkKo3tl9AZUfrMCmcbZ9uBlRR6cP7ChmHRQyj8Lwgv
-jjRsRupzcNHaUfYlEO4UryLXR4mH+Dou6O16frW1mJuoLxsjLu7o/d6Ljh5v8lQs
-UefR83g8lCf3ds0edpP8+w+a4Qj7ckB4tjtIvdiWVyuXdkiguv2abBoU55cWC7Tm
-Rs3HxrZ/pOJBNd9rVDfd6qfrMtU7s82GK5KGO+NJWP5ai+cCDY0jFTeVp8vPlaJh
-s61sJbovrF0UN5gYcf7aXZgNv29fHfJ0NwBTgMYqy3CUao1LygDBtl2GYqL2K1ZU
-ILu0m46LCz0UHyTtWIfHjjmfejj3BXVU6BMCAwEAAaOCAdkwggHVMA4GA1UdDwEB
-/wQEAwIFoDBJBgNVHSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAgBgNVHREEGTAXghVh
-cmNoaXZhLndpa2ltZWRpYS5vcmcwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9i
-YWxzaWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsG
-AQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNp
-Z24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/Bggr
-BgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0
-aW9udmFsc2hhMmcyMB0GA1UdDgQWBBQqh4XRpNpOY9eLaGUabhTCqhYrgzAfBgNV
-HSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEA
-GyDveQavIe2IuApYHggo2UnKuOPZ8iEOdKOyPF4IVKpL8WacnkKuLRriF9SBTXNb
-dbAL40wQ6r0KDoiBanSAGFIxNPhjkE4nGAB7z5imRFBxSEFly8QTvhJ7H2ROUjqx
-8upbGzuYd+P7lm+Nj140655MSa+8eG0hDE67iGEqZk1cryeXJsf8VXrsKW6UpPi1
-oumaKTqF8bVdxj9+jdSsKV7wCjsxhoY+YcuP88M5DoyKROileLZs6YumjcFwVf1O
-XMo/6/4M3O/6zv2lfHFgPNDr7bTYpd+Daa/yyawxjBuSB6feogPnS3JEiHYCKlZe
-WEqrLgVJjjpti1Sy1o5n+Q==
--END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Report failed tab JSON

2017-01-26 Thread Niedzielski (Code Review) 
Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334447 )

Change subject: Report failed tab JSON
..

Report failed tab JSON

Change-Id: Ib1bf99ab5dea0af7ca12e7d7ad3d7eb11c3d25f0
---
M app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/main/java/org/wikipedia/json/TabUnmarshaller.java 
b/app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
index 54f21fb..099ba1a 100644
--- a/app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
+++ b/app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
@@ -40,7 +40,7 @@
 for (PageBackStackItem item : tab.getBackStack()) {
 if 
(TextUtils.isEmpty(item.getTitle().getWikiSite().authority())
 || 
TextUtils.isEmpty(item.getHistoryEntry().getTitle().getWikiSite().authority())) 
{
-L.logRemoteErrorIfProd(new 
IllegalArgumentException("Format error in serialized tab list."));
+L.logRemoteErrorIfProd(new RemoteLogException("Format 
error in serialized tab list.").put("json", json));
 bad = true;
 break;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1bf99ab5dea0af7ca12e7d7ad3d7eb11c3d25f0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.9

2017-01-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334446 )

Change subject: all wikis to 1.29.0-wmf.9
..


all wikis to 1.29.0-wmf.9

Change-Id: I1870811ca9090100331d8236b47f6eebfa2b04d7
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index f650c88..090c6e5 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.8",
+"aawiki": "php-1.29.0-wmf.9",
 "aawikibooks": "php-1.29.0-wmf.9",
 "aawiktionary": "php-1.29.0-wmf.9",
-"abwiki": "php-1.29.0-wmf.8",
+"abwiki": "php-1.29.0-wmf.9",
 "abwiktionary": "php-1.29.0-wmf.9",
-"acewiki": "php-1.29.0-wmf.8",
+"acewiki": "php-1.29.0-wmf.9",
 "advisorywiki": "php-1.29.0-wmf.9",
-"adywiki": "php-1.29.0-wmf.8",
-"afwiki": "php-1.29.0-wmf.8",
+"adywiki": "php-1.29.0-wmf.9",
+"afwiki": "php-1.29.0-wmf.9",
 "afwikibooks": "php-1.29.0-wmf.9",
 "afwikiquote": "php-1.29.0-wmf.9",
 "afwiktionary": "php-1.29.0-wmf.9",
-"akwiki": "php-1.29.0-wmf.8",
+"akwiki": "php-1.29.0-wmf.9",
 "akwikibooks": "php-1.29.0-wmf.9",
 "akwiktionary": "php-1.29.0-wmf.9",
-"alswiki": "php-1.29.0-wmf.8",
+"alswiki": "php-1.29.0-wmf.9",
 "alswikibooks": "php-1.29.0-wmf.9",
 "alswikiquote": "php-1.29.0-wmf.9",
 "alswiktionary": "php-1.29.0-wmf.9",
-"amwiki": "php-1.29.0-wmf.8",
+"amwiki": "php-1.29.0-wmf.9",
 "amwikiquote": "php-1.29.0-wmf.9",
 "amwiktionary": "php-1.29.0-wmf.9",
-"angwiki": "php-1.29.0-wmf.8",
+"angwiki": "php-1.29.0-wmf.9",
 "angwikibooks": "php-1.29.0-wmf.9",
 "angwikiquote": "php-1.29.0-wmf.9",
 "angwikisource": "php-1.29.0-wmf.9",
 "angwiktionary": "php-1.29.0-wmf.9",
-"anwiki": "php-1.29.0-wmf.8",
+"anwiki": "php-1.29.0-wmf.9",
 "anwiktionary": "php-1.29.0-wmf.9",
-"arbcom_cswiki": "php-1.29.0-wmf.8",
-"arbcom_dewiki": "php-1.29.0-wmf.8",
-"arbcom_enwiki": "php-1.29.0-wmf.8",
-"arbcom_fiwiki": "php-1.29.0-wmf.8",
-"arbcom_nlwiki": "php-1.29.0-wmf.8",
-"arcwiki": "php-1.29.0-wmf.8",
-"arwiki": "php-1.29.0-wmf.8",
+"arbcom_cswiki": "php-1.29.0-wmf.9",
+"arbcom_dewiki": "php-1.29.0-wmf.9",
+"arbcom_enwiki": "php-1.29.0-wmf.9",
+"arbcom_fiwiki": "php-1.29.0-wmf.9",
+"arbcom_nlwiki": "php-1.29.0-wmf.9",
+"arcwiki": "php-1.29.0-wmf.9",
+"arwiki": "php-1.29.0-wmf.9",
 "arwikibooks": "php-1.29.0-wmf.9",
 "arwikimedia": "php-1.29.0-wmf.9",
 "arwikinews": "php-1.29.0-wmf.9",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.9",
 "arwikiversity": "php-1.29.0-wmf.9",
 "arwiktionary": "php-1.29.0-wmf.9",
-"arzwiki": "php-1.29.0-wmf.8",
-"astwiki": "php-1.29.0-wmf.8",
+"arzwiki": "php-1.29.0-wmf.9",
+"astwiki": "php-1.29.0-wmf.9",
 "astwikibooks": "php-1.29.0-wmf.9",
 "astwikiquote": "php-1.29.0-wmf.9",
 "astwiktionary": "php-1.29.0-wmf.9",
-"aswiki": "php-1.29.0-wmf.8",
+"aswiki": "php-1.29.0-wmf.9",
 "aswikibooks": "php-1.29.0-wmf.9",
 "aswikisource": "php-1.29.0-wmf.9",
 "aswiktionary": "php-1.29.0-wmf.9",
 "auditcomwiki": "php-1.29.0-wmf.9",
-"avwiki": "php-1.29.0-wmf.8",
+"avwiki": "php-1.29.0-wmf.9",
 "avwiktionary": "php-1.29.0-wmf.9",
-"aywiki": "php-1.29.0-wmf.8",
+"aywiki": "php-1.29.0-wmf.9",
 "aywikibooks": "php-1.29.0-wmf.9",
 "aywiktionary": "php-1.29.0-wmf.9",
-"azbwiki": "php-1.29.0-wmf.8",
-"azwiki": "php-1.29.0-wmf.8",
+"azbwiki": "php-1.29.0-wmf.9",
+"azwiki": "php-1.29.0-wmf.9",
 "azwikibooks": "php-1.29.0-wmf.9",
 "azwikiquote": "php-1.29.0-wmf.9",
 "azwikisource": "php-1.29.0-wmf.9",
 "azwiktionary": "php-1.29.0-wmf.9",
-"barwiki": "php-1.29.0-wmf.8",
-"bat_smgwiki": "php-1.29.0-wmf.8",
-"bawiki": "php-1.29.0-wmf.8",
+"barwiki": "php-1.29.0-wmf.9",
+"bat_smgwiki": "php-1.29.0-wmf.9",
+"bawiki": "php-1.29.0-wmf.9",
 "bawikibooks": "php-1.29.0-wmf.9",
-"bclwiki": "php-1.29.0-wmf.8",
+"bclwiki": "php-1.29.0-wmf.9",
 "bdwikimedia": "php-1.29.0-wmf.9",
-"be_x_oldwiki": "php-1.29.0-wmf.8",
+"be_x_oldwiki": "php-1.29.0-wmf.9",
 "betawikiversity": "php-1.29.0-wmf.9",
-"bewiki": "php-1.29.0-wmf.8",
+"bewiki": "php-1.29.0-wmf.9",
 "bewikibooks": "php-1.29.0-wmf.9",
 "bewikimedia": "php-1.29.0-wmf.9",
 "bewikiquote": "php-1.29.0-wmf.9",
 "bewikisource": "php-1.29.0-wmf.9",
 "bewiktionary": "php-1.29.0-wmf.9",
-"bgwiki": "php-1.29.0-wmf.8",
+"bgwiki": "php-1.29.0-wmf.9",
 "bgwikibooks": "php-1.29.0-wmf.9",
 "bgwikinews": "php-1.29.0-wmf.9",
 "bgwikiquote": "php-1.29.0-wmf.9",
 "bgwikisource": "php-1.29.0-wmf.9",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Linting fixes

2017-01-26 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334286 )

Change subject: icinga: Linting fixes
..


icinga: Linting fixes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: I90a1f30ce6b5f9eb9db317dfbbc8dc6650b158a6
---
M modules/icinga/manifests/event_handlers/raid.pp
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/naggen.pp
M modules/icinga/manifests/plugins.pp
M modules/icinga/manifests/web.pp
5 files changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/modules/icinga/manifests/event_handlers/raid.pp 
b/modules/icinga/manifests/event_handlers/raid.pp
index 7222490..ed0c82f 100644
--- a/modules/icinga/manifests/event_handlers/raid.pp
+++ b/modules/icinga/manifests/event_handlers/raid.pp
@@ -2,7 +2,7 @@
 #
 # Sets up icinga RAID event handler
 class icinga::event_handlers::raid {
-include passwords::phabricator
+include ::passwords::phabricator
 
 class { '::phabricator::bot':
 username => 'ops-monitoring-bot',
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 160327d..9d141ee 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -14,7 +14,7 @@
 ) {
 # Setup icinga user
 # FIXME: This should be done by the package
-include icinga::group
+include ::icinga::group
 
 group { 'icinga':
 ensure => present,
@@ -73,22 +73,22 @@
 notify  => Service['icinga'],
 }
 
-class { 'nagios_common::contactgroups':
+class { '::nagios_common::contactgroups':
 source  => 'puppet:///modules/nagios_common/contactgroups.cfg',
 require => Package['icinga'],
 notify  => Service['icinga'],
 }
 
-class { 'nagios_common::contacts':
+class { '::nagios_common::contacts':
 content => secret('nagios/contacts.cfg'),
 require => Package['icinga'],
 notify  => Service['icinga'],
 }
 
 class { [
-  'nagios_common::user_macros',
-  'nagios_common::timeperiods',
-  'nagios_common::notification_commands',
+  '::nagios_common::user_macros',
+  '::nagios_common::timeperiods',
+  '::nagios_common::notification_commands',
 ] :
 require => Package['icinga'],
 notify  => Service['icinga'],
@@ -101,7 +101,7 @@
 }
 
 # Setup all plugins!
-class { 'icinga::plugins':
+class { '::icinga::plugins':
 require => Package['icinga'],
 notify  => Service['icinga'],
 }
diff --git a/modules/icinga/manifests/naggen.pp 
b/modules/icinga/manifests/naggen.pp
index 74fb45c..1897c01 100644
--- a/modules/icinga/manifests/naggen.pp
+++ b/modules/icinga/manifests/naggen.pp
@@ -3,7 +3,7 @@
 # Runs naggen2 to generate hosts, service and hostext config
 # from exported puppet resources
 class icinga::naggen {
-include icinga
+include ::icinga
 $dbarg = $::use_puppetdb ? {
 true=> '--puppetdb',
 default => '--activerecord',
diff --git a/modules/icinga/manifests/plugins.pp 
b/modules/icinga/manifests/plugins.pp
index e8b4b9a..2571321 100644
--- a/modules/icinga/manifests/plugins.pp
+++ b/modules/icinga/manifests/plugins.pp
@@ -118,12 +118,12 @@
 }
 
 class { [
-'nagios_common::commands',
-'nagios_common::check::redis',
+'::nagios_common::commands',
+'::nagios_common::check::redis',
 ] :
 }
 
-include passwords::nagios::mysql
+include ::passwords::nagios::mysql
 
 $nagios_mysql_check_pass = $passwords::nagios::mysql::mysql_check_pass
 
@@ -184,5 +184,5 @@
 }
 
 # Include check_elasticsearch from elasticsearch module
-include elasticsearch::nagios::plugin
+include ::elasticsearch::nagios::plugin
 }
diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index cf0197c..d034617 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -3,7 +3,7 @@
 # Sets up an apache instance for icinga web interface,
 # protected with ldap authentication
 class icinga::web {
-include icinga
+include ::icinga
 
 # Apparently required for the web interface
 package { 'icinga-doc':
@@ -26,7 +26,7 @@
 
 require_package('php5-gd')
 
-include passwords::ldap::wmf_cluster
+include ::passwords::ldap::wmf_cluster
 $proxypass = $passwords::ldap::wmf_cluster::proxypass
 
 file { '/usr/share/icinga/htdocs/images/logos/ubuntu.png':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90a1f30ce6b5f9eb9db317dfbbc8dc6650b158a6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.9

2017-01-26 Thread 20after4 (Code Review) 
20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334446 )

Change subject: all wikis to 1.29.0-wmf.9
..

all wikis to 1.29.0-wmf.9

Change-Id: I1870811ca9090100331d8236b47f6eebfa2b04d7
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index f650c88..090c6e5 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.8",
+"aawiki": "php-1.29.0-wmf.9",
 "aawikibooks": "php-1.29.0-wmf.9",
 "aawiktionary": "php-1.29.0-wmf.9",
-"abwiki": "php-1.29.0-wmf.8",
+"abwiki": "php-1.29.0-wmf.9",
 "abwiktionary": "php-1.29.0-wmf.9",
-"acewiki": "php-1.29.0-wmf.8",
+"acewiki": "php-1.29.0-wmf.9",
 "advisorywiki": "php-1.29.0-wmf.9",
-"adywiki": "php-1.29.0-wmf.8",
-"afwiki": "php-1.29.0-wmf.8",
+"adywiki": "php-1.29.0-wmf.9",
+"afwiki": "php-1.29.0-wmf.9",
 "afwikibooks": "php-1.29.0-wmf.9",
 "afwikiquote": "php-1.29.0-wmf.9",
 "afwiktionary": "php-1.29.0-wmf.9",
-"akwiki": "php-1.29.0-wmf.8",
+"akwiki": "php-1.29.0-wmf.9",
 "akwikibooks": "php-1.29.0-wmf.9",
 "akwiktionary": "php-1.29.0-wmf.9",
-"alswiki": "php-1.29.0-wmf.8",
+"alswiki": "php-1.29.0-wmf.9",
 "alswikibooks": "php-1.29.0-wmf.9",
 "alswikiquote": "php-1.29.0-wmf.9",
 "alswiktionary": "php-1.29.0-wmf.9",
-"amwiki": "php-1.29.0-wmf.8",
+"amwiki": "php-1.29.0-wmf.9",
 "amwikiquote": "php-1.29.0-wmf.9",
 "amwiktionary": "php-1.29.0-wmf.9",
-"angwiki": "php-1.29.0-wmf.8",
+"angwiki": "php-1.29.0-wmf.9",
 "angwikibooks": "php-1.29.0-wmf.9",
 "angwikiquote": "php-1.29.0-wmf.9",
 "angwikisource": "php-1.29.0-wmf.9",
 "angwiktionary": "php-1.29.0-wmf.9",
-"anwiki": "php-1.29.0-wmf.8",
+"anwiki": "php-1.29.0-wmf.9",
 "anwiktionary": "php-1.29.0-wmf.9",
-"arbcom_cswiki": "php-1.29.0-wmf.8",
-"arbcom_dewiki": "php-1.29.0-wmf.8",
-"arbcom_enwiki": "php-1.29.0-wmf.8",
-"arbcom_fiwiki": "php-1.29.0-wmf.8",
-"arbcom_nlwiki": "php-1.29.0-wmf.8",
-"arcwiki": "php-1.29.0-wmf.8",
-"arwiki": "php-1.29.0-wmf.8",
+"arbcom_cswiki": "php-1.29.0-wmf.9",
+"arbcom_dewiki": "php-1.29.0-wmf.9",
+"arbcom_enwiki": "php-1.29.0-wmf.9",
+"arbcom_fiwiki": "php-1.29.0-wmf.9",
+"arbcom_nlwiki": "php-1.29.0-wmf.9",
+"arcwiki": "php-1.29.0-wmf.9",
+"arwiki": "php-1.29.0-wmf.9",
 "arwikibooks": "php-1.29.0-wmf.9",
 "arwikimedia": "php-1.29.0-wmf.9",
 "arwikinews": "php-1.29.0-wmf.9",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.9",
 "arwikiversity": "php-1.29.0-wmf.9",
 "arwiktionary": "php-1.29.0-wmf.9",
-"arzwiki": "php-1.29.0-wmf.8",
-"astwiki": "php-1.29.0-wmf.8",
+"arzwiki": "php-1.29.0-wmf.9",
+"astwiki": "php-1.29.0-wmf.9",
 "astwikibooks": "php-1.29.0-wmf.9",
 "astwikiquote": "php-1.29.0-wmf.9",
 "astwiktionary": "php-1.29.0-wmf.9",
-"aswiki": "php-1.29.0-wmf.8",
+"aswiki": "php-1.29.0-wmf.9",
 "aswikibooks": "php-1.29.0-wmf.9",
 "aswikisource": "php-1.29.0-wmf.9",
 "aswiktionary": "php-1.29.0-wmf.9",
 "auditcomwiki": "php-1.29.0-wmf.9",
-"avwiki": "php-1.29.0-wmf.8",
+"avwiki": "php-1.29.0-wmf.9",
 "avwiktionary": "php-1.29.0-wmf.9",
-"aywiki": "php-1.29.0-wmf.8",
+"aywiki": "php-1.29.0-wmf.9",
 "aywikibooks": "php-1.29.0-wmf.9",
 "aywiktionary": "php-1.29.0-wmf.9",
-"azbwiki": "php-1.29.0-wmf.8",
-"azwiki": "php-1.29.0-wmf.8",
+"azbwiki": "php-1.29.0-wmf.9",
+"azwiki": "php-1.29.0-wmf.9",
 "azwikibooks": "php-1.29.0-wmf.9",
 "azwikiquote": "php-1.29.0-wmf.9",
 "azwikisource": "php-1.29.0-wmf.9",
 "azwiktionary": "php-1.29.0-wmf.9",
-"barwiki": "php-1.29.0-wmf.8",
-"bat_smgwiki": "php-1.29.0-wmf.8",
-"bawiki": "php-1.29.0-wmf.8",
+"barwiki": "php-1.29.0-wmf.9",
+"bat_smgwiki": "php-1.29.0-wmf.9",
+"bawiki": "php-1.29.0-wmf.9",
 "bawikibooks": "php-1.29.0-wmf.9",
-"bclwiki": "php-1.29.0-wmf.8",
+"bclwiki": "php-1.29.0-wmf.9",
 "bdwikimedia": "php-1.29.0-wmf.9",
-"be_x_oldwiki": "php-1.29.0-wmf.8",
+"be_x_oldwiki": "php-1.29.0-wmf.9",
 "betawikiversity": "php-1.29.0-wmf.9",
-"bewiki": "php-1.29.0-wmf.8",
+"bewiki": "php-1.29.0-wmf.9",
 "bewikibooks": "php-1.29.0-wmf.9",
 "bewikimedia": "php-1.29.0-wmf.9",
 "bewikiquote": "php-1.29.0-wmf.9",
 "bewikisource": "php-1.29.0-wmf.9",
 "bewiktionary": "php-1.29.0-wmf.9",
-"bgwiki": "php-1.29.0-wmf.8",
+"bgwiki": "php-1.29.0-wmf.9",
 "bgwikibooks": "php-1.29.0-wmf.9",
 "bgwikinews": "php-1.29.0-wmf.9",
 "bgwikiquote": "php-1.29.0-wmf.9",
 "bgwikisource": "php-1.29.0-wmf.9",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: update archiva.w.o to use LE cert 2 of 2 (planned)

2017-01-26 Thread RobH (Code Review) 
RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334445 )

Change subject: update archiva.w.o to use LE cert 2 of 2 (planned)
..


update archiva.w.o to use LE cert 2 of 2 (planned)

this patch should set the correct certificate file paths on the
archiva.w.o system.  the first patch already generated the files in
place on the system for reference.

Bug:T154942
Change-Id: I9a29c20fbcf798fb9acdcaa410400985ddc07738
---
M modules/archiva/manifests/proxy.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/archiva/manifests/proxy.pp 
b/modules/archiva/manifests/proxy.pp
index 59f4faf..d1cc697 100644
--- a/modules/archiva/manifests/proxy.pp
+++ b/modules/archiva/manifests/proxy.pp
@@ -15,7 +15,7 @@
 #
 class archiva::proxy(
 $ssl_enabled  = true,
-$certificate_name = 'archiva.wikimedia.org',
+$certificate_name = 'archiva',
 ) {
 Class['::archiva'] -> Class['::archiva::proxy']
 
@@ -49,9 +49,9 @@
 
 $ssl_certificate_chained = $certificate_name ? {
 'ssl-cert-snakeoil' => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-default => 
"/etc/ssl/localcerts/${certificate_name}.chained.crt",
+default => 
"/etc/acme/cert/${certificate_name}.chained.crt",
 }
-$ssl_certificate_key = "/etc/ssl/private/${certificate_name}.key"
+$ssl_certificate_key = "/etc/acme/key/${certificate_name}.key"
 
 # Use puppet's stupidity to flatten these into a single array.
 $server_properties = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a29c20fbcf798fb9acdcaa410400985ddc07738
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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]: update archiva.w.o to use LE cert 2 of 2 (planned)

2017-01-26 Thread RobH (Code Review) 
RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334445 )

Change subject: update archiva.w.o to use LE cert 2 of 2 (planned)
..

update archiva.w.o to use LE cert 2 of 2 (planned)

this patch should set the correct certificate file paths on the
archiva.w.o system.  the first patch already generated the files in
place on the system for reference.

Bug:T154942
Change-Id: I9a29c20fbcf798fb9acdcaa410400985ddc07738
---
M modules/archiva/manifests/proxy.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/334445/1

diff --git a/modules/archiva/manifests/proxy.pp 
b/modules/archiva/manifests/proxy.pp
index 59f4faf..d1cc697 100644
--- a/modules/archiva/manifests/proxy.pp
+++ b/modules/archiva/manifests/proxy.pp
@@ -15,7 +15,7 @@
 #
 class archiva::proxy(
 $ssl_enabled  = true,
-$certificate_name = 'archiva.wikimedia.org',
+$certificate_name = 'archiva',
 ) {
 Class['::archiva'] -> Class['::archiva::proxy']
 
@@ -49,9 +49,9 @@
 
 $ssl_certificate_chained = $certificate_name ? {
 'ssl-cert-snakeoil' => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-default => 
"/etc/ssl/localcerts/${certificate_name}.chained.crt",
+default => 
"/etc/acme/cert/${certificate_name}.chained.crt",
 }
-$ssl_certificate_key = "/etc/ssl/private/${certificate_name}.key"
+$ssl_certificate_key = "/etc/acme/key/${certificate_name}.key"
 
 # Use puppet's stupidity to flatten these into a single array.
 $server_properties = [

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

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

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

  1   2   3   4   5   >