date:20140226

[MediaWiki-commits] [Gerrit] Make sure the text of the permission box is cut exactly betw... - change (mediawiki...MultimediaViewer)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Make sure the text of the permission box is cut exactly between 
lines
..


Make sure the text of the permission box is cut exactly between lines

Change-Id: I7a0a3056f6e3734579f1e04175e04c89ced92576
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/118
---
M resources/mmv/ui/mmv.ui.permission.less
1 file changed, 10 insertions(+), 6 deletions(-)

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



diff --git a/resources/mmv/ui/mmv.ui.permission.less 
b/resources/mmv/ui/mmv.ui.permission.less
index 1f53d73..011a484 100644
--- a/resources/mmv/ui/mmv.ui.permission.less
+++ b/resources/mmv/ui/mmv.ui.permission.less
@@ -6,14 +6,12 @@
width: 90%;
margin: 10px 5% 0;
 
-   max-height: 100px;
-
.empty {
display: none;
}
 
h3 {
-   margin: 10px 10px;
+   margin: 10px;
padding: 0;
color: #565656;
}
@@ -33,7 +31,15 @@
}
 
.mw-mlb-permission-text {
-   padding: 10px;
+   @text-font-size: 1em;
+   @text-line-height: 1.2;
+   @lines-shown: 3;
+
+   max-height: @lines-shown * @text-line-height * @text-font-size;
+   overflow: hidden;
+   margin: 0 10px 10px;
+   font-size: @text-font-size;
+   line-height: @text-line-height;
}
 
.mw-mlb-permission-html {
@@ -41,8 +47,6 @@
}
 
.full-size {
-   max-height: none;
-
.mw-mlb-permission-close {
display: block;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a0a3056f6e3734579f1e04175e04c89ced92576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Aarcos aarcos.w...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Slight change to prod.sh - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Slight change to prod.sh
..

Slight change to prod.sh

Change-Id: I868af806a07b26aaa394b3db5aeb04c6d565e123
---
M files/openstack/folsom/virtscripts/prod.sh
M files/openstack/havana/virtscripts/prod.sh
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/files/openstack/folsom/virtscripts/prod.sh 
b/files/openstack/folsom/virtscripts/prod.sh
index 21155df..62aeabb 100644
--- a/files/openstack/folsom/virtscripts/prod.sh
+++ b/files/openstack/folsom/virtscripts/prod.sh
@@ -8,7 +8,7 @@
 
 # Using token auth env variables
 SERVICE_ENDPOINT=http://virt0.wikimedia.org:35357/v2.0/
-SERVICE_TOKEN=gooz1ooZa4ohtee
+SERVICE_TOKEN=redacted
 
 # ENDPOINT URLS
 NOVA_PUBLIC_URL=http://virt2.pmtpa.wmnet:8774/v2/\$(tenant_id)s
diff --git a/files/openstack/havana/virtscripts/prod.sh 
b/files/openstack/havana/virtscripts/prod.sh
index ef8e621..5bbfd4b 100644
--- a/files/openstack/havana/virtscripts/prod.sh
+++ b/files/openstack/havana/virtscripts/prod.sh
@@ -8,7 +8,7 @@
 
 # Using token auth env variables
 SERVICE_ENDPOINT=http://virt1000.wikimedia.org:35357/v2.0/
-SERVICE_TOKEN=gooz1ooZa4ohtee
+SERVICE_TOKEN=redacted
 
 # ENDPOINT URLS
 NOVA_PUBLIC_URL=http://labnet1001.eqiad.wmnet:8774/v2/\$(tenant_id)s

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I868af806a07b26aaa394b3db5aeb04c6d565e123
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix display issues with view terms - change (mediawiki...MultimediaViewer)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix display issues with view terms
..


Fix display issues with view terms

Hiding the element before it is added to the document causes
a wrong display type in Firefox; changing the order of commands
fixes that.

Bug: 61936
Change-Id: I808131da25f2f70c14747238216e8973af44d029
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/118
---
M resources/mmv/ui/mmv.ui.metadataPanel.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js 
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index d8b0cd8..2e2e79c 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -176,8 +176,8 @@
this.$permissionLink = $( 'span' )
.addClass( 'mw-mlb-permission-link mw-mlb-label' )
.text( mw.message( 'multimediaviewer-permission-link' 
).text() )
-   .hide()
.appendTo( this.$titlePara )
+   .hide()
.on( 'click', function() {
panel.permission.grow();
panel.scrollIntoView( panel.permission.$box, 
500 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I808131da25f2f70c14747238216e8973af44d029
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Aarcos aarcos.w...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Slight change to prod.sh - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Slight change to prod.sh
..


Slight change to prod.sh

Change-Id: I868af806a07b26aaa394b3db5aeb04c6d565e123
---
M files/openstack/folsom/virtscripts/prod.sh
M files/openstack/havana/virtscripts/prod.sh
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/files/openstack/folsom/virtscripts/prod.sh 
b/files/openstack/folsom/virtscripts/prod.sh
index 21155df..62aeabb 100644
--- a/files/openstack/folsom/virtscripts/prod.sh
+++ b/files/openstack/folsom/virtscripts/prod.sh
@@ -8,7 +8,7 @@
 
 # Using token auth env variables
 SERVICE_ENDPOINT=http://virt0.wikimedia.org:35357/v2.0/
-SERVICE_TOKEN=gooz1ooZa4ohtee
+SERVICE_TOKEN=redacted
 
 # ENDPOINT URLS
 NOVA_PUBLIC_URL=http://virt2.pmtpa.wmnet:8774/v2/\$(tenant_id)s
diff --git a/files/openstack/havana/virtscripts/prod.sh 
b/files/openstack/havana/virtscripts/prod.sh
index ef8e621..5bbfd4b 100644
--- a/files/openstack/havana/virtscripts/prod.sh
+++ b/files/openstack/havana/virtscripts/prod.sh
@@ -8,7 +8,7 @@
 
 # Using token auth env variables
 SERVICE_ENDPOINT=http://virt1000.wikimedia.org:35357/v2.0/
-SERVICE_TOKEN=gooz1ooZa4ohtee
+SERVICE_TOKEN=redacted
 
 # ENDPOINT URLS
 NOVA_PUBLIC_URL=http://labnet1001.eqiad.wmnet:8774/v2/\$(tenant_id)s

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I868af806a07b26aaa394b3db5aeb04c6d565e123
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Log tofu detection event - change (mediawiki...UniversalLanguageSelector)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Log tofu detection event
..


Log tofu detection event

This only works if webfonts enabled (the checkbox is checked).

Change-Id: Ibbedc6a34dacb983f156d8a33afa5ab625e32f5f
---
M Resources.php
M UniversalLanguageSelector.php
M resources/js/ext.uls.eventlogger.js
M resources/js/ext.uls.webfonts.js
4 files changed, 48 insertions(+), 11 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index c504361..cb01d80 100644
--- a/Resources.php
+++ b/Resources.php
@@ -79,7 +79,10 @@
 
 $wgResourceModules['ext.uls.eventlogger'] = array(
'scripts' = 'resources/js/ext.uls.eventlogger.js',
-   'dependencies' = 'schema.UniversalLanguageSelector',
+   'dependencies' = array(
+   'schema.UniversalLanguageSelector',
+   'schema.UniversalLanguageSelector-tofu',
+   ),
 ) + $resourcePaths;
 
 $wgResourceModules['ext.uls.i18n'] = array(
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index b21c7af..1164a30 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -216,20 +216,29 @@
};
}
 
-   // If EventLogging integration is enabled, first ensure that the
-   // EventLogging extension is present, then declare schema module.
+   // If EventLogging integration is enabled, first ensure that
+   // the EventLogging extension is present, then declare schema module.
// If it is not present, emit a warning and disable logging.
if ( $wgULSEventLogging ) {
if ( class_exists( 'ResourceLoaderSchemaModule' ) ) {
+   // NB: When updating the schema, remember also to 
update the version
+   // in the schema default in the JavaScript library.
/// @see 
https://meta.wikimedia.org/wiki/Schema:UniversalLanguageSelector
$wgResourceModules['schema.UniversalLanguageSelector'] 
= array(
'class' = 'ResourceLoaderSchemaModule',
'schema' = 'UniversalLanguageSelector',
'revision' = 7327441,
);
+
+   /// @see 
https://meta.wikimedia.org/wiki/Schema:UniversalLanguageSelector-tofu
+   
$wgResourceModules['schema.UniversalLanguageSelector-tofu'] = array(
+   'class' = 'ResourceLoaderSchemaModule',
+   'schema' = 'UniversalLanguageSelector-tofu',
+   'revision' = 7629564,
+   );
} else {
-   wfWarn( 'UniversalLanguageSelector is configured to use 
EventLogging, but '
-   . 'the extension is is not available. Disabling 
wgULSEventLogging.' );
+   wfWarn( 'UniversalLanguageSelector is configured to use 
EventLogging, '
+   . 'but the extension is not available. 
Disabling wgULSEventLogging.' );
$wgULSEventLogging = false;
}
}
diff --git a/resources/js/ext.uls.eventlogger.js 
b/resources/js/ext.uls.eventlogger.js
index 110f7fb..ced1460 100644
--- a/resources/js/ext.uls.eventlogger.js
+++ b/resources/js/ext.uls.eventlogger.js
@@ -35,12 +35,16 @@
init: function () {
var eventLogger = this;
 
-   // Set event defaults and make the
mw.eventLog.setDefaults( 'UniversalLanguageSelector', {
version: 1,
token: mw.user.id(),
contentLanguage: mw.config.get( 
'wgContentLanguage' ),
interfaceLanguage: mw.config.get( 
'wgUserLanguage' )
+   } );
+
+   mw.eventLog.setDefaults( 
'UniversalLanguageSelector-tofu', {
+   version: 1,
+   token: mw.user.id()
} );
 
eventLogger.logEventQueue.fire();
@@ -50,17 +54,20 @@
 * Local wrapper for 'mw.eventLog.logEvent'
 *
 * @param {Object} event Event action and optional fields
+* @param {String} schema The schema; 
'UniversalLanguageSelector' is the default
 * @return {jQuery.Promise} jQuery Promise object for the 
logging call
 */
-   log: function ( event ) {
+   log: function ( event, schema ) {
// We need to create our own deferred for two reasons:
//  - logEvent might not be executed immediately
//  - we

[MediaWiki-commits] [Gerrit] Add socket.io script from Special page instead of using RL hook - change (mediawiki...ContentTranslation)

2014-02-26 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Add socket.io script from Special page instead of using RL hook
..

Add socket.io script from Special page instead of using RL hook

Follow up: Ifa81ed48f2acdbf26632914c77b4e53c318024db

Change-Id: Ia814d45e756fb03d072e68150d930106c5636761
---
M ContentTranslation.hooks.php
M specials/SpecialContentTranslation.php
2 files changed, 6 insertions(+), 12 deletions(-)


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

diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index cedf1ce..61c06fa 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -16,7 +16,7 @@
 * Hook: BeforePageDisplay
 */
public static function addModules( $out, $skin ) {
-   global $wgContentTranslationEventLogging, 
$wgContentTranslationServerURL;
+   global $wgContentTranslationEventLogging;
 
// If EventLogging integration is enabled, load the schema 
module
// and the event logging functions module
@@ -25,17 +25,6 @@
'schema.ContentTranslation',
'ext.cx.eventlogging',
) );
-   }
-
-   $title = $out-getTitle();
-   list( $alias, ) = SpecialPageFactory::resolveAlias( 
$title-getText() );
-
-   if ( $title-isSpecialPage()  ( $alias === 'CX'
-   || $alias === 'ContentTranslation' )
-   ) {
-   $out-addScript(
-   Html::linkedScript( 
$wgContentTranslationServerURL/socket.io/socket.io.js )
-   );
}
 
return true;
diff --git a/specials/SpecialContentTranslation.php 
b/specials/SpecialContentTranslation.php
index fd619f8..9375931 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -22,6 +22,8 @@
}
 
public function execute( $parameters ) {
+   global $wgContentTranslationServerURL;
+
$out = $this-getOutput();
$skin = $this-getSkin();
$user = $this-getUser();
@@ -38,6 +40,9 @@
'mediawiki.page.startup',
'mediawiki.page.ready',
) );
+   $out-addScript(
+   Html::linkedScript( 
$wgContentTranslationServerURL/socket.io/socket.io.js )
+   );
}
 
$out-addHTML( $out-headElement( $skin ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia814d45e756fb03d072e68150d930106c5636761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com

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

[MediaWiki-commits] [Gerrit] WIP Fix resize issues (Part I) - change (mediawiki...MultimediaViewer)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: WIP Fix resize issues (Part I)
..


WIP Fix resize issues (Part I)

After a few false starts trying to fix LIP.autoResize(),
I noticed that it has become obsolete by our latest
improvements (bucketing and cashing), so I decided to
get rid of it and let the browser do the resizing.
I tested in Chrome/Safari/FF and this approach seems
to work fine.

Still work in progress and there are many things that should
be cleaned up regarding the image object logic but please take
a look and let me know if you have any objections if I go
this route.

Bug: 56454
Change-Id: I08207d0f1fcc9dcb69ec31c03e96cfd0c0a6c522
Mingle: 239
---
M resources/mmv/mmv.lightboximage.js
M resources/mmv/mmv.lightboxinterface.js
2 files changed, 13 insertions(+), 87 deletions(-)

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



diff --git a/resources/mmv/mmv.lightboximage.js 
b/resources/mmv/mmv.lightboximage.js
index 512c02f..2ce07dd 100644
--- a/resources/mmv/mmv.lightboximage.js
+++ b/resources/mmv/mmv.lightboximage.js
@@ -91,72 +91,5 @@
return $deferred;
};
 
-   /**
-* Resizes the image.
-* Assumes that the parent element's size is the maximum size.
-* FIXME refactor and document better
-*/
-   LIP.autoResize = function ( ele, $parent ) {
-   function updateRatios() {
-   if ( imgHeight ) {
-   imgHeightRatio = parentHeight / imgHeight;
-   }
-
-   if ( imgWidth ) {
-   imgWidthRatio = parentWidth / imgWidth;
-   }
-   }
-
-   var imgWidthRatio, imgHeightRatio, parentWidth, parentHeight,
-   $img = $( ele ),
-   imgWidth = $img.width(),
-   imgHeight = $img.height();
-
-   $parent = $parent || $img.parent();
-   parentWidth = $parent.width();
-   parentHeight = $parent.height();
-
-   if ( this.globalMaxWidth  parentWidth  this.globalMaxWidth ) 
{
-   parentWidth = this.globalMaxWidth;
-   }
-
-   if ( this.globalMaxHeight  parentHeight  
this.globalMaxHeight ) {
-   parentHeight = this.globalMaxHeight;
-   }
-
-   updateRatios();
-
-   if ( imgWidth  parentWidth ) {
-   imgHeight *= imgWidthRatio || 1;
-   imgWidth = parentWidth;
-   updateRatios();
-   }
-
-   if ( imgHeight  parentHeight ) {
-   imgWidth *= imgHeightRatio || 1;
-   imgHeight = parentHeight;
-   updateRatios();
-   }
-
-   if ( imgWidth  parentWidth  imgHeight  parentHeight ) {
-   if ( imgWidth === 0  imgHeight === 0 ) {
-   // Only set one
-   imgWidth = parentWidth;
-   imgHeight = null;
-   } else {
-   if ( imgHeightRatio  imgWidthRatio ) {
-   imgWidth *= imgHeightRatio;
-   imgHeight = parentHeight;
-   } else {
-   imgHeight *= imgWidthRatio;
-   imgWidth = parentWidth;
-   }
-   updateRatios();
-   }
-   }
-
-   $img.width( imgWidth ).height( imgHeight );
-   };
-
mw.mmv.LightboxImage = LightboxImage;
 }( mediaWiki, jQuery ) );
diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index 40cc452..5ec8040 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -245,11 +245,9 @@
 * Resize callback
 * @protected
 */
-   LIP.resizeCallback = function() {
+   LIP.resizeCallback = function () {
if ( this.currentlyAttached ) {
this.$wrapper.trigger( $.Event( 'mmv-resize') );
-
-   this.autoResizeImage();
}
};
/**
@@ -258,13 +256,10 @@
 * @param {mw.mmv.LightboxImage} image
 * @param {jQuery} $imageElement
 */
-   LIP.showImage = function( image, $imageElement ) {
+   LIP.showImage = function ( image, $imageElement ) {
var iface = this;
 
this.currentImage = image;
-
-   image.globalMaxWidth = $imageElement.width();
-   image.globalMaxHeight = $imageElement.height();

[MediaWiki-commits] [Gerrit] Revert DefaultSettings.php: Remove $wgPasswordSenderName - change (mediawiki/core)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Revert DefaultSettings.php: Remove $wgPasswordSenderName
..


Revert DefaultSettings.php: Remove $wgPasswordSenderName

It seems that this variable is used by a whole
lot of extensions, so to remove it now would be
to break these other extensions.

This reverts commit acda2cc90aea519f41c8ae55bc4d05f02072df84.

Change-Id: I2bd3078508c0608ff58bae4c9ec456e57c617da8
---
M includes/DefaultSettings.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b0ed35b..3526c96 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1330,6 +1330,13 @@
 unset( $serverName ); # Don't leak local variables to global scope
 
 /**
+ * Password reminder name
+ *
+ * @deprecated since 1.23; use the system message 'emailsender' instead.
+ */
+$wgPasswordSenderName = 'MediaWiki Mail';
+
+/**
  * Dummy address which should be accepted during mail send action.
  * It might be necessary to adapt the address or to set it equal
  * to the $wgEmergencyContact address.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bd3078508c0608ff58bae4c9ec456e57c617da8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Increases size of the Special:IndexPages input - change (mediawiki...ProofreadPage)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Increases size of the Special:IndexPages input
..


Increases size of the Special:IndexPages input

Bug: 61818
Change-Id: I5233ee2a0fea5972f8821d4ae34afaa9c2dfebda
---
M SpecialProofreadPages.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php
index 3d8033a..204cd3d 100644
--- a/SpecialProofreadPages.php
+++ b/SpecialProofreadPages.php
@@ -57,11 +57,11 @@
Html::openElement('fieldset', array() ) .
Html::element('legend', null, $this-msg( 
'proofreadpage_specialpage_legend' )-text() ) .
Html::openElement( 'p' ) .
-   Xml::label( $this-msg( 
'proofreadpage_specialpage_label_key' )-text(), 'key' )  . ' ' .
-   Html::input( 'key', $this-searchTerm ) .
+   Html::element( 'label', array( 'for' = 'key' 
), $this-msg( 'proofreadpage_specialpage_label_key' )-text() )  . ' ' .
+   Html::input( 'key', $this-searchTerm, 
'search', array( 'id' = 'key', 'size' = '50' ) ) .
Html::closeElement( 'p' ) .
Html::openElement( 'p' ) .
-   Xml::label( $this-msg( 
'proofreadpage_specialpage_label_orderby' )-text(), 'order' ) . ' ' . 
$orderSelect-getHtml() . ' ' .
+   Html::element( 'label', array( 'for' = 'order' 
), $this-msg( 'proofreadpage_specialpage_label_orderby' )-text() ) . ' ' . 
$orderSelect-getHtml() . ' ' .
Xml::checkLabel( $this-msg( 
'proofreadpage_specialpage_label_sortascending' )-text(), 'sortascending', 
'sortascending', $this-sortAscending ) . ' ' .
Xml::submitButton( $this-msg( 'ilsubmit' 
)-text() ) .
Html::closeElement( 'p' ) .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5233ee2a0fea5972f8821d4ae34afaa9c2dfebda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Phe phil...@free.fr
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix fatal error when usebetatoolbar option was activated and... - change (mediawiki...ProofreadPage)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix fatal error when usebetatoolbar option was activated and 
not showtoolbar
..


Fix fatal error when usebetatoolbar option was activated and not showtoolbar

Users in this configuration will still have a degraded but working editing 
experience

Bug: 61220
Change-Id: Ic9d638f29dcd8fb9c56c04b08e4ed27fb5f31f43
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 969c852..28c428e 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -185,7 +185,7 @@
}
} );
} );
-   } else {
+   } else if( mw.user.options.get( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.action.edit', function() {
var $toolbar = $( '#toolbar' );
 
@@ -212,7 +212,7 @@
 * Improve the WikiEditor interface
 */
function setupWikiEditor() {
-   if( !mw.user.options.get( 'usebetatoolbar' ) ) {
+   if( !mw.user.options.get( 'showtoolbar' ) || 
!mw.user.options.get( 'usebetatoolbar' ) ) {
return;
}
mw.loader.using( 'ext.wikiEditor', function() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9d638f29dcd8fb9c56c04b08e4ed27fb5f31f43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Phe phil...@free.fr
Gerrit-Reviewer: Rtdwivedi ellydwivedi2...@gmail.com
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Correctly scrape reference and source lists - change (mediawiki...Wikibase)

2014-02-26 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Correctly scrape reference and source lists
..

Correctly scrape reference and source lists

When there are snaks which do not need to be scraped, their HTML is used for
scraping the next snak's value, which completely breaks display of reference
and source lists.

Bug: 61943
Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
---
M repo/resources/wikibase.ui.scrapeFormattedValues.js
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/repo/resources/wikibase.ui.scrapeFormattedValues.js 
b/repo/resources/wikibase.ui.scrapeFormattedValues.js
index 91ceb96..a4ac683 100644
--- a/repo/resources/wikibase.ui.scrapeFormattedValues.js
+++ b/repo/resources/wikibase.ui.scrapeFormattedValues.js
@@ -50,8 +50,9 @@
$qualifierValues = 
$qualifierValues || getQualifierValueNodes( $claim );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = $qualifierValues.eq( 
iQualifiers++ ).html();
+   = $qualifierValues.eq( 
iQualifiers ).html();
}
+   iQualifiers++;
} );
} );
 
@@ -63,8 +64,9 @@
= 
$referenceValues || getReferenceValueNodes( reference.getHash() );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = 
$referenceValues.eq( iReferences++ ).html();
+   = 
$referenceValues.eq( iReferences ).html();
}
+   iReferences++;
} );
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Bugfixes and improvements for the progress bar - change (mediawiki...MultimediaViewer)

2014-02-26 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Bugfixes and improvements for the progress bar
..

Bugfixes and improvements for the progress bar

- the bar now starts at 5% for a visual indication that
something is going on
- the bar animates (fast) to 100%, instead of
disappearing immediately
- the animation logic has been fixed to avoid seeing
the bar go backwards
- added sanity check in all the callbacks to make sure
that we don't apply any changes to an image we are
not looking at anymore (including progress updates)

Bug: 58055
Change-Id: I765a61c16513e9330a412c5ec96387623ae7dbc7
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/146
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/242
---
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboxinterface.js
M resources/mmv/mmv.performance.js
M resources/mmv/ui/mmv.ui.metadataPanel.js
M tests/qunit/mmv/mmv.test.js
M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js
6 files changed, 91 insertions(+), 34 deletions(-)


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

diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index ac40e61..b859589 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -245,28 +245,52 @@
 
start = $.now();
 
+   // Reset the progress bar, it could be at any state if we're 
calling loadImage
+   // while another image is already loading
+   viewer.ui.panel.percent( 0 );
+
imagePromise = this.fetchThumbnail(
image.filePageTitle, imageWidths.real
).progress( function ( thumbnailInfoResponse, imageResponse ) {
+   if ( viewer.lightbox.currentIndex !== image.index ) {
+   return;
+   }
+
if ( viewer.ui  viewer.ui.panel ) {
viewer.ui.panel.percent( imageResponse[ 1 ] );
}
-   } ).done( function ( thumbnail, image ) {
-   viewer.displayRealThumbnail( thumbnail, image, 
imageWidths, $.now() - start );
+   } ).done( function ( thumbnail, imageElement ) {
+   if ( viewer.lightbox.currentIndex !== image.index ) {
+   return;
+   }
+
+   viewer.displayRealThumbnail( thumbnail, imageElement, 
imageWidths, $.now() - start );
} );
 
this.imageInfoProvider.get( image.filePageTitle ).done( 
function ( imageInfo ) {
+   if ( viewer.lightbox.currentIndex !== image.index ) {
+   return;
+   }
+
viewer.displayPlaceholderThumbnail( imageInfo, image, 
$initialImage, imageWidths );
} );
 
metadataPromise = this.fetchSizeIndependentLightboxInfo(
image.filePageTitle
).done( function ( imageInfo, repoInfo, localUsage, 
globalUsage, userInfo ) {
+   if ( viewer.lightbox.currentIndex !== image.index ) {
+   return;
+   }
+
viewer.lightbox.iface.panel.setImageInfo(image, 
imageInfo, repoInfo,
localUsage, globalUsage, userInfo );
} );
 
$.when( imagePromise, metadataPromise ).then( function() {
+   if ( viewer.lightbox.currentIndex !== image.index ) {
+   return;
+   }
+
viewer.stopListeningToScroll();
viewer.animateMetadataDivOnce()
// We need to wait until the animation is 
finished before we listen to scroll
diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index 5ec8040..a40d14b 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -54,11 +54,6 @@
addToPost = [],
lbinterface = this;
 
-   // Staging area for image resizes
-   this.$staging = $( 'div' )
-   .addClass( 'mlb-staging-area' );
-   $( document.body ).append( this.$staging );
-
this.$overlay = $( 'div' )
.addClass( 'mlb-overlay' );
 
@@ -263,7 +258,7 @@
 
this.$image = $imageElement;
 
-   this.autoResizeImage();
+   this.$imageDiv.html( this.$image );
 
// Capture listener so we can remove it later, otherwise
// we are going to leak listeners !
@@ -313,14 +308,6 @@

[MediaWiki-commits] [Gerrit] Fix alignment and sizing issues in Transclusion dialog pages - change (mediawiki...VisualEditor)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix alignment and sizing issues in Transclusion dialog pages
..


Fix alignment and sizing issues in Transclusion dialog pages

* No longer style parameter pages with smaller titles
* Properly align remove button to fieldset legends (template title)

Change-Id: I9e0dd628d4b894ab938fc99876b701e52fc96c1b
---
M modules/ve-mw/ui/styles/ve.ui.MWDialog.css
1 file changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/modules/ve-mw/ui/styles/ve.ui.MWDialog.css 
b/modules/ve-mw/ui/styles/ve.ui.MWDialog.css
index 566e0ae..91359fb 100644
--- a/modules/ve-mw/ui/styles/ve.ui.MWDialog.css
+++ b/modules/ve-mw/ui/styles/ve.ui.MWDialog.css
@@ -27,12 +27,6 @@
margin-top: 0;
 }
 
-.ve-ui-mwTransclusionDialog-addParameterFieldset  
legend.oo-ui-labeledElement-label {
-   font-size: 1.25em;
-   padding-left: 2em;
-   line-height: 2em;
-}
-
 .ve-ui-mwTransclusionDialog-addParameterFieldset 
.ve-ui-mwParameterSearchWidget {
position: relative;
overflow: hidden;
@@ -48,7 +42,7 @@
 .ve-ui-mwTransclusionDialog-removeButton {
position: absolute;
right: 1.5em;
-   top: 1em;
+   top: 1.5em;
 }
 
 /* ve.ui.MWMediaDialog */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e0dd628d4b894ab938fc99876b701e52fc96c1b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a8faf69..9204d0d - change (mediawiki/extensions)

2014-02-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: a8faf69..9204d0d
..


Syncronize VisualEditor: a8faf69..9204d0d

Change-Id: I38a1dd62704f246462e03512ed3289952f4b9d5f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index a8faf69..9204d0d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit a8faf695b11b275484d1fd58150fbf8d072cf43d
+Subproject commit 9204d0d22fa8e93bd1183266adb85fa09f2d4c53

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38a1dd62704f246462e03512ed3289952f4b9d5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a8faf69..9204d0d - change (mediawiki/extensions)

2014-02-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: a8faf69..9204d0d
..

Syncronize VisualEditor: a8faf69..9204d0d

Change-Id: I38a1dd62704f246462e03512ed3289952f4b9d5f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/92/115592/1

diff --git a/VisualEditor b/VisualEditor
index a8faf69..9204d0d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit a8faf695b11b275484d1fd58150fbf8d072cf43d
+Subproject commit 9204d0d22fa8e93bd1183266adb85fa09f2d4c53

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38a1dd62704f246462e03512ed3289952f4b9d5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Correctly scrape reference and source lists - change (mediawiki...Wikibase)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Correctly scrape reference and source lists
..


Correctly scrape reference and source lists

When there are snaks which do not need to be scraped, their HTML is used for
scraping the next snak's value, which completely breaks display of reference
and source lists.

Bug: 61943
Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
---
M repo/resources/wikibase.ui.scrapeFormattedValues.js
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/repo/resources/wikibase.ui.scrapeFormattedValues.js 
b/repo/resources/wikibase.ui.scrapeFormattedValues.js
index 91ceb96..a4ac683 100644
--- a/repo/resources/wikibase.ui.scrapeFormattedValues.js
+++ b/repo/resources/wikibase.ui.scrapeFormattedValues.js
@@ -50,8 +50,9 @@
$qualifierValues = 
$qualifierValues || getQualifierValueNodes( $claim );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = $qualifierValues.eq( 
iQualifiers++ ).html();
+   = $qualifierValues.eq( 
iQualifiers ).html();
}
+   iQualifiers++;
} );
} );
 
@@ -63,8 +64,9 @@
= 
$referenceValues || getReferenceValueNodes( reference.getHash() );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = 
$referenceValues.eq( iReferences++ ).html();
+   = 
$referenceValues.eq( iReferences ).html();
}
+   iReferences++;
} );
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Correctly scrape reference and source lists - change (mediawiki...Wikibase)

2014-02-26 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Correctly scrape reference and source lists
..

Correctly scrape reference and source lists

When there are snaks which do not need to be scraped, their HTML is used for
scraping the next snak's value, which completely breaks display of reference
and source lists.

Bug: 61943
Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
---
M repo/resources/wikibase.ui.scrapeFormattedValues.js
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/repo/resources/wikibase.ui.scrapeFormattedValues.js 
b/repo/resources/wikibase.ui.scrapeFormattedValues.js
index 91ceb96..a4ac683 100644
--- a/repo/resources/wikibase.ui.scrapeFormattedValues.js
+++ b/repo/resources/wikibase.ui.scrapeFormattedValues.js
@@ -50,8 +50,9 @@
$qualifierValues = 
$qualifierValues || getQualifierValueNodes( $claim );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = $qualifierValues.eq( 
iQualifiers++ ).html();
+   = $qualifierValues.eq( 
iQualifiers ).html();
}
+   iQualifiers++;
} );
} );
 
@@ -63,8 +64,9 @@
= 
$referenceValues || getReferenceValueNodes( reference.getHash() );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = 
$referenceValues.eq( iReferences++ ).html();
+   = 
$referenceValues.eq( iReferences ).html();
}
+   iReferences++;
} );
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.23-wmf15
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Clear master certs if we change puppet.conf - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Clear master certs if we change puppet.conf
..

Clear master certs if we change puppet.conf

Change-Id: I9551ab2bbbdda1ad495b5941a15a0b9561f24feb
---
M modules/base/manifests/init.pp
1 file changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 3d4ccba..1934d71 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -167,6 +167,8 @@
 mode= '0444',
 content = template('base/puppet.conf.d/10-main.conf.erb'),
 notify  = Exec['compile puppet.conf'],
+notify  = Exec['delete master ca.pem'],
+notify  = Exec['delete master crl.pem'],
 }
 
 file { '/etc/init.d/puppet':
@@ -188,6 +190,20 @@
 refreshonly = true,
 }
 
+# Clear master certs if puppet.conf changed
+exec { 'delete master ca.pem':
+path= '/usr/bin:/bin',
+command = 'rm -f /var/lib/puppet/ssl/certs/ca.pem',
+refreshonly = true,
+}
+
+# Clear master certs if puppet.conf changed
+exec { 'delete master crl.pem':
+path= '/usr/bin:/bin',
+command = 'rm -f /var/lib/puppet/ssl/crl.pem',
+refreshonly = true,
+}
+
 # Keep puppet running -- no longer. now via cron
 cron { 'restartpuppet':
 ensure  = absent,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9551ab2bbbdda1ad495b5941a15a0b9561f24feb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tweak css for blockdiag so img can be larger - change (mediawiki...releng)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Tweak css for blockdiag so img can be larger
..

Tweak css for blockdiag so img can be larger

Change-Id: I3f39ae3b6fcf126ef4203e631472940127580541
---
A source/_static/releng.css
M source/conf.py
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/releng 
refs/changes/95/115595/1

diff --git a/source/_static/releng.css b/source/_static/releng.css
new file mode 100644
index 000..c8b3de0
--- /dev/null
+++ b/source/_static/releng.css
@@ -0,0 +1,5 @@
+@import url(default.css);
+img {
+   /* blockdiag can generate very large images */
+   max-width: none !important;
+}
diff --git a/source/conf.py b/source/conf.py
index 309571a..79d37b2 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -129,7 +129,10 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named default.css will overwrite the builtin default.css.
-#html_static_path = ['_static']
+html_static_path = ['_static']
+
+# This repository specific css to override default styling
+html_style = 'releng.css'
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f39ae3b6fcf126ef4203e631472940127580541
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/releng
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Naming consistency: Use tools instead of aids everywhere - change (mediawiki...ContentTranslation)

2014-02-26 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Naming consistency: Use tools instead of aids everywhere
..

Naming consistency: Use tools instead of aids everywhere

Change-Id: I107ed8ff28bd5e1737607034a52a7c19592f8d8b
---
M ContentTranslation.php
M README.md
M composer.json
M i18n/en.json
M i18n/qqq.json
M modules/base/ext.cx.base.js
M modules/base/ext.cx.datamanager.js
M modules/base/ext.cx.model.js
M modules/base/styles/ext.cx.base.less
M modules/header/ext.cx.header.js
M modules/header/ext.cx.header.render.js
M modules/header/ext.cx.progressbar.js
M modules/source/ext.cx.source.js
M modules/tools/ext.cx.tools.js
M modules/translation/ext.cx.publish.js
M modules/translation/ext.cx.translation.js
M server/README.md
M tests/browser/features/special_content_translation.feature
M tests/browser/features/step_definitions/special_content_translation_steps.rb
19 files changed, 27 insertions(+), 27 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/96/115596/1

diff --git a/ContentTranslation.php b/ContentTranslation.php
index 9ce55f3..42ce5c0 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -2,7 +2,7 @@
 /**
  * ContentTranslation extension
  * A tool that allows editors to translate pages from one language
- * to another with the help of machine translation and other translation aids
+ * to another with the help of machine translation and other translation tools
  *
  * @file
  * @ingroup Extensions
diff --git a/README.md b/README.md
index 9787fca..7532f10 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ContentTranslation is a tool that allows editors to translate
 pages from one language to another with the help of machine
-translation and other translation aids.
+translation and other translation tools.
 
 For more details, see  [Content translation][]
 ## Developing and installing
diff --git a/composer.json b/composer.json
index 78e37fc..aa99ef6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
name: mediawiki/content-translation,
type: mediawiki-extension,
-   description: Allows editors to translate an article from one 
language to another with the help of translation aids.,
+   description: Allows editors to translate an article from one 
language to another with the help of translation tools.,
keywords: [
MediaWiki,
Translation
diff --git a/i18n/en.json b/i18n/en.json
index ef0d463..7a1492b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,7 +7,7 @@
 ]
 },
 cx: Translate page,
-cx-desc: A tool that allows editors to translate pages from one 
language to another with the help of machine translation and other translation 
aids,
+cx-desc: A tool that allows editors to translate pages from one 
language to another with the help of machine translation and other translation 
tools,
 cx-header-progressbar-text: $1% translated,
 cx-header-translation-center: Translation center,
 cx-source-view-page: [$1 view page],
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5014ea5..dc86d2d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,10 +19,10 @@
 tag-contenttranslation: A short description of the contenttranslation 
tag. Appears in the edit summary when a translated page is created.,
 cx-source-loading: Status text shown in the source article pane while 
article is being loaded.\n\nParameters:\n* $1 - the title of the page being 
loaded,
 cx-special-login-error: Error to show when user try to use 
[[Special:ContentTranslation]] without logging in.,
-cx-tools-instructions-title: Title for the translation aids pane.,
-cx-tools-instructions-text1: Help text for the translation aids pane.,
-cx-tools-instructions-text2: Help text for the translation aids pane.,
-cx-tools-instructions-text3: Help text for the translation aids pane.,
-cx-tools-instructions-text4: Help text for the translation aids pane.,
-cx-tools-instructions-text5: Help text for the translation aids pane.
+cx-tools-instructions-title: Title for the translation tools pane.,
+cx-tools-instructions-text1: Help text for the translation tools pane.,
+cx-tools-instructions-text2: Help text for the translation tools pane.,
+cx-tools-instructions-text3: Help text for the translation tools pane.,
+cx-tools-instructions-text4: Help text for the translation tools pane.,
+cx-tools-instructions-text5: Help text for the translation tools pane.
 }
\ No newline at end of file
diff --git a/modules/base/ext.cx.base.js b/modules/base/ext.cx.base.js
index 2951ceb..b612fb0 100644
--- a/modules/base/ext.cx.base.js
+++ b/modules/base/ext.cx.base.js
@@ -1,7 +1,7 @@
 /**
  * ContentTranslation extension
  * A tool that allows editors to translate pages from one language
- * to another

[MediaWiki-commits] [Gerrit] Naming consistency: Use tools instead of aids everywhere - change (mediawiki...ContentTranslation)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Naming consistency: Use tools instead of aids everywhere
..


Naming consistency: Use tools instead of aids everywhere

Change-Id: I107ed8ff28bd5e1737607034a52a7c19592f8d8b
---
M ContentTranslation.php
M README.md
M composer.json
M i18n/en.json
M i18n/qqq.json
M modules/base/ext.cx.base.js
M modules/base/ext.cx.datamanager.js
M modules/base/ext.cx.model.js
M modules/base/styles/ext.cx.base.less
M modules/header/ext.cx.header.js
M modules/header/ext.cx.header.render.js
M modules/header/ext.cx.progressbar.js
M modules/source/ext.cx.source.js
M modules/tools/ext.cx.tools.js
M modules/translation/ext.cx.publish.js
M modules/translation/ext.cx.translation.js
M server/README.md
M tests/browser/features/special_content_translation.feature
M tests/browser/features/step_definitions/special_content_translation_steps.rb
19 files changed, 27 insertions(+), 27 deletions(-)

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



diff --git a/ContentTranslation.php b/ContentTranslation.php
index 9ce55f3..42ce5c0 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -2,7 +2,7 @@
 /**
  * ContentTranslation extension
  * A tool that allows editors to translate pages from one language
- * to another with the help of machine translation and other translation aids
+ * to another with the help of machine translation and other translation tools
  *
  * @file
  * @ingroup Extensions
diff --git a/README.md b/README.md
index 9787fca..7532f10 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ContentTranslation is a tool that allows editors to translate
 pages from one language to another with the help of machine
-translation and other translation aids.
+translation and other translation tools.
 
 For more details, see  [Content translation][]
 ## Developing and installing
diff --git a/composer.json b/composer.json
index 78e37fc..aa99ef6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
name: mediawiki/content-translation,
type: mediawiki-extension,
-   description: Allows editors to translate an article from one 
language to another with the help of translation aids.,
+   description: Allows editors to translate an article from one 
language to another with the help of translation tools.,
keywords: [
MediaWiki,
Translation
diff --git a/i18n/en.json b/i18n/en.json
index ef0d463..7a1492b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,7 +7,7 @@
 ]
 },
 cx: Translate page,
-cx-desc: A tool that allows editors to translate pages from one 
language to another with the help of machine translation and other translation 
aids,
+cx-desc: A tool that allows editors to translate pages from one 
language to another with the help of machine translation and other translation 
tools,
 cx-header-progressbar-text: $1% translated,
 cx-header-translation-center: Translation center,
 cx-source-view-page: [$1 view page],
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5014ea5..dc86d2d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,10 +19,10 @@
 tag-contenttranslation: A short description of the contenttranslation 
tag. Appears in the edit summary when a translated page is created.,
 cx-source-loading: Status text shown in the source article pane while 
article is being loaded.\n\nParameters:\n* $1 - the title of the page being 
loaded,
 cx-special-login-error: Error to show when user try to use 
[[Special:ContentTranslation]] without logging in.,
-cx-tools-instructions-title: Title for the translation aids pane.,
-cx-tools-instructions-text1: Help text for the translation aids pane.,
-cx-tools-instructions-text2: Help text for the translation aids pane.,
-cx-tools-instructions-text3: Help text for the translation aids pane.,
-cx-tools-instructions-text4: Help text for the translation aids pane.,
-cx-tools-instructions-text5: Help text for the translation aids pane.
+cx-tools-instructions-title: Title for the translation tools pane.,
+cx-tools-instructions-text1: Help text for the translation tools pane.,
+cx-tools-instructions-text2: Help text for the translation tools pane.,
+cx-tools-instructions-text3: Help text for the translation tools pane.,
+cx-tools-instructions-text4: Help text for the translation tools pane.,
+cx-tools-instructions-text5: Help text for the translation tools pane.
 }
\ No newline at end of file
diff --git a/modules/base/ext.cx.base.js b/modules/base/ext.cx.base.js
index 2951ceb..b612fb0 100644
--- a/modules/base/ext.cx.base.js
+++ b/modules/base/ext.cx.base.js
@@ -1,7 +1,7 @@
 /**
  * ContentTranslation extension
  * A tool that allows editors to translate pages from one language
- * to another with the help of machine translation and other translation

[MediaWiki-commits] [Gerrit] Add cc-IGO (internal governed organization) - change (mediawiki...WikimediaMessages)

2014-02-26 Thread Rillke (Code Review)

Rillke has uploaded a new change for review.

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

Change subject: Add cc-IGO (internal governed organization)
..

Add cc-IGO (internal governed organization)

Adding cc-by-igo-3.0 and cc-by-sa-igo-3.0 texts.

An IGO is an organization established by a treaty or
other instrument governed by international law and
possessing its own international legal personality.

Change-Id: If60a384e5b863ef38e5fdf53313670ec153f21ab
---
M WikimediaCCLicenseTexts.i18n.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages 
refs/changes/97/115597/1

diff --git a/WikimediaCCLicenseTexts.i18n.php b/WikimediaCCLicenseTexts.i18n.php
index f2123cc..17e9108 100644
--- a/WikimediaCCLicenseTexts.i18n.php
+++ b/WikimediaCCLicenseTexts.i18n.php
@@ -87,6 +87,7 @@
'wm-license-cc-by-3.0-hk-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/hk/deed.en Attribution 3.0 Hong Kong] 
license.',
'wm-license-cc-by-3.0-hr-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/hr/deed.en Attribution 3.0 Croatia] 
license.',
'wm-license-cc-by-3.0-ie-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/ie/deed.en Attribution 3.0 Ireland] 
license.',
+   'wm-license-cc-by-3.0-igo-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/igo/deed.en Attribution 3.0 IGO] 
license.',
'wm-license-cc-by-3.0-it-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/it/deed.en Attribution 3.0 Italy] 
license.',
'wm-license-cc-by-3.0-lu-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/lu/deed.en Attribution 3.0 Luxembourg] 
license.',
'wm-license-cc-by-3.0-nl-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by/3.0/nl/deed.en Attribution 3.0 Netherlands] 
license.',
@@ -182,6 +183,7 @@
'wm-license-cc-by-sa-3.0-hk-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/hk/deed.en Attribution-Share Alike 
3.0 Hong Kong] license.',
'wm-license-cc-by-sa-3.0-hr-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/hr/deed.en Attribution-Share Alike 
3.0 Croatia] license.',
'wm-license-cc-by-sa-3.0-ie-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/ie/deed.en Attribution-ShareAlike 3.0 
Ireland] license.',
+   'wm-license-cc-by-sa-3.0-igo-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/igo/deed.en Attribution-ShareAlike 
3.0 IGO] license.',
'wm-license-cc-by-sa-3.0-it-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/it/deed.en Attribution-ShareAlike 3.0 
Italy] license.',
'wm-license-cc-by-sa-3.0-lu-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/lu/deed.en Attribution-Share Alike 
3.0 Luxembourg] license.',
'wm-license-cc-by-sa-3.0-nl-text' = 'This file is licensed under the 
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]] 
[//creativecommons.org/licenses/by-sa/3.0/nl/deed.en Attribution-Share Alike 
3.0 Netherlands] license.',
@@ -328,6 +330,7 @@
'wm-license-cc-by-3.0-hk-text' = 
'{{CreativeCommonsLicense|by|3.0|hk}}',
'wm-license-cc-by-3.0-hr-text' = 
'{{CreativeCommonsLicense|by|3.0|hr}}',
'wm-license-cc-by-3.0-ie-text' = 
'{{CreativeCommonsLicense|by|3.0|ie}}',
+   'wm-license-cc-by-3.0-igo-text' = 
'{{CreativeCommonsLicense|by|3.0|igo}}',
'wm-license-cc-by-3.0-it-text' = 
'{{CreativeCommonsLicense|by|3.0|it}}',
'wm-license-cc-by-3.0-lu-text' = 
'{{CreativeCommonsLicense|by|3.0|lu}}',
'wm-license-cc-by-3.0-nl-text' = 
'{{CreativeCommonsLicense|by|3.0|nl}}',
@@ -427,6 +430,7 @@
'wm-license-cc-by-sa-3.0-hk-text' = 
'{{CreativeCommonsLicense|by-sa|3.0|hk}}',
'wm-license-cc-by-sa-3.0-hr-text' = 
'{{CreativeCommonsLicense|by-sa|3.0|hr}}',
'wm-license-cc-by-sa-3.0-ie-text' = 
'{{CreativeCommonsLicense|by-sa|3.0|ie}}',
+

[MediaWiki-commits] [Gerrit] Properly escape attributes in test results - change (mediawiki...parsoid)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Properly escape attributes in test results
..


Properly escape attributes in test results

Quotes were not escaped in attributes, which lead to errors as in this result:
http://parsoid.wmflabs.org:8001/result/804ead03252b9694f146b1027b8b5a55d67b4450/hewiki/%D7%A0%D7%A0%D7%95%D7%98%D7%9B%D7%A0%D7%95%D7%9C%D7%95%D7%92%D7%99%D7%99%D7%AA_%D7%93%D7%A0%22%D7%90

Change-Id: I313e803892285e7aa382cc53bd0af5e6a455617b
---
M tests/roundtrip-test.js
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index bb8f420..544393f 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -64,12 +64,18 @@
  .replace( //g, 'gt;' );
 };
 
+function encodeAttribute (str) {
+   return encodeXmlEntities(str)
+   .replace(//g, 'quot;');
+}
+
+
 var xmlCallback = function ( env, err, results ) {
var i, result;
var prefix = ( env  env.conf  env.conf.wiki  env.conf.wiki.iwp ) 
|| '';
var title = ( env  env.page  env.page.name ) || '';
 
-   var output = 'testsuite name=Roundtrip article ' + encodeXmlEntities( 
prefix + ':' + title ) + '';
+   var output = 'testsuite name=Roundtrip article ' + encodeAttribute( 
prefix + ':' + title ) + '';
 
if ( err ) {
output += 'testcase name=entire articleerror 
type=parserFailedToFinish';
@@ -80,7 +86,7 @@
for ( i = 0; i  results.length; i++ ) {
result = results[i];
 
-   output += 'testcase name=' + encodeXmlEntities( 
prefix + ':' + title ) + ' character ' + result.offset[0].start + '';
+   output += 'testcase name=' + encodeAttribute( prefix 
+ ':' + title ) + ' character ' + result.offset[0].start + '';
 
if ( result.type === 'fail' ) {
output += 'failure 
type=significantHtmlDiff\n';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I313e803892285e7aa382cc53bd0af5e6a455617b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] mw-tools-release-tox-doc - change (integration/jenkins-job-builder-config)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: mw-tools-release-tox-doc
..

mw-tools-release-tox-doc

Basically invokes tox -edoc

Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
---
M mediawiki-tools.yaml
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/98/115598/1

diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index 852373c..fa568c0 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -25,6 +25,13 @@
  - python-jobs
 
 - project:
+name: 'mw-tools-release'
+toxenv:
+ - doc
+jobs:
+ - '{name}-tox-{toxenv}'
+
+- project:
 name: 'mw-tools-scap'
 toxenv:
  - py27

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Trigger mw-tools-release-tox-doc - change (integration/zuul-config)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Trigger mw-tools-release-tox-doc
..

Trigger mw-tools-release-tox-doc

Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
---
M layout.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/99/115599/1

diff --git a/layout.yaml b/layout.yaml
index 1a06066..81af4b5 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1023,6 +1023,14 @@
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
 
+  - name: mediawiki/tools/release
+test:
+ - mw-tools-release-tox-doc
+gate-and-submit:
+ - mw-tools-release-tox-doc
+# TODO postmerge to publish doc somewhere
+
+
   - name: mediawiki/tools/scap
 test:
  - mw-tools-scap-tox-flake8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] mw-tools-release-tox-doc - change (integration/jenkins-job-builder-config)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: mw-tools-release-tox-doc
..


mw-tools-release-tox-doc

Basically invokes tox -edoc

Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
---
M mediawiki-tools.yaml
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index 852373c..fa568c0 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -25,6 +25,13 @@
  - python-jobs
 
 - project:
+name: 'mw-tools-release'
+toxenv:
+ - doc
+jobs:
+ - '{name}-tox-{toxenv}'
+
+- project:
 name: 'mw-tools-scap'
 toxenv:
  - py27

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Trigger mw-tools-release-tox-doc - change (integration/zuul-config)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Trigger mw-tools-release-tox-doc
..


Trigger mw-tools-release-tox-doc

Get rid of check-voter in favor of check/test pipelines since tox
executes code.

Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
---
M layout.yaml
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/layout.yaml b/layout.yaml
index 1a06066..bfa19d7 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1014,14 +1014,21 @@
 
   - name: mediawiki/tools/release
 # bug 50112 : we should use the python-lint template + the phplint
-check-voter:
+check:
   - mw-tools-release-phplint
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
+test:
+  - mw-tools-release-phplint
+  - mw-tools-release-pep8
+  - mw-tools-release-pyflakes
+  - mw-tools-release-tox-doc
 gate-and-submit:
   - mw-tools-release-phplint
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
+  - mw-tools-release-tox-doc
+# TODO postmerge to publish doc somewhere
 
   - name: mediawiki/tools/scap
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
Gerrit-PatchSet: 2
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Jenkins validation (DO NOT SUBMIT) - change (mediawiki...releng)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Jenkins validation (DO NOT SUBMIT)
..

Jenkins validation (DO NOT SUBMIT)

Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
---
A JENKINS
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/releng 
refs/changes/00/115600/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaedbb2cf627c5ad66f62c46fb13d59196aa4ea35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/releng
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Revert Trigger mw-tools-release-tox-doc - change (integration/zuul-config)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Revert Trigger mw-tools-release-tox-doc
..

Revert Trigger mw-tools-release-tox-doc

Was meant for mediawiki/tools/releng
 
This reverts commit 970a4443716af3d37ce19bf12a9bfffad7e2d767.

Change-Id: Id0801b9cdb504b0e263e96009a73cd7b221ba735
---
M layout.yaml
1 file changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/01/115601/1

diff --git a/layout.yaml b/layout.yaml
index bfa19d7..1a06066 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1014,21 +1014,14 @@
 
   - name: mediawiki/tools/release
 # bug 50112 : we should use the python-lint template + the phplint
-check:
+check-voter:
   - mw-tools-release-phplint
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
-test:
-  - mw-tools-release-phplint
-  - mw-tools-release-pep8
-  - mw-tools-release-pyflakes
-  - mw-tools-release-tox-doc
 gate-and-submit:
   - mw-tools-release-phplint
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
-  - mw-tools-release-tox-doc
-# TODO postmerge to publish doc somewhere
 
   - name: mediawiki/tools/scap
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0801b9cdb504b0e263e96009a73cd7b221ba735
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Revert Trigger mw-tools-release-tox-doc - change (integration/zuul-config)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Revert Trigger mw-tools-release-tox-doc
..


Revert Trigger mw-tools-release-tox-doc

Was meant for mediawiki/tools/releng
 
This reverts commit 970a4443716af3d37ce19bf12a9bfffad7e2d767.

Change-Id: Id0801b9cdb504b0e263e96009a73cd7b221ba735
---
M layout.yaml
1 file changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/layout.yaml b/layout.yaml
index bfa19d7..1a06066 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1014,21 +1014,14 @@
 
   - name: mediawiki/tools/release
 # bug 50112 : we should use the python-lint template + the phplint
-check:
+check-voter:
   - mw-tools-release-phplint
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
-test:
-  - mw-tools-release-phplint
-  - mw-tools-release-pep8
-  - mw-tools-release-pyflakes
-  - mw-tools-release-tox-doc
 gate-and-submit:
   - mw-tools-release-phplint
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
-  - mw-tools-release-tox-doc
-# TODO postmerge to publish doc somewhere
 
   - name: mediawiki/tools/scap
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0801b9cdb504b0e263e96009a73cd7b221ba735
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] rename mediawiki/tools/{release, releng} - change (integration/jenkins-job-builder-config)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: rename mediawiki/tools/{release,releng}
..

rename mediawiki/tools/{release,releng}

Wrong repo!

Change-Id: I6c9ac16ed191d6821caf48726f52d9d239198d28
---
M mediawiki-tools.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/02/115602/1

diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index fa568c0..2529cfe 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -25,7 +25,7 @@
  - python-jobs
 
 - project:
-name: 'mw-tools-release'
+name: 'mw-tools-releng'
 toxenv:
  - doc
 jobs:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c9ac16ed191d6821caf48726f52d9d239198d28
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] rename mediawiki/tools/{release, releng} - change (integration/jenkins-job-builder-config)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: rename mediawiki/tools/{release,releng}
..


rename mediawiki/tools/{release,releng}

Wrong repo!

Change-Id: I6c9ac16ed191d6821caf48726f52d9d239198d28
---
M mediawiki-tools.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index fa568c0..2529cfe 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -25,7 +25,7 @@
  - python-jobs
 
 - project:
-name: 'mw-tools-release'
+name: 'mw-tools-releng'
 toxenv:
  - doc
 jobs:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c9ac16ed191d6821caf48726f52d9d239198d28
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update README with Redis instructions - change (mediawiki...ContentTranslation)

2014-02-26 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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

Change subject: Update README with Redis instructions
..

Update README with Redis instructions

Change-Id: I06e2f41e7536db49bb1261078916ceaa4290a85a
---
M server/README.md
1 file changed, 13 insertions(+), 7 deletions(-)


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

diff --git a/server/README.md b/server/README.md
index 40dbe58..9181830 100644
--- a/server/README.md
+++ b/server/README.md
@@ -6,19 +6,25 @@
 Installation
 
 
-Install the depdendencies
+Install the dependencies:
 
 ```$ npm install```
 
-You need redis server running on your machine. Install redis-server using
-your OS package manager. Example:
+You need a Redis server on your machine.
+Install it using your OS package manager:
 
-```apt-get install redis-server```
+Debian: ```apt-get install redis-server```
+Fedora: ```yum install redis```
 
 Running the server
 --
 
-To run the server:
+First, make sure that the Redis server is running:
+
+Debian: ```service redis-server start```
+Fedora: ```service redis start```
+
+To run the ContentTranslation server:
 
 ```$ npm start```
 
@@ -29,6 +35,6 @@
 -
 
 An example configuration file is given as config.example.js.
-Rename that file to config.js and make your changes. Then
-restart the server.
+Rename that file to config.js and make your changes.
+Then restart the server.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06e2f41e7536db49bb1261078916ceaa4290a85a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

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

[MediaWiki-commits] [Gerrit] Triggers mw-tools-releng-tox-doc - change (integration/zuul-config)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Triggers mw-tools-releng-tox-doc
..

Triggers mw-tools-releng-tox-doc

Using the proper repo this time: mediawiki/tools/releng

Change-Id: I99646a3497df7924f6fbd94ab9ed2a97ba45d0ac
---
M layout.yaml
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/04/115604/1

diff --git a/layout.yaml b/layout.yaml
index 1a06066..fe7ff68 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1023,6 +1023,13 @@
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
 
+  - name: mediawiki/tools/releng
+test:
+  - mw-tools-releng-tox-doc
+gate-and-submit:
+  - mw-tools-releng-tox-doc
+# TODO add a postmerge job to publish doc somehwere
+
   - name: mediawiki/tools/scap
 test:
  - mw-tools-scap-tox-flake8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99646a3497df7924f6fbd94ab9ed2a97ba45d0ac
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Triggers mw-tools-releng-tox-doc - change (integration/zuul-config)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Triggers mw-tools-releng-tox-doc
..


Triggers mw-tools-releng-tox-doc

Using the proper repo this time: mediawiki/tools/releng

Change-Id: I99646a3497df7924f6fbd94ab9ed2a97ba45d0ac
---
M layout.yaml
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/layout.yaml b/layout.yaml
index 1a06066..fe7ff68 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1023,6 +1023,13 @@
   - mw-tools-release-pep8
   - mw-tools-release-pyflakes
 
+  - name: mediawiki/tools/releng
+test:
+  - mw-tools-releng-tox-doc
+gate-and-submit:
+  - mw-tools-releng-tox-doc
+# TODO add a postmerge job to publish doc somehwere
+
   - name: mediawiki/tools/scap
 test:
  - mw-tools-scap-tox-flake8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99646a3497df7924f6fbd94ab9ed2a97ba45d0ac
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update README with Redis instructions - change (mediawiki...ContentTranslation)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Update README with Redis instructions
..


Update README with Redis instructions

Change-Id: I06e2f41e7536db49bb1261078916ceaa4290a85a
---
M server/README.md
1 file changed, 13 insertions(+), 7 deletions(-)

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



diff --git a/server/README.md b/server/README.md
index 40dbe58..9181830 100644
--- a/server/README.md
+++ b/server/README.md
@@ -6,19 +6,25 @@
 Installation
 
 
-Install the depdendencies
+Install the dependencies:
 
 ```$ npm install```
 
-You need redis server running on your machine. Install redis-server using
-your OS package manager. Example:
+You need a Redis server on your machine.
+Install it using your OS package manager:
 
-```apt-get install redis-server```
+Debian: ```apt-get install redis-server```
+Fedora: ```yum install redis```
 
 Running the server
 --
 
-To run the server:
+First, make sure that the Redis server is running:
+
+Debian: ```service redis-server start```
+Fedora: ```service redis start```
+
+To run the ContentTranslation server:
 
 ```$ npm start```
 
@@ -29,6 +35,6 @@
 -
 
 An example configuration file is given as config.example.js.
-Rename that file to config.js and make your changes. Then
-restart the server.
+Rename that file to config.js and make your changes.
+Then restart the server.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06e2f41e7536db49bb1261078916ceaa4290a85a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Clear master certs if we change puppet.conf - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Clear master certs if we change puppet.conf
..


Clear master certs if we change puppet.conf

This is a hack for labs migration -- it only takes effect
if a special file is found on the host:  /root/allowcertdeletion

Change-Id: I9551ab2bbbdda1ad495b5941a15a0b9561f24feb
---
M modules/base/manifests/init.pp
1 file changed, 11 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Tim Landscheidt: Looks good to me, but someone else must approve
  Matanya: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 3d4ccba..891d751 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -169,6 +169,17 @@
 notify  = Exec['compile puppet.conf'],
 }
 
+if $::realm == 'labs' {
+# Clear master certs if puppet.conf changed
+exec { 'delete master certs':
+path= '/usr/bin:/bin',
+command = 'rm -f /var/lib/puppet/ssl/certs/ca.pem; rm -f 
/var/lib/puppet/ssl/crl.pem; rm -f /root/allowcertdeletion',
+onlyif  = 'test -f /root/allowcertdeletion',
+subscribe   = File['/etc/puppet/puppet.conf.d/10-main.conf'],
+refreshonly = true,
+}
+}
+
 file { '/etc/init.d/puppet':
 owner  = 'root',
 group  = 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9551ab2bbbdda1ad495b5941a15a0b9561f24feb
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] contint: python-dev on labs slaves - change (operations/puppet)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: python-dev on labs slaves
..

contint: python-dev on labs slaves

We are using tox and might end up compiling C python modules, that
requires python-dev to be installed on the labs CI slaves.

Change-Id: I144ae0aeb23b2eefbd0e00ed485400e3f85dfd61
---
M modules/contint/manifests/packages/labs.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/115605/1

diff --git a/modules/contint/manifests/packages/labs.pp 
b/modules/contint/manifests/packages/labs.pp
index d5382a5..ae3d234 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -12,6 +12,9 @@
 'npm',
 'python-pip',
 
+# Let us compile python modules:
+'python-dev',
+
 # For mediawiki/extensions/Collection/OfflineContentGenerator/bundler
 'zip',
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I144ae0aeb23b2eefbd0e00ed485400e3f85dfd61
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Updated dc-migrate a bit. - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Updated dc-migrate a bit.
..

Updated dc-migrate a bit.

I added a few naps to avoid race conditions, and
added a salt line to enable clearing of the puppet master certs
post-migration.

Change-Id: I06179bb5b0714253c25a07b2a7f73ccb0aede196
---
M files/openstack/folsom/virtscripts/dc-migrate
M files/openstack/havana/virtscripts/dc-migrate
2 files changed, 19 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/115606/1

diff --git a/files/openstack/folsom/virtscripts/dc-migrate 
b/files/openstack/folsom/virtscripts/dc-migrate
index 53d9fda..a247bfe 100755
--- a/files/openstack/folsom/virtscripts/dc-migrate
+++ b/files/openstack/folsom/virtscripts/dc-migrate
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/openstack/folsom/virtscripts/dc-migrate
+### puppet:///files/openstack/havana/virtscripts/dc-migrate
 #
 #set -x
 ssh-add -l  /dev/null
@@ -42,6 +42,7 @@
 done
 TOINSTANCENAME=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova 
--os-region ${TOREGION} show ${INSTANCENAME} | grep 
'OS-EXT-SRV-ATTR:instance_name' | awk '{ print $4 }'`
 TOINSTANCE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region 
${TOREGION} show ${INSTANCENAME} | grep ' id ' | awk '{ print $4 }'`
+sleep 2
 echo 
 echo Migrating $FROMINSTANCE from $FROMHOST to $TOINSTANCE on $TOHOST
 echo 
@@ -51,8 +52,16 @@
 echo Clearing resolv.conf in instance on $FROMHOST
 echo 
 salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run rm -f /etc/resolv.conf
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run rm -f 
/etc/resolvconf/resolv.conf.d/original
+echo 
+echo Enabling puppet master cert refresh
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run touch 
/root/allowcertdeletion
+echo 
+sleep 1
 echo Destroying instance on $FROMHOST
 echo 
+OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region ${TOREGION} 
stop ${INSTANCENAME}
+sleep 5
 ssh $FROMHOST.$FROMREGION.wmnet virsh destroy ${FROMINSTANCE}
 echo 
 sleep 30
diff --git a/files/openstack/havana/virtscripts/dc-migrate 
b/files/openstack/havana/virtscripts/dc-migrate
index 540d360..a247bfe 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -42,6 +42,7 @@
 done
 TOINSTANCENAME=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova 
--os-region ${TOREGION} show ${INSTANCENAME} | grep 
'OS-EXT-SRV-ATTR:instance_name' | awk '{ print $4 }'`
 TOINSTANCE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region 
${TOREGION} show ${INSTANCENAME} | grep ' id ' | awk '{ print $4 }'`
+sleep 2
 echo 
 echo Migrating $FROMINSTANCE from $FROMHOST to $TOINSTANCE on $TOHOST
 echo 
@@ -51,8 +52,16 @@
 echo Clearing resolv.conf in instance on $FROMHOST
 echo 
 salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run rm -f /etc/resolv.conf
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run rm -f 
/etc/resolvconf/resolv.conf.d/original
+echo 
+echo Enabling puppet master cert refresh
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run touch 
/root/allowcertdeletion
+echo 
+sleep 1
 echo Destroying instance on $FROMHOST
 echo 
+OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region ${TOREGION} 
stop ${INSTANCENAME}
+sleep 5
 ssh $FROMHOST.$FROMREGION.wmnet virsh destroy ${FROMINSTANCE}
 echo 
 sleep 30

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06179bb5b0714253c25a07b2a7f73ccb0aede196
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] editintro given a css class of its own - change (mediawiki/core)

2014-02-26 Thread Lekshmi (Code Review)

Lekshmi has uploaded a new change for review.

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

Change subject: editintro given a css class of its own
..

editintro given a css class of its own

The template added using the editintro url parameter is
contained within a div tag with a unique class 'mw-editintro'

Change-Id: I9afa41a01a2318fba27df04054871cd593be7e92
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/115607/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 9a27d23..67bfd38 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2114,7 +2114,7 @@
if ( $title instanceof Title  $title-exists()  
$title-userCan( 'read' ) ) {
global $wgOut;
// Added using template syntax, to take 
noinclude's into account.
-   $wgOut-addWikiTextTitleTidy( '{{:' . 
$title-getFullText() . '}}', $this-mTitle );
+   $wgOut-addWikiTextTitleTidy( div 
class='mw-editintro'{{:' . $title-getFullText() . '}}', $this-mTitle/div 
);
return true;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9afa41a01a2318fba27df04054871cd593be7e92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lekshmi andnlnb...@gmail.com

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

[MediaWiki-commits] [Gerrit] Makefile command to check i18n for matching en and qqq keys - change (mediawiki...Flow)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Makefile command to check i18n for matching en and qqq keys
..


Makefile command to check i18n for matching en and qqq keys

Change-Id: I43ed7ff52a9887a1e8649dc842e7cf2adcd82f51
---
M Makefile
A scripts/check-i18n.php
2 files changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/Makefile b/Makefile
index a721ffe..4e56ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,9 @@
 vagrant-browsertests:
@vagrant ssh -- -X cd /srv/browsertests '' 
MEDIAWIKI_URL=http://localhost/wiki/ MEDIAWIKI_USER=Admin 
MEDIAWIKI_PASSWORD=vagrant bundle exec cucumber 
/vagrant/mediawiki/extensions/Flow/tests/browser/features/ -f pretty
 
+check-i18n:
+   @php scripts/check-i18n.php
+
 ###
 # Static analysis
 ###
diff --git a/scripts/check-i18n.php b/scripts/check-i18n.php
new file mode 100644
index 000..9b64641
--- /dev/null
+++ b/scripts/check-i18n.php
@@ -0,0 +1,17 @@
+?php
+
+$repo = realpath( __DIR__ . '/..' );
+
+include __DIR__ . /../Flow.i18n.php;
+
+$missing = array_diff( array_keys( $messages['en'] ), array_keys( 
$messages['qqq'] ) );
+if ( $missing ) {
+   echo Missing i18n messages:\n\t, implode( \n\t, $missing ), \n;
+   exit( 1 );
+}
+
+$extra = array_diff( array_keys( $messages['qqq'] ), array_keys( 
$messages['en'] ) );
+if ( $extra ) {
+   echo Extra qqq messages:\n\t, implode( \n\t, $extra ), \n;
+   exit( 1 );
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ed7ff52a9887a1e8649dc842e7cf2adcd82f51
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Updated dc-migrate a bit. - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Updated dc-migrate a bit.
..


Updated dc-migrate a bit.

I added a few naps to avoid race conditions, and
added a salt line to enable clearing of the puppet master certs
post-migration.

Change-Id: I06179bb5b0714253c25a07b2a7f73ccb0aede196
---
D files/openstack/folsom/virtscripts/dc-migrate
M files/openstack/havana/virtscripts/dc-migrate
M manifests/role/nova.pp
3 files changed, 11 insertions(+), 78 deletions(-)

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



diff --git a/files/openstack/folsom/virtscripts/dc-migrate 
b/files/openstack/folsom/virtscripts/dc-migrate
deleted file mode 100755
index 53d9fda..000
--- a/files/openstack/folsom/virtscripts/dc-migrate
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/openstack/folsom/virtscripts/dc-migrate
-#
-#set -x
-ssh-add -l  /dev/null
-if [ $? != 0 ]
-then
-   echo You must have a forwarded agent to use this script
-   exit 1
-fi
-INSTANCENAME=$1
-PROJECT=$2
-FROMREGION='pmtpa'
-TOREGION='eqiad'
-FROMAUTH=http://virt0.wikimedia.org:35357/v2.0;
-TOAUTH=http://virt1000.wikimedia.org:35357/v2.0;
-FROMPUPPETMASTER=virt0.wikimedia.org
-TOPUPPETMASTER=virt1000.wikimedia.org
-TOINSTANCE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region 
${TOREGION} show ${INSTANCENAME} | grep ' id ' | awk '{ print $4 }'`
-if [ -n $TOINSTANCE ]; then
-   echo Name conflict!  ${INSTANCENAME} already exists in ${TOREGION} 
with ID \${TOINSTANCE}\
-   exit 1
-fi
-echo (That error was a good thing.)
-echo 
-FROMIMAGE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova --os-region 
${FROMREGION} show ${INSTANCENAME} | grep ' image ' | awk '{gsub ( [()], ) 
; print $(NF-1) }'`
-FROMFLAVOR=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova --os-region 
${FROMREGION} show ${INSTANCENAME} | grep ' flavor ' | awk '{gsub ( [()], ) 
; print $5 }'`
-FROMSECURITYRAW=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova 
--os-region ${FROMREGION} show ${INSTANCENAME} | grep ' security_groups ' | awk 
 -F | '{ print $3 }'`
-FROMSECURITY=`python -c print ','.join([o['name'] for o in 
${FROMSECURITYRAW}])`
-FROMHOST=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova --os-region 
${FROMREGION} show ${INSTANCENAME} | grep 'OS-EXT-SRV-ATTR:host' | awk '{ print 
$4 }'`
-FROMINSTANCENAME=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova 
--os-region ${FROMREGION} show ${INSTANCENAME} | grep 
'OS-EXT-SRV-ATTR:instance_name' | awk '{ print $4 }'`
-FROMINSTANCE=$FROMINSTANCENAME
-echo Creating initial image in $TOREGION
-cd /srv/org/wikimedia/controller/wikis/w  php 
./extensions/OpenStackManager/maintenance/createInstance.php --image 
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project 
${PROJECT} --region ${TOREGION} --securitygroups ${FROMSECURITY}
-echo The new instance is building.  Waiting for it to be assigned a host...
-TOHOST=''
-while [ -z $TOHOST ]; do
-   sleep 10
-   TOHOST=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova 
--os-region ${TOREGION} show ${INSTANCENAME} | grep 'OS-EXT-SRV-ATTR:host' | 
awk '{ print $4 }'`
-done
-TOINSTANCENAME=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova 
--os-region ${TOREGION} show ${INSTANCENAME} | grep 
'OS-EXT-SRV-ATTR:instance_name' | awk '{ print $4 }'`
-TOINSTANCE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region 
${TOREGION} show ${INSTANCENAME} | grep ' id ' | awk '{ print $4 }'`
-echo 
-echo Migrating $FROMINSTANCE from $FROMHOST to $TOINSTANCE on $TOHOST
-echo 
-echo Destroying new instance on $TOHOST
-echo 
-ssh $TOHOST.$TOREGION.wmnet virsh destroy ${TOINSTANCE}
-echo Clearing resolv.conf in instance on $FROMHOST
-echo 
-salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run rm -f /etc/resolv.conf
-echo Destroying instance on $FROMHOST
-echo 
-ssh $FROMHOST.$FROMREGION.wmnet virsh destroy ${FROMINSTANCE}
-echo 
-sleep 30
-echo 
-echo Rsyncing instance from $FROMHOST to $TOHOST
-echo 
-# This one is right, but currently impossible due to filtering
-#ssh -A $FROMHOST.$FROMREGION.wmnet rsync -S -av 
/var/lib/nova/instances/${FROMINSTANCE} 
${TOHOST}.${TOREGION}.wmnet:/var/lib/nova/instances/${TOINSTANCE}
-# This is dumb but will work
-rsync -S -av 
${FROMHOST}.${FROMREGION}.wmnet:/var/lib/nova/instances/${FROMINSTANCE} /tmp/
-rsync -S -av /tmp/${FROMINSTANCE}/* 
${TOHOST}.${TOREGION}.wmnet:/var/lib/nova/instances/${TOINSTANCE}
-rm -r /tmp/${FROMINSTANCE}
-echo 
-echo 
-echo 
-echo Clearing stale puppet cert (if any)
-puppet cert clean ${TOINSTANCENAME}.${TOREGION}.wmflabs
-echo 
-echo Rebooting the instance
-echo 
-OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region

[MediaWiki-commits] [Gerrit] Expand MWException tests - change (mediawiki/core)

2014-02-26 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Expand MWException tests
..

Expand MWException tests

Change-Id: Ia6d579eff66c949f6d4318d09afb143ed78f3ac1
---
M tests/phpunit/includes/exception/MWExceptionTest.php
1 file changed, 102 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/115608/1

diff --git a/tests/phpunit/includes/exception/MWExceptionTest.php 
b/tests/phpunit/includes/exception/MWExceptionTest.php
index f1ddc17..c2e3db3 100644
--- a/tests/phpunit/includes/exception/MWExceptionTest.php
+++ b/tests/phpunit/includes/exception/MWExceptionTest.php
@@ -16,6 +16,108 @@
}
 
/**
+* @dataProvider provideTextUseOutputPage
+* @covers MWException::useOutputPage
+*/
+   public function testUseOutputPage( $expected, $wgLang, 
$wgFullyInitialised, $wgOut ) {
+   $this-setMwGlobals( array(
+   'wgLang' = $wgLang,
+   'wgFullyInitialised' = $wgFullyInitialised,
+   'wgOut' = $wgOut,
+   ) );
+
+   $e = new MWException();
+   $this-assertEquals( $expected, $e-useOutputPage() );
+   }
+
+   public function provideTextUseOutputPage() {
+   return array(
+   // expected, wgLang, wgFullyInitialised, wgOut
+   array( false, null, null, null ),
+   array( false, $this-getMockLanguage(), null, null ),
+   array( false, $this-getMockLanguage(), true, null ),
+   array( false, null, true, null ),
+   array( false, null, null, true ),
+   array( true, $this-getMockLanguage(), true, true ),
+   );
+   }
+
+   private function getMockLanguage() {
+   return $this-getMockBuilder( 'Language' )
+   -disableOriginalConstructor()
+   -getMock();
+   }
+
+   /**
+* @dataProvider provideUseMessageCache
+* @covers MWException::useMessageCache
+*/
+   public function testUseMessageCache( $expected, $wgLang ) {
+   $this-setMwGlobals( array(
+   'wgLang' = $wgLang,
+   ) );
+   $e = new MWException();
+   $this-assertEquals( $expected, $e-useMessageCache() );
+   }
+
+   public function provideUseMessageCache() {
+   return array(
+   array( false, null ),
+   array( true, $this-getMockLanguage() ),
+   );
+   }
+
+   /**
+* @covers MWException::isLoggable
+*/
+   public function testIsLogable() {
+   $e = new MWException();
+   $this-assertTrue( $e-isLoggable() );
+   }
+
+   /**
+* @dataProvider provideRunHooks
+* @covers MWException::runHooks
+*/
+   public function testRunHooks( $wgExceptionHooks, $name, $args, 
$expectedReturn ) {
+   $this-setMwGlobals( array(
+   'wgExceptionHooks' = $wgExceptionHooks,
+   ) );
+   $e = new MWException();
+   $this-assertEquals( $expectedReturn, $e-runHooks( $name, 
$args ) );
+   }
+
+   /**
+* @todo test that hooks are actually called correctly
+*/
+   public function provideRunHooks() {
+   return array(
+   array( null, null, null, null ),
+   array( array(), 'name', array(), null ),
+   array( array( 'name' = false ), 'name', array(), null 
),
+   );
+   }
+
+   /**
+* @dataProvider provideIsCommandLine
+* @covers MWException::isCommandLine
+*/
+   public function testisCommandLine( $expected, $wgCommandLineMode ) {
+   $this-setMwGlobals( array(
+   'wgCommandLineMode' = $wgCommandLineMode,
+   ) );
+   $e = new MWException();
+   $this-assertEquals( $expected, $e-isCommandLine() );
+   }
+
+   public function provideIsCommandLine() {
+   return array(
+   array( false, null ),
+   array( true, true ),
+   );
+   }
+
+   /**
 * Verify the exception classes are JSON serializabe.
 *
 * @covers MWExceptionHandler::jsonSerializeException

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6d579eff66c949f6d4318d09afb143ed78f3ac1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

[MediaWiki-commits] [Gerrit] Tools: Set group for $sysdir according to $::site - change (operations/puppet)

2014-02-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Tools: Set group for $sysdir according to $::site
..

Tools: Set group for $sysdir according to $::site

This fixes a regression introduced by
I01592d50cc17a4acb25fd2d4b70881f450ad88cd.

Change-Id: Id7647830d3c925e73a1bc62b6ab4e9239e551090
---
M modules/toollabs/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 302c17c..cdd1aee 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -30,7 +30,10 @@
 file { $sysdir:
 ensure  = directory,
 owner   = 'root',
-group   = 'tools.admin',
+group   = $::site ? {
+'eqiad' = 'tools.admin',
+default = 'local-admin',
+},
 mode= '02775',
 require = $::site? {
 'eqiad' =  Mount['/data/project'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7647830d3c925e73a1bc62b6ab4e9239e551090
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de

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

[MediaWiki-commits] [Gerrit] Make the SVG filter inline - change (mediawiki...MultimediaViewer)

2014-02-26 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Make the SVG filter inline
..

Make the SVG filter inline

The external SVG doesn't work on beta, because
it's hosted on a different domain

Change-Id: Ic6ae42a33f9dbd656df051f056376aea60ac9ea3
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/146
---
D resources/mmv/img/blur.svg
M resources/mmv/mmv.js
M resources/mmv/mmv.less
M resources/mmv/mmv.lightboxinterface.js
4 files changed, 15 insertions(+), 18 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/10/115610/1

diff --git a/resources/mmv/img/blur.svg b/resources/mmv/img/blur.svg
deleted file mode 100644
index f422ea9..000
--- a/resources/mmv/img/blur.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
-svg version=1.1 xmlns=http://www.w3.org/2000/svg;
-  defs
-filter id=gaussian-blur x=0 y=0
-  feGaussianBlur color-interpolation-filters=sRGB stdDeviation=3 /
-/filter
-  /defs
-/svg
\ No newline at end of file
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index ac40e61..366f1cf 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -366,7 +366,10 @@
 
// Only blur the placeholder if it's blown up significantly
if ( blowupFactor  2 ) {
-   $initialImage.addClass( 'blurred' );
+   // We have to apply the SVG filter here, it doesn't 
work when defined in the .less file
+   // We can't use an external SVG file because filters 
can't be accessed cross-domain
+   // We can't embed the SVG file because accessing the 
filter inside of it doesn't work
+   $initialImage.addClass( 'blurred' ).css( 'filter', 
'url(#gaussian-blur)' );
this.blurredThumbnailShown = true;
}
 
diff --git a/resources/mmv/mmv.less b/resources/mmv/mmv.less
index 2cb3c18..9b3b570 100644
--- a/resources/mmv/mmv.less
+++ b/resources/mmv/mmv.less
@@ -309,11 +309,6 @@
 }
 
 .mlb-image img.blurred {
-   /**
-* SVG is for Firefox
-* Cannot be embedded because of the hash needed to access the filter 
inside the SVG
-*/
-   filter: url(img/blur.svg#gaussian-blur);
filter: blur(3px);
-webkit-filter: blur(3px);
opacity: 0.8;
diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index 5ec8040..fda8211 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -59,6 +59,9 @@
.addClass( 'mlb-staging-area' );
$( document.body ).append( this.$staging );
 
+   // SVG filter, needed to achieve blur in Firefox
+   this.$filter = $( 'svgfilter 
id=gaussian-blurfegaussianblur stdDeviation=3/filter/svg' );
+
this.$overlay = $( 'div' )
.addClass( 'mlb-overlay' );
 
@@ -91,7 +94,8 @@
this.$main.append(
this.$preDiv,
this.$imageWrapper,
-   this.$postDiv
+   this.$postDiv,
+   this.$filter
);
 
this.$wrapper.append(
@@ -440,9 +444,13 @@
var self = this,
animationLength = 300;
 
-   // The blurred class has an opacity  1. This animated the 
image to become fully opaque
+   // The blurred class has an opacity  1. This animates the 
image to become fully opaque
this.$image
.addClass( 'blurred' )
+   // We have to apply the SVG filter here, it doesn't 
work when defined in the .less file
+   // We can't use an external SVG file because filters 
can't be accessed cross-domain
+   // We can't embed the SVG file because accessing the 
filter inside of it doesn't work
+   .css( 'filter', 'url(#gaussian-blur)' )
.animate( { opacity: 1.0 }, animationLength );
 
// During the same amount of time (animationLength) we animate 
a blur value from 3.0 to 0.0
@@ -457,7 +465,7 @@
// When the animation is complete, the blur 
value is 0
// We apply empty CSS values to remove the 
inline styles applied by jQuery
// so that they don't get in the way of styles 
defined in CSS
-   self.$image.css( { '-webkit-filter' : '', 
'opacity' : '' } )
+   self.$image.css( { '-webkit-filter' : '', 
'opacity' : '',

[MediaWiki-commits] [Gerrit] improvements; * docs link * User:Drtrigon links pointing to ... - change (pywikibot...drtrigonbot)

2014-02-26 Thread DrTrigon (Code Review)

DrTrigon has uploaded a new change for review.

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

Change subject: improvements; * docs link * User:Drtrigon links pointing to 
tool-labs * bugfix for irc bot status * bugfix for core log filename style 
(hacky - for irc bot only!) * link on info panel renamed
..

improvements;
* docs link
* User:Drtrigon links pointing to tool-labs
* bugfix for irc bot status
* bugfix for core log filename style (hacky - for irc bot only!)
* link on info panel renamed

Change-Id: I97cc4fa1f7619427cb59d93153afe6ad71a80b63
---
M fabfile.py
M public_html/cgi-bin/panel.py
M public_html/cgi-bin/ps_plain.py
M public_html/cgi-bin/templates/info.html
M public_html/cgi-bin/templates/layout.html
5 files changed, 11 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/drtrigonbot 
refs/changes/11/115611/1

diff --git a/fabfile.py b/fabfile.py
index 0b0e32e..ea3e66c 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -139,11 +139,11 @@
 local('mkdir public_html/logs/archive') # target for log archive
 local('mkdir public_html/logs/sge') # sge stdout/-err files
 else:   # toolserver
-local('mkdir public_html/doc')  # contains symlinks
 local('mkdir public_html/DrTrigonBot')  # contains symlinks
 local('mkdir public_html/source')
 # create redirect to svn and git repo browser in 'public_html/source'
 local('mkdir public_html/test')
+local('mkdir public_html/docs') # contains symlinks (like logs)
 
 def dl_drtrigonbot():
 #if LABS:# labs-tools
@@ -209,7 +209,8 @@
 
 def sl_compat():
 if LABS:# labs-tools
-# docs ?
+# docs
+local('ln -s ~/pywikibot-compat/docs public_html/docs/compat')
 # logs
 #local('cd public_html/logs/; ln -s 
/data/project/drtrigonbot/pywikibot-compat/logs compat')
 local('ln -s ~/pywikibot-compat/logs public_html/logs/compat')
diff --git a/public_html/cgi-bin/panel.py b/public_html/cgi-bin/panel.py
index 5fc1c45..c70d94e 100755
--- a/public_html/cgi-bin/panel.py
+++ b/public_html/cgi-bin/panel.py
@@ -68,13 +68,13 @@
 Successfully finished bot runs: b%(successfull)s/bbrbr
 
 h2Log files/h2
-Current log files:
+Current a href=%(oldlink)slog files/a:
 table class=wikitable
 %(currentlog)s
 /table
 %(logbrowse)s
 
-a href=%(oldlink)sOld log/a files: i%(oldlog)s/ibrbr
+Old log files: i%(oldlog)s/ibrbr
 
 h2Messages/h2
 See also a href=%(logstat)slogging statistics/a and the important 
messages:
@@ -176,7 +176,7 @@
 
 # === functions === === ===
 #
-def oldlogfiles(all=False, exclude=['commands.log', 'throttle.log']):
+def oldlogfiles(all=False, exclude=['commands.log', 'throttle.log', 
'nosetests.log']):
 #  files  = os.listdir( localdir )
files  = [os.path.join(ver_desc[0], item) for item in os.listdir( 
os.path.join(localdir, ver_desc[0]) )]
files += [os.path.join(ver_desc[1], item) for item in os.listdir( 
os.path.join(localdir, ver_desc[1]) )]
@@ -188,7 +188,7 @@
if (len(info)  2) or (bn[1:] == info[-1]) or (bn in exclude):
continue
ext = info[-1].lower()
-   if ext == 'log':
+   if ext == 'log' and not info[-2].isdigit():  # isdigit() for 
core log filename style
current.append( item )
if all:
e = strftime(datefmt)
@@ -242,7 +242,7 @@
while True:
buf=s.recv(1024)
readbuffer=readbuffer+buf
-   if (':End of /NAMES' in readbuffer) or (len(buf)  1024):
+   if (':End of /NAMES' in readbuffer):# or (len(buf)  1024):
break
s.close()
del s
diff --git a/public_html/cgi-bin/ps_plain.py b/public_html/cgi-bin/ps_plain.py
index 2a44b19..8096ea2 100644
--- a/public_html/cgi-bin/ps_plain.py
+++ b/public_html/cgi-bin/ps_plain.py
@@ -65,7 +65,7 @@
 # === footer HTML codes === === ===
 #
 footer = \
-smallDrTrigonBot web-interface, written by a 
href=https://wiki.toolserver.org/view/User:DrTrigon;DrTrigon/a 
+smallDrTrigonBot web-interface, written by a 
href=https://wikitech.wikimedia.org/wiki/User:DrTrigon;DrTrigon/a 
 (a href=http://toolserver.org/~daniel/stats/;stat/a /
 a href=http://toolserver.org/~daniel/stats/url_201007.html;url/a /
 a href=http://munin.toolserver.org/index.html;info/a).
diff --git a/public_html/cgi-bin/templates/info.html 
b/public_html/cgi-bin/templates/info.html
index b998a9f..6091935 100644
--- a/public_html/cgi-bin/templates/info.html
+++ b/public_html/cgi-bin/templates/info.html
@@ -1,6 +1,6 @@
 {% extends layout.html %}
 {% block body %}
-smalla href=panel.py back/a/small
+smalla href=panel.py status/a/small
 pbServer Architecture/b: {{ arch.desc }}/p
 pbFlask/b: {{ flask.desc }}/p
 {% if compat %}
diff --git

[MediaWiki-commits] [Gerrit] improvements; * docs link * User:Drtrigon links pointing to ... - change (pywikibot...drtrigonbot)

2014-02-26 Thread DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged.

Change subject: improvements; * docs link * User:Drtrigon links pointing to 
tool-labs * bugfix for irc bot status * bugfix for core log filename style 
(hacky - for irc bot only!) * link on info panel renamed
..


improvements;
* docs link
* User:Drtrigon links pointing to tool-labs
* bugfix for irc bot status
* bugfix for core log filename style (hacky - for irc bot only!)
* link on info panel renamed

Change-Id: I97cc4fa1f7619427cb59d93153afe6ad71a80b63
---
M fabfile.py
M public_html/cgi-bin/panel.py
M public_html/cgi-bin/ps_plain.py
M public_html/cgi-bin/templates/info.html
M public_html/cgi-bin/templates/layout.html
5 files changed, 11 insertions(+), 10 deletions(-)

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



diff --git a/fabfile.py b/fabfile.py
index 0b0e32e..ea3e66c 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -139,11 +139,11 @@
 local('mkdir public_html/logs/archive') # target for log archive
 local('mkdir public_html/logs/sge') # sge stdout/-err files
 else:   # toolserver
-local('mkdir public_html/doc')  # contains symlinks
 local('mkdir public_html/DrTrigonBot')  # contains symlinks
 local('mkdir public_html/source')
 # create redirect to svn and git repo browser in 'public_html/source'
 local('mkdir public_html/test')
+local('mkdir public_html/docs') # contains symlinks (like logs)
 
 def dl_drtrigonbot():
 #if LABS:# labs-tools
@@ -209,7 +209,8 @@
 
 def sl_compat():
 if LABS:# labs-tools
-# docs ?
+# docs
+local('ln -s ~/pywikibot-compat/docs public_html/docs/compat')
 # logs
 #local('cd public_html/logs/; ln -s 
/data/project/drtrigonbot/pywikibot-compat/logs compat')
 local('ln -s ~/pywikibot-compat/logs public_html/logs/compat')
diff --git a/public_html/cgi-bin/panel.py b/public_html/cgi-bin/panel.py
index 5fc1c45..c70d94e 100755
--- a/public_html/cgi-bin/panel.py
+++ b/public_html/cgi-bin/panel.py
@@ -68,13 +68,13 @@
 Successfully finished bot runs: b%(successfull)s/bbrbr
 
 h2Log files/h2
-Current log files:
+Current a href=%(oldlink)slog files/a:
 table class=wikitable
 %(currentlog)s
 /table
 %(logbrowse)s
 
-a href=%(oldlink)sOld log/a files: i%(oldlog)s/ibrbr
+Old log files: i%(oldlog)s/ibrbr
 
 h2Messages/h2
 See also a href=%(logstat)slogging statistics/a and the important 
messages:
@@ -176,7 +176,7 @@
 
 # === functions === === ===
 #
-def oldlogfiles(all=False, exclude=['commands.log', 'throttle.log']):
+def oldlogfiles(all=False, exclude=['commands.log', 'throttle.log', 
'nosetests.log']):
 #  files  = os.listdir( localdir )
files  = [os.path.join(ver_desc[0], item) for item in os.listdir( 
os.path.join(localdir, ver_desc[0]) )]
files += [os.path.join(ver_desc[1], item) for item in os.listdir( 
os.path.join(localdir, ver_desc[1]) )]
@@ -188,7 +188,7 @@
if (len(info)  2) or (bn[1:] == info[-1]) or (bn in exclude):
continue
ext = info[-1].lower()
-   if ext == 'log':
+   if ext == 'log' and not info[-2].isdigit():  # isdigit() for 
core log filename style
current.append( item )
if all:
e = strftime(datefmt)
@@ -242,7 +242,7 @@
while True:
buf=s.recv(1024)
readbuffer=readbuffer+buf
-   if (':End of /NAMES' in readbuffer) or (len(buf)  1024):
+   if (':End of /NAMES' in readbuffer):# or (len(buf)  1024):
break
s.close()
del s
diff --git a/public_html/cgi-bin/ps_plain.py b/public_html/cgi-bin/ps_plain.py
index 2a44b19..8096ea2 100644
--- a/public_html/cgi-bin/ps_plain.py
+++ b/public_html/cgi-bin/ps_plain.py
@@ -65,7 +65,7 @@
 # === footer HTML codes === === ===
 #
 footer = \
-smallDrTrigonBot web-interface, written by a 
href=https://wiki.toolserver.org/view/User:DrTrigon;DrTrigon/a 
+smallDrTrigonBot web-interface, written by a 
href=https://wikitech.wikimedia.org/wiki/User:DrTrigon;DrTrigon/a 
 (a href=http://toolserver.org/~daniel/stats/;stat/a /
 a href=http://toolserver.org/~daniel/stats/url_201007.html;url/a /
 a href=http://munin.toolserver.org/index.html;info/a).
diff --git a/public_html/cgi-bin/templates/info.html 
b/public_html/cgi-bin/templates/info.html
index b998a9f..6091935 100644
--- a/public_html/cgi-bin/templates/info.html
+++ b/public_html/cgi-bin/templates/info.html
@@ -1,6 +1,6 @@
 {% extends layout.html %}
 {% block body %}
-smalla href=panel.py back/a/small
+smalla href=panel.py status/a/small
 pbServer Architecture/b: {{ arch.desc }}/p
 pbFlask/b: {{ flask.desc }}/p
 {% if compat %}
diff --git a/public_html/cgi-bin/templates/layout.html

[MediaWiki-commits] [Gerrit] Tools: Restore local symlinks for jobutils - change (operations/puppet)

2014-02-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Tools: Restore local symlinks for jobutils
..

Tools: Restore local symlinks for jobutils

This partially reverts I01592d50cc17a4acb25fd2d4b70881f450ad88cd.

Bug: 52258
Change-Id: Iee75364cfccb6290f50d8e70daad3a594c302648
---
M modules/gridengine/manifests/submit_host.pp
1 file changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/115612/1

diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index 0054ac1..437d816 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,6 +1,5 @@
 # gridengine.pp
 
-
 class gridengine::submit_host($gridmaster = $grid_master) {
 class { 'gridengine':
 gridmaster = $gridmaster,
@@ -11,7 +10,7 @@
 }
 
 package { 'gridengine-client':
-ensure = latest,
+ensure  = latest,
 require = Package['gridengine-common'],
 }
 
@@ -19,5 +18,23 @@
 ensure = link,
 target = '/data/project/.system/accounting',
 }
-}
 
+# Temporary hack to manage obsolete files in /usr/local/bin.
+# TODO: Remove when no longer needed.
+file { '/usr/local/bin/job':
+ensure = link,
+target = '/usr/bin/job',
+}
+file { '/usr/local/bin/jstart':
+ensure = link,
+target = '/usr/bin/jstart',
+}
+file { '/usr/local/bin/jstop':
+ensure = link,
+target = '/usr/bin/jstop',
+}
+file { '/usr/local/bin/jsub':
+ensure = link,
+target = '/usr/bin/jsub',
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee75364cfccb6290f50d8e70daad3a594c302648
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de

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

[MediaWiki-commits] [Gerrit] [Flow] Make message optional - change (translatewiki)

2014-02-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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

Change subject: [Flow] Make message optional
..

[Flow] Make message optional

https://gerrit.wikimedia.org/r/#/c/109431/19/Flow.i18n.php,unified

Change-Id: I2fa36fc10e6ff196ef05bd3dba22282ec4b04b23
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/13/115613/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index ed38da4..6283b4c 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -611,6 +611,7 @@
 
 Flow
 ignored = flow-hide-usertext, flow-delete-usertext, flow-system-usertext
+ignored = flow-error-invalid-action
 optional = flow-post-interaction-separator
 
 Flv Handler

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fa36fc10e6ff196ef05bd3dba22282ec4b04b23
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] [Flow] Make message optional - change (translatewiki)

2014-02-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: [Flow] Make message optional
..


[Flow] Make message optional

https://gerrit.wikimedia.org/r/#/c/109431/19/Flow.i18n.php,unified

Change-Id: I2fa36fc10e6ff196ef05bd3dba22282ec4b04b23
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index ed38da4..6283b4c 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -611,6 +611,7 @@
 
 Flow
 ignored = flow-hide-usertext, flow-delete-usertext, flow-system-usertext
+ignored = flow-error-invalid-action
 optional = flow-post-interaction-separator
 
 Flv Handler

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fa36fc10e6ff196ef05bd3dba22282ec4b04b23
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Turn rate limits WAY up for nova api. - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Turn rate limits WAY up for nova api.
..

Turn rate limits WAY up for nova api.

This is a temporary change to allow for automated instance migration.
This patch should be reverted after the migration is complete.

Change-Id: Ie4967598f95b0258a1835a7c6376ab1e99f118cc
---
M templates/openstack/folsom/nova/api-paste.ini.erb
M templates/openstack/havana/nova/api-paste.ini.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/115615/1

diff --git a/templates/openstack/folsom/nova/api-paste.ini.erb 
b/templates/openstack/folsom/nova/api-paste.ini.erb
index 5423e72..4ec0769 100644
--- a/templates/openstack/folsom/nova/api-paste.ini.erb
+++ b/templates/openstack/folsom/nova/api-paste.ini.erb
@@ -87,7 +87,7 @@
 
 [filter:ratelimit]
 paste.filter_factory = 
nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
-limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, 
DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, 
MINUTE);(DELETE, *, .*, 100, MINUTE)
+limits =(POST, *, .*, 30, MINUTE);(POST, */servers, ^/servers, 1, 
MINUTE);(PUT, *, .*, 30, MINUTE);(GET, *changes-since*, .*changes-since.*, 
30, MINUTE);(DELETE, *, .*, 100, MINUTE)
 
 [filter:sizelimit]
 paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory
diff --git a/templates/openstack/havana/nova/api-paste.ini.erb 
b/templates/openstack/havana/nova/api-paste.ini.erb
index 2b36b0f..da9ffd2 100644
--- a/templates/openstack/havana/nova/api-paste.ini.erb
+++ b/templates/openstack/havana/nova/api-paste.ini.erb
@@ -87,7 +87,7 @@
 
 [filter:ratelimit]
 paste.filter_factory = 
nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
-limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, 
DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, 
MINUTE);(DELETE, *, .*, 100, MINUTE)
+limits =(POST, *, .*, 30, MINUTE);(POST, */servers, ^/servers, 1, 
MINUTE);(PUT, *, .*, 30, MINUTE);(GET, *changes-since*, .*changes-since.*, 
30, MINUTE);(DELETE, *, .*, 100, MINUTE)
 
 [filter:sizelimit]
 paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4967598f95b0258a1835a7c6376ab1e99f118cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add a line specifying the nova api rate limits. - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Add a line specifying the nova api rate limits.
..

Add a line specifying the nova api rate limits.

This line doesn't change any of the defaults.  I'm commiting
this to establish a baseline... the next patch will actually
change these limits, temporarily.

Change-Id: Ie79b3c6f262ffb18d6db362a11f4182083fd2c78
---
M templates/openstack/folsom/nova/api-paste.ini.erb
M templates/openstack/havana/nova/api-paste.ini.erb
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/templates/openstack/folsom/nova/api-paste.ini.erb 
b/templates/openstack/folsom/nova/api-paste.ini.erb
index 269d956..5423e72 100644
--- a/templates/openstack/folsom/nova/api-paste.ini.erb
+++ b/templates/openstack/folsom/nova/api-paste.ini.erb
@@ -87,6 +87,7 @@
 
 [filter:ratelimit]
 paste.filter_factory = 
nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
+limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, 
DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, 
MINUTE);(DELETE, *, .*, 100, MINUTE)
 
 [filter:sizelimit]
 paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory
diff --git a/templates/openstack/havana/nova/api-paste.ini.erb 
b/templates/openstack/havana/nova/api-paste.ini.erb
index 6a03bb3..2b36b0f 100644
--- a/templates/openstack/havana/nova/api-paste.ini.erb
+++ b/templates/openstack/havana/nova/api-paste.ini.erb
@@ -87,6 +87,7 @@
 
 [filter:ratelimit]
 paste.filter_factory = 
nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
+limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, 
DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, 
MINUTE);(DELETE, *, .*, 100, MINUTE)
 
 [filter:sizelimit]
 paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie79b3c6f262ffb18d6db362a11f4182083fd2c78
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] update; correct/change 'LABS-TOOLS' to 'TOOL-LABS' - change (pywikibot...drtrigonbot)

2014-02-26 Thread DrTrigon (Code Review)

DrTrigon has uploaded a new change for review.

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

Change subject: update; correct/change 'LABS-TOOLS' to 'TOOL-LABS'
..

update; correct/change 'LABS-TOOLS' to 'TOOL-LABS'

Change-Id: I22540e1292b4674bd3024a0c3791bdaf7e65c249
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/drtrigonbot 
refs/changes/16/115616/1

diff --git a/fabfile.py b/fabfile.py
index ea3e66c..1afde96 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-HOW TO INSTALL DrTrigonBot TO TOOLSERVER AND/OR LABS-TOOLS
+HOW TO INSTALL DrTrigonBot TO TOOLSERVER AND/OR TOOL-LABS
 
 1.) download and install git (and fabric)
 2.) download the fabfile, e.g.:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22540e1292b4674bd3024a0c3791bdaf7e65c249
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/drtrigonbot
Gerrit-Branch: master
Gerrit-Owner: DrTrigon dr.tri...@surfeu.ch

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

[MediaWiki-commits] [Gerrit] update; correct/change 'LABS-TOOLS' to 'TOOL-LABS' - change (pywikibot...drtrigonbot)

2014-02-26 Thread DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged.

Change subject: update; correct/change 'LABS-TOOLS' to 'TOOL-LABS'
..


update; correct/change 'LABS-TOOLS' to 'TOOL-LABS'

Change-Id: I22540e1292b4674bd3024a0c3791bdaf7e65c249
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/fabfile.py b/fabfile.py
index ea3e66c..1afde96 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-HOW TO INSTALL DrTrigonBot TO TOOLSERVER AND/OR LABS-TOOLS
+HOW TO INSTALL DrTrigonBot TO TOOLSERVER AND/OR TOOL-LABS
 
 1.) download and install git (and fabric)
 2.) download the fabfile, e.g.:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22540e1292b4674bd3024a0c3791bdaf7e65c249
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/drtrigonbot
Gerrit-Branch: master
Gerrit-Owner: DrTrigon dr.tri...@surfeu.ch
Gerrit-Reviewer: DrTrigon dr.tri...@surfeu.ch

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

[MediaWiki-commits] [Gerrit] beta: lower memcached memory usage - change (operations/puppet)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: beta: lower memcached memory usage
..

beta: lower memcached memory usage

On pmtpa the instance have 16GB ram and we used 15GB, the instance never
used that much memory so I created instance with 4GB of RAM.  I guess
3GB of memcached will be enough.

Change-Id: I91effdcd296d29db8537db214f95491289506b08
---
M manifests/role/memcached.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/115617/1

diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index 937c608..0bc0286 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -15,7 +15,7 @@
 
$memcached_size = $::realm ? {
'production' = '89088',
-   'labs'   = '15000',
+   'labs'   = '3000',
}
 
class { ::memcached:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91effdcd296d29db8537db214f95491289506b08
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] mediawiki: stop timidity after it got installed - change (operations/puppet)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: mediawiki: stop timidity after it got installed
..

mediawiki: stop timidity after it got installed

timidity service comes from wikimedia-task-appserver which might not
have been installed yet producing the puppet error:

err: /Stage[main]/Mediawiki/Service[timidity]:
Could not evaluate: Could not find init script for 'timidity'

Change-Id: I8dcf42005827e7f8630acce95cad5a5318ba7d76
---
M modules/mediawiki/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/115618/1

diff --git a/modules/mediawiki/manifests/init.pp 
b/modules/mediawiki/manifests/init.pp
index 5effd82..6286117 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -12,7 +12,8 @@
# It's recommended by timidity and there's no simple way to avoid 
installing it
service { 'timidity':
enable = false,
-   ensure = stopped;
+   ensure = stopped,
+   after  = 'wikimedia-task-appserver',
}
 
include users::mwdeploy, users::l10nupdate, users::sudo, sync, cgroup, 
packages

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dcf42005827e7f8630acce95cad5a5318ba7d76
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Add $tablesUsed for test - change (mediawiki...Flow)

2014-02-26 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Add $tablesUsed for test
..

Add $tablesUsed for test

Change-Id: I04cb6f78389bf84e5250a1dcc67abe764dc83b0f
---
M tests/PermissionsTest.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/21/115621/1

diff --git a/tests/PermissionsTest.php b/tests/PermissionsTest.php
index b5a7f2e..891936c 100644
--- a/tests/PermissionsTest.php
+++ b/tests/PermissionsTest.php
@@ -16,6 +16,11 @@
  */
 class PermissionsTest extends PostRevisionTestCase {
/**
+* @var array
+*/
+   protected $tablesUsed = array( 'user', 'user_groups', 'ipblocks' );
+
+   /**
 * @var FlowActions
 */
protected $actions;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04cb6f78389bf84e5250a1dcc67abe764dc83b0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix tree_orig_create_time length - change (mediawiki...Flow)

2014-02-26 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Fix tree_orig_create_time length
..

Fix tree_orig_create_time length

It stores a wfTimestampNow(), which is 14 chars

Change-Id: I504b6792cdad85a5f658f11e0f80553396b1d001
---
M Hooks.php
A db_patches/patch-tree_orig_create_time.sql
M flow.sql
3 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/19/115619/1

diff --git a/Hooks.php b/Hooks.php
index 27fef73..8ad99db 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -58,6 +58,9 @@
$updater-modifyExtensionField( 'flow_revision', 
'rev_comment', $dir/db_patches/patch-rev_change_type.sql );
// convert 128 bit uuid's into 88bit
$updater-modifyExtensionField( 'flow_definition', 
'definition_id', $dir/db_patches/patch-88bit_uuids.sql );
+   // sqlite doesn't support alter table change, but also 
doesn't care about field sized so
+   // this patch doesn't matter to it.
+   $updater-modifyExtensionField( 'flow_tree_revision', 
'tree_orig_create_time', $dir/db_patches/patch-tree_orig_create_time.sql );
}
 
$updater-addExtensionIndex( 'flow_workflow', 
'flow_workflow_lookup', $dir/db_patches/patch-workflow_lookup_idx.sql );
diff --git a/db_patches/patch-tree_orig_create_time.sql 
b/db_patches/patch-tree_orig_create_time.sql
new file mode 100644
index 000..5d4597e
--- /dev/null
+++ b/db_patches/patch-tree_orig_create_time.sql
@@ -0,0 +1,2 @@
+ALTER TABLE /*_*/flow_tree_revision
+   CHANGE tree_orig_create_time tree_orig_create_time varchar(14) binary 
not null;
diff --git a/flow.sql b/flow.sql
index 1832689..c759d22 100644
--- a/flow.sql
+++ b/flow.sql
@@ -57,8 +57,8 @@
tree_rev_descendant_id binary(11) not null,
-- fk to flow_revision
tree_rev_id binary(11) not null,
-   -- denormalized so we dont need to keep finding the first revision of a 
post
-   tree_orig_create_time varchar(12) binary not null,
+   -- denormalized so we don't need to keep finding the first revision of 
a post
+   tree_orig_create_time varchar(14) binary not null,
tree_orig_user_id bigint unsigned not null,
tree_orig_user_ip varbinary(39) default null,
-- denormalize post parent as well? Prevents an extra query when 
building

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I504b6792cdad85a5f658f11e0f80553396b1d001
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Prefix tables with /_/ - change (mediawiki...Flow)

2014-02-26 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Prefix tables with /*_*/
..

Prefix tables with /*_*/

And fixed some inconsistent indents

Change-Id: Ib6acaecf40c26beb9562958feede30264af32609
---
M db_patches/patch-88bit_uuids.sql
M db_patches/patch-88bit_uuids.sqlite.sql
M db_patches/patch-rev_change_type.sqlite.sql
M db_patches/patch-revision_last_editor.sql
M db_patches/patch-summary2header.sqlite.sql
5 files changed, 33 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/20/115620/1

diff --git a/db_patches/patch-88bit_uuids.sql b/db_patches/patch-88bit_uuids.sql
index 7aaac7e..93329db 100644
--- a/db_patches/patch-88bit_uuids.sql
+++ b/db_patches/patch-88bit_uuids.sql
@@ -1,29 +1,28 @@
-
-ALTER TABLE flow_definition
+ALTER TABLE /*_*/flow_definition
CHANGE definition_id definition_id binary(11) not null;
 
-ALTER TABLE flow_workflow
+ALTER TABLE /*_*/flow_workflow
CHANGE workflow_id workflow_id binary(11) not null,
CHANGE workflow_definition_id workflow_definition_id binary(11) not 
null;
 
-ALTER TABLE flow_topic_list
+ALTER TABLE /*_*/flow_topic_list
CHANGE topic_list_id topic_list_id binary(11) not null,
CHANGE topic_id topic_id binary(11) default null;
 
-ALTER TABLE flow_tree_revision
+ALTER TABLE /*_*/flow_tree_revision
CHANGE tree_rev_descendant_id tree_rev_descendant_id binary(11) not 
null,
CHANGE tree_rev_id tree_rev_id binary(11) not null,
CHANGE tree_parent_id tree_parent_id binary(11) default null;
 
-ALTER TABLE flow_header_revision
+ALTER TABLE /*_*/flow_header_revision
CHANGE header_workflow_id header_workflow_id binary(11) not null,
CHANGE header_rev_id header_rev_id binary(11) not null;
 
-ALTER TABLE flow_revision
+ALTER TABLE /*_*/flow_revision
CHANGE rev_id rev_id binary(11) not null,
CHANGE rev_parent_id rev_parent_id binary(11) default null,
CHANGE rev_last_edit_id rev_last_edit_id binary(11) default null;
 
-ALTER TABLE flow_tree_node
+ALTER TABLE /*_*/flow_tree_node
CHANGE tree_ancestor_id tree_ancestor_id binary(11) not null,
CHANGE tree_descendant_id tree_descendant_id binary(11) not null;
diff --git a/db_patches/patch-88bit_uuids.sqlite.sql 
b/db_patches/patch-88bit_uuids.sqlite.sql
index b0fa969..41a12b5 100644
--- a/db_patches/patch-88bit_uuids.sqlite.sql
+++ b/db_patches/patch-88bit_uuids.sqlite.sql
@@ -1,29 +1,28 @@
+UPDATE /*_*/flow_definition
+   SET definition_id = substr( definition_id, 1, 11 );
 
-UPDATE flow_definition
-   SET definition_id = substr( definition_id, 1, 11 );
+UPDATE /*_*/flow_workflow
+   SET workflow_id = substr( workflow_id, 1, 11 ),
+   workflow_definition_id = substr( 
workflow_definition_id, 1, 11 );
 
-UPDATE flow_workflow
-   SET workflow_id = substr( workflow_id, 1, 11 ),
-   workflow_definition_id = substr( workflow_definition_id, 1, 11 );
+UPDATE /*_*/flow_topic_list
+   SET topic_list_id = substr( topic_list_id, 1, 11 ),
+   topic_id = substr( topic_id, 1, 11 );
 
-UPDATE flow_topic_list
-   SET topic_list_id = substr( topic_list_id, 1, 11 ),
-   topic_id = substr( topic_id, 1, 11 );
+UPDATE /*_*/flow_tree_revision
+   SET tree_rev_descendant_id = substr( tree_rev_descendant_id, 1, 11 ),
+   tree_rev_id = substr( tree_rev_id, 1, 11 ),
+   tree_parent_id = substr( tree_parent_id, 1, 11 );
 
-UPDATE flow_tree_revision
-   SET tree_rev_descendant_id = substr( tree_rev_descendant_id, 1, 11 ),
-   tree_rev_id = substr( tree_rev_id, 1, 11 ),
-  tree_parent_id = substr( tree_parent_id, 1, 11 );
+UPDATE /*_*/flow_header_revision
+   SET header_workflow_id = substr( header_workflow_id, 1, 11 ),
+   header_rev_id = substr( header_rev_id, 1, 11 );
 
-UPDATE flow_header_revision
-   SET header_workflow_id = substr( header_workflow_id, 1, 11 ),
-   header_rev_id = substr( header_rev_id, 1, 11 );
+UPDATE /*_*/flow_revision
+   SET rev_id = substr( rev_id, 1, 11 ),
+   rev_parent_id = substr( rev_parent_id, 1, 11 ),
+   rev_last_edit_id = substr( rev_last_edit_id, 1, 11 );
 
-UPDATE flow_revision
-   SET rev_id = substr( rev_id, 1, 11 ),
-   rev_parent_id = substr( rev_parent_id, 1, 11 ),
-  rev_last_edit_id = substr( rev_last_edit_id, 1, 11 );
-
-UPDATE flow_tree_node
-   SET tree_ancestor_id = substr( tree_ancestor_id, 1, 11 ),
-   tree_descendant_id = substr( tree_descendant_id, 1, 11 );
+UPDATE /*_*/flow_tree_node
+   SET tree_ancestor_id = substr( tree_ancestor_id, 1, 11 ),
+   tree_descendant_id = substr( tree_descendant_id, 1, 11 
);
diff --git a/db_patches/patch-rev_change_type.sqlite.sql

[MediaWiki-commits] [Gerrit] Correctly scrape reference and source lists - change (mediawiki...Wikibase)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Correctly scrape reference and source lists
..


Correctly scrape reference and source lists

When there are snaks which do not need to be scraped, their HTML is used for
scraping the next snak's value, which completely breaks display of reference
and source lists.

Bug: 61943
Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
---
M repo/resources/wikibase.ui.scrapeFormattedValues.js
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  WikidataJenkins: Verified
  jenkins-bot: Verified



diff --git a/repo/resources/wikibase.ui.scrapeFormattedValues.js 
b/repo/resources/wikibase.ui.scrapeFormattedValues.js
index 91ceb96..a4ac683 100644
--- a/repo/resources/wikibase.ui.scrapeFormattedValues.js
+++ b/repo/resources/wikibase.ui.scrapeFormattedValues.js
@@ -50,8 +50,9 @@
$qualifierValues = 
$qualifierValues || getQualifierValueNodes( $claim );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = $qualifierValues.eq( 
iQualifiers++ ).html();
+   = $qualifierValues.eq( 
iQualifiers ).html();
}
+   iQualifiers++;
} );
} );
 
@@ -63,8 +64,9 @@
= 
$referenceValues || getReferenceValueNodes( reference.getHash() );
 

wb.__formattedValues[JSON.stringify( snak.getValue().toJSON() )]
-   = 
$referenceValues.eq( iReferences++ ).html();
+   = 
$referenceValues.eq( iReferences ).html();
}
+   iReferences++;
} );
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11038267cab50f3e2ce09931b2705c75d3381f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.23-wmf15
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Create OSM labs db partitioning scheme and dhcp - change (operations/puppet)

2014-02-26 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Create OSM labs db partitioning scheme and dhcp
..

Create OSM labs db partitioning scheme and dhcp

Those boxes have a RAID6 hardware raid of 12 2T SATA disks. Configuring
them with a 300Mb /boot, 8G swap and 1T /, the last two on LVM
In the same commit assign their macs the respective hostnames

Change-Id: Id3df153100379a838df724e43fcc54a5d3b9e826
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/osmlabsdb.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 56 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/115622/1

diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 4ff407a..fa8b2ef 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -64,6 +64,7 @@
ms-be30[0-9][0-9]) echo partman/ceph-ssd.cfg ;; \
mw[0-9]*|srv[0-9]*) echo partman/mw.cfg ;; \
labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
+   labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
nickel) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc[1-3]|pc100[1-3]) echo partman/mw.cfg ;; \
diff --git a/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg 
b/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg
new file mode 100644
index 000..9833734
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg
@@ -0,0 +1,51 @@
+# configuration to create:
+#  * no software RAID (either single disk or hardware raid presenting a single 
device)
+#  * 300M on /boot outside of LVM
+#  * the rest formatted with LVM with 80% used
+#  ** 8G swap
+#  ** 1T /
+
+
+d-ipartman-auto/method string  lvm
+d-ipartman-auto/disk   string  /dev/sda
+
+# the install makes sure we want to wipe the lvm/raid config
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite true
+
+# This makes partman automatically partition without confirmation, provided
+# that you told it what to do using one of the methods above.
+d-ipartman-partitioning/confirm_write_new_label booleantrue
+d-ipartman/choose_partitionselect  finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+
+d-ipartman-auto/expert_recipe  string  osmdb ::\
+   40 300 300 ext3 \
+   $primary{ } \
+   $bootable{ }\
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext3 }  \
+   mountpoint{ /boot } \
+   .   \
+   8000 8000 8000 linux-swap   \
+   method{ swap }  \
+   $lvmok{ }   \
+   format{ }   \
+   .
+   100 100 100 ext3\
+   $lvmok{ }   \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext3 }  \
+   mountpoint{ / } \
+   .   \
+
+d-ipartman-auto-lvm/guided_sizestring  80%
+
+d-ipartman-auto/choose_recipe  osmdb
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 77f2574..6ed977a 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1363,14 +1363,14 @@
fixed-address labstore1002.eqiad.wmnet;
 }
 
-host labstore1003 {
+host labsdb1004 {
hardware ethernet d4:ae:52:76:66:59;
-   fixed-address labstore1003.eqiad.wmnet;
+   fixed-address labsdb1004.eqiad.wmnet;
 }
 
-host labstore1004 {
+host labsdb1005 {
hardware ethernet d4:ae:52:76:5c:b2;
-   fixed-address labstore1004.eqiad.wmnet;
+   fixed-address labsdb1005.eqiad.wmnet;
 }
 
 host lanthanum {

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] beta: memcached multiwrite to pmtpa and eqiad - change (operations/mediawiki-config)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: beta: memcached multiwrite to pmtpa and eqiad
..

beta: memcached multiwrite to pmtpa and eqiad

I started creating instances for the beta cluster on eqiad. I got two
new memcached servers:

 deployment-memc02.eqiad.wmflabs 10.68.16.14
 deployment-memc03.eqiad.wmflabs 10.68.16.15

I would like MediaWiki to write to both datacenters. Hopefully this
configuration would work.

Change-Id: If84c2513d4b1ecc1c13bc5ebe565211730654ce7
---
M wmf-config/mc-labs.php
1 file changed, 32 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php
index dbc53ee..eaf6eea 100644
--- a/wmf-config/mc-labs.php
+++ b/wmf-config/mc-labs.php
@@ -14,14 +14,42 @@
  *
  */
 $wgMemCachedPersistent = true;
-$wgMainCacheType = CACHE_MEMCACHED;
+
+$wgMainCacheType = 'beta-memcached-multiwrite';
+
 $wgMemCachedTimeout = 50; # micro seconds
 $wgSessionsInMemcached = true;
 
-$wgMemCachedServers = array(
-   0 = '10.4.1.86:11211',   # deployment-memc0
-   1 = '10.4.1.106:11211',  # deployment-memc1
+# While migrating beta from pmtpa to eqiad, we want to write to memcached in
+# both datacenters.
+
+$wgObjectCaches['beta-memcached-pmtpa'] = array(
+   'class'  = 'MemcachedPeclBagOStuff',
+   'serializer' = 'igbinary',
+   'persistent' = false,
+   'servers'= array(
+   0 = '10.4.1.86:11211',   # deployment-memc0.pmtpa
+   1 = '10.4.1.106:11211',  # deployment-memc1.pmtpa
+   ),
+   'retry_timeout' = 1,
+);
+$wgObjectCaches['beta-memcached-eqiad'] = array(
+   'class'  = 'MemcachedPeclBagOStuff',
+   'serializer' = 'igbinary',
+   'persistent' = false,
+   'servers'= array(
+   0 = '10.68.16.14:11211',  # deployment-memc2.eqiad
+   1 = '10.68.16.15:11211',  # deployment-memc3.eqiad
+   ),
+   'retry_timeout' = 1,
 );
 
+$wgObjectCaches['beta-memcached-multiwrite'] = array(
+   'class'  = 'MultiWriteBagOStuff',
+   'caches' = array(
+   0 = $wgObjectCaches['beta-memcached-pmtpa'],
+   1 = $wgObjectCaches['beta-memcached-eqiad'],
+   ),
+);
 
 } # end safe guard

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If84c2513d4b1ecc1c13bc5ebe565211730654ce7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] deployment::target does not work in labs, skip it - change (operations/puppet)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: deployment::target does not work in labs, skip it
..

deployment::target does not work in labs, skip it

Spotted while installing on beta a role::applicationserver. The common
sub class includes deployment::target which is causing a bunch of errors
in puppet.

Since we cant use salt on beta, lets skip the deployment::target
entirely unless we are in production realm.

Change-Id: I5702f3de95d4abdc23e6470461f0a2357afea122
---
M manifests/role/applicationserver.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/115624/1

diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index f0e370d..941b46f 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -87,7 +87,9 @@
class { lvs::realserver: realserver_ips = 
$lvs::configuration::lvs_service_ips[$::realm][$lvs_pool][$::site] }
}
 
-   deployment::target { mediawiki: }
+   if $::realm == 'production' {
+   deployment::target { mediawiki: }
+   }
}
 
# This class installs everything necessary for an apache webserver

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5702f3de95d4abdc23e6470461f0a2357afea122
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Putting PTR records back for analytics100{3, 4}.eqiad.wmnet - change (operations/dns)

2014-02-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Putting PTR records back for analytics100{3,4}.eqiad.wmnet
..

Putting PTR records back for analytics100{3,4}.eqiad.wmnet

These machines were given public IPs as they were previously Kafka brokers.
I want to use them for temporary kafkatee consumer testers now, and I'd
rather they have private IPs before we start saving webrequest logs here.

Change-Id: I4f2235c28b233b534b25ca5912d7388dfe73bf65
---
M templates/10.in-addr.arpa
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/25/115625/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index cd6f989..7a2f3a3 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1470,6 +1470,8 @@
 3  1H IN PTR   ae2-1021.cr2-eqiad.wikimedia.org.
 ;107   1H IN PTR   analytics1007.eqiad.wmnet.
 
+1031H IN PTR   analytics1003.eqiad.wmnet.
+1041H IN PTR   analytics1004.eqiad.wmnet.
 1101H IN PTR   analytics1010.eqiad.wmnet.
 1231H IN PTR   vanadium.eqiad.wmnet.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f2235c28b233b534b25ca5912d7388dfe73bf65
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Pointing analytics100{3, 4} macs back at their .eqiad.wmnet a... - change (operations/puppet)

2014-02-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Pointing analytics100{3,4} macs back at their .eqiad.wmnet 
addresses
..

Pointing analytics100{3,4} macs back at their .eqiad.wmnet addresses

These machines were given public IPs as they were previously Kafka brokers.
I want to use them for temporary kafkatee consumer testers now, and I'd
rather they have private IPs before we start saving webrequest logs here.

I will change their entries in site.pp in this commit to avoid conflicts:
https://gerrit.wikimedia.org/r/#/c/115411/

Change-Id: I1ab17b491b5537f6cf3c16c9a382a91d915e4f9a
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/115626/1

diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index e82e629..6c9d86b 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -6,12 +6,12 @@
 
 host analytics1003 {
hardware ethernet 88:43:e1:c2:99:48;
-   fixed-address analytics1003.wikimedia.org;
+   fixed-address analytics1003.eqiad.wmnet;
 }
 
 host analytics1004 {
hardware ethernet 88:43:e1:c2:86:94;
-   fixed-address analytics1004.wikimedia.org;
+   fixed-address analytics1004.eqiad.wmnet;
 }
 
 host analytics1009 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ab17b491b5537f6cf3c16c9a382a91d915e4f9a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix typo: Full stop should be outside the paranthesis. - change (mediawiki...CentralNotice)

2014-02-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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

Change subject: Fix typo: Full stop should be outside the paranthesis.
..

Fix typo: Full stop should be outside the paranthesis.

Spotted by Lokal Profil
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralnotice-banner-class-desc/en

Change-Id: Iba5697c5a53b80009b4ffdda61eb92fea55955e9
---
M CentralNotice.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/27/115627/1

diff --git a/CentralNotice.i18n.php b/CentralNotice.i18n.php
index 4a01d04..75f7dbd 100644
--- a/CentralNotice.i18n.php
+++ b/CentralNotice.i18n.php
@@ -216,7 +216,7 @@
'centralnotice-user-role-logged-in' = 'Logged-in',
'centralnotice-banner-messages' = 'Translatable banner messages',
'centralnotice-banner-class' = 'Category',
-   'centralnotice-banner-class-desc' = 'Banners of a specific category 
share tracking variables and group settings (e.g. hide cookies and impression 
counts.) Category names can be magic words like nowiki{{{campaign}}}/nowiki 
or nowiki{{{banner}}}/nowiki which will be automatically expanded at 
display time. Values must be alphanumeric.',
+   'centralnotice-banner-class-desc' = 'Banners of a specific category 
share tracking variables and group settings (e.g. hide cookies and impression 
counts). Category names can be magic words like nowiki{{{campaign}}}/nowiki 
or nowiki{{{banner}}}/nowiki which will be automatically expanded at 
display time. Values must be alphanumeric.',
'centralnotice-templates-included' = 'Included templates',
 
'centralnotice-archive-banner' = 'Archive',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba5697c5a53b80009b4ffdda61eb92fea55955e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] Adding OSM role classes - change (operations/puppet)

2014-02-26 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Adding OSM role classes
..


Adding OSM role classes

For now, setup postgres and postgis as well as replication between
a master and a slave

Change-Id: I3430cef15e7a27dfe4a9a26378af0857e4985b1a
---
A manifests/role/osm.pp
1 file changed, 44 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
new file mode 100644
index 000..c5469fe
--- /dev/null
+++ b/manifests/role/osm.pp
@@ -0,0 +1,44 @@
+# OSM role classes
+
+class role::osm::master {
+include postgresql::master
+include postgresql::postgis
+include passwords::osm
+
+if $::osm_slave_v4 {
+postgresql::user { replication@${::osm_slave}-v4:
+ensure   = 'present',
+user = 'replication',
+password = $passwords::osm::replication_pass,
+cidr = ${::osm_slave_v4}/32,
+type = 'host',
+method   = 'md5',
+attrs= 'REPLICATION',
+database = 'replication',
+require  = Class['postgresql::master'],
+}
+}
+if $::osm_slave_v6 {
+postgresql::user { replication@${::osm_slave}-v6:
+ensure   = 'present',
+user = 'replication',
+password = $passwords::osm::replication_pass,
+cidr = ${::osm_slave_v6}/128,
+type = 'host',
+method   = 'md5',
+attrs= 'REPLICATION',
+database = 'replication',
+require  = Class['postgresql::master'],
+}
+}
+}
+
+class role::osm::slave {
+include postgresql::postgis
+include passwords::osm
+
+class {'postgresql::slave':
+master_server= $::osm_master,
+replication_pass = $passwords::osm::replication_pass,
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3430cef15e7a27dfe4a9a26378af0857e4985b1a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Create OSM labs db partitioning scheme and dhcp - change (operations/puppet)

2014-02-26 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Create OSM labs db partitioning scheme and dhcp
..


Create OSM labs db partitioning scheme and dhcp

Those boxes have a RAID6 hardware raid of 12 2T SATA disks. Configuring
them with a 300Mb /boot, 8G swap and 1T /, the last two on LVM
In the same commit assign their macs the respective hostnames

Change-Id: Id3df153100379a838df724e43fcc54a5d3b9e826
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/osmlabsdb.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 56 insertions(+), 4 deletions(-)

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



diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 4ff407a..fa8b2ef 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -64,6 +64,7 @@
ms-be30[0-9][0-9]) echo partman/ceph-ssd.cfg ;; \
mw[0-9]*|srv[0-9]*) echo partman/mw.cfg ;; \
labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
+   labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
nickel) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc[1-3]|pc100[1-3]) echo partman/mw.cfg ;; \
diff --git a/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg 
b/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg
new file mode 100644
index 000..9833734
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg
@@ -0,0 +1,51 @@
+# configuration to create:
+#  * no software RAID (either single disk or hardware raid presenting a single 
device)
+#  * 300M on /boot outside of LVM
+#  * the rest formatted with LVM with 80% used
+#  ** 8G swap
+#  ** 1T /
+
+
+d-ipartman-auto/method string  lvm
+d-ipartman-auto/disk   string  /dev/sda
+
+# the install makes sure we want to wipe the lvm/raid config
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite true
+
+# This makes partman automatically partition without confirmation, provided
+# that you told it what to do using one of the methods above.
+d-ipartman-partitioning/confirm_write_new_label booleantrue
+d-ipartman/choose_partitionselect  finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+
+d-ipartman-auto/expert_recipe  string  osmdb ::\
+   40 300 300 ext3 \
+   $primary{ } \
+   $bootable{ }\
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext3 }  \
+   mountpoint{ /boot } \
+   .   \
+   8000 8000 8000 linux-swap   \
+   method{ swap }  \
+   $lvmok{ }   \
+   format{ }   \
+   .
+   100 100 100 ext3\
+   $lvmok{ }   \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext3 }  \
+   mountpoint{ / } \
+   .   \
+
+d-ipartman-auto-lvm/guided_sizestring  80%
+
+d-ipartman-auto/choose_recipe  osmdb
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 77f2574..6ed977a 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1363,14 +1363,14 @@
fixed-address labstore1002.eqiad.wmnet;
 }
 
-host labstore1003 {
+host labsdb1004 {
hardware ethernet d4:ae:52:76:66:59;
-   fixed-address labstore1003.eqiad.wmnet;
+   fixed-address labsdb1004.eqiad.wmnet;
 }
 
-host labstore1004 {
+host labsdb1005 {
hardware ethernet d4:ae:52:76:5c:b2;
-   fixed-address labstore1004.eqiad.wmnet;
+   fixed-address labsdb1005.eqiad.wmnet;
 }
 
 host lanthanum {

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

Gerrit-MessageType: merged
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] Introduce labsdb100[45].eqiad.wmnet - change (operations/puppet)

2014-02-26 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Introduce labsdb100[45].eqiad.wmnet
..


Introduce labsdb100[45].eqiad.wmnet

Apply the role::osm roles to them

Change-Id: I85ee9cf9067abcb9ef8f212761c7b0f83f3597db
---
M manifests/site.pp
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index ca22db7..5702659 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1378,6 +1378,19 @@
 }
 }
 
+node 'labsdb1004.eqiad.wmnet' {
+include role::osm::master
+
+$osm_slave = 'labsdb1005.eqiad.wmnet'
+$osm_slave_v4 = '10.64.37.9'
+}
+
+node 'labsdb1005.eqiad.wmnet' {
+include role::osm::slave
+
+$master_server = 'labsdb1004.eqiad.wmnet'
+}
+
 node /labstore[12]\.pmtpa\.wmnet/ {
 
 $site = 'pmtpa'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85ee9cf9067abcb9ef8f212761c7b0f83f3597db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Configuration for beta cluster caches in eqiad - change (operations/puppet)

2014-02-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Configuration for beta cluster caches in eqiad
..

Configuration for beta cluster caches in eqiad

I have created the apache instances on eqiad.wmflabs as well as the
parsoid instance. This fill in missing bits in the huge configuration
hash.

Note eqiad labs does not have /dev/vdb (yet?) so the varnish persistent
storage are not going to work anyway.

Change-Id: I949aa6f5372e3f7c90c5858bb5238d5d9748ce97
---
M manifests/role/cache.pp
1 file changed, 45 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/115629/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 2e438a2..dcb6cc5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -125,12 +125,30 @@
 }
 },
 'labs' = {
-'api'= { 'pmtpa' = '127.0.0.1', },
-'bits'   = { 'pmtpa' = '127.0.0.1', },
-'mobile' = { 'pmtpa' = '127.0.0.1', },
-'text'   = { 'pmtpa' = '127.0.0.1', },
-'upload' = { 'pmtpa' = '127.0.0.1', },
-'parsoid' = { 'pmtpa' = '127.0.0.1', },
+'api'= {
+'eqiad' = '127.0.0.1',
+'pmtpa' = '127.0.0.1',
+},
+'bits'   = {
+'eqiad' = '127.0.0.1',
+'pmtpa' = '127.0.0.1',
+},
+'mobile' = {
+'eqiad' = '127.0.0.1',
+'pmtpa' = '127.0.0.1',
+},
+'text'   = {
+'eqiad' = '127.0.0.1',
+'pmtpa' = '127.0.0.1',
+},
+'upload' = {
+'eqiad' = '127.0.0.1',
+'pmtpa' = '127.0.0.1',
+},
+'parsoid' = {
+'eqiad' = '127.0.0.1',
+'pmtpa' = '127.0.0.1',
+},
 },
 }
 
@@ -335,37 +353,56 @@
 },
 'labs' = {
 'appservers' = {
+'eqiad' = [
+'10.68.16.6',   # deployment-apache01
+'10.68.16.11',  # deployment-apache02
+],
 'pmtpa' = [
 '10.4.0.166',  # deployment-apache32
 '10.4.0.187',  # deployment-apache33
 ],
 },
 'api' = {
+'eqiad' = [
+'10.68.16.6',   # deployment-apache01
+'10.68.16.11',  # deployment-apache02
+],
 'pmtpa' = [
 '10.4.0.166',  # deployment-apache32
 '10.4.0.187',  # deployment-apache33
 ],
 },
 'bits' = {
+# FIXME does eqiad.wmflabs needs that?
 'pmtpa' = 10.4.0.252,
 },
 'bits_appservers' = {
+'eqiad' = [
+'10.68.16.6',   # deployment-apache01
+'10.68.16.11',  # deployment-apache02
+],
 'pmtpa' = [
 '10.4.0.166',  # deployment-apache32
 '10.4.0.187',  # deployment-apache33
 ],
 },
 'rendering' = {
+'eqiad' = [
+'10.68.16.6',   # deployment-apache01
+'10.68.16.11',  # deployment-apache02
+],
 'pmtpa' = [
 '10.4.0.166',  # deployment-apache32
 '10.4.0.187',  # deployment-apache33
 ],
 },
 'test_appservers' = {
-'pmtpa' = [ '10.4.0.166' ],
+'eqiad' = [ '10.68.16.6' ],  # deployment-apache01
+'pmtpa' = [ '10.4.0.166' ],  # deployment-apache32
 },
 'parsoid' = {
-'pmtpa' = [ '10.4.1.121' ], # deployment-parsoid2
+'eqiad' = [ '10.68.16.17' ],  # deployment-parsoid04
+'pmtpa' = [ '10.4.1.121' ],   # deployment-parsoid2
 }
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I949aa6f5372e3f7c90c5858bb5238d5d9748ce97
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits

[MediaWiki-commits] [Gerrit] README.md updates - change (operations...kafka)

2014-02-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: README.md updates
..

README.md updates

Change-Id: Ib64929a4da07e058bda38918661b256a96b3736c
---
M README.md
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka 
refs/changes/28/115628/1

diff --git a/README.md b/README.md
index 30ce4f4..5c505aa 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,9 @@
 # Requirements
 - Java
 - An Kafka 0.8 package.
-  0.8 is not yet released (as of 2013-06-13), but you can build a .deb package 
using
-  [operations/debs/kafka debian 
branch](https://github.com/wikimedia/operations-debs-kafka/tree/debian)
+  You can build a .deb package using the 
+  [operations/debs/kafka debian 
branch](https://github.com/wikimedia/operations-debs-kafka/tree/debian),
+  or just install using this [prebuilt 
.deb](http://apt.wikimedia.org/wikimedia/pool/universe/k/kafka/)
 - A running zookeeper cluster.  You can set one up using WMF's
   [puppet-zookeeper module](https://github.com/wikimedia/puppet-zookeeper).
 
@@ -84,7 +85,7 @@
 ```zkCli.sh``` that ships with Zookeeper, or you can use the kafka built in
 ```zookeeper-shell```:
 
-```bash
+```
 $ kafka zookeeper-shell zookeeper_host:2182
 Connecting to kraken-zookeeper
 Welcome to ZooKeeper!

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib64929a4da07e058bda38918661b256a96b3736c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] README.md updates - change (operations...kafka)

2014-02-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: README.md updates
..


README.md updates

Change-Id: Ib64929a4da07e058bda38918661b256a96b3736c
---
M README.md
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/README.md b/README.md
index 30ce4f4..5c505aa 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,9 @@
 # Requirements
 - Java
 - An Kafka 0.8 package.
-  0.8 is not yet released (as of 2013-06-13), but you can build a .deb package 
using
-  [operations/debs/kafka debian 
branch](https://github.com/wikimedia/operations-debs-kafka/tree/debian)
+  You can build a .deb package using the 
+  [operations/debs/kafka debian 
branch](https://github.com/wikimedia/operations-debs-kafka/tree/debian),
+  or just install using this [prebuilt 
.deb](http://apt.wikimedia.org/wikimedia/pool/universe/k/kafka/)
 - A running zookeeper cluster.  You can set one up using WMF's
   [puppet-zookeeper module](https://github.com/wikimedia/puppet-zookeeper).
 
@@ -84,7 +85,7 @@
 ```zkCli.sh``` that ships with Zookeeper, or you can use the kafka built in
 ```zookeeper-shell```:
 
-```bash
+```
 $ kafka zookeeper-shell zookeeper_host:2182
 Connecting to kraken-zookeeper
 Welcome to ZooKeeper!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib64929a4da07e058bda38918661b256a96b3736c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Putting PTR records back for analytics100{3, 4}.eqiad.wmnet - change (operations/dns)

2014-02-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Putting PTR records back for analytics100{3,4}.eqiad.wmnet
..


Putting PTR records back for analytics100{3,4}.eqiad.wmnet

These machines were given public IPs as they were previously Kafka brokers.
I want to use them for temporary kafkatee consumer testers now, and I'd
rather they have private IPs before we start saving webrequest logs here.

Change-Id: I4f2235c28b233b534b25ca5912d7388dfe73bf65
---
M templates/10.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index cd6f989..7a2f3a3 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1470,6 +1470,8 @@
 3  1H IN PTR   ae2-1021.cr2-eqiad.wikimedia.org.
 ;107   1H IN PTR   analytics1007.eqiad.wmnet.
 
+1031H IN PTR   analytics1003.eqiad.wmnet.
+1041H IN PTR   analytics1004.eqiad.wmnet.
 1101H IN PTR   analytics1010.eqiad.wmnet.
 1231H IN PTR   vanadium.eqiad.wmnet.
 
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 338ea4b..40be40c 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -95,8 +95,6 @@
 157 1H  IN PTR  chromium.wikimedia.org.
 158 1H  IN PTR  calcium.wikimedia.org.
 159 1H  IN PTR  netmon1001.wikimedia.org.
-160 1H  IN PTR  analytics1003.wikimedia.org.
-161 1H  IN PTR  analytics1004.wikimedia.org.
 
 
 ; Neighbor blocks (208.80.154.192/27)
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 0fdb9c0..303936a 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -102,8 +102,6 @@
 al-fundraising 1H  IN A208.80.154.12
 aluminium  1H  IN A208.80.154.6
 aluminum   1H  IN CNAME aluminium
-analytics1003  1H  IN A208.80.154.160
-analytics1004  1H  IN A208.80.154.161
 antimony   1H  IN A208.80.154.7
 
 barium 1H  IN A208.80.155.11

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f2235c28b233b534b25ca5912d7388dfe73bf65
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Gage jger...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Allow configuration of periodic task interval - change (mediawiki/core)

2014-02-26 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

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

Change subject: Allow configuration of periodic task interval
..

Allow configuration of periodic task interval

The redis job queue supports delayed jobs but it only checks for them
once every 10 pops or once every five minutes.  This is fine in production
but when running integration tests we want faster turn around time.  This
allows us to force the periodic task execution to one second in integration
tests which speeds them up substantially but leave the standard periodic
time calculation in production which is optimized for lower load.

Change-Id: I74cf3ca78660bd1ae7c1c88c278a15b4a56f6064
---
M includes/job/JobQueueRedis.php
1 file changed, 19 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/115630/1

diff --git a/includes/job/JobQueueRedis.php b/includes/job/JobQueueRedis.php
index 3422664..c785cb2 100644
--- a/includes/job/JobQueueRedis.php
+++ b/includes/job/JobQueueRedis.php
@@ -72,6 +72,12 @@
protected $key;
 
/**
+* @var null|int maximum seconds between execution of periodic tasks.  
Used to speed up
+* testing but should otherwise be left unset.
+*/
+   protected $maximumPeriodicTaskSeconds;
+
+   /**
 * @params include:
 *   - redisConfig : An array of parameters to 
RedisConnectionPool::__construct().
 *   Note that the serializer option is ignored as 
none is always used.
@@ -79,6 +85,10 @@
 *   If a hostname is specified but no port, the 
standard port number
 *   6379 will be used. Required.
 *   - compression : The type of compression to use; one of (none,gzip).
+*   - maximumPeriodicTaskSeconds : Maximum seconds between check 
periodic tasks.  Set to
+*   force faster execution of periodic tasks for 
inegration tests that
+*   rely on checkDelay.  Without this the integration 
tests are very very
+*   slow.  This really shouldn't be set in production.
 * @param array $params
 */
public function __construct( array $params ) {
@@ -87,6 +97,8 @@
$this-server = $params['redisServer'];
$this-compression = isset( $params['compression'] ) ? 
$params['compression'] : 'none';
$this-redisPool = RedisConnectionPool::singleton( 
$params['redisConfig'] );
+   $this-maximumPeriodicTaskSeconds = isset( 
$params['maximumPeriodicTaskSeconds'] ) ?
+   $params['maximumPeriodicTaskSeconds'] : null;
}
 
protected function supportedOrders() {
@@ -724,10 +736,16 @@
if ( $this-checkDelay ) {
$periods[] = 300; // 5 minutes
}
+   $period = min( $periods );
+   $period = max( $period, 30 ); // sanity
+   // Support override for faster testing
+   if ( $this-maximumPeriodicTaskSeconds !== null ) {
+   $period = min( $period, 
$this-maximumPeriodicTaskSeconds );
+   }
return array(
'recyclePruneAndUndelayJobs' = array(
'callback' = array( $this, 
'recyclePruneAndUndelayJobs' ),
-   'period'   = max( min( $periods ), 30 ) // 
sanity
+   'period'   = $period,
)
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74cf3ca78660bd1ae7c1c88c278a15b4a56f6064
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Turn the labs::nfs::client class off for eqiad. - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Turn the labs::nfs::client class off for eqiad.
..

Turn the labs::nfs::client class off for eqiad.

eqiad is NFS by default, and doesn't need this.

Also some lint cleanup while I'm in here.

Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d
---
M manifests/role/labsnfs.pp
1 file changed, 36 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/115631/1

diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 94cb297..0e30950 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -2,40 +2,43 @@
 # in LDAP once transition is over.
 
 class role::labsnfs::client {
-   $nfscluster = labnfs.pmtpa.wmnet
 
-   file {
-   /etc/auto.master:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.master.erb);
-   }
-   file { /etc/auto.space:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.space.erb);
-   }
-   file { /etc/auto.time.home:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.time.home.erb);
-   }
-   file { /etc/auto.time.project:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.time.project.erb);
-   }
+if $::site == 'pmtpa' {
+$nfscluster = 'labnfs.pmtpa.wmnet'
 
-   file { /etc/init/nfs-noidmap.conf:
-   source = puppet:///files/nfs/upstart-nfs-noidmap.conf
-   }
+file {
+'/etc/auto.master':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.master.erb');
+}
+file { '/etc/auto.space':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.space.erb');
+}
+file { '/etc/auto.time.home':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.time.home.erb');
+}
+file { '/etc/auto.time.project':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.time.project.erb');
+}
+
+file { '/etc/init/nfs-noidmap.conf':
+source = 'puppet:///files/nfs/upstart-nfs-noidmap.conf'
+}
+}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Pointing analytics100{3, 4} macs back at their .eqiad.wmnet a... - change (operations/puppet)

2014-02-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Pointing analytics100{3,4} macs back at their .eqiad.wmnet 
addresses
..


Pointing analytics100{3,4} macs back at their .eqiad.wmnet addresses

These machines were given public IPs as they were previously Kafka brokers.
I want to use them for temporary kafkatee consumer testers now, and I'd
rather they have private IPs before we start saving webrequest logs here.

I will change their entries in site.pp in this commit to avoid conflicts:
https://gerrit.wikimedia.org/r/#/c/115411/

Change-Id: I1ab17b491b5537f6cf3c16c9a382a91d915e4f9a
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index e82e629..6c9d86b 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -6,12 +6,12 @@
 
 host analytics1003 {
hardware ethernet 88:43:e1:c2:99:48;
-   fixed-address analytics1003.wikimedia.org;
+   fixed-address analytics1003.eqiad.wmnet;
 }
 
 host analytics1004 {
hardware ethernet 88:43:e1:c2:86:94;
-   fixed-address analytics1004.wikimedia.org;
+   fixed-address analytics1004.eqiad.wmnet;
 }
 
 host analytics1009 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ab17b491b5537f6cf3c16c9a382a91d915e4f9a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Gage jger...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Show the right username in the confirmation for removing art... - change (mediawiki...EducationProgram)

2014-02-26 Thread Ragesoss (Code Review)

Ragesoss has uploaded a new change for review.

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

Change subject: Show the right username in the confirmation for removing 
articles
..

Show the right username in the confirmation for removing articles

When the remove article link is clicked in the student table,
show the name of the student in the pop confirmation dialog as
intended, instead of the username of the user doing the removal.

Bug: 61949
Change-Id: I153818cbd7a050c51aa682c3f8ce3579cf746ecd
---
M includes/pagers/ArticleTable.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/32/115632/1

diff --git a/includes/pagers/ArticleTable.php b/includes/pagers/ArticleTable.php
index 7880cfa..9390353 100644
--- a/includes/pagers/ArticleTable.php
+++ b/includes/pagers/ArticleTable.php
@@ -416,7 +416,7 @@
$user = $this-getUser();
 
if ( $user-getId() !== $article-getUserId() ) {
-   $attr['data-student-name'] = $user-getName();
+   $attr['data-student-name'] = 
$article-getUser()-getName();
}
 
if ( $this-isForOneCourse() ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I153818cbd7a050c51aa682c3f8ce3579cf746ecd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Ragesoss rages...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Put callback function within class in SiteConfigurationTest - change (mediawiki/core)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Put callback function within class in SiteConfigurationTest
..


Put callback function within class in SiteConfigurationTest

Makes no sense to stick this in as a global function
so we can make a callback to a static function
in this class instead

Change-Id: I168881e7c889daae94ab246bf52d30ebf48e0405
---
M tests/phpunit/includes/SiteConfigurationTest.php
1 file changed, 29 insertions(+), 26 deletions(-)

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



diff --git a/tests/phpunit/includes/SiteConfigurationTest.php 
b/tests/phpunit/includes/SiteConfigurationTest.php
index 053d8a7..572740f 100644
--- a/tests/phpunit/includes/SiteConfigurationTest.php
+++ b/tests/phpunit/includes/SiteConfigurationTest.php
@@ -1,28 +1,5 @@
 ?php
 
-function getSiteParams( $conf, $wiki ) {
-   $site = null;
-   $lang = null;
-   foreach ( $conf-suffixes as $suffix ) {
-   if ( substr( $wiki, -strlen( $suffix ) ) == $suffix ) {
-   $site = $suffix;
-   $lang = substr( $wiki, 0, -strlen( $suffix ) );
-   break;
-   }
-   }
-
-   return array(
-   'suffix' = $site,
-   'lang' = $lang,
-   'params' = array(
-   'lang' = $lang,
-   'site' = $site,
-   'wiki' = $wiki,
-   ),
-   'tags' = array( 'tag' ),
-   );
-}
-
 class SiteConfigurationTest extends MediaWikiTestCase {
 
/**
@@ -97,6 +74,32 @@
);
 
$GLOBALS['global'] = array( 'global' = 'global' );
+   }
+
+   /**
+* This function is used as a callback within the tests below
+*/
+   public static function getSiteParamsCallback( $conf, $wiki ) {
+   $site = null;
+   $lang = null;
+   foreach ( $conf-suffixes as $suffix ) {
+   if ( substr( $wiki, -strlen( $suffix ) ) == $suffix ) {
+   $site = $suffix;
+   $lang = substr( $wiki, 0, -strlen( $suffix ) );
+   break;
+   }
+   }
+
+   return array(
+   'suffix' = $site,
+   'lang' = $lang,
+   'params' = array(
+   'lang' = $lang,
+   'site' = $site,
+   'wiki' = $wiki,
+   ),
+   'tags' = array( 'tag' ),
+   );
}
 
/**
@@ -257,7 +260,7 @@
 * @covers SiteConfiguration::siteFromDB
 */
public function testSiteFromDbWithCallback() {
-   $this-mConf-siteParamsCallback = 'getSiteParams';
+   $this-mConf-siteParamsCallback = 
'SiteConfigurationTest::getSiteParamsCallback';
 
$this-assertEquals(
array( 'wiki', 'en' ),
@@ -280,7 +283,7 @@
 * @covers SiteConfiguration::get
 */
public function testParameterReplacement() {
-   $this-mConf-siteParamsCallback = 'getSiteParams';
+   $this-mConf-siteParamsCallback = 
'SiteConfigurationTest::getSiteParamsCallback';
 
$this-assertEquals(
'en wiki enwiki',
@@ -313,7 +316,7 @@
 * @covers SiteConfiguration::getAll
 */
public function testGetAllGlobals() {
-   $this-mConf-siteParamsCallback = 'getSiteParams';
+   $this-mConf-siteParamsCallback = 
'SiteConfigurationTest::getSiteParamsCallback';
 
$getall = array(
'simple' = 'enwiki',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I168881e7c889daae94ab246bf52d30ebf48e0405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mwalker mwal...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Turn the labs::nfs::client class off for eqiad. - change (operations/puppet)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Turn the labs::nfs::client class off for eqiad.
..


Turn the labs::nfs::client class off for eqiad.

eqiad is NFS by default, and doesn't need this.

Also some lint cleanup while I'm in here.

Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d
---
M manifests/role/labsnfs.pp
1 file changed, 38 insertions(+), 33 deletions(-)

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



diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 94cb297..ee226b7 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -2,40 +2,45 @@
 # in LDAP once transition is over.
 
 class role::labsnfs::client {
-   $nfscluster = labnfs.pmtpa.wmnet
 
-   file {
-   /etc/auto.master:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.master.erb);
-   }
-   file { /etc/auto.space:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.space.erb);
-   }
-   file { /etc/auto.time.home:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.time.home.erb);
-   }
-   file { /etc/auto.time.project:
-   ensure = file,
-   owner = root,
-   group = root,
-   mode = 0444,
-   content = template(labsnfs/auto.time.project.erb);
-   }
+if $::site == 'pmtpa' {
+$nfscluster = 'labnfs.pmtpa.wmnet'
 
-   file { /etc/init/nfs-noidmap.conf:
-   source = puppet:///files/nfs/upstart-nfs-noidmap.conf
-   }
+file {
+'/etc/auto.master':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.master.erb');
+}
+file { '/etc/auto.space':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.space.erb');
+}
+file { '/etc/auto.time.home':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.time.home.erb');
+}
+file { '/etc/auto.time.project':
+ensure = file,
+owner = root,
+group = root,
+mode = 0444,
+content = template('labsnfs/auto.time.project.erb');
+}
+
+file { '/etc/init/nfs-noidmap.conf':
+source = 'puppet:///files/nfs/upstart-nfs-noidmap.conf'
+}
+} else {
+warning('Outside of pmtpa the role::labsnfs::client class is 
deprecated and does nothing.')
+}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Small tweak to _rtselser comment stripping - change (mediawiki...parsoid)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: Small tweak to _rtselser comment stripping
..


Small tweak to _rtselser comment stripping

On some pages with categories at the end there were no trailing newlines in
wikitext, so make them optional in the end-anchored regexp.

Change-Id: Ie35842c2ef90edb5ab9ef01c402a6398bfa14cff
---
M api/ParsoidService.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 85d2f0b..a507821 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -200,7 +200,7 @@
// XXX TODO FIXME BBQ There should be an error callback 
in SelSer.
out = out.join('');
// Strip selser trigger comment
-   out = out.replace(/!--rtSelserEditTestComment--\n$/, 
'');
+   out = out.replace(/!--rtSelserEditTestComment--\n*$/, 
'');
if ( out === undefined ) {
console.log( 'Serializer error!' );
out = An error occured in the 
WikitextSerializer, please check the log for information;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie35842c2ef90edb5ab9ef01c402a6398bfa14cff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] grant hashar, reedy access to caesium per RT 6861 - change (operations/puppet)

2014-02-26 Thread Jgreen (Code Review)

Jgreen has uploaded a new change for review.

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

Change subject: grant hashar,reedy access to caesium per RT 6861
..

grant hashar,reedy access to caesium per RT 6861

Change-Id: If49d13d1bf56eefc1c8f553335c2192bcf0923b4
---
M manifests/role/releases.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/115633/1

diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index da4e284..bedbb2d 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -13,6 +13,9 @@
 
 role::releases::access { 'brion': group = 'mobileupld' }
 role::releases::access { 'csteipp': group = 'mwupld' }
+role::releases::access { 'csteipp': group = 'mwupld' } # RT 6861
+role::releases::access { 'hashar': group = 'mwupld' } # RT 6861
+role::releases::access { 'reedy': group = 'mwupld' } # RT 6861
 }
 
 class role::releases::groups {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If49d13d1bf56eefc1c8f553335c2192bcf0923b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] grant hashar, reedy access to caesium per RT 6861 - change (operations/puppet)

2014-02-26 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: grant hashar,reedy access to caesium per RT 6861
..


grant hashar,reedy access to caesium per RT 6861

Change-Id: If49d13d1bf56eefc1c8f553335c2192bcf0923b4
---
M manifests/role/releases.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index da4e284..306fc4b 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -13,6 +13,8 @@
 
 role::releases::access { 'brion': group = 'mobileupld' }
 role::releases::access { 'csteipp': group = 'mwupld' }
+role::releases::access { 'hashar': group = 'mwupld' } # RT 6861
+role::releases::access { 'reedy': group = 'mwupld' } # RT 6861
 }
 
 class role::releases::groups {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If49d13d1bf56eefc1c8f553335c2192bcf0923b4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Added JSONPickle serializer to remove C_FORCE_ROOT issue - change (analytics/wikimetrics)

2014-02-26 Thread Csalvia (Code Review)

Csalvia has uploaded a new change for review.

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

Change subject: Added JSONPickle serializer to remove C_FORCE_ROOT issue
..

Added JSONPickle serializer to remove C_FORCE_ROOT issue

Change-Id: Idc23bac8853020f49743810e71b46c68c1edd868
---
M wikimetrics/config/queue_config.yaml
M wikimetrics/controllers/cohorts.py
A wikimetrics/models/serializer.py
M wikimetrics/models/validate_cohort.py
4 files changed, 34 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics 
refs/changes/34/115634/1

diff --git a/wikimetrics/config/queue_config.yaml 
b/wikimetrics/config/queue_config.yaml
index d5dd82f..0b8a227 100644
--- a/wikimetrics/config/queue_config.yaml
+++ b/wikimetrics/config/queue_config.yaml
@@ -1,5 +1,8 @@
 BROKER_URL  : 'redis://localhost:6379/0'
 CELERY_RESULT_BACKEND   : 'redis://localhost:6379/0'
+CELERY_ACCEPT_CONTENT   : ['json']
+CELERY_TASK_SERIALIZER  : 'json'
+CELERY_RESULT_SERIALIZER: 'json'
 CELERY_TASK_RESULT_EXPIRES  : 3600
 CELERY_DISABLE_RATE_LIMITS  : True
 CELERY_STORE_ERRORS_EVEN_IF_IGNORED : True
diff --git a/wikimetrics/controllers/cohorts.py 
b/wikimetrics/controllers/cohorts.py
index 4addb40..fd9ecf5 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -14,7 +14,7 @@
 User, WikiUser, CohortWikiUser, MediawikiUser,
 ValidateCohort
 )
-
+import wikimetrics.models.serializer as serializer
 
 @app.route('/cohorts/')
 def cohorts_index():
@@ -148,7 +148,6 @@
 session.close()
 return cohort_dict
 
-
 @app.route('/cohorts/upload', methods=['GET', 'POST'])
 def cohort_upload():
  View for uploading and validating a new cohort via CSV 
@@ -164,6 +163,14 @@
 else:
 form.parse_records()
 vc = ValidateCohort.from_upload(form, current_user.id)
+
+### TEMP TEMP
+import sys
+print  sys.stderr, USING SERIALIZER:, serializer.METHOD
+import kombu.serialization
+print  sys.stderr, kombu.serialization.registry._decoders
+### TEMP TEMP
+
 vc.task.delay(vc)
 return redirect('{0}#{1}'.format(
 url_for('cohorts_index'),
diff --git a/wikimetrics/models/serializer.py b/wikimetrics/models/serializer.py
new file mode 100644
index 000..264c2a5
--- /dev/null
+++ b/wikimetrics/models/serializer.py
@@ -0,0 +1,21 @@
+from kombu import serialization
+import jsonpickle
+
+def json_pickle_dump(obj):
+   return jsonpickle.encode(obj)   
+
+def json_pickle_load(obj):
+   return jsonpickle.decode(obj)
+
+METHOD = json
+CONTENT_TYPE = application/json
+CONTENT_ENCODING = utf8
+
+serialization.register(
+   METHOD, 
+   json_pickle_dump,
+   json_pickle_load, 
+   content_type = CONTENT_TYPE,
+   content_encoding = CONTENT_ENCODING
+)
+
diff --git a/wikimetrics/models/validate_cohort.py 
b/wikimetrics/models/validate_cohort.py
index 275f46c..a3ab72a 100644
--- a/wikimetrics/models/validate_cohort.py
+++ b/wikimetrics/models/validate_cohort.py
@@ -28,7 +28,7 @@
 * Creating a cohort, or loading an existing one
 * Re-validating the cohort's existing users or validating a CSV record list
 * Validating asynchronously and updating the database as it goes
-* Updating the cohort to validated == True once all users have been 
validated
+* Updating the cohort to validated == True iff all users have been 
validated
 
 task = async_validate
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc23bac8853020f49743810e71b46c68c1edd868
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Csalvia csal...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] (Bug 61770) Treat all block tags identically in pre-handler - change (mediawiki...parsoid)

2014-02-26 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: (Bug 61770) Treat all block tags identically in pre-handler
..

(Bug 61770) Treat all block tags identically in pre-handler

* Pre-Handler had a check for HTML-syntax block tags (i.e. html
  tags that showed up in wikitext). But, xxtensions can generate
  block HTML content as well and need to suppress indent-pres
  as well.

* This patch removes the special case which fixes the bug.

* Added a new parser test but Parsoid's test runner doesn't have
  access to extensions and all those fail for that reason.

Change-Id: I2414ec53136f3012f749a601edea15854349
---
M lib/ext.core.PreHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 28 insertions(+), 6 deletions(-)


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

diff --git a/lib/ext.core.PreHandler.js b/lib/ext.core.PreHandler.js
index 09a9ac5..c1f31db 100644
--- a/lib/ext.core.PreHandler.js
+++ b/lib/ext.core.PreHandler.js
@@ -402,7 +402,7 @@
break;
 
case PreHandler.STATE_PRE_COLLECT:
-   if (token.isHTMLTag  token.isHTMLTag()  
Util.isBlockTag(token.name)) {
+   if (token.name  Util.isBlockTag(token.name)) {
ret = 
this.encounteredBlockWhileCollecting( token );
this.moveToIgnoreState();
} else {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 67f726f..bd7e744 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -54,6 +54,7 @@
 add(wt2html, 2a. Indent-Pre and tables,  table 
data-parsoid='{\dsr\:[1,31,2,2]}'\n tbody 
data-parsoid='{\dsr\:[5,29,0,0]}'tr 
data-parsoid='{\startTagSrc\:\|-\,\autoInsertedEnd\:true,\dsr\:[5,27,2,0]}'\n
 th data-parsoid='{\autoInsertedEnd\:true,\dsr\:[9,12,1,0]}'h1/thth 
data-parsoid='{\stx_v\:\row\,\autoInsertedEnd\:true,\dsr\:[12,16,2,0]}'h2/th\n
 td data-parsoid='{\autoInsertedEnd\:true,\dsr\:[18,22,1,0]}'foo/tdtd 
data-parsoid='{\stx_v\:\row\,\autoInsertedEnd\:true,\dsr\:[22,27,2,0]}'bar/td/tr\n
 /tbody/table);
 add(wt2html, 2b. Indent-Pre and tables,   table 
data-parsoid='{\dsr\:[2,16,2,2]}'\n tbody 
data-parsoid='{\dsr\:[6,14,0,0]}'tr 
data-parsoid='{\startTagSrc\:\|-\,\autoInsertedEnd\:true,\dsr\:[6,13,2,0]}'\ntd
 
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[9,13,1,0]}'foo/td/tr\n/tbody/table);
 add(wt2html, 2c. Indent-Pre and tables (bug 42252), table 
data-parsoid='{\dsr\:[0,23,2,2]}'\n caption 
data-parsoid='{\dsr\:[4,10,2,null]}' foo/caption\n tbody 
data-parsoid='{\dsr\:[12,21,0,0]}'tr 
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[12,20,0,0]}'th
 data-parsoid='{\startTagSrc\:\!  
\,\attrSepSrc\:\|\,\autoInsertedEnd\:true,\dsr\:[12,20,4,0]}' 
bar/th/tr\n/tbody/table);
+add(wt2html, 4. Indent-Pre and extension tags, pre 
data-parsoid='{\dsr\:[0,39,1,0]}'a span typeof=\mw:Extension/gallery\ 
about=\#mwt1\ 
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:foobar.jpg\\nlt;/gallery\,\tagWidths\:[9,10],\dsr\:[3,39,9,10]}'lt;gallery\nFile:foobar.jpg\nlt;/gallery/span/pre);
 add(wt2html, Leading pipes outside of tables, | foo);
 add(wt2html, Leading pipes outside of tables 2, p 
data-parsoid='{\dsr\:[0,1,0,0]}'a/p\n| foo\np 
data-parsoid='{\dsr\:[8,9,0,0]}'b/p);
 add(wt2html, Leading pipes outside of tables 3, p 
data-parsoid='{\dsr\:[0,1,0,0]}'a/p\n| class=\foo bar\ | baz\np 
data-parsoid='{\dsr\:[26,27,0,0]}'b/p);
@@ -550,6 +551,7 @@
 add(wt2wt, nowiki inside pre (bug 13238), 
pre\nnowiki\n/pre\npre\nnowiki/nowiki\n/pre\nprenowikilt;nowikigt;/nowikiFoonowiki/nowiki/nowiki/pre);
 add(wt2wt, nowiki and pre preference (first one wins), 
pre\nnowiki\n/pre\n/nowiki\n/pre\n\nnowiki\npre\nlt;nowikigt;\n/pre\n/nowiki\n/pre\n);
 add(wt2wt, Templates: Indent-Pre: 1f: Wrapping should be based on expanded 
content, {{echo| }}a\n\n{{echo|\n }}a\n\n{{echo|\n b}}\n\n{{echo|a\n 
}}b\n\n{{echo|a\n}}\n b\n);
+add(wt2wt, 4. Indent-Pre and extension tags,  a gallery\n 
File:foobar.jpg\n /gallery\n);
 add(wt2wt, Leading pipes outside of tables 2, a\n| foo\n\nb\n);
 add(wt2wt, Leading pipes outside of tables 3, a\n| class=\foo bar\ | 
baz\n\nb\n);
 add(wt2wt, HTML-pre: 1. embedded newlines, 
prefoo/pre\n\npre\nfoo\n/pre\n\npre\nfoo\n/pre\n\npre\n\nfoo\n/pre);
@@ -728,7 +730,8 @@
 add(html2html, nowiki inside pre (bug 13238), pre 
data-parsoid='{\dsr\:[0,15,1,0]}'span typeof=\mw:Entity\ 
data-parsoid='{\src\:\amp;lt;\,\srcContent\:\lt;\,\dsr\:[1,5,null,null]}'lt;/spannowikispan
 typeof=\mw:Entity\ 
data-parsoid='{\src\:\amp;gt;\,\srcContent\:\\,\dsr\:[11,15,null,null]}'/span/pre\n\n
 p data-parsoid='{\dsr\:[18,18,0,0]}'br 
data-parsoid='{\dsr\:[18,18,0,0]}'//p\n\npre

[MediaWiki-commits] [Gerrit] Bold/italic icons for ar - change (VisualEditor/VisualEditor)

2014-02-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Bold/italic icons for ar
..

Bold/italic icons for ar

Change-Id: I30983e8f30ef535195dc6c737943622bc6fb150d
---
A modules/ve/ui/styles/images/icons/bold-arab-ain.png
A modules/ve/ui/styles/images/icons/bold-arab-ain.svg
A modules/ve/ui/styles/images/icons/italic-arab-meem.png
A modules/ve/ui/styles/images/icons/italic-arab-meem.svg
M modules/ve/ui/styles/ve.ui.Icons-raster.css
M modules/ve/ui/styles/ve.ui.Icons-vector.css
M modules/ve/ui/tools/ve.ui.AnnotationTool.js
7 files changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/36/115636/1

diff --git a/modules/ve/ui/styles/images/icons/bold-arab-ain.png 
b/modules/ve/ui/styles/images/icons/bold-arab-ain.png
new file mode 100644
index 000..d63f3f9
--- /dev/null
+++ b/modules/ve/ui/styles/images/icons/bold-arab-ain.png
Binary files differ
diff --git a/modules/ve/ui/styles/images/icons/bold-arab-ain.svg 
b/modules/ve/ui/styles/images/icons/bold-arab-ain.svg
new file mode 100644
index 000..45d81c9
--- /dev/null
+++ b/modules/ve/ui/styles/images/icons/bold-arab-ain.svg
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=iso-8859-1?
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px width=24px
+height=24px viewBox=0 0 24 24 style=enable-background:new 0 0 24 
24; xml:space=preserve
+g id=bold-arab-ain style=opacity:0.75;
+   path id=arab-ain style=fill-rule:evenodd;clip-rule:evenodd; d=m 
9.3370268,13.616371 c -2e-6,1.348807 1.3862692,2.101402 4.1588182,2.257789 L 
15.682364,15.844843 16,15.24 c -0.02955,0.127058 -0.251163,0.344529 
-0.66482,0.652413 -0.0394,0.02932 -0.06895,0.05131 -0.08864,0.06598 
-1.23608,0.928523 -2.422906,1.392786 -3.56048,1.392792 -1.14251,-6e-6 
-2.0461711,-0.329877 -2.7109887,-0.989615 -0.6500472,-0.659747 
-0.9750699,-1.558953 -0.9750692,-2.697618 0.00492,-1.353696 0.5663268,-2.572999 
1.6842105,-3.657911 l 0,-0.04398 C 9.2951658,10.2639 9.0932577,10.080637 
9.0784857,10.061087 8.9307464,9.8802714 8.8568775,9.6701311 8.8568791,9.4306661 
8.8568775,8.9419706 9.0957201,8.3213238 9.5734073,7.5687237 10.223451,6.522914 
10.875958,6.0024503 11.530932,6.0073311 c 0.886422,0.00489 1.617724,0.4202868 
2.193907,1.2461819 0.325016,0.4789293 -0.02955,0.552234 -1.063712,0.2199144 
-0.842111,-0.3274231 -1.526628,-0.051309 -2.053556,0.8283445 l 0.01478,0.073304 
1.122807,0.8649969 0.05171,0.00733 c 1.403503,-0.4984693 2.417967,-0.740375 
3.043398,-0.7257177 -0.05911,0.1172913 -0.140358,0.3616404 -0.243768,0.7330482 
-0.103424,0.3567527 -0.204378,0.6841806 -0.302862,0.9822843 l 
-0.125577,0.373855 -0.384118,0.05131 c -1.743311,0.239464 -2.991693,0.715945 
-3.745153,1.429444 -0.4629137,0.464263 -0.6968316,0.97251 -0.7017542,1.52474/
+/g
+/svg
diff --git a/modules/ve/ui/styles/images/icons/italic-arab-meem.png 
b/modules/ve/ui/styles/images/icons/italic-arab-meem.png
new file mode 100644
index 000..38ae408
--- /dev/null
+++ b/modules/ve/ui/styles/images/icons/italic-arab-meem.png
Binary files differ
diff --git a/modules/ve/ui/styles/images/icons/italic-arab-meem.svg 
b/modules/ve/ui/styles/images/icons/italic-arab-meem.svg
new file mode 100644
index 000..669d711
--- /dev/null
+++ b/modules/ve/ui/styles/images/icons/italic-arab-meem.svg
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=iso-8859-1?
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px width=24px
+   height=24px viewBox=0 0 24 24 style=enable-background:new 0 0 24 24; 
xml:space=preserve
+g id=italic-arab-meem style=opacity:0.75;
+  path id=arab-meem style=fill-rule:evenodd;clip-rule:evenodd; d=m 
16,9.729378 c -8e-6,2.3e-6 -0.310009,0.729994 -0.930003,2.189979 l -4.663072,0 
c -0.479188,0 -0.8574152,0.122174 -1.1346836,0.366524 l -0.06098,0.109957 C 
9.027705,14.411715 8.7093782,15.954168 8.2562805,17.0232 7.984421,17.66461 
7.6236809,18.275482 7.1740591,18.855817 c -0.1772589,0.226016 
-0.2191298,0.18631 -0.1256126,-0.11912 0.045368,-0.146616 0.09261,-0.314606 
0.1417255,-0.503969 0.049113,-0.189377 0.105884,-0.412345 0.1703033,-0.668906 
0.069018,-0.250463 0.1470781,-0.540629 0.2341806,-0.870494 l 0.00209,-0.0092 c 
0.04645,-0.256571 0.1137669,-0.604768 0.2019519,-1.044593 0.073848,-0.40318 
0.1600039,-0.87355 0.2584674,-1.46 0.097072,-0.531461 0.2148002,-1.166768 
0.3531835,-1.905923 0.1907451,-0.311545 0.4239029,-0.638362 0.6994736,-0.980451 
0.275568,-0.342088 0.5889505,-0.705557 0.9401487,-1.090408 0.128683,-0.09163 
0.696921,-0.180205 1.70472,-0.2657293 1.049721,-0.085521 1.638017,-0.1832597 
1.76489,-0.2932189 l

[MediaWiki-commits] [Gerrit] Varnish should restart on initscript/defaults changes - change (operations/puppet)

2014-02-26 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Varnish should restart on initscript/defaults changes
..

Varnish should restart on initscript/defaults changes

Currently, if the initscript's contents change (CC_COMMAND
for loading new shared libs for VCL), this doesn't trigger a
restart to pick up the new settings, and then later vcl-reload
operations fail.

Change-Id: Ie34b96a4f3bc1546f0170eb21d1005274c7c52bb
---
M modules/varnish/manifests/instance.pp
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/115637/1

diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index ef50ec1..2850bec 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -77,15 +77,17 @@
 service { varnish${instancesuffix}:
 ensure= running,
 require   = [
-File[/etc/default/varnish${instancesuffix}],
-File[/etc/init.d/varnish${instancesuffix}],
 File[/etc/varnish/${vcl}.inc.vcl],
 File[/etc/varnish/wikimedia_${vcl}.vcl],
 Mount['/var/lib/varnish']
 ],
 hasstatus = false,
 pattern   = /var/run/varnishd${instancesuffix}.pid,
-subscribe = Package['varnish'],
+subscribe = [
+File[/etc/default/varnish${instancesuffix}],
+File[/etc/init.d/varnish${instancesuffix}],
+Package['varnish']
+],
 before= Exec['generate varnish.pyconf'],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie34b96a4f3bc1546f0170eb21d1005274c7c52bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swap in tantalum for rhodium for pdf/trusty testing - change (operations/puppet)

2014-02-26 Thread Jgreen (Code Review)

Jgreen has uploaded a new change for review.

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

Change subject: swap in tantalum for rhodium for pdf/trusty testing
..

swap in tantalum for rhodium for pdf/trusty testing

Change-Id: Id9892612ecb74cee728dee3c14c1c051ccf69bd1
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/115638/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 5702659..fd3b125 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -,7 +,7 @@
 }
 
 # QA box for the new PDF system
-node 'rhodium.eqiad.wmnet' {
+node 'tantalum.eqiad.wmnet' {
 $gid = '500'
 include standard
 include role::ocg::test
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index fa8b2ef..b20bc58 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
nickel) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc[1-3]|pc100[1-3]) echo partman/mw.cfg ;; \
-   rhodium*) echo partman/raid1-1partition.cfg ;; \
+   tantalum*) echo partman/raid1-1partition.cfg ;; \
elastic100[0-9]|elastic101[0-6]|rdb100[1-4]|logstash100[1-3]) 
echo partman/mw.cfg ;; \
searchidx*) echo partman/searchidx.cfg ;; \
search[0-9]*) echo partman/search.cfg ;; \
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 6ed977a..ab0f403 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3587,9 +3587,9 @@
fixed-address rdb1004.eqiad.wmnet;
 }
 
-host rhodium {
-   hardware ethernet 18:03:73:f1:56:d2;
-   fixed-address rhodium.eqiad.wmnet;
+host tantalum {
+   hardware ethernet 78:2B:CB:2D:F3:D9;
+   fixed-address tantalum.eqiad.wmnet;
option pxelinux.pathprefix trusty-installer/;
filename trusty-installer/ubuntu-installer/amd64/pxelinux.0;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9892612ecb74cee728dee3c14c1c051ccf69bd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swap in tantalum for rhodium for pdf/trusty testing - change (operations/puppet)

2014-02-26 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: swap in tantalum for rhodium for pdf/trusty testing
..


swap in tantalum for rhodium for pdf/trusty testing

Change-Id: Id9892612ecb74cee728dee3c14c1c051ccf69bd1
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 5702659..fd3b125 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -,7 +,7 @@
 }
 
 # QA box for the new PDF system
-node 'rhodium.eqiad.wmnet' {
+node 'tantalum.eqiad.wmnet' {
 $gid = '500'
 include standard
 include role::ocg::test
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index fa8b2ef..b20bc58 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
nickel) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc[1-3]|pc100[1-3]) echo partman/mw.cfg ;; \
-   rhodium*) echo partman/raid1-1partition.cfg ;; \
+   tantalum*) echo partman/raid1-1partition.cfg ;; \
elastic100[0-9]|elastic101[0-6]|rdb100[1-4]|logstash100[1-3]) 
echo partman/mw.cfg ;; \
searchidx*) echo partman/searchidx.cfg ;; \
search[0-9]*) echo partman/search.cfg ;; \
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 6ed977a..ab0f403 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3587,9 +3587,9 @@
fixed-address rdb1004.eqiad.wmnet;
 }
 
-host rhodium {
-   hardware ethernet 18:03:73:f1:56:d2;
-   fixed-address rhodium.eqiad.wmnet;
+host tantalum {
+   hardware ethernet 78:2B:CB:2D:F3:D9;
+   fixed-address tantalum.eqiad.wmnet;
option pxelinux.pathprefix trusty-installer/;
filename trusty-installer/ubuntu-installer/amd64/pxelinux.0;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9892612ecb74cee728dee3c14c1c051ccf69bd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Ignore left/right key presses when there's a modifier - change (mediawiki...MultimediaViewer)

2014-02-26 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Ignore left/right key presses when there's a modifier
..

Ignore left/right key presses when there's a modifier

Change-Id: I8998fd27a7d60f5826802153d3ad74ab8a37c3fe
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/236
---
M resources/mmv/mmv.lightboxinterface.js
M tests/qunit/mmv/mmv.lightboxinterface.test.js
2 files changed, 47 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/39/115639/1

diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index 5ec8040..a88a382 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -502,6 +502,12 @@
LIP.keydown = function ( e ) {
var isRtl = $( document.body ).hasClass( 'rtl' );
 
+   if ( e.altKey || e.shiftKey || e.ctrlKey || e.metaKey ) {
+   return;
+   }
+
+   e.preventDefault();
+
switch ( e.which ) {
case 37:
// Left arrow
diff --git a/tests/qunit/mmv/mmv.lightboxinterface.test.js 
b/tests/qunit/mmv/mmv.lightboxinterface.test.js
index a71cd9e..e3d20d9 100644
--- a/tests/qunit/mmv/mmv.lightboxinterface.test.js
+++ b/tests/qunit/mmv/mmv.lightboxinterface.test.js
@@ -389,7 +389,7 @@
} );
 
QUnit.test( 'Unblur', 3, function ( assert ) {
-   var lightbox = new mw.mmv.LightboxInterface( mw.mediaViewer ),
+   var lightbox = new mw.mmv.LightboxInterface( mw.mmv.mediaViewer 
),
oldAnimate = $.fn.animate;
 
$.fn.animate = function ( target, options ) {
@@ -427,4 +427,44 @@
 
$.fn.animate = oldAnimate;
} );
+
+   QUnit.test( 'Keyboard prev/next', 2, function ( assert ) {
+   var viewer =  mw.mmv.mediaViewer,
+   lightbox = new mw.mmv.LightboxInterface( viewer ),
+   oldNextImage = viewer.nextImage,
+   oldPrevImage = viewer.prevImage;
+
+   // Since we define both, the test works regardless of RTL 
settings
+   viewer.nextImage = function () {
+   assert.ok( true, 'Next image was open' );
+   };
+
+   viewer.prevImage = function () {
+   assert.ok( true, 'Prev image was open' );
+   };
+
+   // 37 is left arrow, 39 is right arrow
+   lightbox.keydown( $.Event( 'keydown', { which : 37 } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 39 } ) );
+
+   viewer.nextImage = function () {
+   assert.ok( false, 'Next image should not have been 
open' );
+   };
+
+   viewer.prevImage = function () {
+   assert.ok( false, 'Prev image should not have been 
open' );
+   };
+
+   lightbox.keydown( $.Event( 'keydown', { which : 37, altKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 39, altKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 37, ctrlKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 39, ctrlKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 37, shiftKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 39, shiftKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 37, metaKey : 
true } ) );
+   lightbox.keydown( $.Event( 'keydown', { which : 39, metaKey : 
true } ) );
+
+   viewer.nextImage = oldNextImage;
+   viewer.prevImage = oldPrevImage;
+   } );
 }( mediaWiki, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8998fd27a7d60f5826802153d3ad74ab8a37c3fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add a 'revdelete-selected-file' message on Special:RevisionD... - change (mediawiki/core)

2014-02-26 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

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

Change subject: Add a 'revdelete-selected-file' message on 
Special:RevisionDelete
..

Add a 'revdelete-selected-file' message on Special:RevisionDelete

This allows a file adjusted message when delete file versions and can
make clear the difference between deleting a revision of the file
description page or a version of the file.

Also renamed 'revdelete-selected' to 'revdelete-selected-text' to be
able to reorder the params, this allows using the same code for each
type (log, text and file)

Change-Id: I02514eda2f267ede16b4298ed5cae64c6787f79d
---
M includes/specials/SpecialRevisiondelete.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
4 files changed, 27 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/115640/1

diff --git a/includes/specials/SpecialRevisiondelete.php 
b/includes/specials/SpecialRevisiondelete.php
index 3599dc6..296ef1f 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -63,26 +63,31 @@
 */
static $UILabels = array(
'revision' = array(
+   'selected'  = 'revdelete-selected-text',
'check-label'   = 'revdelete-hide-text',
'success'   = 'revdelete-success',
'failure'   = 'revdelete-failure',
),
'archive' = array(
+   'selected'  = 'revdelete-selected-text',
'check-label'   = 'revdelete-hide-text',
'success'   = 'revdelete-success',
'failure'   = 'revdelete-failure',
),
'oldimage' = array(
+   'selected'  = 'revdelete-selected-file',
'check-label'   = 'revdelete-hide-image',
'success'   = 'revdelete-success',
'failure'   = 'revdelete-failure',
),
'filearchive' = array(
+   'selected'  = 'revdelete-selected-file',
'check-label'   = 'revdelete-hide-image',
'success'   = 'revdelete-success',
'failure'   = 'revdelete-failure',
),
'logging' = array(
+   'selected'  = 'logdelete-selected',
'check-label'   = 'revdelete-hide-name',
'success'   = 'logdelete-success',
'failure'   = 'logdelete-failure',
@@ -330,12 +335,8 @@
protected function showForm() {
$UserAllowed = true;
 
-   if ( $this-typeName == 'logging' ) {
-   $this-getOutput()-addWikiMsg( 'logdelete-selected', 
$this-getLanguage()-formatNum( count( $this-ids ) ) );
-   } else {
-   $this-getOutput()-addWikiMsg( 'revdelete-selected',
-   $this-targetObj-getPrefixedText(), count( 
$this-ids ) );
-   }
+   $this-getOutput()-wrapWikiMsg( strong$1/strong, array( 
$this-typeLabels['selected'],
+   $this-getLanguage()-formatNum( count( $this-ids ) ), 
$this-targetObj-getPrefixedText() ) );
 
$this-getOutput()-addHTML( ul );
 
diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 3fffec2..9323908 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1710,8 +1710,9 @@
 'revdelete-no-file'   = 'The file specified does not exist.',
 'revdelete-show-file-confirm' = 'Are you sure you want to view a deleted 
revision of the file nowiki$1/nowiki from $2 at $3?',
 'revdelete-show-file-submit'  = 'Yes',
-'revdelete-selected'  = strong{{PLURAL:$2|Selected 
revision|Selected revisions}} of [[:$1]]:/strong,
-'logdelete-selected'  = strong{{PLURAL:$1|Selected log 
event|Selected log events}}:/strong,
+'revdelete-selected-text' = {{PLURAL:$1|Selected revision|Selected 
revisions}} of [[:$2]]:,
+'revdelete-selected-file' = {{PLURAL:$1|Selected file version|Selected 
file versions}} of [[:$2]]:,
+'logdelete-selected'  = {{PLURAL:$1|Selected log event|Selected log 
events}}:,
 'revdelete-text'  = strongDeleted revisions and events will 
still appear in the page history and logs, but parts of their content will be 
inaccessible to the public./strong
 Other administrators on {{SITENAME}} will still be able to access the hidden 
content and can

[MediaWiki-commits] [Gerrit] Labs: manage LVM volumes on instance - change (operations/puppet)

2014-02-26 Thread coren (Code Review)

coren has uploaded a new change for review.

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

Change subject: Labs: manage LVM volumes on instance
..

Labs: manage LVM volumes on instance

Includes a test role.

Change-Id: Idc25fafc4c6fc8e8562c25ed56dc2172b6ca65c8
---
A manifests/role/labstest.pp
A modules/labs_lvm/files/make-instance-vg
A modules/labs_lvm/files/make-instance-vol
A modules/labs_lvm/manifest/init.pp
4 files changed, 141 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/115641/1

diff --git a/manifests/role/labstest.pp b/manifests/role/labstest.pp
new file mode 100644
index 000..8c2ff62
--- /dev/null
+++ b/manifests/role/labstest.pp
@@ -0,0 +1,17 @@
+#
+# This is just for testing new things
+# and will go away
+#
+
+class role::labs::instancetest {
+
+class { 'labs_lvm':
+device = '/dev/vda'
+}
+
+class { 'labs_lvm::volume':
+mountpoint = '/mnt'
+}
+
+}
+
diff --git a/modules/labs_lvm/files/make-instance-vg 
b/modules/labs_lvm/files/make-instance-vg
new file mode 100755
index 000..42b3e30
--- /dev/null
+++ b/modules/labs_lvm/files/make-instance-vg
@@ -0,0 +1,30 @@
+#! /bin/bash
+
+device=$1
+if ! /sbin/parted -s $device mkpart primary $(
+/sbin/parted -s $device print free |
+/bin/grep 'Free Space' |
+/usr/bin/tail -n 1 |
+/bin/sed -e 's/  */ /g' |
+/usr/bin/cut -d ' ' -f 2,3 ); then
+  echo $0: failed to create new partition 2
+  exit 1
+fi
+
+part=$( /sbin/parted -s $device print |
+  /bin/grep 'primary' |
+  /usr/bin/tail -n 1 |
+  /bin/sed -e 's/  */ /g' |
+  /bin/sed -e 's/^ *//' |
+  /usr/bin/cut -d ' ' -f 1 )
+  echo Last partition [$part]
+if [ $part !=  ]; then
+  if [ $part -gt 2 ]; then
+/sbin/parted -s $device set $part lvm on
+/sbin/pvcreate $device$part
+/sbin/vgcreate vd $device$part
+/sbin/partprobe
+exit 0
+  fi
+fi
+exit 2
diff --git a/modules/labs_lvm/files/make-instance-vol 
b/modules/labs_lvm/files/make-instance-vol
new file mode 100755
index 000..7cd281c
--- /dev/null
+++ b/modules/labs_lvm/files/make-instance-vol
@@ -0,0 +1,20 @@
+#! /bin/bash
+
+name=$1; shift
+size=$1; shift
+fstype=$1; shift
+sopt=-L $size
+
+if (echo $size|grep '%'); then
+  sopt=-l $size
+fi
+
+if /sbin/lvcreate $sopt -n $name vd; then
+  if ! /sbin/mkfs -t $fstype $@ /dev/mapper/vd-$name; then
+/sbin/lvremove vd/$name
+exit 1
+  else
+exit 0
+  fi
+fi
+exit 1
diff --git a/modules/labs_lvm/manifest/init.pp 
b/modules/labs_lvm/manifest/init.pp
new file mode 100644
index 000..a5afb15
--- /dev/null
+++ b/modules/labs_lvm/manifest/init.pp
@@ -0,0 +1,74 @@
+# Class: labs_lvm
+#
+# Manages LVM in labs instance for extra storage.  labs_lvm
+# only ensures the volume group exists, creating (and mounting)
+# actual logical volumes is done with labs_lvm::volume.
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class labs_lvm($device) {
+
+package { 'lvm2':
+ensure  = present,
+}
+
+file { '/usr/local/sbin/make-instance-vg':
+ensure  = file,
+source  = 'puppet:///modules/labs_lvm/make-instance-vg',
+requires= Package['lvm2'],
+mode= 0544,
+owner   = 'root',
+group   = 'root',
+}
+
+exec { 'create-volume-group':
+creates = '/dev/vd',
+requires= File['/usr/local/sbin/make-instance-vg'],
+command = /usr/local/sbin/make-instance-vg '$device',
+}
+
+}
+
+class labs_lvm::volume(
+$name   = 'store',
+$mountpoint = '/mnt',
+$size   = '100%FREE',
+$fstype = 'ext4',
+$mkfs_opt   = ''
+) {
+
+file { '/usr/local/sbin/make-instance-vol':
+ensure  = file,
+source  = 'puppet:///modules/labs_lvm/make-instance-vol',
+requires= Package['lvm2'],
+mode= 0544,
+owner   = 'root',
+group   = 'root',
+}
+
+exec { create-vd-$name:
+creates = /dev/vd/$name,
+requires= [
+ File['/usr/local/sbin/make-instance-vol'],
+ Exec['create-volume-group']
+   ],
+command = /usr/local/sbin/make-instance-vol '$name' '$size' 
'$fstype' $mkfs_opt,
+}
+
+mount { $mountpoint:
+ensure  = mounted,
+atboot  = false,
+device  = /dev/mapper/vd-$name,
+options = defaults,noauto,
+fstype  = $fstype,
+requires= Exec[create-vd-$name],
+}
+
+}
+

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

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

[MediaWiki-commits] [Gerrit] Move uploaded by to the right spot - change (mediawiki...MultimediaViewer)

2014-02-26 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Move uploaded by to the right spot
..

Move uploaded by to the right spot

As specified in the acceptance criteria, it should be
between Learn more and the creation date

Change-Id: Ie3e7fd55b6bb8fa5cf995fa90dd8ab45581f34bd
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/217
---
M resources/mmv/ui/mmv.ui.metadataPanel.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/42/115642/1

diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js 
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 2e2e79c..b65e4fe 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -218,8 +218,8 @@
.appendTo( this.$imageLinkDiv );
 
this.initializeRepoLink();
-   this.initializeDatetime();
this.initializeUploader();
+   this.initializeDatetime();
this.initializeLocation();
 
this.fileReuse = new mw.mmv.ui.FileReuse( this.$imageLinks );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3e7fd55b6bb8fa5cf995fa90dd8ab45581f34bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Make it possible to check for RL errors anywhere - change (mediawiki/selenium)

2014-02-26 Thread Cmcmahon (Code Review)

Cmcmahon has uploaded a new change for review.

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

Change subject: Make it possible to check for RL errors anywhere
..

Make it possible to check for RL errors anywhere

Intended usage:

Given I am on Foo Page
  And page has no ResourceLoader errors

Change-Id: I183755fb211e5b1ca0cafdbb6f570c4799cf90b5
---
A lib/mediawiki_selenium/step_definitions/resource_loader_error_check_steps.rb
1 file changed, 46 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/43/115643/1

diff --git 
a/lib/mediawiki_selenium/step_definitions/resource_loader_error_check_steps.rb 
b/lib/mediawiki_selenium/step_definitions/resource_loader_error_check_steps.rb
new file mode 100644
index 000..119f3c4
--- /dev/null
+++ 
b/lib/mediawiki_selenium/step_definitions/resource_loader_error_check_steps.rb
@@ -0,0 +1,46 @@
+
+=begin
+This file is subject to the license terms in the LICENSE file found in the
+mediawiki_selenium top-level directory and at
+https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
+mediawiki_selenium, including this file, may be copied, modified, propagated, 
or
+distributed except according to the terms contained in the LICENSE file.
+Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
+mediawiki_selenium top-level directory and at
+https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
+=end
+
+Then(/^page has no ResourceLoader errors$/) do
+  @browser.execute_script(
+return (function() {
+// Returns a string listing problem modules,
+// or empty string if all OK (or not a MediaWiki page).
+// MediaWiki registers many JS modules that are not loaded on average 
pages.
+var i, len, state,
+modules = mw.loader.getModuleNames(),
+error = [],
+missing = [],
+ret = '';
+if ( ( typeof mediaWiki === 'undefined' ) || !mediaWiki.loader ) {
+return ret;
+}
+
+for ( i = 0, len = modules.length; i  len; i++ ) {
+state = mw.loader.getState( modules[i] );
+if ( state === 'error' ) {
+error.push( modules[i] );
+}
+if ( state === 'missing' ) {
+missing.push( modules[i] );
+}
+}
+if ( error.length ) {
+   ret += 'Error modules: ' + error.join( '; ') + '.';
+}
+if ( missing.length ) {
+   ret += 'Missing modules: ' + missing.join( '; ') + '.';
+}
+return ret;
+}) ();
+).should == 
+end
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I183755fb211e5b1ca0cafdbb6f570c4799cf90b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add puppetcopy and puppetcopyregion args to createInstance. - change (mediawiki...OpenStackManager)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Add puppetcopy and puppetcopyregion args to createInstance.
..

Add puppetcopy and puppetcopyregion args to createInstance.

Change-Id: I44db7809f0e893dfb1ce56564643e714e949945f
---
M maintenance/createInstance.php
1 file changed, 39 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/44/115644/1

diff --git a/maintenance/createInstance.php b/maintenance/createInstance.php
index f7900a4..2c491a3 100644
--- a/maintenance/createInstance.php
+++ b/maintenance/createInstance.php
@@ -45,26 +45,59 @@
$this-addOption( 'image', 'The image ID to use when creating', 
true, true );
$this-addOption( 'flavor', 'The flavor of the new instance, 
e.g. m1.small', true, true );
$this-addOption( 'securitygroups', 'Comma-separated list of 
security groups for new instance', false, true );
-   $this-addOption( 'puppetclasses', 'Comma-separated list of 
security groups for new instance', false, true );
+   $this-addOption( 'copypuppet', 'Instance id to copy puppet 
settings from', false, true );
+   $this-addOption( 'copypuppetregion', 'Region for copypuppet 
instance.', false, true );
}
 
public function execute() {
global $wgAuth;
global $wgOpenStackManagerLDAPUsername;
global $wgOpenStackManagerLDAPUserPassword;
+   global $wgOpenStackManagerPuppetOptions;
 
 
+   $region = $this-getOption( 'region' );
if ( $this-hasOption( 'securitygroups' ) ) {
$secGroups = explode(',', $this-getOption( 
'securitygroups' ) );
} else {
$secGroups = array();
}
-   if ( $this-hasOption( 'puppetclasses' ) ) {
-   $pupClasses = explode(',', $this-getOption( 
'puppetclasses' ) );
+   if ( $this-hasOption( 'copypuppetregion' ) ) {
+   $copypuppetregion = $this-getOption( 
'copypuppetregion' );
} else {
-   $pupClasses = array();
+   $copypuppetregion = $region;
}
-   $region = $this-getOption( 'region' );
+   $puppetinfo = array();
+   if ( $this-hasOption( 'copypuppet' ) ) {
+   $puppetsource = OpenStackNovaHost::getHostByInstanceId( 
$this-getOption( 'copypuppet' ), $copypuppetregion );
+   $info = $puppetsource-getPuppetConfiguration();
+   if ( isset( $info['puppetclass'] ) ) {
+   $puppetinfo['classes'] = array();
+   foreach ( $info['puppetclass'] as $class ) {
+   if ( ! ( in_array( $class, 
$wgOpenStackManagerPuppetOptions['defaultclasses'] ) ) ) {
+   $puppetinfo['classes'][] = 
$class;
+   }
+   }
+   }
+   if ( isset( $info['puppetvar'] ) ) {
+   $puppetinfo['variables'] = array();
+   foreach ( $info['puppetvar'] as $key = $value 
) {
+   if ( $key == 'instanceproject' ) {
+   continue;
+   }
+   if ( $key == 'instancename' ) {
+   continue;
+   }
+   if ( $key == 'realm' ) {
+   continue;
+   }
+   if ( ! ( in_array( $key, 
$wgOpenStackManagerPuppetOptions['defaultvariables'] ) ) ) {
+   $puppetinfo['variables'][$key] 
= $value;
+   }
+   }
+   }
+   }
+
$flavor = $this-getOption( 'flavor' );
$image = $this-getOption( 'image' );
$instance = $this-getOption( 'instance' );
@@ -90,7 +123,7 @@
$instance = $this-userNova-getInstance( $instanceId );
}
if ( $instance ) {
-   $host = OpenStackNovaHost::addHostFromInstance( 
$instance, $domain, $pupClasses );
+   $host = OpenStackNovaHost::addHostFromInstance( 
$instance, $domain, $puppetinfo );
 
if ( $host ) {
$instance-setHost( $host );

-- 
To

[MediaWiki-commits] [Gerrit] Add puppetcopy and puppetcopyregion args to createInstance. - change (mediawiki...OpenStackManager)

2014-02-26 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Add puppetcopy and puppetcopyregion args to createInstance.
..


Add puppetcopy and puppetcopyregion args to createInstance.

Change-Id: I44db7809f0e893dfb1ce56564643e714e949945f
---
M maintenance/createInstance.php
1 file changed, 39 insertions(+), 6 deletions(-)

Approvals:
  Andrew Bogott: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/maintenance/createInstance.php b/maintenance/createInstance.php
index f7900a4..2c491a3 100644
--- a/maintenance/createInstance.php
+++ b/maintenance/createInstance.php
@@ -45,26 +45,59 @@
$this-addOption( 'image', 'The image ID to use when creating', 
true, true );
$this-addOption( 'flavor', 'The flavor of the new instance, 
e.g. m1.small', true, true );
$this-addOption( 'securitygroups', 'Comma-separated list of 
security groups for new instance', false, true );
-   $this-addOption( 'puppetclasses', 'Comma-separated list of 
security groups for new instance', false, true );
+   $this-addOption( 'copypuppet', 'Instance id to copy puppet 
settings from', false, true );
+   $this-addOption( 'copypuppetregion', 'Region for copypuppet 
instance.', false, true );
}
 
public function execute() {
global $wgAuth;
global $wgOpenStackManagerLDAPUsername;
global $wgOpenStackManagerLDAPUserPassword;
+   global $wgOpenStackManagerPuppetOptions;
 
 
+   $region = $this-getOption( 'region' );
if ( $this-hasOption( 'securitygroups' ) ) {
$secGroups = explode(',', $this-getOption( 
'securitygroups' ) );
} else {
$secGroups = array();
}
-   if ( $this-hasOption( 'puppetclasses' ) ) {
-   $pupClasses = explode(',', $this-getOption( 
'puppetclasses' ) );
+   if ( $this-hasOption( 'copypuppetregion' ) ) {
+   $copypuppetregion = $this-getOption( 
'copypuppetregion' );
} else {
-   $pupClasses = array();
+   $copypuppetregion = $region;
}
-   $region = $this-getOption( 'region' );
+   $puppetinfo = array();
+   if ( $this-hasOption( 'copypuppet' ) ) {
+   $puppetsource = OpenStackNovaHost::getHostByInstanceId( 
$this-getOption( 'copypuppet' ), $copypuppetregion );
+   $info = $puppetsource-getPuppetConfiguration();
+   if ( isset( $info['puppetclass'] ) ) {
+   $puppetinfo['classes'] = array();
+   foreach ( $info['puppetclass'] as $class ) {
+   if ( ! ( in_array( $class, 
$wgOpenStackManagerPuppetOptions['defaultclasses'] ) ) ) {
+   $puppetinfo['classes'][] = 
$class;
+   }
+   }
+   }
+   if ( isset( $info['puppetvar'] ) ) {
+   $puppetinfo['variables'] = array();
+   foreach ( $info['puppetvar'] as $key = $value 
) {
+   if ( $key == 'instanceproject' ) {
+   continue;
+   }
+   if ( $key == 'instancename' ) {
+   continue;
+   }
+   if ( $key == 'realm' ) {
+   continue;
+   }
+   if ( ! ( in_array( $key, 
$wgOpenStackManagerPuppetOptions['defaultvariables'] ) ) ) {
+   $puppetinfo['variables'][$key] 
= $value;
+   }
+   }
+   }
+   }
+
$flavor = $this-getOption( 'flavor' );
$image = $this-getOption( 'image' );
$instance = $this-getOption( 'instance' );
@@ -90,7 +123,7 @@
$instance = $this-userNova-getInstance( $instanceId );
}
if ( $instance ) {
-   $host = OpenStackNovaHost::addHostFromInstance( 
$instance, $domain, $pupClasses );
+   $host = OpenStackNovaHost::addHostFromInstance( 
$instance, $domain, $puppetinfo );
 
if ( $host ) {
$instance-setHost( $host );

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

[MediaWiki-commits] [Gerrit] Adding mgmt ip's for row d pdus - change (operations/dns)

2014-02-26 Thread Cmjohnson (Code Review)

Cmjohnson has uploaded a new change for review.

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

Change subject: Adding mgmt ip's for row d pdus
..

Adding mgmt ip's for row d pdus

Change-Id: I91a1b53044396b021b95644bfcd306c905f5b902
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/45/115645/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 7a2f3a3..547af8e 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1778,6 +1778,14 @@
 53 1H IN PTR   ps1-c6-eqiad.mgmt.eqiad.wmnet.
 54 1H IN PTR   ps1-c7-eqiad.mgmt.eqiad.wmnet.
 55 1H IN PTR   ps1-c8-eqiad.mgmt.eqiad.wmnet.
+56  1H IN PTR   ps1-d1-eqiad.mgmt.eqiad.wmnet.
+57  1H IN PTR   ps1-d2-eqiad.mgmt.eqiad.wmnet.
+58  1H IN PTR   ps1-d3-eqiad.mgmt.eqiad.wmnet.
+59  1H IN PTR   ps1-d4-eqiad.mgmt.eqiad.wmnet.
+60  1H IN PTR   ps1-d5-eqiad.mgmt.eqiad.wmnet.
+61  1H IN PTR   ps1-d6-eqiad.mgmt.eqiad.wmnet.
+62  1H IN PTR   ps1-d7-eqiad.mgmt.eqiad.wmnet.
+63  1H IN PTR   ps1-d8-eqiad.mgmt.eqiad.wmnet.
 
 1011H IN PTR   nas1001-a.mgmt.eqiad.wmnet.
 1021H IN PTR   nas1001-b.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f0a7210..c0dbfc1 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1314,6 +1314,14 @@
 ps1-c6-eqiad   1H  IN A10.65.0.53
 ps1-c7-eqiad   1H  IN A10.65.0.54
 ps1-c8-eqiad   1H  IN A10.65.0.55
+ps1-d1.eqiad1H  IN A10.65.0.56
+ps1-d2-eqiad1H  IN A10.65.0.57
+ps1-d3-eqiad1H  IN A10.65.0.58
+ps1-d4-eqiad1H  IN A10.65.0.59
+ps1-d5-eqiad1H  IN A10.65.0.60
+ps1-d6-eqiad1H  IN A10.65.0.61
+ps1-d7-eqiad1H  IN A10.65.0.62
+ps1-d8-eqiad1H  IN A10.65.0.63
 
 nas1001-a  1H  IN A10.65.0.102
 nas1001-b  1H  IN A10.65.0.101

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91a1b53044396b021b95644bfcd306c905f5b902
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] 1.0 updates - change (mediawiki...CirrusSearch)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: 1.0 updates
..


1.0 updates

Everything works with Elasticsearch 0.90 and 1.0.  Dropping support for
0.90 will remove some of the weird constructs and might speed some things
up so we'll do that once we've updated WMF's cluster.

This commit also makes some changes to make running the browser tests on
vagrant simpler.  They are bundled together because that is how I tested
1.0 and untangling them is more trouble then it is worth because we want
both of them.

Bug: 61879

Change-Id: I1dc24be8350b3a9d7ec9aa4fc251368c7c4b7da2
---
M .gitignore
M includes/AnalysisConfigBuilder.php
M includes/ElasticsearchIntermediary.php
M includes/MappingConfigBuilder.php
M includes/Result.php
M includes/ResultsType.php
M includes/Searcher.php
M maintenance/updateOneSearchIndexConfig.php
M tests/browser/features/step_definitions/page_steps.rb
M tests/browser/features/step_definitions/search_steps.rb
M tests/browser/features/support/pages/article_page.rb
M tests/browser/features/update_weight.feature
12 files changed, 267 insertions(+), 93 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 1dcf7a5..7c72671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *~
 *.kate-swp
 .*.swp
+.indexed
 tests/browser/cucumber_failures.log
 tests/browser/.bundle
 tests/browser/screenshots
diff --git a/includes/AnalysisConfigBuilder.php 
b/includes/AnalysisConfigBuilder.php
index 8a0698c..f56144c 100644
--- a/includes/AnalysisConfigBuilder.php
+++ b/includes/AnalysisConfigBuilder.php
@@ -118,7 +118,7 @@
),
'aggressive_splitting' = array(
'type' = 'word_delimiter',
-   'stem_english_possessive' = 'false', 
// No need
+   'stem_english_possessive' = false, // 
No need
),
'prefix_ngram_filter' = array(
'type' = 'edgeNGram',
diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index 8802521..e7b883c 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -115,6 +115,28 @@
}
 
/**
+* Unwrap a result that we expect to be a single value.
+* @param mixed $data from Elastica result
+* @return mixed the single result
+*/
+   public static function singleValue( $result, $name ) {
+   $data = $result-__get( $name );
+   if ( $data === null ) {
+   return null;
+   }
+   // Elasticsearch 0.90 returns single results as, well, single 
results
+   if ( !is_array( $data ) ) {
+   return $data;
+   }
+   // Elasticsearch 1.0 returns them as single node arrays
+   $count = count( $data );
+   if ( $count !== 1 ) {
+   wfLogWarning( Expected a single result for $name but 
got $count. );
+   }
+   return $data[ 0 ];
+   }
+
+   /**
 * Does this status represent an Elasticsearch parse error?
 * @param $status Status to check
 * @return boolean is this a parse error?
diff --git a/includes/MappingConfigBuilder.php 
b/includes/MappingConfigBuilder.php
index cc37dcd..cc02143 100644
--- a/includes/MappingConfigBuilder.php
+++ b/includes/MappingConfigBuilder.php
@@ -80,11 +80,11 @@
 
$config = array(
'dynamic' = false,
+   '_all' = array( 'enabled' = false ),
'properties' = array(
'timestamp' = array(
'type' = 'date',
'format' = 'dateOptionalTime',
-   'include_in_all' = false,
),
'namespace' = $this-buildLongField(),
'namespace_text' = $this-buildKeywordField(),
@@ -93,9 +93,8 @@
$this-buildStringField( 'text', 
$textExtraAnalyzers ),
array( 'fields' = array( 'word_count' 
= array(
'type' = 'token_count',
-   'store' = 'yes',
+   'store' = true,
'analyzer' = 'plain',
-   'include_in_all' = false,
) ) )
),

[MediaWiki-commits] [Gerrit] Adding mgmt ip's for row d pdus - change (operations/dns)

2014-02-26 Thread Cmjohnson (Code Review)

Cmjohnson has submitted this change and it was merged.

Change subject: Adding mgmt ip's for row d pdus
..


Adding mgmt ip's for row d pdus

Change-Id: I91a1b53044396b021b95644bfcd306c905f5b902
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 7a2f3a3..547af8e 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1778,6 +1778,14 @@
 53 1H IN PTR   ps1-c6-eqiad.mgmt.eqiad.wmnet.
 54 1H IN PTR   ps1-c7-eqiad.mgmt.eqiad.wmnet.
 55 1H IN PTR   ps1-c8-eqiad.mgmt.eqiad.wmnet.
+56  1H IN PTR   ps1-d1-eqiad.mgmt.eqiad.wmnet.
+57  1H IN PTR   ps1-d2-eqiad.mgmt.eqiad.wmnet.
+58  1H IN PTR   ps1-d3-eqiad.mgmt.eqiad.wmnet.
+59  1H IN PTR   ps1-d4-eqiad.mgmt.eqiad.wmnet.
+60  1H IN PTR   ps1-d5-eqiad.mgmt.eqiad.wmnet.
+61  1H IN PTR   ps1-d6-eqiad.mgmt.eqiad.wmnet.
+62  1H IN PTR   ps1-d7-eqiad.mgmt.eqiad.wmnet.
+63  1H IN PTR   ps1-d8-eqiad.mgmt.eqiad.wmnet.
 
 1011H IN PTR   nas1001-a.mgmt.eqiad.wmnet.
 1021H IN PTR   nas1001-b.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f0a7210..c0dbfc1 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1314,6 +1314,14 @@
 ps1-c6-eqiad   1H  IN A10.65.0.53
 ps1-c7-eqiad   1H  IN A10.65.0.54
 ps1-c8-eqiad   1H  IN A10.65.0.55
+ps1-d1.eqiad1H  IN A10.65.0.56
+ps1-d2-eqiad1H  IN A10.65.0.57
+ps1-d3-eqiad1H  IN A10.65.0.58
+ps1-d4-eqiad1H  IN A10.65.0.59
+ps1-d5-eqiad1H  IN A10.65.0.60
+ps1-d6-eqiad1H  IN A10.65.0.61
+ps1-d7-eqiad1H  IN A10.65.0.62
+ps1-d8-eqiad1H  IN A10.65.0.63
 
 nas1001-a  1H  IN A10.65.0.102
 nas1001-b  1H  IN A10.65.0.101

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91a1b53044396b021b95644bfcd306c905f5b902
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] (Bug 61770) Treat all block tags identically in pre-handler - change (mediawiki...parsoid)

2014-02-26 Thread jenkins-bot (Code Review)

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

Change subject: (Bug 61770) Treat all block tags identically in pre-handler
..


(Bug 61770) Treat all block tags identically in pre-handler

* Pre-Handler had a check for HTML-syntax block tags (i.e. html
  tags that showed up in wikitext). But, xxtensions can generate
  block HTML content as well and need to suppress indent-pres
  as well.

* This patch removes the special case which fixes the bug.

* Added a new parser test but Parsoid's test runner doesn't have
  access to extensions and all those fail for that reason.

Change-Id: I2414ec53136f3012f749a601edea15854349
---
M lib/ext.core.PreHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 28 insertions(+), 6 deletions(-)

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



diff --git a/lib/ext.core.PreHandler.js b/lib/ext.core.PreHandler.js
index 09a9ac5..c1f31db 100644
--- a/lib/ext.core.PreHandler.js
+++ b/lib/ext.core.PreHandler.js
@@ -402,7 +402,7 @@
break;
 
case PreHandler.STATE_PRE_COLLECT:
-   if (token.isHTMLTag  token.isHTMLTag()  
Util.isBlockTag(token.name)) {
+   if (token.name  Util.isBlockTag(token.name)) {
ret = 
this.encounteredBlockWhileCollecting( token );
this.moveToIgnoreState();
} else {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 67f726f..bd7e744 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -54,6 +54,7 @@
 add(wt2html, 2a. Indent-Pre and tables,  table 
data-parsoid='{\dsr\:[1,31,2,2]}'\n tbody 
data-parsoid='{\dsr\:[5,29,0,0]}'tr 
data-parsoid='{\startTagSrc\:\|-\,\autoInsertedEnd\:true,\dsr\:[5,27,2,0]}'\n
 th data-parsoid='{\autoInsertedEnd\:true,\dsr\:[9,12,1,0]}'h1/thth 
data-parsoid='{\stx_v\:\row\,\autoInsertedEnd\:true,\dsr\:[12,16,2,0]}'h2/th\n
 td data-parsoid='{\autoInsertedEnd\:true,\dsr\:[18,22,1,0]}'foo/tdtd 
data-parsoid='{\stx_v\:\row\,\autoInsertedEnd\:true,\dsr\:[22,27,2,0]}'bar/td/tr\n
 /tbody/table);
 add(wt2html, 2b. Indent-Pre and tables,   table 
data-parsoid='{\dsr\:[2,16,2,2]}'\n tbody 
data-parsoid='{\dsr\:[6,14,0,0]}'tr 
data-parsoid='{\startTagSrc\:\|-\,\autoInsertedEnd\:true,\dsr\:[6,13,2,0]}'\ntd
 
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[9,13,1,0]}'foo/td/tr\n/tbody/table);
 add(wt2html, 2c. Indent-Pre and tables (bug 42252), table 
data-parsoid='{\dsr\:[0,23,2,2]}'\n caption 
data-parsoid='{\dsr\:[4,10,2,null]}' foo/caption\n tbody 
data-parsoid='{\dsr\:[12,21,0,0]}'tr 
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[12,20,0,0]}'th
 data-parsoid='{\startTagSrc\:\!  
\,\attrSepSrc\:\|\,\autoInsertedEnd\:true,\dsr\:[12,20,4,0]}' 
bar/th/tr\n/tbody/table);
+add(wt2html, 4. Indent-Pre and extension tags, pre 
data-parsoid='{\dsr\:[0,39,1,0]}'a span typeof=\mw:Extension/gallery\ 
about=\#mwt1\ 
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:foobar.jpg\\nlt;/gallery\,\tagWidths\:[9,10],\dsr\:[3,39,9,10]}'lt;gallery\nFile:foobar.jpg\nlt;/gallery/span/pre);
 add(wt2html, Leading pipes outside of tables, | foo);
 add(wt2html, Leading pipes outside of tables 2, p 
data-parsoid='{\dsr\:[0,1,0,0]}'a/p\n| foo\np 
data-parsoid='{\dsr\:[8,9,0,0]}'b/p);
 add(wt2html, Leading pipes outside of tables 3, p 
data-parsoid='{\dsr\:[0,1,0,0]}'a/p\n| class=\foo bar\ | baz\np 
data-parsoid='{\dsr\:[26,27,0,0]}'b/p);
@@ -550,6 +551,7 @@
 add(wt2wt, nowiki inside pre (bug 13238), 
pre\nnowiki\n/pre\npre\nnowiki/nowiki\n/pre\nprenowikilt;nowikigt;/nowikiFoonowiki/nowiki/nowiki/pre);
 add(wt2wt, nowiki and pre preference (first one wins), 
pre\nnowiki\n/pre\n/nowiki\n/pre\n\nnowiki\npre\nlt;nowikigt;\n/pre\n/nowiki\n/pre\n);
 add(wt2wt, Templates: Indent-Pre: 1f: Wrapping should be based on expanded 
content, {{echo| }}a\n\n{{echo|\n }}a\n\n{{echo|\n b}}\n\n{{echo|a\n 
}}b\n\n{{echo|a\n}}\n b\n);
+add(wt2wt, 4. Indent-Pre and extension tags,  a gallery\n 
File:foobar.jpg\n /gallery\n);
 add(wt2wt, Leading pipes outside of tables 2, a\n| foo\n\nb\n);
 add(wt2wt, Leading pipes outside of tables 3, a\n| class=\foo bar\ | 
baz\n\nb\n);
 add(wt2wt, HTML-pre: 1. embedded newlines, 
prefoo/pre\n\npre\nfoo\n/pre\n\npre\nfoo\n/pre\n\npre\n\nfoo\n/pre);
@@ -728,7 +730,8 @@
 add(html2html, nowiki inside pre (bug 13238), pre 
data-parsoid='{\dsr\:[0,15,1,0]}'span typeof=\mw:Entity\ 
data-parsoid='{\src\:\amp;lt;\,\srcContent\:\lt;\,\dsr\:[1,5,null,null]}'lt;/spannowikispan
 typeof=\mw:Entity\ 
data-parsoid='{\src\:\amp;gt;\,\srcContent\:\\,\dsr\:[11,15,null,null]}'/span/pre\n\n
 p data-parsoid='{\dsr\:[18,18,0,0]}'br 
data-parsoid='{\dsr\:[18,18,0,0]}'//p\n\npre 
data-parsoid='{\dsr\:[20,53,1,0]}'span typeof=\mw:Entity\

[MediaWiki-commits] [Gerrit] Labs: manage LVM volumes on instance - change (operations/puppet)

2014-02-26 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Labs: manage LVM volumes on instance
..


Labs: manage LVM volumes on instance

Includes a test role.

Change-Id: Idc25fafc4c6fc8e8562c25ed56dc2172b6ca65c8
---
A manifests/role/labstest.pp
A modules/labs_lvm/files/make-instance-vg
A modules/labs_lvm/files/make-instance-vol
A modules/labs_lvm/manifest/init.pp
4 files changed, 141 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/labstest.pp b/manifests/role/labstest.pp
new file mode 100644
index 000..8c2ff62
--- /dev/null
+++ b/manifests/role/labstest.pp
@@ -0,0 +1,17 @@
+#
+# This is just for testing new things
+# and will go away
+#
+
+class role::labs::instancetest {
+
+class { 'labs_lvm':
+device = '/dev/vda'
+}
+
+class { 'labs_lvm::volume':
+mountpoint = '/mnt'
+}
+
+}
+
diff --git a/modules/labs_lvm/files/make-instance-vg 
b/modules/labs_lvm/files/make-instance-vg
new file mode 100755
index 000..42b3e30
--- /dev/null
+++ b/modules/labs_lvm/files/make-instance-vg
@@ -0,0 +1,30 @@
+#! /bin/bash
+
+device=$1
+if ! /sbin/parted -s $device mkpart primary $(
+/sbin/parted -s $device print free |
+/bin/grep 'Free Space' |
+/usr/bin/tail -n 1 |
+/bin/sed -e 's/  */ /g' |
+/usr/bin/cut -d ' ' -f 2,3 ); then
+  echo $0: failed to create new partition 2
+  exit 1
+fi
+
+part=$( /sbin/parted -s $device print |
+  /bin/grep 'primary' |
+  /usr/bin/tail -n 1 |
+  /bin/sed -e 's/  */ /g' |
+  /bin/sed -e 's/^ *//' |
+  /usr/bin/cut -d ' ' -f 1 )
+  echo Last partition [$part]
+if [ $part !=  ]; then
+  if [ $part -gt 2 ]; then
+/sbin/parted -s $device set $part lvm on
+/sbin/pvcreate $device$part
+/sbin/vgcreate vd $device$part
+/sbin/partprobe
+exit 0
+  fi
+fi
+exit 2
diff --git a/modules/labs_lvm/files/make-instance-vol 
b/modules/labs_lvm/files/make-instance-vol
new file mode 100755
index 000..7cd281c
--- /dev/null
+++ b/modules/labs_lvm/files/make-instance-vol
@@ -0,0 +1,20 @@
+#! /bin/bash
+
+name=$1; shift
+size=$1; shift
+fstype=$1; shift
+sopt=-L $size
+
+if (echo $size|grep '%'); then
+  sopt=-l $size
+fi
+
+if /sbin/lvcreate $sopt -n $name vd; then
+  if ! /sbin/mkfs -t $fstype $@ /dev/mapper/vd-$name; then
+/sbin/lvremove vd/$name
+exit 1
+  else
+exit 0
+  fi
+fi
+exit 1
diff --git a/modules/labs_lvm/manifest/init.pp 
b/modules/labs_lvm/manifest/init.pp
new file mode 100644
index 000..a5afb15
--- /dev/null
+++ b/modules/labs_lvm/manifest/init.pp
@@ -0,0 +1,74 @@
+# Class: labs_lvm
+#
+# Manages LVM in labs instance for extra storage.  labs_lvm
+# only ensures the volume group exists, creating (and mounting)
+# actual logical volumes is done with labs_lvm::volume.
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class labs_lvm($device) {
+
+package { 'lvm2':
+ensure  = present,
+}
+
+file { '/usr/local/sbin/make-instance-vg':
+ensure  = file,
+source  = 'puppet:///modules/labs_lvm/make-instance-vg',
+requires= Package['lvm2'],
+mode= 0544,
+owner   = 'root',
+group   = 'root',
+}
+
+exec { 'create-volume-group':
+creates = '/dev/vd',
+requires= File['/usr/local/sbin/make-instance-vg'],
+command = /usr/local/sbin/make-instance-vg '$device',
+}
+
+}
+
+class labs_lvm::volume(
+$name   = 'store',
+$mountpoint = '/mnt',
+$size   = '100%FREE',
+$fstype = 'ext4',
+$mkfs_opt   = ''
+) {
+
+file { '/usr/local/sbin/make-instance-vol':
+ensure  = file,
+source  = 'puppet:///modules/labs_lvm/make-instance-vol',
+requires= Package['lvm2'],
+mode= 0544,
+owner   = 'root',
+group   = 'root',
+}
+
+exec { create-vd-$name:
+creates = /dev/vd/$name,
+requires= [
+ File['/usr/local/sbin/make-instance-vol'],
+ Exec['create-volume-group']
+   ],
+command = /usr/local/sbin/make-instance-vol '$name' '$size' 
'$fstype' $mkfs_opt,
+}
+
+mount { $mountpoint:
+ensure  = mounted,
+atboot  = false,
+device  = /dev/mapper/vd-$name,
+options = defaults,noauto,
+fstype  = $fstype,
+requires= Exec[create-vd-$name],
+}
+
+}
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc25fafc4c6fc8e8562c25ed56dc2172b6ca65c8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren

1 2 3 4 >

1 - 100 of 336 matches

Mail list logo