[MediaWiki-commits] [Gerrit] enable ipsec for mobile and bits clusters - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: enable ipsec for mobile and bits clusters
..
enable ipsec for mobile and bits clusters
these are simpler and lower traffic than text, and give us more
hosts to look at for more probability of seeing low-rate issues
via monitoring.
Still holding off on the upload cluster a bit until we've got more
runtime experience with these clusters...
Bug: T92604
Change-Id: Ib66687b55ebbd6978ca6bba922b6e8b20ce1511d
---
M manifests/site.pp
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index caf91d2..bc7e63e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -392,7 +392,7 @@
node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
interface::add_ip6_mapped { 'main': }
-role cache::mobile
+role cache::mobile, ipsec
}
node /^cp10(4[89]|5[01]|6[1-4]|7[1-4]|99)\.eqiad\.wmnet$/ {
@@ -407,7 +407,7 @@
node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet',
'cp1070.eqiad.wmnet' {
interface::add_ip6_mapped { 'main': }
-role cache::bits
+role cache::bits, ipsec
}
node /^cp20(0[147]|1[0369]|23)\.codfw\.wmnet$/ {
@@ -442,12 +442,12 @@
node /^cp301[5678]\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::mobile
+role cache::mobile, ipsec
}
node /^cp30(19|2[0-2])\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::bits
+role cache::bits, ipsec
}
node /^cp30[34][01]\.esams\.wmnet$/ {
@@ -467,7 +467,7 @@
node /^cp400[1-4]\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::bits
+role cache::bits, ipsec
}
node /^cp40(0[5-7]|1[3-5])\.ulsfo\.wmnet$/ {
@@ -485,7 +485,7 @@
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::mobile
+role cache::mobile, ipsec
}
node 'dataset1001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/227980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib66687b55ebbd6978ca6bba922b6e8b20ce1511d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@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] [UploadWizard] Introducing the usage of an object reference - change (mediawiki...UploadWizard)
Kai Nissen (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227984
Change subject: [UploadWizard] Introducing the usage of an object reference
..
[UploadWizard] Introducing the usage of an object reference
The parameter objref will be used to have a bot updating the
lists of monuments with a thumbnail image of one of the uploaded
images.
This patch also adds the keyword 'useObjref' to the home button
and the keyword 'dropObjref' to the begin button configuration.
If it is set and there is an objref parameter passed with the request,
clicking the home button leads to the page passed as the reference (this
may be any page in any wiki defined for interwiki links; it is intended
to be the referer, though). If the begin button is configured to drop the
object reference, it will reload the Upload Wizard page, but will drop
the reference parameter from the URL.
Independently from the button configuration, if the objref parameter is
set, the Upload Wizard adds the reference parameter to the description
page inside a comment tag. This will later be used by a bot that
supplements an image thumbnail to monument lists.
Bug: T105281
Change-Id: Ia974a148a6326dbca17a70c54a0cffcd2e4a39ac
---
M includes/UploadWizardCampaign.php
M includes/specials/SpecialUploadWizard.php
M resources/mw.UploadWizardDetails.js
M resources/ui/uw.ui.Thanks.js
A tests/phpunit/UploadWizardConfigTest.php
M tests/qunit/controller/uw.controller.Thanks.test.js
6 files changed, 144 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/84/227984/1
diff --git a/includes/UploadWizardCampaign.php
b/includes/UploadWizardCampaign.php
index b58ebd9..feff16b 100755
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -337,9 +337,14 @@
}
$this-parsedConfig = $parsedConfig;
+
$cache-set( $memKey, array( 'timestamp' = time(),
'config' = $parsedConfig ) );
}
+ $uwDefaults = UploadWizardConfig::getSetting( 'defaults' );
+ if ( array_key_exists( 'objref', $uwDefaults ) ) {
+ $this-applyObjectReferenceToButtons(
$uwDefaults['objref'] );
+ }
$this-modifyIfNecessary();
return $this-parsedConfig;
@@ -431,4 +436,38 @@
return $start === null || $start = $today;
}
+
+ /**
+* Generate the URL out of the object reference
+*
+* @param string $objRef
+* @return bool|string
+*/
+ private function getButtonHrefByObjectReference( $objRef ) {
+ list( $wiki, $title ) = explode( '|', $objRef );
+ if ( Interwiki::isValidInterwiki( $wiki ) ) {
+ return str_replace( '$1', $title, Interwiki::fetch(
$wiki )-getURL() );
+ }
+ return false;
+ }
+
+ /**
+* Apply given object reference to buttons configured to use it as href
+*
+* @param string $objRef
+*/
+ private function applyObjectReferenceToButtons( $objRef ) {
+ $customizableButtons = array( 'homeButton', 'beginButton' );
+
+ foreach( $customizableButtons as $button ) {
+ if ( array_key_exists( $button,
$this-parsedConfig['display'] )
+
$this-parsedConfig['display'][$button]['target'] === 'useObjref'
+ ) {
+ $validUrl =
$this-getButtonHrefByObjectReference( $objRef );
+ if ( $validUrl ) {
+
$this-parsedConfig['display'][$button]['target'] = $validUrl;
+ }
+ }
+ }
+ }
}
diff --git a/includes/specials/SpecialUploadWizard.php
b/includes/specials/SpecialUploadWizard.php
index 3015f36..645f14e 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -77,6 +77,8 @@
$urlDefaults['categories'] = explode( '|', $categories
);
}
+ $urlDefaults['objref'] = $req-getText( 'objref' ) ?: '';
+
UploadWizardConfig::setUrlSetting( 'defaults', $urlDefaults );
$fields = $req-getArray( 'fields' );
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 5a50321..d439798 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -1467,6 +1467,13 @@
wikiText +=
mw.UploadWizard.config.autoAdd.wikitext;
}
+ // add parameters for list callback bot
+
[MediaWiki-commits] [Gerrit] Set test assertions to new date format - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Set test assertions to new date format .. Set test assertions to new date format Bug: T107417 Change-Id: I1f36ff5d6ae0e1edb5f066ec44c355bdc5f59bb0 --- M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js b/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js index 59b7a9f..f20bd5e 100644 --- a/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js +++ b/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js @@ -156,7 +156,7 @@ assert.strictEqual( panel.creditField.$element.find( '.mw-mmv-source' ).html(), 'bLost/ba href=fooBar/a', 'Source text is correctly set' ); // Either multimediaviewer-credit-popup-text or multimediaviewer-credit-popup-text-more. assert.ok( creditPopupText === 'Author and source information' || creditPopupText === 'View full author and source', 'Source tooltip is correctly set' ); - assert.ok( panel.$datetime.text().indexOf( 'August 26, 2013' ) 0, 'Correct date is displayed' ); + assert.ok( panel.$datetime.text().indexOf( '26 August 2013' ) 0, 'Correct date is displayed' ); assert.strictEqual( panel.$license.text(), 'CC BY 2.0', 'License is correctly set' ); assert.ok( panel.$license.prop( 'target' ), 'License information opens in new window' ); assert.ok( panel.$username.text().indexOf( imageData.lastUploader ) 0, 'Correct username is displayed' ); @@ -165,7 +165,7 @@ imageData.creationDateTime = undefined; panel.setImageInfo( image, imageData, repoData, gender ); - assert.ok( panel.$datetime.text().indexOf( 'August 25, 2013' ) 0, 'Correct date is displayed' ); + assert.ok( panel.$datetime.text().indexOf( '25 August 2013' ) 0, 'Correct date is displayed' ); window.moment = oldMoment; } ); -- To view, visit https://gerrit.wikimedia.org/r/227983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f36ff5d6ae0e1edb5f066ec44c355bdc5f59bb0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Gergő Tisza gti...@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] mail: fix smarthost route_list for OTRS - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: mail: fix smarthost route_list for OTRS
..
mail: fix smarthost route_list for OTRS
Commit bf70e33cd5d1a1016533e2f68e5557cf7b2a84b8 switch the route_list
from * to +local_domains, like it was configured for every other
mailhost. Unfortunately, OTRS is special in this case since it handles
our top domains partially (e.g. wikimedia.org) and hence local_domains
is ambiguous (not entirely local domains).
Fix this by reverting that part of the config and using * as a domain
selector again.
Change-Id: Icd049b83808bd177ec10c5eb08a33b70a814b8d7
---
M templates/exim/exim4.conf.otrs.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/exim4.conf.otrs.erb
b/templates/exim/exim4.conf.otrs.erb
index 3816d1c..8dcc4d9 100644
--- a/templates/exim/exim4.conf.otrs.erb
+++ b/templates/exim/exim4.conf.otrs.erb
@@ -176,7 +176,7 @@
transport = remote_smtp
# OTRS receives emails for project domains
# (such as info-en @ wikipedia.org), defined dynamically in its
database.
- route_list = !+local_domains %= @mail_smarthost.join(':') %
+ route_list = * %= @mail_smarthost.join(':') %
##
# Transports #
--
To view, visit https://gerrit.wikimedia.org/r/227987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd049b83808bd177ec10c5eb08a33b70a814b8d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] Debianize 0.8.2.1 tag - change (operations...kafka)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227989
Change subject: Debianize 0.8.2.1 tag
..
Debianize 0.8.2.1 tag
This renames the kafka-client package to kafka-cli,
in order to disambiguate the package name from the
kafka-clients.jar shipped with kafka-common.
kafka-examples .jars are no longer shipped as part of the kafka-common
package, and kafka-perf no longer exists as its own jar.
Any ext/ jars that are shipped along with the packages have been
intentially named with their version numbers, so as to avoid
potential naming conflicts with packages that might come from
Debian or Ubuntu. This won't avoid all conflicts, but it will
likely avoid most.
Bug T106581
Change-Id: I1c24a79d7992d3e9e3ca28ff133f31501f475cc0
---
M debian/README.Debian
M debian/bin/kafka
M debian/changelog
M debian/control
M debian/gbp.conf
R debian/kafka-cli.dirs
R debian/kafka-cli.install
R debian/kafka-cli.postinst
R debian/kafka-cli.postrm
M debian/kafka-common.install
M debian/kafka-common.links
M debian/kafka-mirror.init
M debian/patches/our-own-build-system.patch
D debian/patches/remove_scala_annotations2.8.patch
M debian/patches/series
M debian/rules
M debian/source/include-binaries
A ext/commons-collections-2.1.1.jar
A ext/lz4-1.2.0.jar
A ext/paranamer-2.1.jar
A ext/piggybank-0.12.0.jar
A ext/snappy-java-1.0.4.1.jar
A ext/xmlenc-0.52.jar
23 files changed, 151 insertions(+), 216 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/kafka
refs/changes/89/227989/1
diff --git a/debian/README.Debian b/debian/README.Debian
index fa06c5a..c92fa6d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
kafka for Debian
This package is created using a custom build system based on Makefiles
-instead of the standard sbt build system used by upstream. The reason
+instead of the standard sbt/gradle build system used by upstream. The reason
for this is to satisfy debian policy that no internet connection should
be required during package building as well as security concers about
the downloaded JAR files by sbt
@@ -27,7 +27,7 @@
* Create a cowbuilder environment (we assume you are building against
precise pangolin here)
- $ sudo DIST=precise git-pbuilder create --components main universe
+ $ sudo DIST=jessie git-pbuilder create --components main universe
* Clone the repo
@@ -36,7 +36,7 @@
* Build
- $ DIST=precise git-buildpackage -us -uc
+ $ DIST=jessie git-buildpackage -us -uc
or if you dont want to use git-pbuilder:
@@ -68,9 +68,9 @@
from upstream that matches the debian upstream version specs. In that
case VERSION == commit-ish
-* Then update the master branch to reflect that
+* Then update the debian branch to reflect that
- $ git checkout master # Assuming you are not there already
+ $ git checkout debian # Assuming you are not there already
$ git merge upstream/VERSION
* Solve any potential conflicts that might arise. A very helpful way to
diff --git a/debian/bin/kafka b/debian/bin/kafka
index 2ff0bf5..14cf876 100755
--- a/debian/bin/kafka
+++ b/debian/bin/kafka
@@ -11,12 +11,21 @@
SCRIPT_NAME=$(basename $0)
KAFKA_CONFIG=${KAFKA_CONFIG:-/etc/kafka}
LOG_DIR=${LOG_DIR:-/var/log/kafka}
+SYS_CLASSDIR=${SYS_CLASSDIR:-/usr/share/java}
+KAFKA_CLASSDIR=${KAFKA_CLASSDIR:-/usr/share/kafka}
# Set ZOOKEEPER_OPT if ZOOKEEPER_URL is set and --zookeeper has not
# also been passed in as a CLI arg. This will be included
# in command functions that take a --zookeeper argument.
if [ -n ${ZOOKEEPER_URL} -a -z $(echo $@ | grep -- --zookeeper) ]; then
ZOOKEEPER_OPT=--zookeeper ${ZOOKEEPER_URL}
+fi
+
+# Set BROKER_LIST_OPT if BROKER_LIST is set and --broker-list has not
+# also been passed in as a CLI arg. This will be included
+# in command functions that take a --broker-list argument.
+if [ -n ${BROKER_LIST} -a -z $(echo $@ | grep -- --broker-list) ]; then
+BROKER_LIST_OPT=--broker-list ${BROKER_LIST}
fi
@@ -36,11 +45,9 @@
$SCRIPT_NAME mirror-maker [opts]
$SCRIPT_NAME consumer-offset-checker[opts]
- $SCRIPT_NAME add-partitions [opts]
$SCRIPT_NAME reassign-partitions[opts]
- $SCRIPT_NAME check-reassignment-status [opts]
$SCRIPT_NAME preferred-replica-election [opts]
- $SCRIPT_NAME controlled-shutdown[opts]
+ $SCRIPT_NAME replica-verification-tool [opts]
$SCRIPT_NAME producer-perf-test [opts]
$SCRIPT_NAME consumer-perf-test [opts]
@@ -55,6 +62,7 @@
Environment Variables:
ZOOKEEPER_URL - If this is set, any commands that take a
--zookeeper flag will be passed with this value.
+ BROKER_LIST- If this is set, any commands that take a
--broker-list flag will be passed with this value.
KAFKA_CONFIG - location of Kafka config files. Default:
/etc/kafka
JMX_PORT
[MediaWiki-commits] [Gerrit] Fixes: Property Background remains blue after removing state... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixes: Property Background remains blue after removing statement
..
Fixes: Property Background remains blue after removing statement
Removes wb-edit class in afterremove event
Bug: T93810
Change-Id: I6cb63ab566671ff738b21121137cb1ab8404012f
---
M view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, but someone else must approve
Aude: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
index 39396ed..e1ab9d7 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
@@ -166,6 +166,7 @@
self.$property.addClass( 'wb-edit' );
} )
.on( prefix + 'afterremove.' + this.widgetName, function( event
) {
+ self.$property.removeClass( 'wb-error' ).removeClass(
'wb-edit' );
self._trigger( 'afterremove' );
} )
.statementlistview( {
--
To view, visit https://gerrit.wikimedia.org/r/227702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cb63ab566671ff738b21121137cb1ab8404012f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) jonas.kr...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@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] Use DM Serialization in RB for addEntityRevision - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Use DM Serialization in RB for addEntityRevision
..
Use DM Serialization in RB for addEntityRevision
Bug: T104180
Change-Id: I58fdfe04bcb128ec3b6325689ba1834a06c65211
---
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/api/GetEntities.php
M repo/includes/api/ResultBuilder.php
M repo/tests/phpunit/data/api/getentities.xml
M repo/tests/phpunit/includes/api/GetEntitiesTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
6 files changed, 405 insertions(+), 124 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index 9ffd493..e8cff36 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -456,9 +456,6 @@
// function gets called multiple times during testing, etc.
$res-reset();
- //TODO: apply language filter/Fallback via options!
- $options = new SerializationOptions();
-
$resultBuilder = new ResultBuilder(
$res,
$this-entityTitleLookup,
@@ -468,7 +465,7 @@
$this-propertyLookup,
false // Never index tags for this service as we dont
output XML
);
- $resultBuilder-addEntityRevision( null, $entityRevision,
$options );
+ $resultBuilder-addEntityRevision( null, $entityRevision );
return $res;
}
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 3e34cb2..01c9fb1 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -9,8 +9,6 @@
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\EntityRevision;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\Serializers\EntitySerializer;
-use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\UnresolvedRedirectException;
@@ -265,53 +263,50 @@
* @param EntityRevision|null $entityRevision
* @param array $params
*/
- private function handleEntity( $sourceEntityId, EntityRevision
$entityRevision = null, array $params = array() ) {
+ private function handleEntity(
+ $sourceEntityId,
+ EntityRevision $entityRevision = null,
+ array $params = array()
+ ) {
if ( $entityRevision === null ) {
$this-resultBuilder-addMissingEntity(
$sourceEntityId, array( 'id' = $sourceEntityId ) );
} else {
- $props = $this-getPropsFromParams( $params );
- $options = $this-getSerializationOptions( $params,
$props );
- $siteFilterIds = $params['sitefilter'];
-
+ list( $languageCodeFilter, $fallbackChains ) =
$this-getLanguageCodesAndFallback( $params );
$this-resultBuilder-addEntityRevision(
$sourceEntityId,
$entityRevision,
- $options,
- $props,
- $siteFilterIds
+ $this-getPropsFromParams( $params ),
+ $params['sitefilter'],
+ $languageCodeFilter,
+ $fallbackChains
);
}
}
/**
* @param array $params
-* @param array $props
*
-* @return SerializationOptions
+* @return array
+* 0 = string[] languageCodes that the user wants returned
+* 1 = LanguageFallbackChain[] Keys are requested lang codes
*/
- private function getSerializationOptions( $params, $props ) {
- $fallbackMode = (
- LanguageFallbackChainFactory::FALLBACK_VARIANTS
- | LanguageFallbackChainFactory::FALLBACK_OTHERS
- | LanguageFallbackChainFactory::FALLBACK_SELF );
-
- $options = new SerializationOptions();
+ private function getLanguageCodesAndFallback( $params ) {
+ $languageCodes = ( is_array( $params['languages'] )?
$params['languages'] : array() );
+ $fallbackChains = array();
if ( $params['languagefallback'] ) {
- $languages = array();
- foreach ( $params['languages'] as $languageCode ) {
-
[MediaWiki-commits] [Gerrit] Remove LibSerializerFactory from ResultBuilder - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove LibSerializerFactory from ResultBuilder
..
Remove LibSerializerFactory from ResultBuilder
This completes / fixes the issue
Bug: T104180
Change-Id: I1ae7badf0792a67dc87d0411142ec7882a1e03db
---
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/api/ApiHelperFactory.php
M repo/includes/api/ResultBuilder.php
M repo/includes/specials/SpecialEntityData.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
9 files changed, 14 insertions(+), 128 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index e8cff36..88ddd37 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -16,8 +16,6 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\SerializerFactory;
use Wikibase\EntityRevision;
-use Wikibase\Lib\Serializers\SerializationOptions;
-use Wikibase\Lib\Serializers\LibSerializerFactory;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Lib\Store\EntityTitleLookup;
@@ -83,11 +81,6 @@
private $entityTitleLookup;
/**
-* @var LibSerializerFactory
-*/
- private $libSerializerFactory;
-
- /**
* @var SerializerFactory
*/
private $serializerFactory;
@@ -122,7 +115,6 @@
* @param string $rdfDataURI
* @param EntityLookup $entityLookup
* @param EntityTitleLookup $entityTitleLookup
-* @param LibSerializerFactory $libSerializerFactory
* @param PropertyDataTypeLookup $propertyLookup
* @param EntityDataFormatProvider $entityDataFormatProvider
* @param SiteList $sites
@@ -136,7 +128,6 @@
$rdfDataURI,
EntityLookup $entityLookup,
EntityTitleLookup $entityTitleLookup,
- LibSerializerFactory $libSerializerFactory,
PropertyDataTypeLookup $propertyLookup,
SiteList $sites,
EntityDataFormatProvider $entityDataFormatProvider,
@@ -147,7 +138,6 @@
$this-rdfDataURI = $rdfDataURI;
$this-entityLookup = $entityLookup;
$this-entityTitleLookup = $entityTitleLookup;
- $this-libSerializerFactory = $libSerializerFactory;
$this-serializerFactory = $serializerFactory;
$this-propertyLookup = $propertyLookup;
$this-sites = $sites;
@@ -459,7 +449,6 @@
$resultBuilder = new ResultBuilder(
$res,
$this-entityTitleLookup,
- $this-libSerializerFactory,
$this-serializerFactory,
$this-siteStore,
$this-propertyLookup,
diff --git a/repo/includes/api/ApiHelperFactory.php
b/repo/includes/api/ApiHelperFactory.php
index f402b99..8eb8a01 100644
--- a/repo/includes/api/ApiHelperFactory.php
+++ b/repo/includes/api/ApiHelperFactory.php
@@ -10,8 +10,6 @@
use Wikibase\EditEntityFactory;
use Wikibase\EntityFactory;
use Wikibase\Lib\Localizer\ExceptionLocalizer;
-use Wikibase\Lib\Serializers\SerializationOptions;
-use Wikibase\Lib\Serializers\LibSerializerFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\SummaryFormatter;
@@ -91,15 +89,13 @@
* Returns a ResultBuilder wrapping the ApiResult of the given API
module.
*
* @param ApiBase $api
-* @param SerializationOptions $defaultOptions
*
* @return ResultBuilder
*/
- public function getResultBuilder( ApiBase $api, SerializationOptions
$defaultOptions = null ) {
+ public function getResultBuilder( ApiBase $api ) {
return new ResultBuilder(
$api-getResult(),
$this-titleLookup,
- $this-newLibSerializerFactory( $defaultOptions ),
$this-newSerializerFactory(),
$this-siteStore,
$this-dataTypeLookup,
@@ -119,21 +115,6 @@
$api,
$this-exceptionLocalizer,
$api-getLanguage()
- );
- }
-
- /**
-* Returns a serializer factory to be used when constructing API
results.
[MediaWiki-commits] [Gerrit] exim: use exim4 directly from role::otrs - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: exim: use exim4 directly from role::otrs
..
exim: use exim4 directly from role::otrs
Avoid the indirection of exim::roled from role::otrs and inline all of
the resources needed.
Change-Id: Iea3cc533a60e569d45bf32cc95bea18444db4d77
---
M manifests/mail.pp
M manifests/role/otrs.pp
2 files changed, 29 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/mail.pp b/manifests/mail.pp
index f7f3fb2..7cc7546 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -18,7 +18,6 @@
# Internal hostname of the wiki to which verp bounce emails are HTTP
POST-ed and processed
class roled(
$enable_mail_relay=false,
-$enable_otrs_server=false,
$verp_domains=[],
$verp_post_connect_server='',
$verp_bounce_post_url='',
@@ -29,10 +28,7 @@
$otrs_mysql_password = $passwords::exim::otrs_mysql_password
$smtp_ldap_password = $passwords::exim::smtp_ldap_password
-if $enable_otrs_server {
-$config_template = template('exim/exim4.conf.otrs.erb')
-$filter_template = template('exim/system_filter.conf.otrs.erb')
-} elsif $enable_mail_relay {
+if $enable_mail_relay {
$config_template = template('exim/exim4.conf.mx.erb')
$filter_template = template('exim/system_filter.conf.erb')
} else {
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 734c9cc..b28ad60 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -161,13 +161,36 @@
debug_logging = '--debug spf',
}
-# warning: don't unquote these booleans until exim::roled is fixed
-class { 'exim::roled':
-enable_otrs_server = true,
+include passwords::exim
+$otrs_mysql_password = $passwords::exim::otrs_mysql_password
+
+class { 'exim4':
+variant = 'heavy',
+config = template('exim/exim4.conf.otrs.erb'),
+filter = template('exim/system_filter.conf.erb'),
+require = [
+Class['spamassassin'],
+Class['clamav'],
+]
+}
+include exim4::ganglia
+
+file { '/etc/exim4/defer_domains':
+ensure = present,
+owner = 'root',
+group = 'Debian-exim',
+mode= '0444',
+require = Class['exim4'],
}
-Class['spamassassin'] - Class['exim::roled']
-Class['clamav'] - Class['exim::roled']
+file { '/etc/exim4/wikimedia_domains':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode= '0444',
+source = 'puppet:///files/exim/wikimedia_domains',
+require = Class['exim4'],
+}
cron { 'otrs_train_spamassassin':
ensure = 'present',
--
To view, visit https://gerrit.wikimedia.org/r/216650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea3cc533a60e569d45bf32cc95bea18444db4d77
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] exim: fold exim::roled into role::mail::mx - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: exim: fold exim::roled into role::mail::mx
..
exim: fold exim::roled into role::mail::mx
There's nothing left in exim::roled now but the mail relay
configuration. Fold it into its role class (role::mail::mx), getting rid
of the whole class and file in the process.
Change-Id: I54955b97e52ddcc1f9e918cf63cab2235ea04eb9
---
D manifests/mail.pp
M manifests/role/mail.pp
M manifests/site.pp
3 files changed, 45 insertions(+), 89 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mail.pp b/manifests/mail.pp
deleted file mode 100644
index 7cc7546..000
--- a/manifests/mail.pp
+++ /dev/null
@@ -1,82 +0,0 @@
-# mail.pp
-
-class exim {
-# Class: exim::roled
-#
-# This class installs a full featured Exim MTA
-#
-# Parameters:
-# - $enable_mail_relay:
-# Values: primary, secondary
-# Whether Exim will act as a primary or secondary mail relay for
-# other mail servers
-# - $verp_domains:
-# List of domains for which VERP responses should be POST-ed to the
MediaWiki 'bouncehandler' API for processing
-# - $verp_post_connect_server:
-# External hostname to connect while HTTP POST-ing a bounced email
to the MediaWiki 'bouncehandler' API
-# - $verp_bounce_post_url:
-# Internal hostname of the wiki to which verp bounce emails are HTTP
POST-ed and processed
-class roled(
-$enable_mail_relay=false,
-$verp_domains=[],
-$verp_post_connect_server='',
-$verp_bounce_post_url='',
-) {
-include exim4::ganglia
-
-include passwords::exim
-$otrs_mysql_password = $passwords::exim::otrs_mysql_password
-$smtp_ldap_password = $passwords::exim::smtp_ldap_password
-
-if $enable_mail_relay {
-$config_template = template('exim/exim4.conf.mx.erb')
-$filter_template = template('exim/system_filter.conf.erb')
-} else {
-fail('Unrecognized exim role type')
-}
-
-class { 'exim4':
-variant = 'heavy',
-config = $config_template,
-filter = $filter_template,
-}
-
-file { '/etc/exim4/defer_domains':
-ensure = present,
-owner = 'root',
-group = 'Debian-exim',
-mode= '0444',
-require = Class['exim4'],
-}
-
-file { '/etc/exim4/wikimedia_domains':
-ensure = present,
-owner = 'root',
-group = 'root',
-mode= '0444',
-source = 'puppet:///files/exim/wikimedia_domains',
-require = Class['exim4'],
-}
-
-if $enable_mail_relay {
-file { '/etc/exim4/legacy_mailing_lists':
-ensure = present,
-owner = 'root',
-group = 'root',
-mode= '0444',
-source = 'puppet:///files/exim/legacy_mailing_lists',
-require = Class['exim4'],
-}
-exim4::dkim { 'wikimedia.org':
-domain = 'wikimedia.org',
-selector = 'wikimedia',
-content = secret('dkim/wikimedia.org-wikimedia.key'),
-}
-exim4::dkim { 'wiki-mail':
-domain = 'wikimedia.org',
-selector = 'wiki-mail',
-content = secret('dkim/wikimedia.org-wiki-mail.key'),
-}
-}
-}
-}
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index b2c0f69..8f2dd1f 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -30,14 +30,53 @@
trusted_networks = $network::constants::all_networks,
}
-class { 'exim::roled':
-verp_domains = $verp_domains,
-verp_post_connect_server = $verp_post_connect_server,
-verp_bounce_post_url = $verp_bounce_post_url,
-enable_mail_relay= true,
+include passwords::exim
+$otrs_mysql_password = $passwords::exim::otrs_mysql_password
+$smtp_ldap_password = $passwords::exim::smtp_ldap_password
+
+class { 'exim4':
+variant = 'heavy',
+config = template('exim/exim4.conf.mx.erb'),
+filter = template('exim/system_filter.conf.erb'),
+require = Class['spamassassin'],
+}
+include exim4::ganglia
+
+file { '/etc/exim4/defer_domains':
+ensure = present,
+owner = 'root',
+group = 'Debian-exim',
+mode= '0444',
+require = Class['exim4'],
}
-Class['spamassassin'] - Class['exim::roled']
+file { '/etc/exim4/wikimedia_domains':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode= '0444',
+source
[MediaWiki-commits] [Gerrit] Add support for math - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227981
Change subject: Add support for math
..
Add support for math
Testplan:
Use enwiki Integral article for testing. The first equation in that
page has math\int_a^b \! f(x)\,dx/math
and it should be transferred to target article without any issues.
Bug: T106715
Change-Id: I752b4c72581c599b8602c5ebd8e241ca10d92978
---
M modules/publish/ext.cx.publish.js
M modules/tools/ext.cx.tools.images.js
2 files changed, 11 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/81/227981/1
diff --git a/modules/publish/ext.cx.publish.js
b/modules/publish/ext.cx.publish.js
index 03a17e4..d4af0f5 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -365,7 +365,7 @@
} );
// Remove empty sections
- if ( !$.trim( $section.text() ) ) {
+ if ( !$.trim( $section.text()
!$section.children().length ) ) {
$section.remove();
}
} );
diff --git a/modules/tools/ext.cx.tools.images.js
b/modules/tools/ext.cx.tools.images.js
index 14286c9..10c597d 100644
--- a/modules/tools/ext.cx.tools.images.js
+++ b/modules/tools/ext.cx.tools.images.js
@@ -92,13 +92,17 @@
var targetLanguage = mw.cx.targetLanguage;
$section.find( 'img' ).each( function () {
- var $image = $( this );
+ var $sourceSection, $sourceImage, $image = $( this );
+ $sourceSection = mw.cx.getSourceSection( $section.data(
'source' ) );
+ $sourceImage = $sourceSection.find( '#' + $image.prop(
'id' ) );
$image.on( 'click', function ( event ) {
// Avoid opening images by clicking.
event.preventDefault();
} );
-
+ // Copy data-mw if any from source image.
+ // Math extension, for example, carry the equation to
render in its data-mw
+ $image.attr( 'data-mw', $sourceImage.attr( 'data-mw' )
);
getImageNamespaceTranslation( targetLanguage )
.done( function ( translatedNamespace ) {
var resource;
@@ -109,7 +113,10 @@
if ( resource ) {
resource = resource.replace(
/(\.\/)*(.+)(:)/g,
'$1' +
translatedNamespace + '$3' );
- $image.attr( 'resource',
resource );
+ $image.prop( {
+ resource: resource,
+ id: 'cx' +
$sourceImage.prop( 'id' )
+ } );
// If the image has a parent
link, correct its link target
$image.parents( 'a' ).attr(
'href', resource );
}
--
To view, visit https://gerrit.wikimedia.org/r/227981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I752b4c72581c599b8602c5ebd8e241ca10d92978
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] Update cxserver to 9669e19 - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Update cxserver to 9669e19 .. Update cxserver to 9669e19 Changes: src: * 9669e19 Merge Enhance /list api |\ | * 1b69e55 Enhance /list api * | 50d5284 Merge config: Update config to sync with Production |\ \ | * | 27204a7 config: Update config to sync with Production | |/ * | 1174cbc Merge Validate authorization header if required |\ \ | * | fdb3ed8 Validate authorization header if required * | | 30b01e1 Set loglevel to debug for annotation mapping errors | |/ |/| * | 7261c73 config: Remove closed/read-only wikis from selector node_modules: * Added jsonwebtoken module. Change-Id: I7645f7bfb3785ce4be99cbe75d10b67d65d7d2c6 --- A node_modules/jsonwebtoken/.jshintrc A node_modules/jsonwebtoken/.npmignore A node_modules/jsonwebtoken/.travis.yml A node_modules/jsonwebtoken/CHANGELOG.md A node_modules/jsonwebtoken/LICENSE A node_modules/jsonwebtoken/README.md A node_modules/jsonwebtoken/index.js A node_modules/jsonwebtoken/lib/JsonWebTokenError.js A node_modules/jsonwebtoken/lib/TokenExpiredError.js A node_modules/jsonwebtoken/node_modules/jws/.jshintrc A node_modules/jsonwebtoken/node_modules/jws/.npmignore A node_modules/jsonwebtoken/node_modules/jws/.travis.yml A node_modules/jsonwebtoken/node_modules/jws/CHANGELOG.md A node_modules/jsonwebtoken/node_modules/jws/LICENSE A node_modules/jsonwebtoken/node_modules/jws/Makefile A node_modules/jsonwebtoken/node_modules/jws/index.js A node_modules/jsonwebtoken/node_modules/jws/lib/data-stream.js A node_modules/jsonwebtoken/node_modules/jws/lib/sign-stream.js A node_modules/jsonwebtoken/node_modules/jws/lib/tostring.js A node_modules/jsonwebtoken/node_modules/jws/lib/verify-stream.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/.bin/base64url A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/.npmignore A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/.travis.yml A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/LICENSE A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/bin/base64url A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/index.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/LICENSE A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/index.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/LICENSE A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/README.md A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/inherits.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/inherits_browser.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/package.json A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/test.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/.npmignore A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/LICENSE A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/README.md A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/duplex.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/float.patch A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js A node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/README.md A
[MediaWiki-commits] [Gerrit] mail: bump spamassassin's max_children to 16 - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/227986 Change subject: mail: bump spamassassin's max_children to 16 .. mail: bump spamassassin's max_children to 16 We frequently get all spamd servers failed due to connection refused from our main MX. spamd frequently complaints about server reaching --max-children setting and there are various times where child states reaches to all 8 of them being in a B(usy) state. Raise the max_children limit to 16 from the current 8. The MXes are dedicated servers with 16GB RAM, so there is plenty of wiggle room for that. Change-Id: I8a823991d328c057d578013e01a05c2c2fb46388 --- M manifests/role/mail.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/227986/1 diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 62b4116..b75b0de 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -27,6 +27,7 @@ required_score = '4.0', use_bayes= '1', bayes_auto_learn = '1', +max_children = 16, trusted_networks = $network::constants::all_networks, } -- To view, visit https://gerrit.wikimedia.org/r/227986 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a823991d328c057d578013e01a05c2c2fb46388 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove custom fact ec2id (2nd try), unused - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Remove custom fact ec2id (2nd try), unused
..
Remove custom fact ec2id (2nd try), unused
All uses of $::ec2id within puppet have been removed, no reason to carry
this fact anymore.
Change-Id: I7dd66d906b819aa82a325487d0dd7b65586c62f5
---
D modules/base/lib/facter/ec2id.rb
M modules/puppet/manifests/self/master.pp
2 files changed, 0 insertions(+), 19 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/lib/facter/ec2id.rb b/modules/base/lib/facter/ec2id.rb
deleted file mode 100644
index 1d2d61e..000
--- a/modules/base/lib/facter/ec2id.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# ec2id.rb
-#
-# This fact provides ec2id (old-timey instance id) for instances in labs.
-# This is used to set the puppet certname, among other things.
-
-require 'facter'
-
-Facter.add(:ec2id) do
- setcode do
-domain = Facter::Util::Resolution.exec(hostname -d).chomp
-if domain.include? wmflabs
- Facter::Util::Resolution.exec(curl -f
http://169.254.169.254/1.0/meta-data/instance-id 2 /dev/null).chomp
-else
-
-end
- end
-end
-
diff --git a/modules/puppet/manifests/self/master.pp
b/modules/puppet/manifests/self/master.pp
index c987131..fc63434 100644
--- a/modules/puppet/manifests/self/master.pp
+++ b/modules/puppet/manifests/self/master.pp
@@ -44,7 +44,6 @@
}
# If localhost, then just name the cert 'localhost'.
-# Else certname should be the labs instanceid. ($::ec2id comes from
instance metadata.)
$certname = $server ? {
'localhost' = 'localhost',
default = $fqdn
--
To view, visit https://gerrit.wikimedia.org/r/227201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7dd66d906b819aa82a325487d0dd7b65586c62f5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@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] enable ipsec for mobile and bits clusters - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227980
Change subject: enable ipsec for mobile and bits clusters
..
enable ipsec for mobile and bits clusters
these are simpler and lower traffic than text, and give us more
hosts to look at for more probability of seeing low-rate issues
via monitoring.
Still holding off on the upload cluster a bit until we've got more
runtime experience with these clusters...
Bug: T92604
Change-Id: Ib66687b55ebbd6978ca6bba922b6e8b20ce1511d
---
M manifests/site.pp
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/227980/1
diff --git a/manifests/site.pp b/manifests/site.pp
index caf91d2..bc7e63e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -392,7 +392,7 @@
node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
interface::add_ip6_mapped { 'main': }
-role cache::mobile
+role cache::mobile, ipsec
}
node /^cp10(4[89]|5[01]|6[1-4]|7[1-4]|99)\.eqiad\.wmnet$/ {
@@ -407,7 +407,7 @@
node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet',
'cp1070.eqiad.wmnet' {
interface::add_ip6_mapped { 'main': }
-role cache::bits
+role cache::bits, ipsec
}
node /^cp20(0[147]|1[0369]|23)\.codfw\.wmnet$/ {
@@ -442,12 +442,12 @@
node /^cp301[5678]\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::mobile
+role cache::mobile, ipsec
}
node /^cp30(19|2[0-2])\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::bits
+role cache::bits, ipsec
}
node /^cp30[34][01]\.esams\.wmnet$/ {
@@ -467,7 +467,7 @@
node /^cp400[1-4]\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::bits
+role cache::bits, ipsec
}
node /^cp40(0[5-7]|1[3-5])\.ulsfo\.wmnet$/ {
@@ -485,7 +485,7 @@
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role cache::mobile
+role cache::mobile, ipsec
}
node 'dataset1001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/227980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib66687b55ebbd6978ca6bba922b6e8b20ce1511d
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] nodepool: point to Zuul DNS service entry - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: nodepool: point to Zuul DNS service entry .. nodepool: point to Zuul DNS service entry gallium.wikimedia.org hosts both Jenkins and Zuul. To better differentiate each service, point the gearman parameter to the Zuul service entry zuul.eqiad.wmnet. The reason is that Nodepool threads and tasks are named based on the hostname. Changing the entry helps disambiguate. Change-Id: I95a9a2415f7d6b577f61b6f5ce00afe7f538fcbe --- M modules/nodepool/templates/nodepool.yaml.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/nodepool/templates/nodepool.yaml.erb b/modules/nodepool/templates/nodepool.yaml.erb index e149563..8a7946d 100644 --- a/modules/nodepool/templates/nodepool.yaml.erb +++ b/modules/nodepool/templates/nodepool.yaml.erb @@ -27,7 +27,7 @@ # Zuul / Gearman server gearman-servers: - - host: gallium.wikimedia.org + - host: zuul.eqiad.wmnet port: 4730 # Jenkins masters emits jobs start/completion over zeromq -- To view, visit https://gerrit.wikimedia.org/r/225370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95a9a2415f7d6b577f61b6f5ce00afe7f538fcbe Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org 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] Clean up 'Flow talk page manager' related code - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up 'Flow talk page manager' related code
..
Clean up 'Flow talk page manager' related code
* Always use the hardcoded English version so the username is the same
across all wikis.
* Use accounts even if we didn't create them. If a malicious user takes
the name, they will be locked out due to the UserGetReservedNames
hook.
** Previous detection only checked if the user was a bot, which can
easily be spoofed.
* If CentralAuth is installed, attach new users to the global account.
* Remove special casing for PHPUnit tests :)
Bug: T101300
Bug: T107329
Change-Id: I3f01fa40fcb364382caddad268d1d90a4d37ad9a
---
M Hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/TalkpageManager.php
4 files changed, 18 insertions(+), 42 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 35c9038..f4ccf4f 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -674,9 +674,7 @@
}
$names[] = 'msg:flow-system-usertext';
- // Reserve both the localized username and the English fallback
for the
- // taking-over revision.
- $names[] = 'msg:flow-talk-username';
+ // Reserve the bot account we use during content model changes
LQT conversion
$names[] = 'Flow talk page manager';
return true;
diff --git a/i18n/en.json b/i18n/en.json
index 2272f40..d555ea5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,7 +16,6 @@
enableflow: Enable Flow,
flow-desc: Workflow management system,
flow-talk-taken-over: This talk page is using
[https://www.mediawiki.org/wiki/Special:MyLanguage/Flow_Portal Flow].,
- flow-talk-username: Flow talk page manager,
log-name-flow: Flow activity log,
logentry-delete-flow-delete-post: $1 {{GENDER:$2|deleted}} a [$4
post] on \[[$3|$5]]\ on [[$6]],
logentry-delete-flow-restore-post: $1 {{GENDER:$2|restored}} a [$4
post] on \[[$3|$5]]\ on [[$6]],
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 29e3a27..6351465 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,7 +22,6 @@
enableflow: {{doc-special|EnableFlow}},
flow-desc:
{{desc|name=Flow|url=https://www.mediawiki.org/wiki/Extension:Flow}};,
flow-talk-taken-over: Content to replace existing page content by
for pages that are turned into Flow boards.,
- flow-talk-username: Username used for the revision added when Flow
takes over a talk page. Avoid changing this unnecessarily, as it will cause a
new user to be used for future actions.,
log-name-flow: {{doc-logpage}}\nName of the Flow log filter on the
[[Special:Log]] page.,
logentry-delete-flow-delete-post: Text for a deletion log entry when
a post was deleted. Parameters:\n* $1 - the user: link to the user page\n* $2 -
the username. Can be used for GENDER.\n* $3 - the page where the post was
moderated\n* $4 - permalink URL to the moderated post\n* $5 - The topic title
text\n* $6 - The board page\n{{Related|Flow-logentry}},
logentry-delete-flow-restore-post: Text for a deletion log entry
when a deleted post was restored. Parameters:\n* $1 - the user: link to the
user page\n* $2 - the username. Can be used for GENDER.\n* $3 - the page where
the post was moderated\n* $4 - permalink URL to the moderated post\n* $5 - The
topic title text\n* $6 - The board page\n{{Related|Flow-logentry}},
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index 7a93e5c..c585592 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -7,6 +7,7 @@
use Flow\Exception\InvalidInputException;
use Flow\Model\Workflow;
use Article;
+use CentralAuthUser;
use Status;
use Title;
use User;
@@ -245,55 +246,34 @@
* Gives a user object used to manage talk pages
*
* @return User User to manage talkpages
-* @throws FlowException If both of the names already exist, but are
not properly
-* configured.
*/
public function getTalkpageManager() {
if ( $this-talkPageManagerUser !== null ) {
return $this-talkPageManagerUser;
}
- $userNameCandidates = array(
- wfMessage( 'flow-talk-username'
)-inContentLanguage()-text(),
- 'Flow talk page manager',
- );
- $user = null;
+ $user = User::newFromName( 'Flow talk page manager' );
- foreach ( $userNameCandidates as $name ) {
- $candidateUser = User::newFromName( $name );
-
- if ( $candidateUser-getId() === 0 ) {
- $user = User::createNew( $name );
- $user-addGroup(
[MediaWiki-commits] [Gerrit] mail: bump MX's spamassassin max_children to 16 - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: mail: bump MX's spamassassin max_children to 16 .. mail: bump MX's spamassassin max_children to 16 We frequently get all spamd servers failed due to connection refused from our main MX. spamd frequently complaints about server reaching --max-children setting and there are various times where child states reaches to all 8 of them being in a B(usy) state. Raise the max_children limit to 16 from the current 8. The MXes are dedicated servers with 16GB RAM, so there is plenty of wiggle room for that. Change-Id: I8a823991d328c057d578013e01a05c2c2fb46388 --- M manifests/role/mail.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 62b4116..b75b0de 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -27,6 +27,7 @@ required_score = '4.0', use_bayes= '1', bayes_auto_learn = '1', +max_children = 16, trusted_networks = $network::constants::all_networks, } -- To view, visit https://gerrit.wikimedia.org/r/227986 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a823991d328c057d578013e01a05c2c2fb46388 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add inital to typos file - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Add inital to typos file .. Add inital to typos file I've had one too many JS errors from mistyping initialized as initalized. Change-Id: Ica5b57e96cbffb1b3d7db19140c22ff38ffc288d --- M build/typos.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/build/typos.json b/build/typos.json index f54ce28..8a70441 100644 --- a/build/typos.json +++ b/build/typos.json @@ -13,6 +13,7 @@ [ intialization, initialization ], [ durring, during ], [ contian, contain ], - [ occured, occurred ] + [ occured, occurred ], + [ inital, initial ] ] } -- To view, visit https://gerrit.wikimedia.org/r/226779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica5b57e96cbffb1b3d7db19140c22ff38ffc288d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com 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] Recreate debianization on top of 0.8.2.1 tag - change (operations...kafka)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/227988 Change subject: Recreate debianization on top of 0.8.2.1 tag .. Recreate debianization on top of 0.8.2.1 tag This commit copies debian/ and ext/ from master (old debian branch) at 2322e4842af3bbb0a6feacc116b3f9d34b61a3a0. I had trouble with merge conflicts not resolving properly when merging 0.8.2.1 into the old debian branch (master). Even when always choosing 'theirs', many of the automatically merged files ended up not matching what was in the 0.8.2.1 tag, which caused the build process to fail when comparing the source in the debian branch to the orig.tar.gz file created from the tag. To work around, I have recreated the debianization directly on top of the 0.8.2.1 tag by manually copying the old debian/ and ext/ dirs, and then modifying them to work with 0.8.2.1. The old git history for the debian/ and ext/ dirs can be found in the master branch of this repository (unless we decide to rename this branch to avoid confusion). Change-Id: I20323a9c86b6c924e1507d35e7cfe279b2c0106b --- A debian/README.Debian A debian/bin/kafka A debian/changelog A debian/compat A debian/control A debian/copyright A debian/gbp.conf A debian/kafka-client.dirs A debian/kafka-client.install A debian/kafka-client.postinst A debian/kafka-client.postrm A debian/kafka-common.dirs A debian/kafka-common.install A debian/kafka-common.links A debian/kafka-mirror.default A debian/kafka-mirror.dirs A debian/kafka-mirror.init A debian/kafka-server.dirs A debian/kafka-server.kafka.default A debian/kafka-server.kafka.init A debian/kafka-server.postinst A debian/patches/kafka_data_dirs_fixes.patch A debian/patches/logging_to_var_log.patch A debian/patches/our-own-build-system.patch A debian/patches/remove_scala_annotations2.8.patch A debian/patches/series A debian/rules A debian/source/format A debian/source/include-binaries A debian/source/options A ext/avro-1.4.0.jar A ext/easymock-3.0.jar A ext/hadoop-core-0.20.2.jar A ext/jasper-compiler-5.5.12.jar A ext/jasper-runtime-5.5.12.jar A ext/jopt-simple-3.2.jar A ext/jsp-2.1-6.1.14.jar A ext/jsp-api-2.1-6.1.14.jar A ext/kafka-ganglia-1.0.0.jar A ext/kfs-0.3.jar A ext/metrics-annotation-2.2.0.jar A ext/metrics-core-2.2.0.jar A ext/metrics-ganglia-2.2.0.jar A ext/metrics-graphite-2.2.0.jar A ext/paranamer-ant-2.2.jar A ext/paranamer-generator-2.2.jar A ext/pig-0.8.0.jar A ext/scalatest-1.2.jar A ext/zkclient-0.3.jar 49 files changed, 1,904 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/kafka refs/changes/88/227988/1 diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000..fa06c5a --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,138 @@ +kafka for Debian + +This package is created using a custom build system based on Makefiles +instead of the standard sbt build system used by upstream. The reason +for this is to satisfy debian policy that no internet connection should +be required during package building as well as security concers about +the downloaded JAR files by sbt + +How to build this package +- + +This repository is be used to build the kafka package using +git-buildpackage. Below we illustrate one of the ways this can work for +you: + +* Install some mandatory packages + + $ apt-get install git-buildpackage + +* And some not so mandatory but nice to have packages + + $ apt-get install pbuilder cowbuilder + +Note that pbuilder/cowbuilder is not strictly required but it will save +you from installing the dependencies manually + +* Create a cowbuilder environment (we assume you are building against +precise pangolin here) + + $ sudo DIST=precise git-pbuilder create --components main universe + +* Clone the repo + + $ git clone http://gerrit.wikimedia.org/r/operations/debs/kafka + $ cd kafka + +* Build + + $ DIST=precise git-buildpackage -us -uc + +or if you dont want to use git-pbuilder: + + $ git-buildpackage -us -uc --git-builder=debuild + +* Grab your packages from the directory above the one your are in, unless +you have configured pbuilder otherwise + +Build a new version +--- + +* Should the current version in the repo not be enough, set upstream and + fetch + + $ git remote add kafka http://git-wip-us.apache.org/repos/asf/kafka.git + $ git fetch kafka + +* Tag the version you want to build against + + $ git tag upstream/VERSION commit-ish + +VERSION should be a valid upstream version according to the debian +specification: + +https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version + +commit-sh can be any upstream commit like git tag, branch or a single +commit. The best result will probably be achieved with a valid git tag +from upstream that matches the debian upstream version specs. In that +case VERSION == commit-ish + +* Then update the master branch to
[MediaWiki-commits] [Gerrit] Fix target rename merge conflict in CSS - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix target rename merge conflict in CSS
..
Fix target rename merge conflict in CSS
Change-Id: I4ca015696d51c59a4c533127458bf5453d092bad
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
index 548ef0d..b21e221 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
@@ -28,7 +28,7 @@
padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content
font-size) 0.875em */
}
-.mw-body .ve-init-mw-viewPageTarget-surface .ve-ui-surface-placeholder * {
+.mw-body .ve-init-mw-target-surface .ve-ui-surface-placeholder * {
/* Fix margin overlap */
margin-top: 0;
/* Placeholder doesn't need a border as well */
--
To view, visit https://gerrit.wikimedia.org/r/227955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ca015696d51c59a4c533127458bf5453d092bad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@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] Syncronize VisualEditor: 08a9551..9921759 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/227990 Change subject: Syncronize VisualEditor: 08a9551..9921759 .. Syncronize VisualEditor: 08a9551..9921759 Change-Id: I91ea01cbd55eefc5c7c838b90106e19a29882052 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/90/227990/1 diff --git a/VisualEditor b/VisualEditor index 08a9551..9921759 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 08a9551c845cea85f27f3d7259d56b650ec6c774 +Subproject commit 9921759456dcbd9f9cb9852916441904db260718 -- To view, visit https://gerrit.wikimedia.org/r/227990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91ea01cbd55eefc5c7c838b90106e19a29882052 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] exim: reference the proper system_filter for OTRS - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: exim: reference the proper system_filter for OTRS
..
exim: reference the proper system_filter for OTRS
Four-character fix for 4142e84.
Change-Id: I69ed8f534c1154c1c88f9a604f2648d4fbfb86de
---
M manifests/role/otrs.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index b28ad60..f81f557 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -167,7 +167,7 @@
class { 'exim4':
variant = 'heavy',
config = template('exim/exim4.conf.otrs.erb'),
-filter = template('exim/system_filter.conf.erb'),
+filter = template('exim/system_filter.conf.otrs.erb'),
require = [
Class['spamassassin'],
Class['clamav'],
--
To view, visit https://gerrit.wikimedia.org/r/227979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69ed8f534c1154c1c88f9a604f2648d4fbfb86de
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Python issue #10254 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Python issue #10254 .. Python issue #10254 Pywikibot had problems with NFC normalizing unicode, resulting in Python issue #10254, which was resolved in Python 2.7.2 and backported to Python 2.6.7. It is unlikely that supporting Python 2.7.0 and 2.7.1 is still necessary, so decommission support for Python 2.7.0 and 2.7.1. Workaround the problem using unicodedata2 backport of unicodedata, which includes Unicode 7.0 support. If unicodedata2 isnt available on Python 2.6.6, the Link constructor raises UnicodeError for titles containing combining characters, which will allow normal usage for many languages, but will fail predictably for page titles which could encounter this error. Moves the unicode test from the version script to the test suite, as the only supported platform with this bug is Python 2.6.6. Bug: T102461 Change-Id: If4a8e8eed682b837dd468b02a5d98b01ebf37584 --- M .appveyor.yml M pwb.py M pywikibot/bot.py M pywikibot/page.py M pywikibot/version.py M requirements.txt M scripts/version.py M setup.py M tests/link_tests.py A tests/python_tests.py 10 files changed, 193 insertions(+), 41 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index acd7c07..1befd5d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,9 +15,9 @@ matrix: -# Pywikibot support matrix suggests 'should run' on Python 2.6.5+ -# Test the lowest release of each major Python version. +# Test the lowest supported release of each major Python version. +# Pywikibot support matrix suggests 'should run' on Python 2.6.5+ # Only Python 2.6.6 is able to be set up on Appveyor. # https://github.com/ogrisel/python-appveyor-demo/issues/10 # fwiw, Redhat Enterprise Linux ships with 2.6.6. @@ -26,11 +26,8 @@ PYTHON_VERSION: 2.6.6 PYTHON_ARCH: 64 -# Python 2.7.0 needs 2.7 as the version instead of 2.7.0 -# https://github.com/ogrisel/python-appveyor-demo/issues/9 - -- PYTHON: C:\\Python270-x64 - PYTHON_VERSION: 2.7 +- PYTHON: C:\\Python272-x64 + PYTHON_VERSION: 2.7.2 PYTHON_ARCH: 64 - PYTHON: C:\\Python330-x64 diff --git a/pwb.py b/pwb.py index 0efba76..3266a85 100755 --- a/pwb.py +++ b/pwb.py @@ -29,6 +29,30 @@ from warnings import warn +PYTHON_VERSION = sys.version_info[:3] +PY2 = (PYTHON_VERSION[0] == 2) +PY26 = (PYTHON_VERSION (2, 7)) + +versions_required_message = +Pywikibot not available on: +%s + +Pywikibot is only supported under Python 2.6.5+, 2.7.2+ or 3.3+ + + + +def python_is_supported(): +Check that Python is supported. +# Any change to this must be copied to setup.py +return (PYTHON_VERSION = (3, 3, 0) or +(PY2 and PYTHON_VERSION = (2, 7, 2)) or +(PY26 and PYTHON_VERSION = (2, 6, 5))) + + +if not python_is_supported(): +print(versions_required_message % sys.version) +sys.exit(1) + pwb = None @@ -106,17 +130,6 @@ path = path[0].upper() + path[1:] return path - -if sys.version_info[0] not in (2, 3): -raise RuntimeError(ERROR: Pywikibot only runs under Python 2 - or Python 3) -version = tuple(sys.version_info)[:3] -if version (2, 6, 5): -raise RuntimeError(ERROR: Pywikibot only runs under Python 2.6.5 - or higher) -if version = (3, ) and version (3, 3): -raise RuntimeError(ERROR: Pywikibot only runs under Python 3.3 - or higher) # Establish a normalised path for the directory containing pwb.py. # Either it is '.' if the user's current working directory is the same, diff --git a/pywikibot/bot.py b/pywikibot/bot.py index a110ea1..6c334b6 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -367,7 +367,11 @@ all_modules = sys.modules.keys() # These are the main dependencies of pywikibot. -check_package_list = ['requests', 'mwparserfromhell'] +check_package_list = [ +'requests', +'mwparserfromhell', +'unicodedata', 'unicodedata2', # T102461 +] # report all imported packages if config.verbose_output: diff --git a/pywikibot/page.py b/pywikibot/page.py index 278ed54..479eace 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -24,7 +24,11 @@ import logging import re import sys -import unicodedata + +try: +import unicodedata2 as unicodedata +except ImportError: +import unicodedata from collections import defaultdict, namedtuple from warnings import warn @@ -53,6 +57,7 @@ UserRightsError, ) from pywikibot.tools import ( +PYTHON_VERSION, MediaWikiVersion, UnicodeMixin, ComparableMixin, DotReadableDict, deprecated, deprecate_arg, deprecated_args, issue_deprecation_warning, first_upper,
[MediaWiki-commits] [Gerrit] Fix many space-related phpcs warnings in repo - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix many space-related phpcs warnings in repo
..
Fix many space-related phpcs warnings in repo
Change-Id: I68eeb5efe9c5b4d18d91e5378cb39674c4979efc
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
M repo/includes/Diff/ClaimDiffer.php
M repo/includes/EditEntity.php
M repo/includes/Interactors/TermIndexSearchInteractor.php
M repo/includes/ItemDisambiguation.php
M repo/includes/LinkedData/EntityDataFormatProvider.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/SummaryFormatter.php
M repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
M repo/includes/ValidatorBuilders.php
M repo/includes/api/ApiErrorReporter.php
M repo/includes/api/ItemByTitleHelper.php
M repo/includes/rdf/DateTimeValueCleaner.php
M repo/includes/rdf/JulianDateTimeValueCleaner.php
M repo/includes/rdf/RdfBuilder.php
M repo/includes/rdf/RdfVocabulary.php
M repo/includes/rdf/SimpleValueRdfBuilder.php
M repo/includes/rdf/SiteLinksRdfBuilder.php
M repo/includes/specials/SpecialDispatchStats.php
M repo/includes/specials/SpecialEntitiesWithoutPage.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/includes/specials/SpecialListDatatypes.php
M repo/includes/specials/SpecialModifyTerm.php
M repo/includes/specials/SpecialWikibaseQueryPage.php
M repo/includes/store/SiteLinkSubscriptionLookup.php
M repo/maintenance/dispatchChanges.php
M repo/tests/phpunit/includes/ChangeDispatcherTest.php
M repo/tests/phpunit/includes/DefaultRepoSettingsTest.php
M repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php
M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
M repo/tests/phpunit/includes/EditEntityTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/Interactors/TokenCheckInteractorTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataFormatProviderTest.php
M repo/tests/phpunit/includes/Notifications/DatabaseChangeTransmitterTest.php
M repo/tests/phpunit/includes/SummaryFormatterTest.php
M repo/tests/phpunit/includes/ValidatorBuildersTest.php
M repo/tests/phpunit/includes/View/RepoSpecialPageLinkerTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/api/ApiConventionsTest.php
M repo/tests/phpunit/includes/api/BotEditTest.php
M repo/tests/phpunit/includes/api/EntityTestHelper.php
M repo/tests/phpunit/includes/api/GetEntitiesTest.php
M repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
M repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php
M repo/tests/phpunit/includes/api/LinkTitlesTest.php
M repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M repo/tests/phpunit/includes/api/PermissionsTest.php
M repo/tests/phpunit/includes/api/RemoveQualifiersTest.php
M repo/tests/phpunit/includes/api/RemoveReferencesTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/api/SearchEntitiesTest.php
M repo/tests/phpunit/includes/api/SetAliasesTest.php
M repo/tests/phpunit/includes/api/SetClaimTest.php
M repo/tests/phpunit/includes/api/SetClaimValueTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
M repo/tests/phpunit/includes/rdf/DateValueCleanerTest.php
M repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
M repo/tests/phpunit/includes/specials/SpecialSetSiteLinkTest.php
64 files changed, 203 insertions(+), 203 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 1fa195b..12bcb9d 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -445,7 +445,7 @@
*
* @return bool
*/
- public static function onPageHistoryLineEnding( HistoryPager $history,
$row, $s, array $classes ) {
+ public static function onPageHistoryLineEnding( HistoryPager $history,
$row, $s, array $classes ) {
$entityContentFactory =
WikibaseRepo::getDefaultInstance()-getEntityContentFactory();
$article = $history-getArticle();
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index d3409f4..787808c 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -128,7 +128,7 @@
$wgValueParsers['quantity'] = function( ValueParsers\ParserOptions
$options ) {
$language = Language::factory( $options-getOption(
ValueParser::OPT_LANG ) );
- $unlocalizer = new Wikibase\Lib\MediaWikiNumberUnlocalizer(
$language);
+ $unlocalizer = new Wikibase\Lib\MediaWikiNumberUnlocalizer(
$language );
return new \ValueParsers\QuantityParser( $options, $unlocalizer
[MediaWiki-commits] [Gerrit] mail: re-add $outbound_ips/$list_outbound_ips to role - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: mail: re-add $outbound_ips/$list_outbound_ips to role
..
mail: re-add $outbound_ips/$list_outbound_ips to role
This was accidentally removed during an automated rebase of
5d469e1e4da313bbd3d3679d40e0136288f3916d, which currently breaks the
lists config.
This hardcodes the IPs in the role class rather than using hiera for
now; this is not, however, a regression than how the role used to look
like before 5d469e1.
Change-Id: I6e37d705a5703554f59749d80b1fac874f373554
---
M manifests/role/mail.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 4f53a92..b2c0f69 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -85,6 +85,15 @@
prefixlen = '128',
}
+$outbound_ips = [
+'208.80.154.61',
+'2620:0:861:1:208:80:154:61'
+]
+$list_outbound_ips = [
+'208.80.154.4',
+'2620:0:861:1::2'
+]
+
sslcert::certificate { 'lists.wikimedia.org': }
include mailman
--
To view, visit https://gerrit.wikimedia.org/r/227978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e37d705a5703554f59749d80b1fac874f373554
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] strongswan: Make SAs and rekey actions more robust, hopefully - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: strongswan: Make SAs and rekey actions more robust, hopefully .. strongswan: Make SAs and rekey actions more robust, hopefully Bug: T96111 Change-Id: Ife73b482d78ee310dd8f80c2c28e88c3ca4eb9d4 --- M modules/strongswan/templates/ipsec.conf.erb 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/modules/strongswan/templates/ipsec.conf.erb b/modules/strongswan/templates/ipsec.conf.erb index 330cebd..2ef37bb 100644 --- a/modules/strongswan/templates/ipsec.conf.erb +++ b/modules/strongswan/templates/ipsec.conf.erb @@ -42,6 +42,10 @@ esp=aes128gcm16-ecp384bp-noesn! type=transport auto=start + keyexchange=ikev2 # don't accept IKEv1 + keyingtries=%forever # don't give up after serial keying failures + margintime=13m # default is 9m (double this value must be less than lifetime, which is def 1h) + dpdaction=restart # try to restart if dead peer detected # Connections % @hosts.each do |node| -% -- To view, visit https://gerrit.wikimedia.org/r/227977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife73b482d78ee310dd8f80c2c28e88c3ca4eb9d4 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@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] Fix height of framless toolbar button - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227982
Change subject: Fix height of framless toolbar button
..
Fix height of framless toolbar button
Use line-height to define the height in one rule, instead of adding
font height and padding which leads to compound rounding errors.
Change-Id: I48cad2bcd635ab1ea82c520255dc5441c9cc6d2d
---
M src/themes/apex/tools.less
M src/themes/mediawiki/tools.less
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/82/227982/1
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index ca78a57..1cc7326 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -25,9 +25,10 @@
margin: 0;
.oo-ui-buttonElement-button {
margin: 0;
- padding: 1.1953125em 0.3125em;
+ padding: 0 0.3125em;
.oo-ui-labelElement-label {
margin: 0 1em;
+ line-height: 3.40625em; /*
43/12.8 */
}
}
}
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index 1043946..14caccf 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -30,11 +30,11 @@
border: 0;
border-radius: 0;
margin: 0;
- padding: 1.0546875em 0.3125em;
+ padding: 0 0.3125em;
.oo-ui-labelElement-label {
margin: 0 1em;
- line-height: inherit;
+ line-height: 3.125em; /* 40/12.8 */
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/227982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48cad2bcd635ab1ea82c520255dc5441c9cc6d2d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set test assertions to new date format - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/227983 Change subject: Set test assertions to new date format .. Set test assertions to new date format Bug: T107417 Change-Id: I1f36ff5d6ae0e1edb5f066ec44c355bdc5f59bb0 --- M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/83/227983/1 diff --git a/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js b/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js index 59b7a9f..f20bd5e 100644 --- a/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js +++ b/tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js @@ -156,7 +156,7 @@ assert.strictEqual( panel.creditField.$element.find( '.mw-mmv-source' ).html(), 'bLost/ba href=fooBar/a', 'Source text is correctly set' ); // Either multimediaviewer-credit-popup-text or multimediaviewer-credit-popup-text-more. assert.ok( creditPopupText === 'Author and source information' || creditPopupText === 'View full author and source', 'Source tooltip is correctly set' ); - assert.ok( panel.$datetime.text().indexOf( 'August 26, 2013' ) 0, 'Correct date is displayed' ); + assert.ok( panel.$datetime.text().indexOf( '26 August 2013' ) 0, 'Correct date is displayed' ); assert.strictEqual( panel.$license.text(), 'CC BY 2.0', 'License is correctly set' ); assert.ok( panel.$license.prop( 'target' ), 'License information opens in new window' ); assert.ok( panel.$username.text().indexOf( imageData.lastUploader ) 0, 'Correct username is displayed' ); @@ -165,7 +165,7 @@ imageData.creationDateTime = undefined; panel.setImageInfo( image, imageData, repoData, gender ); - assert.ok( panel.$datetime.text().indexOf( 'August 25, 2013' ) 0, 'Correct date is displayed' ); + assert.ok( panel.$datetime.text().indexOf( '25 August 2013' ) 0, 'Correct date is displayed' ); window.moment = oldMoment; } ); -- To view, visit https://gerrit.wikimedia.org/r/227983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f36ff5d6ae0e1edb5f066ec44c355bdc5f59bb0 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] Set bot flags by checking revision user's permissions - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/227985 Change subject: Set bot flags by checking revision user's permissions .. Set bot flags by checking revision user's permissions Change-Id: I58ceafa85e18dddbe3ad8d1e09e02ce822cad115 --- M includes/Formatter/RecentChanges.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/85/227985/1 diff --git a/includes/Formatter/RecentChanges.php b/includes/Formatter/RecentChanges.php index 114ab28..be17ef1 100644 --- a/includes/Formatter/RecentChanges.php +++ b/includes/Formatter/RecentChanges.php @@ -221,7 +221,7 @@ 'newpage' = $row-isFirstReply $row-revision-isFirstRevision(), 'minor' = false, 'unpatrolled' = ChangesList::isUnpatrolled( $row-recentChange, $ctx-getUser() ), - 'bot' = false, + 'bot' = $row-revision-getUser()-isAllowed( 'bot' ), ); } -- To view, visit https://gerrit.wikimedia.org/r/227985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58ceafa85e18dddbe3ad8d1e09e02ce822cad115 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] mail: rename role::mail::lists to role::lists - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: mail: rename role::mail::lists to role::lists
..
mail: rename role::mail::lists to role::lists
role::mail::* got too big and the role class for lists is really more of
a service, not a mail server setup. Give it its own role class
hierarchy.
Change-Id: I6caebb6256198eb18bc864df467676e7652b9e01
---
R hieradata/role/common/lists.yaml
A manifests/role/lists.pp
M manifests/role/mail.pp
M manifests/site.pp
4 files changed, 158 insertions(+), 159 deletions(-)
Approvals:
John F. Lewis: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/mail/lists.yaml
b/hieradata/role/common/lists.yaml
similarity index 100%
rename from hieradata/role/common/mail/lists.yaml
rename to hieradata/role/common/lists.yaml
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
new file mode 100644
index 000..b2d82ee
--- /dev/null
+++ b/manifests/role/lists.pp
@@ -0,0 +1,157 @@
+class role::lists {
+include network::constants
+
+system::role { 'role::mail::lists':
+description = 'Mailing list server',
+}
+
+mailalias { 'root':
+recipient = 'r...@wikimedia.org',
+}
+
+interface::ip { 'lists.wikimedia.org_v4':
+interface = 'eth0',
+address = hiera('mailman::lists_ipv4'),
+prefixlen = '32',
+}
+
+interface::ip { 'lists.wikimedia.org_v6':
+interface = 'eth0',
+address = hiera('mailman::lists_ipv6'),
+prefixlen = '128',
+}
+
+$outbound_ips = [
+'208.80.154.61',
+'2620:0:861:1:208:80:154:61'
+]
+$list_outbound_ips = [
+'208.80.154.4',
+'2620:0:861:1::2'
+]
+
+sslcert::certificate { 'lists.wikimedia.org': }
+
+include mailman
+
+class { 'spamassassin':
+required_score = '4.0',
+use_bayes= '0',
+bayes_auto_learn = '0',
+trusted_networks = $network::constants::all_networks,
+}
+
+include privateexim::listserve
+
+class { 'exim4':
+variant = 'heavy',
+config = template('exim/exim4.conf.mailman.erb'),
+filter = template('exim/system_filter.conf.mailman.erb'),
+require = [
+Class['spamassassin'],
+Interface::Ip['lists.wikimedia.org_v4'],
+Interface::Ip['lists.wikimedia.org_v6'],
+],
+}
+include exim4::ganglia
+
+file { '/etc/exim4/aliases/lists.wikimedia.org':
+owner = 'root',
+group = 'root',
+mode= '0444',
+source = 'puppet:///files/exim/listserver_aliases',
+require = Class['exim4'],
+}
+
+exim4::dkim { 'lists.wikimedia.org':
+domain = 'lists.wikimedia.org',
+selector = 'wikimedia',
+content = secret('dkim/lists.wikimedia.org-wikimedia.key'),
+}
+
+include role::backup::host
+backup::set { 'var-lib-mailman': }
+
+monitoring::service { 'smtp':
+description = 'Exim SMTP',
+check_command = 'check_smtp',
+}
+
+monitoring::service { 'https':
+description = 'HTTPS',
+check_command = 'check_ssl_http!lists.wikimedia.org',
+}
+
+nrpe::monitor_service { 'procs_mailmanctl':
+description = 'mailman_ctl',
+nrpe_command = '/usr/lib/nagios/plugins/check_procs -c 1:1 -u list
--ereg-argument-array=\'/mailman/bin/mailmanctl\''
+}
+
+nrpe::monitor_service { 'procs_mailman_qrunner':
+description = 'mailman_qrunner',
+nrpe_command = '/usr/lib/nagios/plugins/check_procs -c 8:8 -u list
--ereg-argument-array=\'/mailman/bin/qrunner\''
+}
+
+monitoring::service { 'mailman_listinfo':
+description = 'mailman list info',
+check_command =
'check_https_url_for_string!lists.wikimedia.org!/mailman/listinfo/wikimedia-l!\'Discussion
list for the Wikimedia community\'',
+}
+
+monitoring::service { 'mailman_archives':
+description = 'mailman archives',
+check_command =
'check_https_url_for_string!lists.wikimedia.org!/pipermail/wikimedia-l/!\'The
Wikimedia-l Archives\'',
+}
+
+file { '/usr/local/lib/nagios/plugins/check_mailman_queue':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode = '0755',
+source = 'puppet:///files/icinga/check_mailman_queue',
+}
+
+nrpe::monitor_service { 'mailman_queue':
+description = 'mailman_queue_size',
+nrpe_command = '/usr/local/lib/nagios/plugins/check_mailman_queue
42',
+}
+
+# on list servers we monitor I/O with iostat
+# the icinga plugin needs bc to compare floating point numbers
+package { 'bc':
+ensure = present,
+}
+
+file { '/usr/local/lib/nagios/plugins/check_iostat':
+ensure = present,
+
[MediaWiki-commits] [Gerrit] Don't add trailing newline when switching from VE to wikitext - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't add trailing newline when switching from VE to wikitext
..
Don't add trailing newline when switching from VE to wikitext
Parsoid serializes pFoo/p to Foo\n (T106925), and we
don't want to put that newline into the wikitext editor,
because then moving the cursor to the end (or simply clicking
into the editor below the content) doesn't do what
users expect.
Change-Id: I7ab2f82672b7876fa349668c9d0e43ccbe2aef3f
---
M includes/Parsoid/Utils.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index fea4e40..b4299c6 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -124,7 +124,12 @@
throw new NoParsoidException( $msg,
'process-wikitext' );
}
- return $request-getContent();
+ $content = $request-getContent();
+ // HACK remove trailing newline inserted by Parsoid (T106925)
+ if ( $to === 'wikitext' ) {
+ $content = preg_replace( '/\\n$/', '', $content );
+ }
+ return $content;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/226945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ab2f82672b7876fa349668c9d0e43ccbe2aef3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
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] mail: fix smarthost route_list for OTRS - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227987
Change subject: mail: fix smarthost route_list for OTRS
..
mail: fix smarthost route_list for OTRS
Commit bf70e33cd5d1a1016533e2f68e5557cf7b2a84b8 switch the route_list
from * to +local_domains, like it was configured for every other
mailhost. Unfortunately, OTRS is special in this case since it handles
our top domains partially (e.g. wikimedia.org) and hence local_domains
is ambiguous (not entirely local domains).
Fix this by reverting that part of the config and using * as a domain
selector again.
Change-Id: Icd049b83808bd177ec10c5eb08a33b70a814b8d7
---
M templates/exim/exim4.conf.otrs.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/227987/1
diff --git a/templates/exim/exim4.conf.otrs.erb
b/templates/exim/exim4.conf.otrs.erb
index 3816d1c..8dcc4d9 100644
--- a/templates/exim/exim4.conf.otrs.erb
+++ b/templates/exim/exim4.conf.otrs.erb
@@ -176,7 +176,7 @@
transport = remote_smtp
# OTRS receives emails for project domains
# (such as info-en @ wikipedia.org), defined dynamically in its
database.
- route_list = !+local_domains %= @mail_smarthost.join(':') %
+ route_list = * %= @mail_smarthost.join(':') %
##
# Transports #
--
To view, visit https://gerrit.wikimedia.org/r/227987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd049b83808bd177ec10c5eb08a33b70a814b8d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use simplified toolbar for VE now that it handles back/save ... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Use simplified toolbar for VE now that it handles back/save
itself
..
Use simplified toolbar for VE now that it handles back/save itself
Depends on Ic89dd4efb in VE.
Change-Id: I37850f1ad5c341bf3e5ebf45bdceb62aacc970f8
---
M includes/Resources.php
M resources/mobile.editor.ve/VisualEditorOverlay.js
M resources/mobile.editor.ve/VisualEditorOverlay.less
A resources/mobile.editor.ve/toolbarVE.hogan
4 files changed, 28 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 1615a58..ebeaee3 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1481,6 +1481,7 @@
),
'templates' = array(
'contentVE.hogan' =
'resources/mobile.editor.ve/contentVE.hogan',
+ 'toolbarVE.hogan' =
'resources/mobile.editor.ve/toolbarVE.hogan',
),
'messages' = array(
'mobile-frontend-page-edit-summary',
diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.js
b/resources/mobile.editor.ve/VisualEditorOverlay.js
index 4c97ab7..3b7001a 100644
--- a/resources/mobile.editor.ve/VisualEditorOverlay.js
+++ b/resources/mobile.editor.ve/VisualEditorOverlay.js
@@ -14,6 +14,7 @@
isBorderBox: false,
/** @inheritdoc **/
templatePartials: $.extend( {},
EditorOverlayBase.prototype.templatePartials, {
+ editHeader: mw.template.get( 'mobile.editor.ve',
'toolbarVE.hogan' ),
content: mw.template.get( 'mobile.editor.ve',
'contentVE.hogan' )
} ),
/** @inheritdoc **/
@@ -82,6 +83,8 @@
overlay.target.activating = true;
overlay.target.load();
overlay.target.connect( overlay, {
+ back: 'onBack',
+ saveBegin: 'onStageChanges',
save: 'onSaveComplete',
saveAsyncBegin: 'showSpinner',
saveAsyncComplete:
'clearSpinner',
@@ -137,12 +140,20 @@
EditorOverlayBase.prototype.postRender.apply( this );
},
/**
+* Handle back event
+*/
+ onBack: function () {
+ window.history.back();
+ },
+
+ /**
* @inheritdoc
*/
onClickBack: function () {
EditorOverlayBase.prototype.onClickBack.apply( this,
arguments );
this.switchToEditor();
},
+
/**
* Reveal the editing interface.
* @method
diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.less
b/resources/mobile.editor.ve/VisualEditorOverlay.less
index e9d325b..d629f5f 100644
--- a/resources/mobile.editor.ve/VisualEditorOverlay.less
+++ b/resources/mobile.editor.ve/VisualEditorOverlay.less
@@ -77,12 +77,15 @@
-webkit-transform: translate(0,0);
}
+ .overlay-content .surface {
+ overflow: hidden;
+ }
+
// Toolbar
@baseIconSize: 24px;
@targetIconSize: 32px;
.overlay-header-container {
.toolbar {
- border-left: 1px solid @grayLight;
// Expand the toolbar as wide as possible to limit the
size of the
// overlay-action. (Both are displayed as table-cells.)
width: 100%;
@@ -99,6 +102,11 @@
box-shadow: none;
}
}
+ .oo-ui-toolbar-tools {
+ .oo-ui-toolGroup:last-child {
+ border-right: 0;
+ }
+ }
.editor-switcher .oo-ui-toolGroup {
border-right: 0;
}
@@ -107,4 +115,8 @@
.overlay-header {
border-collapse: separate;
}
+
+ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel {
+ display: none;
+ }
}
diff --git a/resources/mobile.editor.ve/toolbarVE.hogan
b/resources/mobile.editor.ve/toolbarVE.hogan
new file mode 100644
index 000..0f72f15
--- /dev/null
+++ b/resources/mobile.editor.ve/toolbarVE.hogan
@@ -0,0 +1,3 @@
+div class=overlay-header initial-header hideable hidden
+ div class=toolbar/div
+/div
--
To view, visit
[MediaWiki-commits] [Gerrit] Fix scrollIntoView util binding - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Fix scrollIntoView util binding .. Fix scrollIntoView util binding Change-Id: Ibcbcf31c043686a1273824a52cc2d51ca43a8c48 --- M src/ve.utils.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ve.utils.js b/src/ve.utils.js index 3adffd7..b10398d 100644 --- a/src/ve.utils.js +++ b/src/ve.utils.js @@ -72,7 +72,7 @@ * @method * @inheritdoc OO.ui.Element#scrollIntoView */ -ve.scrollIntoView = OO.ui.Element.static.scrollIntoView; +ve.scrollIntoView = OO.ui.Element.static.scrollIntoView.bind( OO.ui.Element.static ); /** * Copy an array of DOM elements, optionally into a different document. -- To view, visit https://gerrit.wikimedia.org/r/227954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcbcf31c043686a1273824a52cc2d51ca43a8c48 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Jforrester jforres...@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] [BREAKING CHANGE] Use config object for Target constructors - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Use config object for Target constructors
..
[BREAKING CHANGE] Use config object for Target constructors
Bonus:
* Use 'super' calls
Change-Id: I09b00668380d11feca73061803431fa6c3b8dffd
---
M src/init/sa/ve.init.sa.Target.js
M src/init/ve.init.Target.js
2 files changed, 15 insertions(+), 10 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/init/sa/ve.init.sa.Target.js b/src/init/sa/ve.init.sa.Target.js
index a351702..a6c68c0 100644
--- a/src/init/sa/ve.init.sa.Target.js
+++ b/src/init/sa/ve.init.sa.Target.js
@@ -24,17 +24,19 @@
* @extends ve.init.Target
*
* @constructor
- * @param {string} [surfaceType] Type of surface to use, 'desktop' or 'mobile'
- * @param {Object} [toolbarConfig] Configuration options for the toolbar
+ * @param {Object} [config] Configuration options
+ * @cfg {string} [surfaceType] Type of surface to use, 'desktop' or 'mobile'
+ * @cfg {Object} [toolbarConfig] Configuration options for the toolbar
* @throws {Error} Unknown surfaceType
*/
-ve.init.sa.Target = function VeInitSaTarget( surfaceType, toolbarConfig ) {
- toolbarConfig = $.extend( { shadow: true, actions: true, floatable:
true }, toolbarConfig );
+ve.init.sa.Target = function VeInitSaTarget( config ) {
+ config = config || {};
+ config.toolbarConfig = $.extend( { shadow: true, actions: true,
floatable: true }, config.toolbarConfig );
// Parent constructor
- ve.init.Target.call( this, toolbarConfig );
+ ve.init.sa.Target.super.call( this, config );
- this.surfaceType = surfaceType ||
this.constructor.static.defaultSurfaceType;
+ this.surfaceType = config.surfaceType ||
this.constructor.static.defaultSurfaceType;
this.actions = null;
switch ( this.surfaceType ) {
diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index 76e26c6..a147d39 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -13,11 +13,14 @@
* @mixins OO.EventEmitter
*
* @constructor
- * @param {Object} toolbarConfig Configuration options for the toolbar
+ * @param {Object} [config] Configuration options
+ * @cfg {Object} [toolbarConfig] Configuration options for the toolbar
*/
-ve.init.Target = function VeInitTarget( toolbarConfig ) {
+ve.init.Target = function VeInitTarget( config ) {
+ config = config || {};
+
// Parent constructor
- OO.ui.Element.call( this );
+ ve.init.Target.super.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
@@ -26,7 +29,7 @@
this.surfaces = [];
this.surface = null;
this.toolbar = null;
- this.toolbarConfig = toolbarConfig;
+ this.toolbarConfig = config.toolbarConfig;
this.documentTriggerListener = new ve.TriggerListener(
this.constructor.static.documentCommands );
this.targetTriggerListener = new ve.TriggerListener(
this.constructor.static.targetCommands );
--
To view, visit https://gerrit.wikimedia.org/r/227957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09b00668380d11feca73061803431fa6c3b8dffd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@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] Use frameless buttons in mobile process dialogs - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227991
Change subject: Use frameless buttons in mobile process dialogs
..
Use frameless buttons in mobile process dialogs
Change-Id: I6eb1baf8f0189374bc30aebd98fc322f7fcee223
---
M src/ui/windowmanagers/ve.ui.MobileWindowManager.js
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/91/227991/1
diff --git a/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
b/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
index b9519dc..a7f2406 100644
--- a/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
+++ b/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
@@ -19,6 +19,9 @@
// Parent constructor
ve.ui.MobileWindowManager.super.call( this, surface, config );
+ // Events
+ this.connect( this, { opening: 'onMobileOpening' } );
+
// Initialization
this.$element.addClass( 've-ui-mobileWindowManager' );
};
@@ -38,3 +41,19 @@
ve.ui.MobileWindowManager.static.defaultSize = 'full';
/* Methods */
+
+/**
+ * Handle window opening events
+ */
+ve.ui.MobileWindowManager.prototype.onMobileOpening = function ( win, opening
) {
+ // HACK: un-frame buttons
+ opening.done( function () {
+ var i, l, list;
+ if ( win instanceof OO.ui.ProcessDialog ) {
+ list = win.actions.list;
+ for ( i = 0, l = list.length; i l; i++ ) {
+ list[i].toggleFramed( false );
+ }
+ }
+ } );
+};
--
To view, visit https://gerrit.wikimedia.org/r/227991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6eb1baf8f0189374bc30aebd98fc322f7fcee223
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable base::firewall on multatuli - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Enable base::firewall on multatuli .. Enable base::firewall on multatuli Change-Id: I623c6d658ce5b598975045a73e92a19d2b42e40f --- M manifests/site.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index a93e33b..8324968 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1681,6 +1681,7 @@ interface = 'eth0', } include standard +include base::firewall } # also see dataset1001 -- To view, visit https://gerrit.wikimedia.org/r/227416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I623c6d658ce5b598975045a73e92a19d2b42e40f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@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] exim: reference the proper system_filter for OTRS - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227979
Change subject: exim: reference the proper system_filter for OTRS
..
exim: reference the proper system_filter for OTRS
Four-character fix for 4142e84.
Change-Id: I69ed8f534c1154c1c88f9a604f2648d4fbfb86de
---
M manifests/role/otrs.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/227979/1
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index b28ad60..f81f557 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -167,7 +167,7 @@
class { 'exim4':
variant = 'heavy',
config = template('exim/exim4.conf.otrs.erb'),
-filter = template('exim/system_filter.conf.erb'),
+filter = template('exim/system_filter.conf.otrs.erb'),
require = [
Class['spamassassin'],
Class['clamav'],
--
To view, visit https://gerrit.wikimedia.org/r/227979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69ed8f534c1154c1c88f9a604f2648d4fbfb86de
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attach VE toolbar after VE debug bar, if there is one - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Attach VE toolbar after VE debug bar, if there is one
..
Attach VE toolbar after VE debug bar, if there is one
The surface attaches the debug bar after itself, but the
toolbar is also attached after the surface, so whether
the debug bar ends up being before or after the toolbar in
the DOM depends on which was attached first.
We want the debug bar to be before the toolbar for correct
styling, and right now that works by accident. But if
we reuse a target (by removing a surface and then adding
a new one later), the operations will run in a different
order the second time and the debug bar will end up
after the toolbar.
Really ve.ui.Surface shouldn't append things after itself
(but instead but the debug bar inside itself), but until
that (T106927) is fixed, let's explicitly put the toolbar
after the debug bar.
Bug: T103712
Change-Id: I0a36126eafe35575d228b4011524b06789716ff5
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
index 7066f2e..140cb4b 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -47,7 +47,12 @@
// Methods
mw.flow.ve.Target.prototype.attachToolbar = function () {
- this.getToolbar().$element.insertAfter(
this.getToolbar().getSurface().$element );
+ // HACK ve.ui.Surface appends a debugBar *after* itself instead
of putting it
+ // inside itself (T106927)
+ // Work around this by appending the toolbar after the debugBar
if it's there, and
+ // after the surface otherwise.
+ var surface = this.getToolbar().getSurface();
+ ( surface.debugBar || surface ).$element.after(
this.getToolbar().$element );
};
}( mediaWiki, OO, ve ) );
--
To view, visit https://gerrit.wikimedia.org/r/220530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a36126eafe35575d228b4011524b06789716ff5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Mooeypoo mor...@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] cassandra: add restbase1008 - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227994
Change subject: cassandra: add restbase1008
..
cassandra: add restbase1008
Bug: T102015
Change-Id: I4ceb139ce87aedc23b3f3f9a1830d7509edcf5e9
---
M conftool-data/nodes/eqiad.yaml
M hieradata/role/common/cassandra.yaml
M hieradata/role/common/restbase.yaml
3 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/227994/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index b20e595..3c7f7d3 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -323,6 +323,7 @@
restbase1005.eqiad.wmnet: [restbase]
restbase1006.eqiad.wmnet: [restbase]
restbase1007.eqiad.wmnet: [restbase]
+ restbase1008.eqiad.wmnet: [restbase]
elasticsearch:
elastic1001.eqiad.wmnet: [elasticsearch]
elastic1002.eqiad.wmnet: [elasticsearch]
diff --git a/hieradata/role/common/cassandra.yaml
b/hieradata/role/common/cassandra.yaml
index 1f3cbc1..e93f3b9 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -12,6 +12,7 @@
- restbase1005.eqiad.wmnet
- restbase1006.eqiad.wmnet
- restbase1007.eqiad.wmnet
+- restbase1008.eqiad.wmnet
cassandra::max_heap_size: 16g
# 1/4 heap size, no more than 100m/thread
cassandra::heap_newsize: 2048m
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index b85323d..e5cd866 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -10,6 +10,7 @@
- restbase1005.eqiad.wmnet
- restbase1006.eqiad.wmnet
- restbase1007.eqiad.wmnet
+- restbase1008.eqiad.wmnet
restbase::logstash_host: logstash1001.eqiad.wmnet
restbase::cassandra_defaultConsistency: localQuorum
restbase::cassandra_localDc: %{::site}
--
To view, visit https://gerrit.wikimedia.org/r/227994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ceb139ce87aedc23b3f3f9a1830d7509edcf5e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load all mobile license messages along with Skin.js - change (mediawiki...MobileFrontend)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/228000 Change subject: Load all mobile license messages along with Skin.js .. Load all mobile license messages along with Skin.js Currently only one of the three required messages is loaded at the right time. Bug: T107429 Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 (cherry picked from commit 9682b8b8b0c18ea484fc0848b06a8eaff9f0ce79) --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/00/228000/1 diff --git a/includes/Resources.php b/includes/Resources.php index b6dfa1e..1ae4815 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -497,6 +497,8 @@ 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', // Skin.js + 'mobile-frontend-editor-licensing', + 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-terms-link', ), 'styles' = array( @@ -642,8 +644,6 @@ 'mobile-frontend-editor-continue', 'mobile-frontend-editor-cancel', 'mobile-frontend-editor-keep-editing', - 'mobile-frontend-editor-licensing', - 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', -- To view, visit https://gerrit.wikimedia.org/r/228000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.26wmf16 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add legacy bits.wm.o support to text-lb VCL - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Add legacy bits.wm.o support to text-lb VCL
..
Add legacy bits.wm.o support to text-lb VCL
This is the code that should allow us to move the DNS for the
bits.wm.o hostname to the text cluster.
On the tier one backends, this adds the bits.wm.o request url/host
mangling before fetching. On the frontends, this supports the
legacy beacon/event/statsv pattern as-it-was, as well as the
bits-specific hacks for apache-level HTTPS redirects.
The rest of the potential diffs were already ported to shared code
(e.g. $foo/geoiplookup + geoiplookup.wm.o), already existed in
the text or shared code, or are primarily a performance issue
which won't matter at bits' current relatively-low request rate.
Bug: T95448
Change-Id: I3c4f1b938cdcf222ae994d5df970621b74c9ab23
---
M hieradata/labs.yaml
M modules/role/manifests/cache/text.pp
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
4 files changed, 63 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, but someone else must approve
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index edc5768..ebdd8e4 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -42,6 +42,8 @@
role::cache::upload::top_domain: 'beta.wmflabs.org'
role::cache::bits::bits_domain: 'bits.beta.wmflabs.org'
role::cache::bits::top_domain: 'beta.wmflabs.org'
+role::cache::text::bits_domain: 'bits.beta.wmflabs.org'
+role::cache::text::top_domain: 'beta.wmflabs.org'
role::cache::mobile::zero_site: 'http://zero.wikimedia.beta.wmflabs.org'
role::cache::text::static_host: 'deployment.wikimedia.beta.wmflabs.org'
varnish::dynamic_directors: false
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index ecf1831..22fe204 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -1,4 +1,7 @@
-class role::cache::text {
+class role::cache::text (
+$bits_domain = 'bits.wikimedia.org',
+$top_domain = 'org'
+) {
system::role { 'role::cache::text':
description = 'text Varnish cache server',
}
@@ -115,6 +118,10 @@
'max_connections' = 1000,
},
]),
+cluster_options = {
+'bits_domain'= $bits_domain,
+'top_domain' = $top_domain,
+},
wikimedia_networks = $::role::cache::base::wikimedia_networks,
}
@@ -157,6 +164,8 @@
},
]),
cluster_options = {
+'bits_domain'= $bits_domain,
+'top_domain' = $top_domain,
'enable_geoiplookup' = true,
'do_gzip'= true,
'https_redirects'= true,
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 400b4d9..55dd1a5 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -54,11 +54,37 @@
return (lookup);
}
+% if @vcl_config.fetch(cluster_tier, one) == one -%
+// BITS: legacy bits.wm.o domain support
+sub bitscompat_1be_mangle {
+ // Transform backend url: /sitename/load.php - /w/load.php
+ // Set host header for backend to sitename
+ if (req.url ~
^/([a-zA-Z0-9-]+\.)?([a-zA-Z0-9-]+\.)?([a-zA-Z0-9-]+)\.%=
Regexp.escape(@cluster_options.fetch(top_domain, org)) %/load\.php) {
+ set bereq.http.host = regsub(req.url, ^/([^/]+)/(.*)$, \1);
+ set bereq.url = regsub(req.url, ^/([^/]+)/load\.php(.*)?,
/w/load.php\2);
+ }
+}
+% end -%
+
sub vcl_pass {
+% if @vcl_config.fetch(cluster_tier, one) == one -%
+ // BITS: legacy bits.wm.o domain support
+ if (req.http.host == %= @cluster_options.fetch(bits_domain,
bits.wikimedia.org) %) {
+ call bitscompat_1be_mangle;
+ return (pass);
+ }
+% end -%
call restore_cookie;
}
sub vcl_miss {
+% if @vcl_config.fetch(cluster_tier, one) == one -%
+ // BITS: legacy bits.wm.o domain support
+ if (req.http.host == %= @cluster_options.fetch(bits_domain,
bits.wikimedia.org) %) {
+ call bitscompat_1be_mangle;
+ return (fetch);
+ }
+% end -%
call restore_cookie;
}
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 1dba1a9..6465bc2 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -79,6 +79,17 @@
// Disable Range requests for now.
unset req.http.Range;
+ // BITS: legacy bits.wm.o domain support
+ if (req.http.host == %= @cluster_options.fetch(bits_domain,
[MediaWiki-commits] [Gerrit] Better fix for timeline - only link event if _pageName is in... - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228002
Change subject: Better fix for timeline - only link event if _pageName is in
query
..
Better fix for timeline - only link event if _pageName is in query
Change-Id: I3c5443e183f957cc531c3713d649729e77ee106f
---
M specials/CargoExport.php
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/02/228002/1
diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index 1269293..10801ea 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -199,14 +199,23 @@
// necessarily the page name.
$eventTitle = reset( $queryResult );
}
- $title = Title::newFromText( $eventTitle );
- $displayedArray[] = array(
+ $eventDisplayDetails = array(
'title' = $eventTitle,
'start' = $queryResult[$dateFields[0]],
'description' = $eventDescription,
- 'link' = $title-getFullURL(),
);
+
+ // If we have the name of the page on which
+ // the event is defined, link to that -
+ // otherwise, don't link to anything.
+ // (In most cases, the _pageName field will
+ // also be the title of the event.)
+ if ( array_key_exists( '_pageName',
$queryResult ) ) {
+ $title = Title::newFromText(
$queryResult['_pageName'] );
+ $eventDisplayDetails['link'] =
$title-getFullURL();
+ }
+ $displayedArray[] = $eventDisplayDetails;
}
}
// Sort by date, ascending.
--
To view, visit https://gerrit.wikimedia.org/r/228002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c5443e183f957cc531c3713d649729e77ee106f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9921759..cf191f5 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 9921759..cf191f5 .. Syncronize VisualEditor: 9921759..cf191f5 Change-Id: I9446d74d3b0669a2a2eb55489108ac2c937733c5 --- 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 9921759..cf191f5 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9921759456dcbd9f9cb9852916441904db260718 +Subproject commit cf191f5fa8deae449f41b4fbffa0ab9c5c2b12b1 -- To view, visit https://gerrit.wikimedia.org/r/228003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9446d74d3b0669a2a2eb55489108ac2c937733c5 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] Use Perso-Arabic numberic system for South Azeri (azb) - change (mediawiki/core)
Mjbmr has uploaded a new change for review. https://gerrit.wikimedia.org/r/227993 Change subject: Use Perso-Arabic numberic system for South Azeri (azb) .. Use Perso-Arabic numberic system for South Azeri (azb) Change-Id: Ifb0e8edc1ca4d0720ceb048a46589158b34eec52 --- M resources/src/mediawiki.legacy/shared.css 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/227993/1 diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index f995229..27c3841 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -944,6 +944,7 @@ } /* Localised ordered list numbering for some languages */ +ol:lang(azb) li, ol:lang(bcc) li, ol:lang(bgn) li, ol:lang(bqi) li, -- To view, visit https://gerrit.wikimedia.org/r/227993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb0e8edc1ca4d0720ceb048a46589158b34eec52 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mjbmr mjb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Push to dev branch by default - change (mediawiki...Gather)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/227996 Change subject: Push to dev branch by default .. Push to dev branch by default Bug: T104556 Change-Id: I50c7b470f2796d4f7e88df246da964bdf7bfbff5 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/96/227996/1 diff --git a/.gitreview b/.gitreview index bfbaae0..b9efa8f 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/Gather.git -defaultbranch=master +defaultbranch=dev defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/227996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50c7b470f2796d4f7e88df246da964bdf7bfbff5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Labs: Let Puppet install mpt-status - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Labs: Let Puppet install mpt-status .. Labs: Let Puppet install mpt-status Change da2f050608bd6c7bf2856c3e528fef3b50d56de3 fixed useless mpt-status mails by installing the configuration file with RUN_DAEMON=no for mpt-status before the package was installed. However in Labs images, mpt-status is already installed in the base image and at the first boot, the mpt-status daemon is started before Puppet creates the configuration file, thus firing off the mails until reboot or manually killing the daemon. This could be fixed by adding /etc/default/mpt-statusd to the list of files to be copied from the VM builder machine to the base image; on the other hand this would introduce another non-obvious dependence which would miss fixes like da2f050608bd6c7bf2856c3e528fef3b50d56de3. Instead this change lets Puppet install mpt-status after the configuration file has been created. Bug: T104779 Change-Id: Ie52618f946685473797f6b4d2ed924e065b3d689 --- M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml index 96cb011..dc60b6a 100644 --- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml +++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml @@ -84,7 +84,6 @@ - debian-goodies - python-redis - python-apt -- mpt-status - apt-show-versions - pv - nagios-plugins-standard diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb index 08ea518..0295e0c 100644 --- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb +++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb @@ -17,8 +17,8 @@ mirror = http://ubuntu.wikimedia.org/ubuntu/ components = main,restricted,multiverse,universe % if scope.function_os_version(['ubuntu = trusty']) % -addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23, libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, mpt-status, python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, jq +addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23, libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, jq % else % -addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23, libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, mpt-status, apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint, tree, nagios-plugins-basic +addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23, libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint, tree, nagios-plugins-basic % end % removepkg = mlocate -- To
[MediaWiki-commits] [Gerrit] Project logos: Updated commonswiki.png from File:Wiki-common... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Project logos: Updated commonswiki.png from File:Wiki-commons.png .. Project logos: Updated commonswiki.png from File:Wiki-commons.png To increase logo sharpness Bug: T106375 Change-Id: Ie72fe5dd268fdb1d9034c4c657bd8820bff34eac --- M w/static/images/project-logos/commonswiki.png 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/w/static/images/project-logos/commonswiki.png b/w/static/images/project-logos/commonswiki.png index 64440f1..5d153f2 100644 --- a/w/static/images/project-logos/commonswiki.png +++ b/w/static/images/project-logos/commonswiki.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/227962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie72fe5dd268fdb1d9034c4c657bd8820bff34eac Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Zhuyifei1999 zhuyifei1...@gmail.com Gerrit-Reviewer: Alex Monk kren...@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] Load all mobile license messages along with Skin.js - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Load all mobile license messages along with Skin.js .. Load all mobile license messages along with Skin.js Currently only one of the three required messages is loaded at the right time. Bug: T107429 Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 1615a58..d7f29e0 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -487,6 +487,8 @@ 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', // Skin.js + 'mobile-frontend-editor-licensing', + 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-terms-link', ), 'styles' = array( @@ -632,8 +634,6 @@ 'mobile-frontend-editor-continue', 'mobile-frontend-editor-cancel', 'mobile-frontend-editor-keep-editing', - 'mobile-frontend-editor-licensing', - 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', -- To view, visit https://gerrit.wikimedia.org/r/227998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Jforrester jforres...@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] Upgrade to elasticsearch 1.7.1 - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Upgrade to elasticsearch 1.7.1
..
Upgrade to elasticsearch 1.7.1
Change-Id: I818d76afca0fa39768c00a8d5420ade469067a8e
---
M puppet/modules/elasticsearch/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index a9fea2e..2ad1779 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -5,7 +5,7 @@
#
class elasticsearch {
package { 'elasticsearch':
-ensure = '1.7.0',
+ensure = '1.7.1',
}
require_package('openjdk-7-jre-headless')
--
To view, visit https://gerrit.wikimedia.org/r/227970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I818d76afca0fa39768c00a8d5420ade469067a8e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: DCausse dcau...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@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] Push to dev branch by default - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/227995 Change subject: Push to dev branch by default .. Push to dev branch by default Bug: T104556 Change-Id: Ie548c75047cd7bd14da886f8a12682b3babc52d8 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/95/227995/1 diff --git a/.gitreview b/.gitreview index f9053c8..c3e0f68 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/MobileFrontend.git -defaultbranch=master +defaultbranch=dev defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/227995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie548c75047cd7bd14da886f8a12682b3babc52d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify access rules - change (wikibase)
QChris has submitted this change and it was merged. Change subject: Modify access rules .. Modify access rules --- M groups M project.config 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, but someone else must approve QChris: Verified; Looks good to me, approved diff --git a/groups b/groups index b56628e..56fbfff 100644 --- a/groups +++ b/groups @@ -1,5 +1,6 @@ # UUID Group Name # 2bc47fcadf4e44ec9a1a73bcfa06232554f47ce2 JenkinsBot +58f296e12def7ca8f52f35079396b524838a0398 wikidata cc37d98e3a4301744a0c0a9249173ae170696072 l10n-bot d138c5c3d9a84c49008893eaaae20a0a127a201b wikibase diff --git a/project.config b/project.config index aef5d50..2f4ea6d 100644 --- a/project.config +++ b/project.config @@ -4,5 +4,6 @@ mergeContent = true [access refs/*] owner = group wikibase + owner = group wikidata submit = group JenkinsBot submit = group l10n-bot -- To view, visit https://gerrit.wikimedia.org/r/227896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25a3bec094cb0c9cc7551debe54db9fe0b028d76 Gerrit-PatchSet: 1 Gerrit-Project: wikibase Gerrit-Branch: refs/meta/config Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9921759..cf191f5 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/228003 Change subject: Syncronize VisualEditor: 9921759..cf191f5 .. Syncronize VisualEditor: 9921759..cf191f5 Change-Id: I9446d74d3b0669a2a2eb55489108ac2c937733c5 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/03/228003/1 diff --git a/VisualEditor b/VisualEditor index 9921759..cf191f5 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9921759456dcbd9f9cb9852916441904db260718 +Subproject commit cf191f5fa8deae449f41b4fbffa0ab9c5c2b12b1 -- To view, visit https://gerrit.wikimedia.org/r/228003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9446d74d3b0669a2a2eb55489108ac2c937733c5 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] Update VE core submodule to master (8feab4e) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (8feab4e)
..
Update VE core submodule to master (8feab4e)
New changes:
11953f7 Localisation updates from https://translatewiki.net.
0dbafb0 Update OOjs UI to v0.12.2
cbd0982 Replace placeholder color with opacity
087365c Support other types of 'empty' document placeholders
7692890 Make scrollIntoView a VE utility function
5a1a159 Localisation updates from https://translatewiki.net.
8edf71e [BREAKING CHANGE] Kill ve.indexOf and thus @until
bb02b02 build: Bump various devDependencies to latest
cb5b2cd Fix scrollIntoView util binding
8feab4e [BREAKING CHANGE] Use config object for Target constructors
Local changes:
* Use config object for Target constructors
Bonus:
* Add CSS classes to MW targets
* Use 'super' calls
Change-Id: Ieb4e4eb3663aab2706c0f3ecc8b82e00555df1d5
---
M lib/ve
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
4 files changed, 25 insertions(+), 8 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index cb14f66..8feab4e 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit cb14f66f50ace8069ba3646293cb27069b30f24c
+Subproject commit 8feab4e565996c08cc7bc389a9235a9e6386800a
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index e57c8e4..a36dedf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -14,13 +14,16 @@
* @extends ve.init.mw.Target
*
* @constructor
+ * @param {Object} config Configuration options
*/
-ve.init.mw.DesktopArticleTarget = function VeInitMwDesktopArticleTarget() {
+ve.init.mw.DesktopArticleTarget = function VeInitMwDesktopArticleTarget(
config ) {
// A workaround, as default URI does not get updated after pushState
(bug 72334)
var currentUri = new mw.Uri( location.href );
// Parent constructor
- ve.init.mw.Target.call( this, mw.config.get( 'wgRelevantPageName' ),
currentUri.query.oldid );
+ ve.init.mw.DesktopArticleTarget.super.call(
+ this, mw.config.get( 'wgRelevantPageName' ),
currentUri.query.oldid, config
+ );
// Parent constructor bound key event handlers, but we don't want them
bound until
// we activate; so unbind them again
@@ -84,6 +87,9 @@
serializeError: 'onSerializeError'
} );
+ // Initialization
+ this.$element.addClass( 've-init-mw-desktopArticleTarget' );
+
if ( history.replaceState ) {
// We replace the current state with one that's marked with our
tag. This way, when users
// use the Back button to exit the editor we can restore Read
mode. This is because we want
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index 0fd5126..812e58e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -18,15 +18,19 @@
*/
ve.init.mw.MobileArticleTarget = function VeInitMwMobileArticleTarget( config
) {
var currentUri = new mw.Uri();
+
config = config || {};
// Parent constructor
ve.init.mw.Target.call(
- this, mw.config.get( 'wgRelevantPageName' ),
currentUri.query.oldid
+ this, mw.config.get( 'wgRelevantPageName' ),
currentUri.query.oldid, config
);
this.section = config.section;
this.isIos = !!config.isIos;
+
+ // Initialization
+ this.$element.addClass( 've-init-mw-mobileArticleTarget' );
};
/* Inheritance */
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 486b8de..652a891 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -15,17 +15,21 @@
*
* @constructor
* @param {string} pageName Name of target page
- * @param {number} [revisionId] If the editor should load a revision of the
page, pass the
+ * @param {string} [revisionId] If the editor should load a revision of the
page, pass the
* revision id here. Defaults to loading the latest version (see #load).
+ * @param {Object} [config] Configuration options
*/
-ve.init.mw.Target = function VeInitMwTarget( pageName, revisionId ) {
- // Parent constructor
- ve.init.Target.call( this, {
+ve.init.mw.Target = function VeInitMwTarget( pageName, revisionId, config ) {
+ config = config || {};
+ config.toolbarConfig = $.extend( {
shadow: true,
actions: true,
[MediaWiki-commits] [Gerrit] Better fix for timeline - only link event if _pageName is in... - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged.
Change subject: Better fix for timeline - only link event if _pageName is in
query
..
Better fix for timeline - only link event if _pageName is in query
Change-Id: I3c5443e183f957cc531c3713d649729e77ee106f
---
M specials/CargoExport.php
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index 1269293..10801ea 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -199,14 +199,23 @@
// necessarily the page name.
$eventTitle = reset( $queryResult );
}
- $title = Title::newFromText( $eventTitle );
- $displayedArray[] = array(
+ $eventDisplayDetails = array(
'title' = $eventTitle,
'start' = $queryResult[$dateFields[0]],
'description' = $eventDescription,
- 'link' = $title-getFullURL(),
);
+
+ // If we have the name of the page on which
+ // the event is defined, link to that -
+ // otherwise, don't link to anything.
+ // (In most cases, the _pageName field will
+ // also be the title of the event.)
+ if ( array_key_exists( '_pageName',
$queryResult ) ) {
+ $title = Title::newFromText(
$queryResult['_pageName'] );
+ $eventDisplayDetails['link'] =
$title-getFullURL();
+ }
+ $displayedArray[] = $eventDisplayDetails;
}
}
// Sort by date, ascending.
--
To view, visit https://gerrit.wikimedia.org/r/228002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c5443e183f957cc531c3713d649729e77ee106f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@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] Let redirect.py fixe item redirect in Wikidata - change (pywikibot/core)
Ladsgroup has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227992
Change subject: Let redirect.py fixe item redirect in Wikidata
..
Let redirect.py fixe item redirect in Wikidata
Bug: T77025
Change-Id: Ic867daa1d38973a26e1ff3ff0a3d00c77aed7e41
---
M scripts/redirect.py
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/92/227992/1
diff --git a/scripts/redirect.py b/scripts/redirect.py
index 93f2b55..cb2e959 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -387,6 +387,7 @@
})
super(RedirectRobot, self).__init__(**kwargs)
self.site = pywikibot.Site()
+self.repo = self.site.data_repository()
self.action = action
self.generator = generator
self.exiting = False
@@ -631,6 +632,12 @@
except pywikibot.BadTitle:
pywikibot.output(uBad Title Error)
break
+if self.repo == self.site and redir.namespace() == 0:
+redir = pywikibot.ItemPage(self.repo, redir.title())
+targetPage = pywikibot.ItemPage(self.repo, targetPage.title())
+pywikibot.output('Fixing double item redirect')
+redir.set_redirect_target(targetPage)
+break
redir.set_redirect_target(targetPage, keep_section=True,
save=False)
summary = i18n.twtranslate(self.site, 'redirect-fix-double',
{'to': targetPage.title(asLink=True)}
--
To view, visit https://gerrit.wikimedia.org/r/227992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic867daa1d38973a26e1ff3ff0a3d00c77aed7e41
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup ladsgr...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove multatuli from site.pp - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227997
Change subject: remove multatuli from site.pp
..
remove multatuli from site.pp
Change-Id: I0b0cef0c5bfd6bc189b9db1078e01305eff88028
---
M manifests/site.pp
1 file changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/227997/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 8324968..68c778c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,14 +1676,6 @@
}
}
-node 'multatuli.wikimedia.org' {
-interface::add_ip6_mapped { 'main':
-interface = 'eth0',
-}
-include standard
-include base::firewall
-}
-
# also see dataset1001
node 'ms1001.wikimedia.org' {
$cluster = 'misc'
--
To view, visit https://gerrit.wikimedia.org/r/227997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b0cef0c5bfd6bc189b9db1078e01305eff88028
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load all mobile license messages along with Skin.js - change (mediawiki...MobileFrontend)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/227998 Change subject: Load all mobile license messages along with Skin.js .. Load all mobile license messages along with Skin.js Currently only one of the three required messages is loaded at the right time. Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/98/227998/1 diff --git a/includes/Resources.php b/includes/Resources.php index 1615a58..d7f29e0 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -487,6 +487,8 @@ 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', // Skin.js + 'mobile-frontend-editor-licensing', + 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-terms-link', ), 'styles' = array( @@ -632,8 +634,6 @@ 'mobile-frontend-editor-continue', 'mobile-frontend-editor-cancel', 'mobile-frontend-editor-keep-editing', - 'mobile-frontend-editor-licensing', - 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', -- To view, visit https://gerrit.wikimedia.org/r/227998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Recreate debianization on top of 0.8.2.1 tag - change (operations...kafka)
Ottomata has submitted this change and it was merged. Change subject: Recreate debianization on top of 0.8.2.1 tag .. Recreate debianization on top of 0.8.2.1 tag This commit copies debian/ and ext/ from master (old debian branch) at 2322e4842af3bbb0a6feacc116b3f9d34b61a3a0. I had trouble with merge conflicts not resolving properly when merging 0.8.2.1 into the old debian branch (master). Even when always choosing 'theirs', many of the automatically merged files ended up not matching what was in the 0.8.2.1 tag, which caused the build process to fail when comparing the source in the debian branch to the orig.tar.gz file created from the tag. To work around, I have recreated the debianization directly on top of the 0.8.2.1 tag by manually copying the old debian/ and ext/ dirs, and then modifying them to work with 0.8.2.1. The old git history for the debian/ and ext/ dirs can be found in the master branch of this repository (unless we decide to rename this branch to avoid confusion). Bug: T106581 Change-Id: I20323a9c86b6c924e1507d35e7cfe279b2c0106b --- A debian/README.Debian A debian/bin/kafka A debian/changelog A debian/compat A debian/control A debian/copyright A debian/gbp.conf A debian/kafka-client.dirs A debian/kafka-client.install A debian/kafka-client.postinst A debian/kafka-client.postrm A debian/kafka-common.dirs A debian/kafka-common.install A debian/kafka-common.links A debian/kafka-mirror.default A debian/kafka-mirror.dirs A debian/kafka-mirror.init A debian/kafka-server.dirs A debian/kafka-server.kafka.default A debian/kafka-server.kafka.init A debian/kafka-server.postinst A debian/patches/kafka_data_dirs_fixes.patch A debian/patches/logging_to_var_log.patch A debian/patches/our-own-build-system.patch A debian/patches/remove_scala_annotations2.8.patch A debian/patches/series A debian/rules A debian/source/format A debian/source/include-binaries A debian/source/options A ext/avro-1.4.0.jar A ext/easymock-3.0.jar A ext/hadoop-core-0.20.2.jar A ext/jasper-compiler-5.5.12.jar A ext/jasper-runtime-5.5.12.jar A ext/jopt-simple-3.2.jar A ext/jsp-2.1-6.1.14.jar A ext/jsp-api-2.1-6.1.14.jar A ext/kafka-ganglia-1.0.0.jar A ext/kfs-0.3.jar A ext/metrics-annotation-2.2.0.jar A ext/metrics-core-2.2.0.jar A ext/metrics-ganglia-2.2.0.jar A ext/metrics-graphite-2.2.0.jar A ext/paranamer-ant-2.2.jar A ext/paranamer-generator-2.2.jar A ext/pig-0.8.0.jar A ext/scalatest-1.2.jar A ext/zkclient-0.3.jar 49 files changed, 1,904 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000..fa06c5a --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,138 @@ +kafka for Debian + +This package is created using a custom build system based on Makefiles +instead of the standard sbt build system used by upstream. The reason +for this is to satisfy debian policy that no internet connection should +be required during package building as well as security concers about +the downloaded JAR files by sbt + +How to build this package +- + +This repository is be used to build the kafka package using +git-buildpackage. Below we illustrate one of the ways this can work for +you: + +* Install some mandatory packages + + $ apt-get install git-buildpackage + +* And some not so mandatory but nice to have packages + + $ apt-get install pbuilder cowbuilder + +Note that pbuilder/cowbuilder is not strictly required but it will save +you from installing the dependencies manually + +* Create a cowbuilder environment (we assume you are building against +precise pangolin here) + + $ sudo DIST=precise git-pbuilder create --components main universe + +* Clone the repo + + $ git clone http://gerrit.wikimedia.org/r/operations/debs/kafka + $ cd kafka + +* Build + + $ DIST=precise git-buildpackage -us -uc + +or if you dont want to use git-pbuilder: + + $ git-buildpackage -us -uc --git-builder=debuild + +* Grab your packages from the directory above the one your are in, unless +you have configured pbuilder otherwise + +Build a new version +--- + +* Should the current version in the repo not be enough, set upstream and + fetch + + $ git remote add kafka http://git-wip-us.apache.org/repos/asf/kafka.git + $ git fetch kafka + +* Tag the version you want to build against + + $ git tag upstream/VERSION commit-ish + +VERSION should be a valid upstream version according to the debian +specification: + +https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version + +commit-sh can be any upstream commit like git tag, branch or a single +commit. The best result will probably be achieved with a valid git tag +from upstream that matches the debian upstream version specs. In that +case VERSION == commit-ish + +* Then update the master branch to reflect that + + $ git
[MediaWiki-commits] [Gerrit] Load all mobile license messages along with Skin.js - change (mediawiki...MobileFrontend)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/228001 Change subject: Load all mobile license messages along with Skin.js .. Load all mobile license messages along with Skin.js Currently only one of the three required messages is loaded at the right time. Bug: T107429 Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 (cherry picked from commit 9682b8b8b0c18ea484fc0848b06a8eaff9f0ce79) --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/01/228001/1 diff --git a/includes/Resources.php b/includes/Resources.php index 7e9da29..30ad107 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -497,6 +497,8 @@ 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', // Skin.js + 'mobile-frontend-editor-licensing', + 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-terms-link', ), 'styles' = array( @@ -643,8 +645,6 @@ 'mobile-frontend-editor-continue', 'mobile-frontend-editor-cancel', 'mobile-frontend-editor-keep-editing', - 'mobile-frontend-editor-licensing', - 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', -- To view, visit https://gerrit.wikimedia.org/r/228001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.26wmf15 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump Sentry version to match operations/puppet - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Bump Sentry version to match operations/puppet
..
Bump Sentry version to match operations/puppet
Change-Id: Ibf285cd2683f06f158f25f7abc6bd351b80231ec
---
M puppet/modules/sentry/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/sentry/manifests/init.pp
b/puppet/modules/sentry/manifests/init.pp
index 194186e..a10bda5 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -83,7 +83,7 @@
# Use virtualenv because Sentry has lots of dependencies
virtualenv::environment { $deploy_dir:
ensure = present,
-packages = ['sentry[mysql]==7.6.2', 'raven'],
+packages = ['sentry[mysql]==7.7.0', 'raven'],
require = Package['libmysqlclient-dev'],
}
--
To view, visit https://gerrit.wikimedia.org/r/227941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf285cd2683f06f158f25f7abc6bd351b80231ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Ori.livneh 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] Add interwiki import sources for mrwikisource - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add interwiki import sources for mrwikisource .. Add interwiki import sources for mrwikisource Bug: T105116 Change-Id: I0a71b170d999e271c75d716e9e8d0477f6cd3cf3 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7df9eac..d710eec 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9848,6 +9848,7 @@ 'mlwikisource' = array( 'w', 'en', 'w:en', ), 'mlwikiquote' = array( 'en', 'w:en', 'w' ), 'mrwiki' = array( 'meta', 'commons', 'en', 'hi' ), // T96807 + 'mrwikisource' = array( 'w', 'b', 'en', 'sa' ), // T105116 'mswiki' = array( 'id' ), // T18033 'mswiktionary' = array( 'w' ), 'myvwiki' = array( 'incubator' ), -- To view, visit https://gerrit.wikimedia.org/r/227999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a71b170d999e271c75d716e9e8d0477f6cd3cf3 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alex Monk kren...@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] Fix possible crash in History and Saved Pages. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible crash in History and Saved Pages.
..
Fix possible crash in History and Saved Pages.
Note: this fixes the crash, but doesn't quite answer the question of why
onLoadFinished() is sometimes called with a null Cursor...
Bug: T107355
Change-Id: I6a47bc587a0bebd2ba217511c5bcac03ec8d7600
---
M wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Sniedzielski: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
index 60d25fa..4506b9a 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -221,7 +221,7 @@
@Override
public void onLoadFinished(LoaderCursor cursorLoader, Cursor cursor) {
-if (!isAdded()) {
+if (!isAdded() || cursor == null) {
return;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
index 36f4b1b..e102423 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
@@ -250,7 +250,7 @@
@Override
public void onLoadFinished(LoaderCursor cursorLoader, Cursor cursor) {
-if (!isAdded()) {
+if (!isAdded() || cursor == null) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a47bc587a0bebd2ba217511c5bcac03ec8d7600
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: Sniedzielski sniedziel...@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] Load all mobile license messages along with Skin.js - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Load all mobile license messages along with Skin.js .. Load all mobile license messages along with Skin.js Currently only one of the three required messages is loaded at the right time. Bug: T107429 Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 (cherry picked from commit 9682b8b8b0c18ea484fc0848b06a8eaff9f0ce79) --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index b6dfa1e..1ae4815 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -497,6 +497,8 @@ 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', // Skin.js + 'mobile-frontend-editor-licensing', + 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-terms-link', ), 'styles' = array( @@ -642,8 +644,6 @@ 'mobile-frontend-editor-continue', 'mobile-frontend-editor-cancel', 'mobile-frontend-editor-keep-editing', - 'mobile-frontend-editor-licensing', - 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', -- To view, visit https://gerrit.wikimedia.org/r/228000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.26wmf16 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Esanders esand...@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] Load all mobile license messages along with Skin.js - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Load all mobile license messages along with Skin.js .. Load all mobile license messages along with Skin.js Currently only one of the three required messages is loaded at the right time. Bug: T107429 Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 (cherry picked from commit 9682b8b8b0c18ea484fc0848b06a8eaff9f0ce79) --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 7e9da29..30ad107 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -497,6 +497,8 @@ 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', // Skin.js + 'mobile-frontend-editor-licensing', + 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-terms-link', ), 'styles' = array( @@ -643,8 +645,6 @@ 'mobile-frontend-editor-continue', 'mobile-frontend-editor-cancel', 'mobile-frontend-editor-keep-editing', - 'mobile-frontend-editor-licensing', - 'mobile-frontend-editor-licensing-with-terms', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', -- To view, visit https://gerrit.wikimedia.org/r/228001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I434acd82c89a3d0a3cad1e4add36134072db26e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.26wmf15 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Esanders esand...@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] Follow-up Ieb4e4eb3: Remove @until jsduck tag - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228004
Change subject: Follow-up Ieb4e4eb3: Remove @until jsduck tag
..
Follow-up Ieb4e4eb3: Remove @until jsduck tag
Change-Id: Ia8a76d8011145ef11720ccd242b354299bc67434
---
M .jsduck/CustomTags.rb
1 file changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/04/228004/1
diff --git a/.jsduck/CustomTags.rb b/.jsduck/CustomTags.rb
index 5e32a89..346079b 100644
--- a/.jsduck/CustomTags.rb
+++ b/.jsduck/CustomTags.rb
@@ -48,24 +48,6 @@
end
end
-class UntilTag CommonTag
- def initialize
-@tagname = :until
-@pattern = until
-super
- end
-
- def to_html(context)
--EOHTML
- h3Until/h3
- div class=signature-boxp
- This method provides strongbrowser compatibility/strong for:
- #{ context[@tagname].map {|tag| tag[:doc] }.join(\n) }
- /p/div
-EOHTML
- end
-end
-
class SeeTag CommonTag
def initialize
@tagname = :see
--
To view, visit https://gerrit.wikimedia.org/r/228004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8a76d8011145ef11720ccd242b354299bc67434
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add interwiki import sources for mrwikisource - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/227999 Change subject: Add interwiki import sources for mrwikisource .. Add interwiki import sources for mrwikisource Bug: T105116 Change-Id: I0a71b170d999e271c75d716e9e8d0477f6cd3cf3 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/99/227999/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7df9eac..9b18ef9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9848,6 +9848,7 @@ 'mlwikisource' = array( 'w', 'en', 'w:en', ), 'mlwikiquote' = array( 'en', 'w:en', 'w' ), 'mrwiki' = array( 'meta', 'commons', 'en', 'hi' ), // T96807 + 'mrwikisource' = array( 'w', 'b', 's:en', 'sa' ), // T105116 'mswiki' = array( 'id' ), // T18033 'mswiktionary' = array( 'w' ), 'myvwiki' = array( 'incubator' ), -- To view, visit https://gerrit.wikimedia.org/r/227999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a71b170d999e271c75d716e9e8d0477f6cd3cf3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use frameless buttons in mobile process dialogs - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Use frameless buttons in mobile process dialogs
..
Use frameless buttons in mobile process dialogs
Change-Id: I6eb1baf8f0189374bc30aebd98fc322f7fcee223
---
M src/ui/windowmanagers/ve.ui.MobileWindowManager.js
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
b/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
index b9519dc..a7f2406 100644
--- a/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
+++ b/src/ui/windowmanagers/ve.ui.MobileWindowManager.js
@@ -19,6 +19,9 @@
// Parent constructor
ve.ui.MobileWindowManager.super.call( this, surface, config );
+ // Events
+ this.connect( this, { opening: 'onMobileOpening' } );
+
// Initialization
this.$element.addClass( 've-ui-mobileWindowManager' );
};
@@ -38,3 +41,19 @@
ve.ui.MobileWindowManager.static.defaultSize = 'full';
/* Methods */
+
+/**
+ * Handle window opening events
+ */
+ve.ui.MobileWindowManager.prototype.onMobileOpening = function ( win, opening
) {
+ // HACK: un-frame buttons
+ opening.done( function () {
+ var i, l, list;
+ if ( win instanceof OO.ui.ProcessDialog ) {
+ list = win.actions.list;
+ for ( i = 0, l = list.length; i l; i++ ) {
+ list[i].toggleFramed( false );
+ }
+ }
+ } );
+};
--
To view, visit https://gerrit.wikimedia.org/r/227991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6eb1baf8f0189374bc30aebd98fc322f7fcee223
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@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] Open new tabs from + button in foreground. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Open new tabs from + button in foreground.
..
Open new tabs from + button in foreground.
Bug: T107443
Change-Id: I93caece4b92582dce768bf08af55aa98222810ad
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
BearND: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index cf5e594..24aff39 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -590,7 +590,8 @@
return;
}
//is the new title the same as what's already being displayed?
-if (!frag.getCurrentTab().getBackStack().isEmpty()
+if (position == TabPosition.CURRENT_TAB
+ !frag.getCurrentTab().getBackStack().isEmpty()
frag.getCurrentTab().getBackStack()
.get(frag.getCurrentTab().getBackStack().size() -
1).getTitle()
.equals(title) || mustBeEmpty
!frag.getCurrentTab().getBackStack().isEmpty()) {
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 25a6b2c..63e58da 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -27,7 +27,6 @@
import org.wikipedia.savedpages.SavePageTask;
import org.wikipedia.search.SearchBarHideHandler;
import org.wikipedia.settings.Prefs;
-import org.wikipedia.staticdata.MainPageNameData;
import org.wikipedia.tooltip.ToolTipUtil;
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.ThrowableUtil;
@@ -460,9 +459,7 @@
@Override
public void onNewTabRequested() {
// just load the main page into a new tab...
-PageTitle newTitle = new
PageTitle(MainPageNameData.valueFor(app.getAppLanguageCode()),
app.getPrimarySite());
-HistoryEntry newEntry = new HistoryEntry(newTitle,
HistoryEntry.SOURCE_INTERNAL_LINK);
-openInNewBackgroundTab(newTitle, newEntry);
+((PageActivity)getActivity()).displayMainPageInForegroundTab();
tabFunnel.logCreateNew(tabList.size());
}
@@ -595,7 +592,11 @@
private void openInNewTab(PageTitle title, HistoryEntry entry, int
position) {
// create a new tab
Tab tab = new Tab();
-// put this tab behind the current tab
+// if the requested position is at the top, then make its backstack
current
+if (position == getForegroundTabPosition()) {
+pageLoadStrategy.setBackStack(tab.getBackStack());
+}
+// put this tab in the requested position
tabList.add(position, tab);
// add the requested page to its backstack
tab.getBackStack().add(new PageBackStackItem(title, entry));
--
To view, visit https://gerrit.wikimedia.org/r/228037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93caece4b92582dce768bf08af55aa98222810ad
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@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] labstore: Fix ensure to be properly boolean - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228121
Change subject: labstore: Fix ensure to be properly boolean
..
labstore: Fix ensure to be properly boolean
Change-Id: I1ab40aa74a9178e70fa0e9f420b27e358eb20a0b
---
M modules/labstore/manifests/account_services.pp
M modules/labstore/manifests/fileserver/exports.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/228121/1
diff --git a/modules/labstore/manifests/account_services.pp
b/modules/labstore/manifests/account_services.pp
index 45c5774..67f4e13 100644
--- a/modules/labstore/manifests/account_services.pp
+++ b/modules/labstore/manifests/account_services.pp
@@ -50,8 +50,8 @@
}
base::service_unit { 'create-dbusers':
+ensure = $is_active,
systemd = true,
-ensure = ensure_service($is_active),
}
if $is_active {
diff --git a/modules/labstore/manifests/fileserver/exports.pp
b/modules/labstore/manifests/fileserver/exports.pp
index c84404e..ca7e4d2 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -59,7 +59,7 @@
}
base::service_unit { 'nfs-exports':
-ensure = ensure_service($is_active),
+ensure = $is_active,
systemd = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/228121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ab40aa74a9178e70fa0e9f420b27e358eb20a0b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update URL configuration for mobile when entering mobile mode - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Update URL configuration for mobile when entering mobile mode
..
Update URL configuration for mobile when entering mobile mode
* Use $wgCanonicalServer to construct $wgExtensionAssetsPath, $wgLoadScript,
$wgResourceBasePath, and $wgStyleSheetPath, because
MobileContext::getMobileUrl() does not work correctly with protocol-relative
URLs.
* When entering mobile mode, call MobileContext::getMobileUrl() to transform
each of the aforementioned configuration variables.
Bug: T106966
Change-Id: I0990ac5b6850315420511fce8b8be0bb97efda5d
---
M wmf-config/CommonSettings.php
M wmf-config/mobile.php
2 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3e58cb9..9e22ca3 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -201,11 +201,10 @@
unset( $wgStylePath );
unset( $wgStyleSheetPath );
-$wmgAssetsHost = $_SERVER['SERVER_NAME'];
-$wgLoadScript = //{$wmgAssetsHost}/w/load.php;
-$wgExtensionAssetsPath =
//{$wmgAssetsHost}/static/{$wmfVersionNumber}/extensions;
-$wgStyleSheetPath = //{$wmgAssetsHost}/static/{$wmfVersionNumber}/skins;
-$wgResourceBasePath = //{$wmgAssetsHost}/static/{$wmfVersionNumber};
+$wgLoadScript = {$wgCanonicalServer}/w/load.php;
+$wgExtensionAssetsPath =
{$wgCanonicalServer}/static/{$wmfVersionNumber}/extensions;
+$wgStyleSheetPath = {$wgCanonicalServer}/static/{$wmfVersionNumber}/skins;
+$wgResourceBasePath = {$wgCanonicalServer}/static/{$wmfVersionNumber};
$wgStylePath = $wgStyleSheetPath;
$wgArticlePath = /wiki/$1;
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 2e24a10..66bc9e7 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -64,7 +64,14 @@
$wgMFNoMobilePages = $wmgMFNoMobilePages;
$wgHooks['EnterMobileMode'][] = function() {
- global $wgCentralAuthCookieDomain;
+ global $wgCentralAuthCookieDomain, $wgExtensionAssetsPath,
+ $wgLoadScript, $wgResourceBasePath, $wgStyleSheetPath;
+
+ $mobileContext = MobileContext::singleton();
+ $wgExtensionAssetsPath = $mobileContext-getMobileUrl(
$wgExtensionAssetsPath );
+ $wgLoadScript = $mobileContext-getMobileUrl( $wgLoadScript );
+ $wgResourceBasePath = $mobileContext-getMobileUrl(
$wgResourceBasePath );
+ $wgStyleSheetPath = $mobileContext-getMobileUrl(
$wgStyleSheetPath );
// Hack for T49647
if ( $wgCentralAuthCookieDomain == 'commons.wikimedia.org' ) {
--
To view, visit https://gerrit.wikimedia.org/r/228122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0990ac5b6850315420511fce8b8be0bb97efda5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh 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] add script to flush all iptables rules for emergencies - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/228137 Change subject: add script to flush all iptables rules for emergencies .. add script to flush all iptables rules for emergencies https://en.wikipedia.org/wiki/Tear_down_this_wall! in case we have issues with ferm a script should be present to safely flush all rules without locking us out Change-Id: Ie54e29dfed23b4eef278e58bcbb54a6913ca7f56 --- A files/misc/scripts/mr_gorbachev.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/37/228137/1 diff --git a/files/misc/scripts/mr_gorbachev.sh b/files/misc/scripts/mr_gorbachev.sh new file mode 100755 index 000..41993c4 --- /dev/null +++ b/files/misc/scripts/mr_gorbachev.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# removes all iptables rules +# https://en.wikipedia.org/wiki/Tear_down_this_wall! +echo flushing all iptables rules.. +iptables -F +iptables -X +iptables -t nat -F +iptables -t nat -X +iptables -t mangle -F +iptables -t mangle -X +iptables -P INPUT ACCEPT +iptables -P FORWARD ACCEPT +iptables -P OUTPUT ACCEPT +echo done -- To view, visit https://gerrit.wikimedia.org/r/228137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie54e29dfed23b4eef278e58bcbb54a6913ca7f56 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] git: remove out-of-sync alert - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: git: remove out-of-sync alert
..
git: remove out-of-sync alert
Puppet is not a monitoring system and alerts have no place in puppet
runs.
Change-Id: I3c056f2af773a258c9be7b07786f57fdd25c30dc
---
M modules/git/manifests/install.pp
1 file changed, 0 insertions(+), 26 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/git/manifests/install.pp b/modules/git/manifests/install.pp
index 34de680..2b0d1e5 100644
--- a/modules/git/manifests/install.pp
+++ b/modules/git/manifests/install.pp
@@ -34,12 +34,6 @@
# Specifies a file on disk whose presence will cause the repository to
# hold at the last specified tag
#
-# NOTE: If the lock file exists and the tag on disk does not match
-# the current tag in Puppet a notice will be thrown.
-#
-# Example:
-# path_to_repo is out of sync with upstream tag tag_in_puppet
-#
# === Example usage
#
# git::install { 'project/name/on/gerrit':
@@ -79,26 +73,6 @@
owner = $owner,
group = $group,
require = Git::Clone[$title]
-}
-}
-
-if ($lock_file) {
-
-exec {${title}_confirm_tag_version:
-command = '/bin/true',
-cwd = $directory,
-user = $owner,
-unless= git diff HEAD..${git_tag} --exit-code,
-path = '/usr/bin/:bin',
-logoutput = false,
-notify= Exec[${title}_alert_for_out_of_sync],
-}
-
-exec { ${title}_alert_for_out_of_sync:
-command = /bin/echo ${directory} is out of sync with
upstream tag ${git_tag},
-logoutput = true,
-before = Exec[git_update_${title}],
-refreshonly = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/228143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c056f2af773a258c9be7b07786f57fdd25c30dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] Follow composer.json: include Predis - change (mediawiki...vendor)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/228145 Change subject: Follow composer.json: include Predis .. Follow composer.json: include Predis Change-Id: I20679003cbaae9e179b0e193e1a4a04bbba38cc3 --- M composer/autoload_psr4.php M composer/installed.json A predis/predis/CHANGELOG.md A predis/predis/CONTRIBUTING.md A predis/predis/FAQ.md A predis/predis/LICENSE A predis/predis/README.md A predis/predis/VERSION A predis/predis/autoload.php A predis/predis/bin/create-command-test A predis/predis/bin/create-pear A predis/predis/bin/create-phar A predis/predis/bin/create-single-file A predis/predis/composer.json A predis/predis/examples/custom_cluster_distributor.php A predis/predis/examples/debuggable_connection.php A predis/predis/examples/dispatcher_loop.php A predis/predis/examples/executing_redis_commands.php A predis/predis/examples/key_prefixing.php A predis/predis/examples/lua_scripting_abstraction.php A predis/predis/examples/monitor_consumer.php A predis/predis/examples/pipelining_commands.php A predis/predis/examples/pubsub_consumer.php A predis/predis/examples/redis_collections_iterators.php A predis/predis/examples/replication_complex.php A predis/predis/examples/replication_simple.php A predis/predis/examples/session_handler.php A predis/predis/examples/shared.php A predis/predis/examples/transaction_using_cas.php A predis/predis/package.ini A predis/predis/src/Autoloader.php A predis/predis/src/Client.php A predis/predis/src/ClientContextInterface.php A predis/predis/src/ClientException.php A predis/predis/src/ClientInterface.php A predis/predis/src/Cluster/ClusterStrategy.php A predis/predis/src/Cluster/Distributor/DistributorInterface.php A predis/predis/src/Cluster/Distributor/EmptyRingException.php A predis/predis/src/Cluster/Distributor/HashRing.php A predis/predis/src/Cluster/Distributor/KetamaRing.php A predis/predis/src/Cluster/Hash/CRC16.php A predis/predis/src/Cluster/Hash/HashGeneratorInterface.php A predis/predis/src/Cluster/PredisStrategy.php A predis/predis/src/Cluster/RedisStrategy.php A predis/predis/src/Cluster/StrategyInterface.php A predis/predis/src/Collection/Iterator/CursorBasedIterator.php A predis/predis/src/Collection/Iterator/HashKey.php A predis/predis/src/Collection/Iterator/Keyspace.php A predis/predis/src/Collection/Iterator/ListKey.php A predis/predis/src/Collection/Iterator/SetKey.php A predis/predis/src/Collection/Iterator/SortedSetKey.php A predis/predis/src/Command/Command.php A predis/predis/src/Command/CommandInterface.php A predis/predis/src/Command/ConnectionAuth.php A predis/predis/src/Command/ConnectionEcho.php A predis/predis/src/Command/ConnectionPing.php A predis/predis/src/Command/ConnectionQuit.php A predis/predis/src/Command/ConnectionSelect.php A predis/predis/src/Command/HashDelete.php A predis/predis/src/Command/HashExists.php A predis/predis/src/Command/HashGet.php A predis/predis/src/Command/HashGetAll.php A predis/predis/src/Command/HashGetMultiple.php A predis/predis/src/Command/HashIncrementBy.php A predis/predis/src/Command/HashIncrementByFloat.php A predis/predis/src/Command/HashKeys.php A predis/predis/src/Command/HashLength.php A predis/predis/src/Command/HashScan.php A predis/predis/src/Command/HashSet.php A predis/predis/src/Command/HashSetMultiple.php A predis/predis/src/Command/HashSetPreserve.php A predis/predis/src/Command/HashValues.php A predis/predis/src/Command/HyperLogLogAdd.php A predis/predis/src/Command/HyperLogLogCount.php A predis/predis/src/Command/HyperLogLogMerge.php A predis/predis/src/Command/KeyDelete.php A predis/predis/src/Command/KeyDump.php A predis/predis/src/Command/KeyExists.php A predis/predis/src/Command/KeyExpire.php A predis/predis/src/Command/KeyExpireAt.php A predis/predis/src/Command/KeyKeys.php A predis/predis/src/Command/KeyMove.php A predis/predis/src/Command/KeyPersist.php A predis/predis/src/Command/KeyPreciseExpire.php A predis/predis/src/Command/KeyPreciseExpireAt.php A predis/predis/src/Command/KeyPreciseTimeToLive.php A predis/predis/src/Command/KeyRandom.php A predis/predis/src/Command/KeyRename.php A predis/predis/src/Command/KeyRenamePreserve.php A predis/predis/src/Command/KeyRestore.php A predis/predis/src/Command/KeyScan.php A predis/predis/src/Command/KeySort.php A predis/predis/src/Command/KeyTimeToLive.php A predis/predis/src/Command/KeyType.php A predis/predis/src/Command/ListIndex.php A predis/predis/src/Command/ListInsert.php A predis/predis/src/Command/ListLength.php A predis/predis/src/Command/ListPopFirst.php A predis/predis/src/Command/ListPopFirstBlocking.php A predis/predis/src/Command/ListPopLast.php A predis/predis/src/Command/ListPopLastBlocking.php A predis/predis/src/Command/ListPopLastPushHead.php A predis/predis/src/Command/ListPopLastPushHeadBlocking.php A predis/predis/src/Command/ListPushHead.php A predis/predis/src/Command/ListPushHeadX.php A
[MediaWiki-commits] [Gerrit] Resume running refreshLinks cron on enwiki - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Resume running refreshLinks cron on enwiki
..
Resume running refreshLinks cron on enwiki
Bug: T44180
Change-Id: Ia99611bca7d6dfa881a14e09539abab744c54cc1
---
M manifests/misc/maintenance.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index dfa999a..d086b28 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -36,8 +36,8 @@
}
}
-# add cron jobs - usage: cluster@day of month (these are just needed
monthly) (note: s1 is temp. deactivated)
-cronjob { ['s2@2', 's3@3', 's4@4', 's5@5', 's6@6', 's7@7']: }
+# add cron jobs - usage: cluster@day of month (these are just needed
monthly)
+cronjob { ['s1@1', 's2@2', 's3@3', 's4@4', 's5@5', 's6@6', 's7@7']: }
}
class misc::maintenance::pagetriage( $ensure = present ) {
--
To view, visit https://gerrit.wikimedia.org/r/225569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia99611bca7d6dfa881a14e09539abab744c54cc1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Ori.livneh 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] analytics refinery: remove jgage - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/228151 Change subject: analytics refinery: remove jgage .. analytics refinery: remove jgage Change-Id: I3fb47c7f58f3e26427a4be4ef7d6a18c6322d58a --- M manifests/role/analytics/refinery.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/228151/1 diff --git a/manifests/role/analytics/refinery.pp b/manifests/role/analytics/refinery.pp index 8b8fcd7..b449a39 100644 --- a/manifests/role/analytics/refinery.pp +++ b/manifests/role/analytics/refinery.pp @@ -177,7 +177,7 @@ # I am not sure why this is not working. $hdfs_mount_point = '/mnt/hdfs' -$mail_to = 'o...@wikimedia.org,jg...@wikimedia.org,j...@wikimedia.org' +$mail_to = 'o...@wikimedia.org,j...@wikimedia.org' # Since the 'stats' user is not in ldap, it is unnecessarily hard # to grant it access to the private data in hdfs. As discussed in -- To view, visit https://gerrit.wikimedia.org/r/228151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fb47c7f58f3e26427a4be4ef7d6a18c6322d58a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [parserTests] Print output on a new line - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: [parserTests] Print output on a new line
..
[parserTests] Print output on a new line
* This can get confusing with definition lists.
Change-Id: I290430d590c8f7091bdb2a6459143cc7214bc74e
---
M tests/parserTests.js
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.js b/tests/parserTests.js
index 47f3eba..11ab54a 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -1281,22 +1281,22 @@
ParserTests.prototype.getActualExpected = function(actual, expected, getDiff) {
var returnStr = '';
expected.formattedRaw = expected.isWT ? expected.raw :
DU.formatHTML(expected.raw);
- returnStr += 'RAW EXPECTED'.cyan + ':';
+ returnStr += 'RAW EXPECTED'.cyan + ':\n';
returnStr += expected.formattedRaw + '\n';
actual.formattedRaw = actual.isWT ? actual.raw :
DU.formatHTML(actual.raw);
- returnStr += 'RAW RENDERED'.cyan + ':';
+ returnStr += 'RAW RENDERED'.cyan + ':\n';
returnStr += actual.formattedRaw + '\n';
expected.formattedNormal = expected.isWT ? expected.normal :
DU.formatHTML(expected.normal);
- returnStr += 'NORMALIZED EXPECTED'.magenta + ':';
+ returnStr += 'NORMALIZED EXPECTED'.magenta + ':\n';
returnStr += expected.formattedNormal + '\n';
actual.formattedNormal = actual.isWT ? actual.normal :
DU.formatHTML(actual.normal);
- returnStr += 'NORMALIZED RENDERED'.magenta + ':';
+ returnStr += 'NORMALIZED RENDERED'.magenta + ':\n';
returnStr += actual.formattedNormal + '\n';
- returnStr += 'DIFF'.cyan + ': \n';
+ returnStr += 'DIFF'.cyan + ':\n';
returnStr += getDiff(actual, expected);
return returnStr;
--
To view, visit https://gerrit.wikimedia.org/r/228119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I290430d590c8f7091bdb2a6459143cc7214bc74e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@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] Revert add base::firewall on labsdb1005 - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228120
Change subject: Revert add base::firewall on labsdb1005
..
Revert add base::firewall on labsdb1005
This reverts commit 8231ca10471630c1a2aa039197d9537a49b44578.
Change-Id: Icc1037eed410491263cd160e8fa78e48901deaac
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/228120/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 17c32bd..f032ccb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1287,7 +1287,6 @@
# $postgres_master = 'labsdb1004.eqiad.wmnet'
# include role::postgres::slave
role labs::db::master
-include base::firewall
}
node 'labsdb1006.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/228120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc1037eed410491263cd160e8fa78e48901deaac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update domino to 1.0.19. - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged.
Change subject: Update domino to 1.0.19.
..
Update domino to 1.0.19.
This provides some fixes to the TreeWalker interface which are needed
for the new mwparserfromhell-like JsApi.
Change-Id: Ie1de26734b00712237adebf55e16c50d1ccea5ec
---
M node_modules/domino/.travis.yml
M node_modules/domino/CHANGELOG.md
M node_modules/domino/lib/Document.js
A node_modules/domino/lib/NodeIterator.js
A node_modules/domino/lib/NodeTraversal.js
M node_modules/domino/lib/TreeWalker.js
M node_modules/domino/package.json
M node_modules/domino/test/domino.js
M node_modules/domino/test/fixture/doc.html
9 files changed, 325 insertions(+), 81 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/node_modules/domino/.travis.yml b/node_modules/domino/.travis.yml
index f238dc5..df42fb2 100644
--- a/node_modules/domino/.travis.yml
+++ b/node_modules/domino/.travis.yml
@@ -4,3 +4,4 @@
- 0.10
- 0.11
script: npm run test-spec
+sudo: false
diff --git a/node_modules/domino/CHANGELOG.md b/node_modules/domino/CHANGELOG.md
index 74fc313..cc944b6 100644
--- a/node_modules/domino/CHANGELOG.md
+++ b/node_modules/domino/CHANGELOG.md
@@ -1,3 +1,9 @@
+# domino 1.0.19 (29 Jul 2015)
+* Bug fixes for `TreeWalker` / `document.createTreeWalker` (filter
+ argument was ignored; various traversal issues)
+* Implement `NodeIterator` / `document.createNodeIterator` (#54)
+* Update `mocha` dependency to 2.2.x and `should` to 7.0.x.
+
# domino 1.0.18 (25 Sep 2014)
* HTMLAnchorElement now implements URLUtils. (#47)
* Be consistent with our handling of null/empty namespaces. (#48)
diff --git a/node_modules/domino/lib/Document.js
b/node_modules/domino/lib/Document.js
index 3dd15cf..16d1246 100644
--- a/node_modules/domino/lib/Document.js
+++ b/node_modules/domino/lib/Document.js
@@ -11,6 +11,7 @@
var DOMImplementation = require('./DOMImplementation');
var FilteredElementList = require('./FilteredElementList');
var TreeWalker = require('./TreeWalker');
+var NodeIterator = require('./NodeIterator');
var NodeFilter = require('./NodeFilter');
var URL = require('./URL');
var select = require('./select')
@@ -184,9 +185,10 @@
createTreeWalker: {value: function (root, whatToShow, filter) {
whatToShow = whatToShow === undefined ? NodeFilter.SHOW_ALL : whatToShow;
-if (filter typeof filter.acceptNode == 'function') {
- filter = filter.acceptNode;
- // Support filter being a function
+if (filter typeof filter === 'object'
+ typeof filter.acceptNode == 'function') {
+ filter = filter.acceptNode.bind(filter);
+ // Support filter being a function
// https://developer.mozilla.org/en-US/docs/DOM/document.createTreeWalker
}
else if (typeof filter != 'function') {
@@ -195,6 +197,22 @@
return new TreeWalker(root, whatToShow, filter);
}},
+ // See: http://www.w3.org/TR/dom/#dom-document-createnodeiterator
+ createNodeIterator: {value: function (root, whatToShow, filter) {
+whatToShow = whatToShow === undefined ? NodeFilter.SHOW_ALL : whatToShow;
+
+if (filter typeof filter === 'object'
+ typeof filter.acceptNode == 'function') {
+ filter = filter.acceptNode.bind(filter);
+ // Support filter being a function
+ //
https://developer.mozilla.org/en-US/docs/DOM/document.createNodeIterator
+}
+else if (typeof filter != 'function') {
+ filter = null;
+}
+return new NodeIterator(root, whatToShow, filter);
+ }},
+
// Add some (surprisingly complex) document hierarchy validity
// checks when adding, removing and replacing nodes into a
// document object, and also maintain the documentElement and
diff --git a/node_modules/domino/lib/NodeIterator.js
b/node_modules/domino/lib/NodeIterator.js
new file mode 100644
index 000..11892ba
--- /dev/null
+++ b/node_modules/domino/lib/NodeIterator.js
@@ -0,0 +1,144 @@
+module.exports = NodeIterator;
+
+var NodeFilter = require('./NodeFilter');
+var NodeTraversal = require('./NodeTraversal');
+
+/* Private methods and helpers */
+
+/**
+ * @based on WebKit's NodeIterator::moveToNext and NodeIterator::moveToPrevious
+ *
https://trac.webkit.org/browser/trunk/Source/WebCore/dom/NodeIterator.cpp?rev=186279#L51
+ */
+function move(node, stayWithin, directionIsNext) {
+ if (directionIsNext) {
+return NodeTraversal.next(node, stayWithin);
+ } else {
+if (node === stayWithin) {
+ return null;
+}
+return NodeTraversal.previous(node, null);
+ }
+}
+
+/**
+ * @spec http://www.w3.org/TR/dom/#concept-nodeiterator-traverse
+ * @method
+ * @access private
+ * @param {NodeIterator} ni
+ * @param {string} direction One of 'next' or 'previous'.
+ * @return {Node|null}
+ */
+function traverse(ni, directionIsNext) {
+ var node, beforeNode;
+ node = ni.referenceNode;
+ beforeNode =
[MediaWiki-commits] [Gerrit] Update URL configuration for mobile when entering mobile mode - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228122
Change subject: Update URL configuration for mobile when entering mobile mode
..
Update URL configuration for mobile when entering mobile mode
* Use $wgCanonicalServer to construct $wgExtensionAssetsPath, $wgLoadScript,
$wgResourceBasePath, and $wgStyleSheetPath, because
MobileContext::getMobileUrl() does not work correctly with protocol-relative
URLs.
* When entering mobile mode, call MobileContext::getMobileUrl() to transform
each of the aforementioned configuration variables.
Bug: T106966
Change-Id: I0990ac5b6850315420511fce8b8be0bb97efda5d
---
M wmf-config/CommonSettings.php
M wmf-config/mobile.php
2 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/22/228122/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3e58cb9..9e22ca3 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -201,11 +201,10 @@
unset( $wgStylePath );
unset( $wgStyleSheetPath );
-$wmgAssetsHost = $_SERVER['SERVER_NAME'];
-$wgLoadScript = //{$wmgAssetsHost}/w/load.php;
-$wgExtensionAssetsPath =
//{$wmgAssetsHost}/static/{$wmfVersionNumber}/extensions;
-$wgStyleSheetPath = //{$wmgAssetsHost}/static/{$wmfVersionNumber}/skins;
-$wgResourceBasePath = //{$wmgAssetsHost}/static/{$wmfVersionNumber};
+$wgLoadScript = {$wgCanonicalServer}/w/load.php;
+$wgExtensionAssetsPath =
{$wgCanonicalServer}/static/{$wmfVersionNumber}/extensions;
+$wgStyleSheetPath = {$wgCanonicalServer}/static/{$wmfVersionNumber}/skins;
+$wgResourceBasePath = {$wgCanonicalServer}/static/{$wmfVersionNumber};
$wgStylePath = $wgStyleSheetPath;
$wgArticlePath = /wiki/$1;
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 2e24a10..66bc9e7 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -64,7 +64,14 @@
$wgMFNoMobilePages = $wmgMFNoMobilePages;
$wgHooks['EnterMobileMode'][] = function() {
- global $wgCentralAuthCookieDomain;
+ global $wgCentralAuthCookieDomain, $wgExtensionAssetsPath,
+ $wgLoadScript, $wgResourceBasePath, $wgStyleSheetPath;
+
+ $mobileContext = MobileContext::singleton();
+ $wgExtensionAssetsPath = $mobileContext-getMobileUrl(
$wgExtensionAssetsPath );
+ $wgLoadScript = $mobileContext-getMobileUrl( $wgLoadScript );
+ $wgResourceBasePath = $mobileContext-getMobileUrl(
$wgResourceBasePath );
+ $wgStyleSheetPath = $mobileContext-getMobileUrl(
$wgStyleSheetPath );
// Hack for T49647
if ( $wgCentralAuthCookieDomain == 'commons.wikimedia.org' ) {
--
To view, visit https://gerrit.wikimedia.org/r/228122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0990ac5b6850315420511fce8b8be0bb97efda5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labstore: Fix ensure to be properly boolean - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: labstore: Fix ensure to be properly boolean
..
labstore: Fix ensure to be properly boolean
Change-Id: I1ab40aa74a9178e70fa0e9f420b27e358eb20a0b
---
M modules/labstore/manifests/account_services.pp
M modules/labstore/manifests/fileserver/exports.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/labstore/manifests/account_services.pp
b/modules/labstore/manifests/account_services.pp
index 45c5774..67f4e13 100644
--- a/modules/labstore/manifests/account_services.pp
+++ b/modules/labstore/manifests/account_services.pp
@@ -50,8 +50,8 @@
}
base::service_unit { 'create-dbusers':
+ensure = $is_active,
systemd = true,
-ensure = ensure_service($is_active),
}
if $is_active {
diff --git a/modules/labstore/manifests/fileserver/exports.pp
b/modules/labstore/manifests/fileserver/exports.pp
index c84404e..ca7e4d2 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -59,7 +59,7 @@
}
base::service_unit { 'nfs-exports':
-ensure = ensure_service($is_active),
+ensure = $is_active,
systemd = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/228121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ab40aa74a9178e70fa0e9f420b27e358eb20a0b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@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 disabling cirrus request logging from query string - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow disabling cirrus request logging from query string
..
Allow disabling cirrus request logging from query string
We want to be able to try throwing various combinations of search parameters at
the production elasticsearch instances for indexes that are too big to test
elsewhere (such as enwiki).
This allows a web request to recuse itself from the CirrusSearchRequests log if
it knows the secret key. The key will need to be set from the cluster's private
data repository.
Change-Id: Iac79ad90e3ae32aa10a8eba5df63e5906ea41aa3
---
M CirrusSearch.php
M includes/ElasticsearchIntermediary.php
M includes/Hooks.php
M maintenance/runSearch.php
4 files changed, 48 insertions(+), 15 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index e8eea80..6abe6ae 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -663,6 +663,18 @@
*/
$wgCirrusSearchEnableSearchLogging = false;
+/**
+ * Whether elasticsearch queries should be logged on the server side.
+ */
+$wgCirrusSearchLogElasticRequests = true;
+
+/**
+ * When truthy and this value is passed as the cirrusLogElasticRequests query
+ * variable $wgCirrusSearchLogElasticRequests will be set to false for that
+ * request.
+ */
+$wgCirrusSearchLogElasticRequestsSecret = false;
+
// The maximum number of incategory:a|b|c items to OR together.
$wgCirrusSearchMaxIncategoryOptions = 100;
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index dce6040..515bc5e 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -166,19 +166,32 @@
* @return int number of milliseconds it took to complete the request
*/
private function finishRequest() {
+ global $wgCirrusSearchLogElasticRequests;
+
if ( !$this-requestStart ) {
wfLogWarning( 'finishRequest called without staring a
request' );
return;
}
- // No need to check description because it must be set by
$this-start.
-
- // Build the log message
$endTime = microtime( true );
$took = round( ( $endTime - $this-requestStart ) * 1000 );
+ if ( $wgCirrusSearchLogElasticRequests ) {
+ $logMessage = $this-buildLogMessage(
$this-requestStart, $endTime, $took );
+ LoggerFactory::getInstance( 'CirrusSearchRequests'
)-debug( $logMessage );
+ if ( $this-slowMillis $took = $this-slowMillis ) {
+ $logMessage .= $this-user ? ' for ' .
$this-user-getName() : '';
+ LoggerFactory::getInstance(
'CirrusSearchSlowRequests' )-info( $logMessage );
+ }
+ }
+ $this-requestStart = null;
+ return $took;
+ }
+
+ private function buildLogMessage( $startTime, $endTime, $took ) {
\RequestContext::getMain()-getStats()-timing(
'CirrusSearch.requestTime', $took );
+ // No need to check description because it must be set by
$this-start.
$logMessage = $this-description;
- $this-searchMetrics['wgCirrusStartTime'] = $this-requestStart;
+ $this-searchMetrics['wgCirrusStartTime'] = $startTime;
$this-searchMetrics['wgCirrusEndTime'] = $endTime;
$client = Connection::getClient();
@@ -213,7 +226,6 @@
$resultData[ 'suggest' ][ 'suggest' ][
0 ][ 'options' ][ 0 ][ 'text' ] . '\'';
}
}
- $request = $client-getLastRequest();
if ( php_sapi_name() === 'cli' ) {
$source = 'cli';
@@ -224,14 +236,7 @@
}
$logMessage .= . Requested via $source by executor .
self::getExecutionId();
- // Now log and clear our state.
- LoggerFactory::getInstance( 'CirrusSearchRequests' )-debug(
$logMessage );
- if ( $this-slowMillis $took = $this-slowMillis ) {
- $logMessage .= $this-user ? ' for ' .
$this-user-getName() : '';
- LoggerFactory::getInstance( 'CirrusSearchSlowRequests'
)-info( $logMessage );
- }
- $this-requestStart = null;
- return $took;
+ return $logMessage;
}
private function extractMessageAndStatus( $exception ) {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index c7bf082..4cf1efd 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -82,7 +82,9 @@
$wgCirrusSearchBoostLinks,
[MediaWiki-commits] [Gerrit] Debug logging for T102199 (take 2) - change (mediawiki/core)
Ori.livneh has submitted this change and it was merged.
Change subject: Debug logging for T102199 (take 2)
..
Debug logging for T102199 (take 2)
Change-Id: I5308c9e6f77b73ac2386cdf441bd6bd1881ee450
---
M includes/Message.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/includes/Message.php b/includes/Message.php
index 0f1db6c..0d90efc 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -253,7 +253,10 @@
// Debug logging for T102199. --OL, 29-Jul-2015
if ( $key === 'session_fail_preview_html' || $key ===
'session_fail_preview' ) {
- wfDebugLog( 'redis', wfHostname() . ' session fail' );
+ global $wgUser;
+ $user = $wgUser ? $wgUser-getName() : 'n/a';
+ $url = isset( $_SERVER['REQUEST_URI'] ) ?
$_SERVER['REQUEST_URI'] : 'n/a';
+ wfDebugLog( 'T102199', Session fail: key={$key};
user={$user}; url={$url} );
}
$this-keysToTry = (array)$key;
--
To view, visit https://gerrit.wikimedia.org/r/228142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5308c9e6f77b73ac2386cdf441bd6bd1881ee450
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh 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] Add composer/semver 0.1.0 - change (mediawiki/vendor)
jenkins-bot has submitted this change and it was merged.
Change subject: Add composer/semver 0.1.0
..
Add composer/semver 0.1.0
Will be used in MediaWiki core I778582721.
Bug: T99086
Change-Id: I50d636df321b6aa7a921c8ca1d111f5b0c459ca9
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_psr4.php
M composer/installed.json
A composer/semver/CHANGELOG.md
A composer/semver/LICENSE
A composer/semver/README.md
A composer/semver/composer.json
A composer/semver/src/Comparator.php
A composer/semver/src/Constraint/EmptyConstraint.php
A composer/semver/src/Constraint/LinkConstraintInterface.php
A composer/semver/src/Constraint/MultiConstraint.php
A composer/semver/src/Constraint/SpecificConstraint.php
A composer/semver/src/Constraint/VersionConstraint.php
A composer/semver/src/VersionParser.php
16 files changed, 1,335 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 0e55797..e3884d1 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
},
prefer-stable: true,
require: {
+ composer/semver: 0.1.0,
cssjanus/cssjanus: 1.1.1,
kzykhys/pygments: 1.0,
leafo/lessphp: 0.5.0,
diff --git a/composer.lock b/composer.lock
index 2f77679..792fa6a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,70 @@
Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
This file is @generated automatically
],
-hash: 09e6099a2d48fd0aa20ad2fb526eedcd,
+hash: 5fe0e654588289e1b4b522428039ace3,
packages: [
{
+name: composer/semver,
+version: 0.1.0,
+source: {
+type: git,
+url: https://github.com/composer/semver.git;,
+reference: f6469477aa1952f2fcbd0ab52fcc7662f1dd0173
+},
+dist: {
+type: zip,
+url:
https://api.github.com/repos/composer/semver/zipball/f6469477aa1952f2fcbd0ab52fcc7662f1dd0173;,
+reference: f6469477aa1952f2fcbd0ab52fcc7662f1dd0173,
+shasum:
+},
+require: {
+php: =5.3.2
+},
+require-dev: {
+phpunit/phpunit: ~4.5,
+phpunit/phpunit-mock-objects: ~2.3
+},
+type: library,
+extra: {
+branch-alias: {
+dev-master: 0.1-dev
+}
+},
+autoload: {
+psr-4: {
+Composer\\Semver\\: src
+}
+},
+notification-url: https://packagist.org/downloads/;,
+license: [
+MIT
+],
+authors: [
+{
+name: Rob Bast,
+email: rob.b...@gmail.com
+},
+{
+name: Nils Adermann,
+email: nader...@naderman.de,
+homepage: http://www.naderman.de;
+},
+{
+name: Jordi Boggiano,
+email: j.boggi...@seld.be,
+homepage: http://seld.be;
+}
+],
+description: Semver library that offers utilities, version
constraint parsing and validation.,
+keywords: [
+semantic,
+semver,
+validation,
+versioning
+],
+time: 2015-07-23 06:21:50
+},
+{
name: cssjanus/cssjanus,
version: v1.1.1,
source: {
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index a8d8445..86f69e8 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -16,6 +16,13 @@
'Cdb\\Writer' = $vendorDir . '/wikimedia/cdb/src/Writer.php',
'Cdb\\Writer\\DBA' = $vendorDir . '/wikimedia/cdb/src/Writer/DBA.php',
'Cdb\\Writer\\PHP' = $vendorDir . '/wikimedia/cdb/src/Writer/PHP.php',
+'Composer\\Semver\\Comparator' = $vendorDir .
'/composer/semver/src/Comparator.php',
+'Composer\\Semver\\Constraint\\EmptyConstraint' = $vendorDir .
'/composer/semver/src/Constraint/EmptyConstraint.php',
+'Composer\\Semver\\Constraint\\LinkConstraintInterface' = $vendorDir .
'/composer/semver/src/Constraint/LinkConstraintInterface.php',
+'Composer\\Semver\\Constraint\\MultiConstraint' = $vendorDir .
'/composer/semver/src/Constraint/MultiConstraint.php',
+'Composer\\Semver\\Constraint\\SpecificConstraint' = $vendorDir .
'/composer/semver/src/Constraint/SpecificConstraint.php',
+'Composer\\Semver\\Constraint\\VersionConstraint' = $vendorDir .
[MediaWiki-commits] [Gerrit] Add active state to search bar language select button - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Add active state to search bar language select button .. Add active state to search bar language select button Bug: T104855 Change-Id: I7c7cb13e70e4a7bb6ea66b2a00c63a639aa479a6 --- A wikipedia/res/drawable-v21/lang_button_foreground.xml A wikipedia/res/drawable/lang_button_foreground.xml M wikipedia/res/layout/activity_page.xml M wikipedia/res/values/colors.xml M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 5 files changed, 44 insertions(+), 16 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/drawable-v21/lang_button_foreground.xml b/wikipedia/res/drawable-v21/lang_button_foreground.xml new file mode 100644 index 000..79edda0 --- /dev/null +++ b/wikipedia/res/drawable-v21/lang_button_foreground.xml @@ -0,0 +1,11 @@ +?xml version=1.0 encoding=utf-8? + +ripple xmlns:android=http://schemas.android.com/apk/res/android; +android:color=@color/gray_highlight +item +selector +item android:state_pressed=true android:drawable=@color/blue_progressive_transparent / +item android:drawable=@android:color/transparent / +/selector +/item +/ripple \ No newline at end of file diff --git a/wikipedia/res/drawable/lang_button_foreground.xml b/wikipedia/res/drawable/lang_button_foreground.xml new file mode 100644 index 000..605bcee --- /dev/null +++ b/wikipedia/res/drawable/lang_button_foreground.xml @@ -0,0 +1,20 @@ +?xml version=1.0 encoding=utf-8? + +selector xmlns:android=http://schemas.android.com/apk/res/android; +item android:state_enabled=false +shape android:shape=rectangle +corners +android:radius=2dp / +solid +android:color=@android:color/transparent / +/shape +/item +item android:state_pressed=true +shape android:shape=rectangle +corners +android:radius=2dp / +solid +android:color=@color/blue_progressive_transparent / +/shape +/item +/selector \ No newline at end of file diff --git a/wikipedia/res/layout/activity_page.xml b/wikipedia/res/layout/activity_page.xml index 37370f4..617c25c 100644 --- a/wikipedia/res/layout/activity_page.xml +++ b/wikipedia/res/layout/activity_page.xml @@ -126,15 +126,18 @@ android:paddingBottom=2dp android:paddingLeft=9dp android:paddingRight=9dp +android:layout_marginRight=8dp +android:layout_marginEnd=8dp android:id=@+id/search_lang_button_container + android:foreground=@drawable/lang_button_foreground android:clickable=true -Button +TextView android:id=@+id/search_lang_button android:layout_width=30dp android:layout_height=30dp -android:layout_marginRight=7dp -android:layout_marginEnd=7dp android:gravity=center +android:clickable=false +android:focusable=false android:background=@drawable/lang_button_shape style=@style/AppTheme.ActionModeStyle android:textColor=@android:color/white / diff --git a/wikipedia/res/values/colors.xml b/wikipedia/res/values/colors.xml index a5847d7..c359936 100644 --- a/wikipedia/res/values/colors.xml +++ b/wikipedia/res/values/colors.xml @@ -9,6 +9,7 @@ color name=button_disabled#BEBEBE/color color name=preview_header_background#D0D0D0/color color name=blue_progressive#347BFF/color +color name=blue_progressive_transparent#88347BFF/color color name=blue_progressive_dark#1A3D7F/color color name=blue_liberal#3366bb/color color name=green_progressive#ff42a078/color diff --git a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java index e81cee1..20ca6a2 100644 --- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java @@ -27,7 +27,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import
[MediaWiki-commits] [Gerrit] Debug logging for T102199 (take 2) - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228142
Change subject: Debug logging for T102199 (take 2)
..
Debug logging for T102199 (take 2)
Change-Id: I5308c9e6f77b73ac2386cdf441bd6bd1881ee450
---
M includes/Message.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/228142/1
diff --git a/includes/Message.php b/includes/Message.php
index 0f1db6c..0d90efc 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -253,7 +253,10 @@
// Debug logging for T102199. --OL, 29-Jul-2015
if ( $key === 'session_fail_preview_html' || $key ===
'session_fail_preview' ) {
- wfDebugLog( 'redis', wfHostname() . ' session fail' );
+ global $wgUser;
+ $user = $wgUser ? $wgUser-getName() : 'n/a';
+ $url = isset( $_SERVER['REQUEST_URI'] ) ?
$_SERVER['REQUEST_URI'] : 'n/a';
+ wfDebugLog( 'T102199', Session fail: key={$key};
user={$user}; url={$url} );
}
$this-keysToTry = (array)$key;
--
To view, visit https://gerrit.wikimedia.org/r/228142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5308c9e6f77b73ac2386cdf441bd6bd1881ee450
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert add base::firewall on labsdb1005 - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Revert add base::firewall on labsdb1005
..
Revert add base::firewall on labsdb1005
This reverts commit 8231ca10471630c1a2aa039197d9537a49b44578.
Change-Id: Icc1037eed410491263cd160e8fa78e48901deaac
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 17c32bd..f032ccb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1287,7 +1287,6 @@
# $postgres_master = 'labsdb1004.eqiad.wmnet'
# include role::postgres::slave
role labs::db::master
-include base::firewall
}
node 'labsdb1006.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/228120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc1037eed410491263cd160e8fa78e48901deaac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@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] Remove unit tests from generated autoload - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unit tests from generated autoload
..
Remove unit tests from generated autoload
Change-Id: I020f6b6569fc423409b4f3212cddc7d42793d56c
---
M autoload.php
M scripts/gen-autoload.php
2 files changed, 1 insertion(+), 7 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index 87954b0..a663e72 100644
--- a/autoload.php
+++ b/autoload.php
@@ -18,7 +18,6 @@
'CirrusSearch\\CheckIndexes' = __DIR__ .
'/maintenance/checkIndexes.php',
'CirrusSearch\\CirrusIsSetup' = __DIR__ .
'/maintenance/cirrusNeedsToBeBuilt.php',
'CirrusSearch\\Connection' = __DIR__ . '/includes/Connection.php',
- 'CirrusSearch\\ConnectionTest' = __DIR__ .
'/tests/unit/ConnectionTest.php',
'CirrusSearch\\DataSender' = __DIR__ . '/includes/DataSender.php',
'CirrusSearch\\Dump' = __DIR__ . '/includes/Dump.php',
'CirrusSearch\\ElasticsearchIntermediary' = __DIR__ .
'/includes/ElasticsearchIntermediary.php',
@@ -26,7 +25,6 @@
'CirrusSearch\\Extra\\Filter\\SourceRegex' = __DIR__ .
'/includes/Extra/Filter/SourceRegex.php',
'CirrusSearch\\ForceSearchIndex' = __DIR__ .
'/maintenance/forceSearchIndex.php',
'CirrusSearch\\Hooks' = __DIR__ . '/includes/Hooks.php',
- 'CirrusSearch\\HooksTest' = __DIR__ . '/tests/unit/HooksTest.php',
'CirrusSearch\\InterwikiSearcher' = __DIR__ .
'/includes/InterwikiSearcher.php',
'CirrusSearch\\Job\\DeletePages' = __DIR__ .
'/includes/Job/DeletePages.php',
'CirrusSearch\\Job\\ElasticaWrite' = __DIR__ .
'/includes/Job/ElasticaWrite.php',
@@ -34,7 +32,6 @@
'CirrusSearch\\Job\\Job' = __DIR__ . '/includes/Job/Job.php',
'CirrusSearch\\Job\\LinksUpdate' = __DIR__ .
'/includes/Job/LinksUpdate.php',
'CirrusSearch\\Job\\MassIndex' = __DIR__ .
'/includes/Job/MassIndex.php',
- 'CirrusSearch\\Job\\MassIndexTest' = __DIR__ .
'/tests/unit/Job/MassIndexTest.php',
'CirrusSearch\\Job\\OtherIndex' = __DIR__ .
'/includes/Job/OtherIndex.php',
'CirrusSearch\\Maintenance\\AnalysisConfigBuilder' = __DIR__ .
'/includes/Maintenance/AnalysisConfigBuilder.php',
'CirrusSearch\\Maintenance\\ChunkBuilder' = __DIR__ .
'/includes/Maintenance/ChunkBuilder.php',
@@ -71,10 +68,8 @@
'CirrusSearch\\Sanity\\QueueingRemediator' = __DIR__ .
'/includes/Sanity/QueueingRemediator.php',
'CirrusSearch\\Sanity\\Remediator' = __DIR__ .
'/includes/Sanity/Remediator.php',
'CirrusSearch\\Search\\Escaper' = __DIR__ .
'/includes/Search/Escaper.php',
- 'CirrusSearch\\Search\\EscaperTest' = __DIR__ .
'/tests/unit/Search/EscaperTest.php',
'CirrusSearch\\Search\\FancyTitleResultsType' = __DIR__ .
'/includes/Search/ResultsType.php',
'CirrusSearch\\Search\\Filters' = __DIR__ .
'/includes/Search/Filters.php',
- 'CirrusSearch\\Search\\FiltersTest' = __DIR__ .
'/tests/unit/Search/FiltersTest.php',
'CirrusSearch\\Search\\FullTextResultsType' = __DIR__ .
'/includes/Search/ResultsType.php',
'CirrusSearch\\Search\\IdResultsType' = __DIR__ .
'/includes/Search/ResultsType.php',
'CirrusSearch\\Search\\InterwikiResultsType' = __DIR__ .
'/includes/Search/ResultsType.php',
@@ -85,6 +80,5 @@
'CirrusSearch\\Searcher' = __DIR__ . '/includes/Searcher.php',
'CirrusSearch\\Updater' = __DIR__ . '/includes/Updater.php',
'CirrusSearch\\Util' = __DIR__ . '/includes/Util.php',
- 'CirrusSearch\\UtilTest' = __DIR__ . '/tests/unit/UtilTest.php',
'CirrusSearch\\Version' = __DIR__ . '/includes/Version.php',
);
diff --git a/scripts/gen-autoload.php b/scripts/gen-autoload.php
index 23f802f..62d4fe6 100644
--- a/scripts/gen-autoload.php
+++ b/scripts/gen-autoload.php
@@ -5,7 +5,7 @@
function main() {
$base = dirname( __DIR__ );
$generator = new AutoloadGenerator( $base );
- foreach ( array( 'includes', 'maintenance', 'tests/unit' ) as $dir ) {
+ foreach ( array( 'includes', 'maintenance' ) as $dir ) {
$generator-readDir( $base . '/' . $dir );
}
foreach ( glob( $base . '/*.php' ) as $file ) {
--
To view, visit https://gerrit.wikimedia.org/r/228052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I020f6b6569fc423409b4f3212cddc7d42793d56c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: DCausse dcau...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Basic script to run cirrus queries in bulk - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Basic script to run cirrus queries in bulk
..
Basic script to run cirrus queries in bulk
script takes a stream of queries on stdin and issues them via the \CirrusSearch
object. Reports the query and number of results to stdout as a json object per
line. Can override global variables by passing a json object as a cli
parameter.
Change-Id: Id92168c03b6310fb4ad6bb77f28dd9ee90f184ea
---
M autoload.php
A includes/Maintenance/StreamingForkController.php
A maintenance/runSearch.php
3 files changed, 293 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
Objections:
Cindy-the-browser-test-bot: There's a problem with this change, please improve
diff --git a/autoload.php b/autoload.php
index 87954b0..99e6b28 100644
--- a/autoload.php
+++ b/autoload.php
@@ -47,6 +47,8 @@
'CirrusSearch\\Maintenance\\MappingConfigBuilder' = __DIR__ .
'/includes/Maintenance/MappingConfigBuilder.php',
'CirrusSearch\\Maintenance\\ReindexForkController' = __DIR__ .
'/includes/Maintenance/ReindexForkController.php',
'CirrusSearch\\Maintenance\\Reindexer' = __DIR__ .
'/includes/Maintenance/Reindexer.php',
+ 'CirrusSearch\\Maintenance\\RunSearch' = __DIR__ .
'/maintenance/runSearch.php',
+ 'CirrusSearch\\Maintenance\\StreamingForkController' = __DIR__ .
'/includes/Maintenance/StreamingForkController.php',
'CirrusSearch\\Maintenance\\UpdateOneSearchIndexConfig' = __DIR__ .
'/maintenance/updateOneSearchIndexConfig.php',
'CirrusSearch\\Maintenance\\UpdateSearchIndexConfig' = __DIR__ .
'/maintenance/updateSearchIndexConfig.php',
'CirrusSearch\\Maintenance\\UpdateVersionIndex' = __DIR__ .
'/maintenance/updateVersionIndex.php',
diff --git a/includes/Maintenance/StreamingForkController.php
b/includes/Maintenance/StreamingForkController.php
new file mode 100644
index 000..9a2ed73
--- /dev/null
+++ b/includes/Maintenance/StreamingForkController.php
@@ -0,0 +1,160 @@
+?php
+
+namespace CirrusSearch\Maintenance;
+
+/**
+ * Reads lines of work from an input stream and farms them out to multiple
+ * child streams. Each child has exactly one piece of work in flight at a given
+ * moment. Writes the result of child's work to an output stream. If numProcs
+ * = zero the work will be performed in process.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+class StreamingForkController extends \ForkController {
+ // @var callable
+ protected $workCallback;
+ // @var resource
+ protected $input;
+ // @var resource
+ protected $output;
+
+ /**
+* @var int $numProcs The number of worker processes to fork
+* @var callable $workCallback A callback to call in the child process
+* once for each line of work to process.
+* @var resource $input A socket to read work lines from
+* @var resource $output A socket to write the result of work to.
+*/
+ public function __construct( $numProcs, $workCallback, $input, $output
) {
+ parent::__construct( $numProcs );
+ $this-workCallback = $workCallback;
+ $this-input = $input;
+ $this-output = $output;
+ }
+
+ /**
+* {@inheritDoc}
+*/
+ public function start() {
+ if ( $this-procsToStart 0 ) {
+ $status = parent::start();
+ if ( $status === 'child' ) {
+ $this-consume();
+ }
+ } else {
+ $this-consume();
+ }
+ }
+
+ /**
+* {@inheritDoc}
+*/
+ protected function forkWorkers( $numProcs ) {
+ $this-prepareEnvironment();
+
+ // Create the child processes
+ for ( $i = 0; $i $numProcs; $i++ ) {
+ $sockets = stream_socket_pair( STREAM_PF_UNIX,
STREAM_SOCK_STREAM, STREAM_IPPROTO_IP );
+ // Do the fork
+ $pid = pcntl_fork();
+ if ( $pid === -1
[MediaWiki-commits] [Gerrit] JsApi: Add text and comment node support; bump domino depend... - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: JsApi: Add text and comment node support; bump domino
dependency.
..
JsApi: Add text and comment node support; bump domino dependency.
Bump domino dependency to 1.0.19 due to fixes needed for the DOM
TreeWalker interface.
Change-Id: I3667af918035c721d40813d32e9063bf61404f39
---
M .jsduck/categories.json
M lib/jsapi.js
M package.json
M tests/mocha/jsapi.js
4 files changed, 178 insertions(+), 6 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 56b89e7..7d8f247 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -6,6 +6,7 @@
name: Package Interface,
classes: [
Parsoid,
+ PComment,
PDoc,
PNodeList,
PNode,
@@ -13,6 +14,7 @@
PHeading,
PHtmlEntity,
PTemplate,
+ PText,
PWikiLink
]
},
diff --git a/lib/jsapi.js b/lib/jsapi.js
index ece9e90..e91d88d 100644
--- a/lib/jsapi.js
+++ b/lib/jsapi.js
@@ -6,13 +6,16 @@
require('../lib/core-upgrade.js');
// TO DO:
-// comment/tag/text/figure
+// tag/figure
// PTemplate#get should return PParameter and support mutation.
// PExtLink#url PWikiLink#title should handle mw:ExpandedAttrs
// make separate package?
var WikitextSerializer =
require('../lib/mediawiki.WikitextSerializer.js').WikitextSerializer;
var DU = require('../lib/mediawiki.DOMUtils.js').DOMUtils;
+var DOMImpl = require('domino').impl;
+var Node = DOMImpl.Node;
+var NodeFilter = DOMImpl.NodeFilter;
var util = require('util');
// WTS helper
@@ -38,7 +41,7 @@
var noop = function() { };
// Forward declarations of Wrapper classes.
-var PNode, PNodeList, PExtLink, PHeading, PHtmlEntity, PTemplate, PWikiLink;
+var PNode, PNodeList, PComment, PExtLink, PHeading, PHtmlEntity, PTemplate,
PText, PWikiLink;
// HTML escape helper
var toHtmlStr = function(node, v) {
@@ -106,7 +109,52 @@
if (this.parent) { this.parent.update(); }
}, },
_querySelectorAll: { value: function(selector) {
- return Array.from(this.container.querySelectorAll(selector));
+ var tweakedSelector = ',' + selector + ',';
+ if (!(/,(COMMENT|TEXT),/.test(tweakedSelector))) {
+ // Use fast native querySelectorAll
+ return
Array.from(this.container.querySelectorAll(selector));
+ }
+ // Implement comment/text node selector the hard way
+ /* jshint bitwise: false */
+ var whatToShow = NodeFilter.SHOW_ELEMENT; // always show
templates
+ if (/,COMMENT,/.test(tweakedSelector)) {
+ whatToShow = whatToShow | NodeFilter.SHOW_COMMENT;
+ }
+ if (/,TEXT,/.test(tweakedSelector)) {
+ whatToShow = whatToShow | NodeFilter.SHOW_TEXT;
+ }
+ var nodeFilter = function(node) {
+ if (node.nodeType !== Node.ELEMENT_NODE) {
+ return NodeFilter.FILTER_ACCEPT;
+ }
+ if
(/\bmw:Transclusion\b/.test(node.getAttribute('typeof') || '')) {
+ return NodeFilter.FILTER_ACCEPT;
+ }
+ return NodeFilter.FILTER_SKIP;
+ };
+ var result = [];
+ var includeTemplates =
+ /,\[typeof~=mw:Transclusion\],/.test(tweakedSelector);
+ var treeWalker = this.pdoc.document.createTreeWalker(
+ this.container, whatToShow, nodeFilter, false
+ );
+ while (treeWalker.nextNode()) {
+ var node = treeWalker.currentNode;
+ // We don't need the extra test for ELEMENT_NODEs yet,
since
+ // non-template element nodes will be skipped by the
nodeFilter
+ // above. But if we ever extend filter() to be fully
generic,
+ // we might need the commented-out portion of this test.
+ if (node.nodeType === Node.ELEMENT_NODE /*
+
/\bmw:Transclusion\b/.test(node.getAttribute('typeof') || '')*/
+ ) {
+ treeWalker.lastChild(); // always skip over all
[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I3b557cfc02f9a16e4a2350f4e85c82800bb266cf --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 2f2501e..53bd165 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 2f2501e4ae4c63f74f4729ec29220b135601ec1d +Subproject commit 53bd165e6618f2547befcb75d09d44bbca2283b8 -- To view, visit https://gerrit.wikimedia.org/r/228148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b557cfc02f9a16e4a2350f4e85c82800bb266cf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_25 Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: Awight awi...@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] [parserTests] Print output on a new line - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228119
Change subject: [parserTests] Print output on a new line
..
[parserTests] Print output on a new line
* This can get confusing with definition lists.
Change-Id: I290430d590c8f7091bdb2a6459143cc7214bc74e
---
M tests/parserTests.js
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/19/228119/1
diff --git a/tests/parserTests.js b/tests/parserTests.js
index 47f3eba..11ab54a 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -1281,22 +1281,22 @@
ParserTests.prototype.getActualExpected = function(actual, expected, getDiff) {
var returnStr = '';
expected.formattedRaw = expected.isWT ? expected.raw :
DU.formatHTML(expected.raw);
- returnStr += 'RAW EXPECTED'.cyan + ':';
+ returnStr += 'RAW EXPECTED'.cyan + ':\n';
returnStr += expected.formattedRaw + '\n';
actual.formattedRaw = actual.isWT ? actual.raw :
DU.formatHTML(actual.raw);
- returnStr += 'RAW RENDERED'.cyan + ':';
+ returnStr += 'RAW RENDERED'.cyan + ':\n';
returnStr += actual.formattedRaw + '\n';
expected.formattedNormal = expected.isWT ? expected.normal :
DU.formatHTML(expected.normal);
- returnStr += 'NORMALIZED EXPECTED'.magenta + ':';
+ returnStr += 'NORMALIZED EXPECTED'.magenta + ':\n';
returnStr += expected.formattedNormal + '\n';
actual.formattedNormal = actual.isWT ? actual.normal :
DU.formatHTML(actual.normal);
- returnStr += 'NORMALIZED RENDERED'.magenta + ':';
+ returnStr += 'NORMALIZED RENDERED'.magenta + ':\n';
returnStr += actual.formattedNormal + '\n';
- returnStr += 'DIFF'.cyan + ': \n';
+ returnStr += 'DIFF'.cyan + ':\n';
returnStr += getDiff(actual, expected);
return returnStr;
--
To view, visit https://gerrit.wikimedia.org/r/228119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I290430d590c8f7091bdb2a6459143cc7214bc74e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deprecating mariadb::labsdb - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Deprecating mariadb::labsdb
..
Deprecating mariadb::labsdb
It sould be substituted soon by labs::db::slave and
labs::db::master, but it is still in use.
Mark explicitly asked the labs team to have ownership of the
labs db (with our DBA's help of course)
Change-Id: I1734806c8f872af5bf15755c7332a29433a28baf
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index edeeb6e..f0d3449 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -467,6 +467,8 @@
}
# MariaDB 10 labsdb multiple-shards slave.
+# This role is deprecated but still in use
+# It should be migrated to labs::db::slave
class role::mariadb::labs {
system::role { 'role::mariadb::labs':
diff --git a/manifests/site.pp b/manifests/site.pp
index f032ccb..f7f35e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1262,14 +1262,17 @@
## labsdb dbs
node 'labsdb1001.eqiad.wmnet' {
+# this role is depecated and should be converted to labs::db::slave
include role::mariadb::labs
}
node 'labsdb1002.eqiad.wmnet' {
+# this role is depecated and should be converted to labs::db::slave
include role::mariadb::labs
}
node 'labsdb1003.eqiad.wmnet' {
+# this role is depecated and should be converted to labs::db::slave
include role::mariadb::labs
}
--
To view, visit https://gerrit.wikimedia.org/r/228134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1734806c8f872af5bf15755c7332a29433a28baf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo jcre...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] T105080: maintenance mode page - change (wikidata...rdf)
Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/228139 Change subject: T105080: maintenance mode page .. T105080: maintenance mode page Change-Id: I788ea30466fdde75f2e854c0ffe968d14c3ac7be --- A gui/maint.html 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/39/228139/1 diff --git a/gui/maint.html b/gui/maint.html new file mode 100644 index 000..82b450c --- /dev/null +++ b/gui/maint.html @@ -0,0 +1,9 @@ +html +head +titleError 503 Service Unavailable/title +/head +body +h1503 Service Unavailable/h1 +The service is temporary down for maintenance. Please check back a bit later. +/body +/html -- To view, visit https://gerrit.wikimedia.org/r/228139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I788ea30466fdde75f2e854c0ffe968d14c3ac7be Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev smalys...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow composer.json: include Predis - change (mediawiki...vendor)
Awight has submitted this change and it was merged. Change subject: Follow composer.json: include Predis .. Follow composer.json: include Predis Change-Id: I20679003cbaae9e179b0e193e1a4a04bbba38cc3 --- M composer/autoload_psr4.php M composer/installed.json A predis/predis/CHANGELOG.md A predis/predis/CONTRIBUTING.md A predis/predis/FAQ.md A predis/predis/LICENSE A predis/predis/README.md A predis/predis/VERSION A predis/predis/autoload.php A predis/predis/bin/create-command-test A predis/predis/bin/create-pear A predis/predis/bin/create-phar A predis/predis/bin/create-single-file A predis/predis/composer.json A predis/predis/examples/custom_cluster_distributor.php A predis/predis/examples/debuggable_connection.php A predis/predis/examples/dispatcher_loop.php A predis/predis/examples/executing_redis_commands.php A predis/predis/examples/key_prefixing.php A predis/predis/examples/lua_scripting_abstraction.php A predis/predis/examples/monitor_consumer.php A predis/predis/examples/pipelining_commands.php A predis/predis/examples/pubsub_consumer.php A predis/predis/examples/redis_collections_iterators.php A predis/predis/examples/replication_complex.php A predis/predis/examples/replication_simple.php A predis/predis/examples/session_handler.php A predis/predis/examples/shared.php A predis/predis/examples/transaction_using_cas.php A predis/predis/package.ini A predis/predis/src/Autoloader.php A predis/predis/src/Client.php A predis/predis/src/ClientContextInterface.php A predis/predis/src/ClientException.php A predis/predis/src/ClientInterface.php A predis/predis/src/Cluster/ClusterStrategy.php A predis/predis/src/Cluster/Distributor/DistributorInterface.php A predis/predis/src/Cluster/Distributor/EmptyRingException.php A predis/predis/src/Cluster/Distributor/HashRing.php A predis/predis/src/Cluster/Distributor/KetamaRing.php A predis/predis/src/Cluster/Hash/CRC16.php A predis/predis/src/Cluster/Hash/HashGeneratorInterface.php A predis/predis/src/Cluster/PredisStrategy.php A predis/predis/src/Cluster/RedisStrategy.php A predis/predis/src/Cluster/StrategyInterface.php A predis/predis/src/Collection/Iterator/CursorBasedIterator.php A predis/predis/src/Collection/Iterator/HashKey.php A predis/predis/src/Collection/Iterator/Keyspace.php A predis/predis/src/Collection/Iterator/ListKey.php A predis/predis/src/Collection/Iterator/SetKey.php A predis/predis/src/Collection/Iterator/SortedSetKey.php A predis/predis/src/Command/Command.php A predis/predis/src/Command/CommandInterface.php A predis/predis/src/Command/ConnectionAuth.php A predis/predis/src/Command/ConnectionEcho.php A predis/predis/src/Command/ConnectionPing.php A predis/predis/src/Command/ConnectionQuit.php A predis/predis/src/Command/ConnectionSelect.php A predis/predis/src/Command/HashDelete.php A predis/predis/src/Command/HashExists.php A predis/predis/src/Command/HashGet.php A predis/predis/src/Command/HashGetAll.php A predis/predis/src/Command/HashGetMultiple.php A predis/predis/src/Command/HashIncrementBy.php A predis/predis/src/Command/HashIncrementByFloat.php A predis/predis/src/Command/HashKeys.php A predis/predis/src/Command/HashLength.php A predis/predis/src/Command/HashScan.php A predis/predis/src/Command/HashSet.php A predis/predis/src/Command/HashSetMultiple.php A predis/predis/src/Command/HashSetPreserve.php A predis/predis/src/Command/HashValues.php A predis/predis/src/Command/HyperLogLogAdd.php A predis/predis/src/Command/HyperLogLogCount.php A predis/predis/src/Command/HyperLogLogMerge.php A predis/predis/src/Command/KeyDelete.php A predis/predis/src/Command/KeyDump.php A predis/predis/src/Command/KeyExists.php A predis/predis/src/Command/KeyExpire.php A predis/predis/src/Command/KeyExpireAt.php A predis/predis/src/Command/KeyKeys.php A predis/predis/src/Command/KeyMove.php A predis/predis/src/Command/KeyPersist.php A predis/predis/src/Command/KeyPreciseExpire.php A predis/predis/src/Command/KeyPreciseExpireAt.php A predis/predis/src/Command/KeyPreciseTimeToLive.php A predis/predis/src/Command/KeyRandom.php A predis/predis/src/Command/KeyRename.php A predis/predis/src/Command/KeyRenamePreserve.php A predis/predis/src/Command/KeyRestore.php A predis/predis/src/Command/KeyScan.php A predis/predis/src/Command/KeySort.php A predis/predis/src/Command/KeyTimeToLive.php A predis/predis/src/Command/KeyType.php A predis/predis/src/Command/ListIndex.php A predis/predis/src/Command/ListInsert.php A predis/predis/src/Command/ListLength.php A predis/predis/src/Command/ListPopFirst.php A predis/predis/src/Command/ListPopFirstBlocking.php A predis/predis/src/Command/ListPopLast.php A predis/predis/src/Command/ListPopLastBlocking.php A predis/predis/src/Command/ListPopLastPushHead.php A predis/predis/src/Command/ListPopLastPushHeadBlocking.php A predis/predis/src/Command/ListPushHead.php A predis/predis/src/Command/ListPushHeadX.php A predis/predis/src/Command/ListPushTail.php A
[MediaWiki-commits] [Gerrit] labstore: Fix ensure issues take 2 - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228150
Change subject: labstore: Fix ensure issues take 2
..
labstore: Fix ensure issues take 2
Puppet docs suggest you can use an if like this
Change-Id: I3b3945f9cccf02fd3ee47caeac7fc4ea6c4e006a
---
M modules/labstore/manifests/account_services.pp
M modules/labstore/manifests/fileserver/exports.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/228150/1
diff --git a/modules/labstore/manifests/account_services.pp
b/modules/labstore/manifests/account_services.pp
index 67f4e13..0e0b4d9 100644
--- a/modules/labstore/manifests/account_services.pp
+++ b/modules/labstore/manifests/account_services.pp
@@ -50,7 +50,7 @@
}
base::service_unit { 'create-dbusers':
-ensure = $is_active,
+ensure = if $is_active { present } else { absent },
systemd = true,
}
diff --git a/modules/labstore/manifests/fileserver/exports.pp
b/modules/labstore/manifests/fileserver/exports.pp
index ca7e4d2..78cc045 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -59,7 +59,7 @@
}
base::service_unit { 'nfs-exports':
-ensure = $is_active,
+ensure = if $is_active { present } else { absent },
systemd = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/228150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b3945f9cccf02fd3ee47caeac7fc4ea6c4e006a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to run l10nupdate on mira - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Don't try to run l10nupdate on mira
..
Don't try to run l10nupdate on mira
It won't work there yet and is causing errors, but we probably only
ever want it to run from one server at a given time anyway.
Bug: T106460
Change-Id: Ia3f0c968863b121144469ffc7b75e111c0eb102e
---
M hieradata/hosts/mira.yaml
M hieradata/hosts/tin.yaml
M modules/scap/manifests/l10nupdate.pp
3 files changed, 17 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/hieradata/hosts/mira.yaml b/hieradata/hosts/mira.yaml
index cceebe8..f6f1279 100644
--- a/hieradata/hosts/mira.yaml
+++ b/hieradata/hosts/mira.yaml
@@ -8,3 +8,4 @@
- parsoid-admin
- ocg-render-admins
cluster: misc
+scap::l10nupdate::run_l10nupdate: false
diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml
index ef9a7b9..71b61c0 100644
--- a/hieradata/hosts/tin.yaml
+++ b/hieradata/hosts/tin.yaml
@@ -9,3 +9,4 @@
- ocg-render-admins
- wdqs-admins
cluster: misc
+scap::l10nupdate::run_l10nupdate: true
diff --git a/modules/scap/manifests/l10nupdate.pp
b/modules/scap/manifests/l10nupdate.pp
index d164880..c443292 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -1,11 +1,25 @@
# = class: scap::l10nupdate
#
# Sets up files and cron required to do l10nupdate
+#
+# == Parameters:
+# [*deployment_group*]
+# User group that will be allowed to read log files. (default: wikidev)
+#
+# [*run_l10nupdate*]
+# Should l10nupdate be run automatically from cron? (default: false)
+#
class scap::l10nupdate(
$deployment_group = 'wikidev',
+$run_l10nupdate = false,
) {
+$ensure_l10nupdate_cron = $run_l10nupdate ? {
+true= 'present',
+default = 'absent',
+}
+
cron { 'l10nupdate':
-ensure = present,
+ensure = $ensure_l10nupdate_cron,
command = '/usr/local/bin/l10nupdate-1 --verbose
/var/log/l10nupdatelog/l10nupdate.log 21',
user= 'l10nupdate',
hour= '2',
--
To view, visit https://gerrit.wikimedia.org/r/228126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3f0c968863b121144469ffc7b75e111c0eb102e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Ori.livneh 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] Get rid of old /home/wikipedia references - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Get rid of old /home/wikipedia references
..
Get rid of old /home/wikipedia references
And delete the old mysql-reset-slave script, which has probably been broken
for years and sounds dangerous. Jaime says they have much better tools and
would not use this anyway.
MW_CRON_LOGS is still referenced by tin:/usr/local/bin/purge-checkuser,
but that is no longer used. See I448bf155
Remaining stuff:
files/snapshot/sudoers.snapshot - T107479
modules/dataset/files/rsync/rsyncd.conf.dumps_to_public - Ariel, where did
these files end up?
Change-Id: I45a879eb604e28fa27fd6dcccb65949e04a07849
---
M manifests/misc/logging.pp
M manifests/role/logging.pp
M modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
M modules/nagios_common/files/check_commands/check_all_memcached.php
M modules/scap/files/manpages/asciidoc/foreachwiki.txt
M modules/scap/files/manpages/asciidoc/set-group-write.txt
M modules/scap/files/manpages/man/foreachwiki.1
M modules/scap/files/manpages/man/set-group-write.1
D modules/scap/files/reset-mysql-slave
M modules/scap/manifests/scripts.pp
M modules/scap/templates/mw-deployment-vars.erb
11 files changed, 9 insertions(+), 50 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index f4ab30d..735a365 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -9,7 +9,7 @@
#
# $config - Type of configuration to apply (nfs, network). Default 'nfs'
# $basepath - Path where to write logs to, without trailing slash.
-# Default: '/home/wikipedia/syslog'
+# Default: '/srv/syslog'
#
class misc::syslog-server($config='nfs', $basepath='/srv/syslog') {
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 60a44ce..0fca2af 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -33,7 +33,7 @@
}
# mediawiki udp2log instance. Does not use monitoring.
-class role::logging::mediawiki($monitor = true, $log_directory =
'/home/wikipedia/logs' ) {
+class role::logging::mediawiki($monitor = true, $log_directory = '/srv/mw-log'
) {
system::role { 'role::logging:mediawiki':
description = 'MediaWiki log collector',
}
diff --git a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
index ea6ee81..ff0261a 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
+++ b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
@@ -37,6 +37,6 @@
# for your.org, contact: Kevin Day ke...@your.org
# they manage it but we have access; see file in /home/wikipedia/docs/mirrors
# added amazonaws.com, Oct 31 2012 -- atg
-# we are still in the process of setting it up, for access see file in
/home/w/docs/mirrors
+# we are still in the process of setting it up, for access see file in
/home/wikipedia/docs/mirrors
# it will eventually be managed by folks at amazon
hosts allow = 199.47.196.26 ftpmirror.your.org
ec2-174-129-186-231.compute-1.amazonaws.com 69.31.98.2
diff --git a/modules/nagios_common/files/check_commands/check_all_memcached.php
b/modules/nagios_common/files/check_commands/check_all_memcached.php
index 89d6148..5b31f29 100755
--- a/modules/nagios_common/files/check_commands/check_all_memcached.php
+++ b/modules/nagios_common/files/check_commands/check_all_memcached.php
@@ -19,7 +19,7 @@
# old method to get mc.php - relies on NFS, which is a -1
# but as of today (20120427) you could also still use it if there are any
issues with the new way
-# require_once( '/home/w/common/wmf-config/mc.php' );
+# require_once( '/srv/mediawiki-staging/wmf-config/mc.php' );
# should stay commented. was here for debug.
#$wgMemCachedServers[] = '10.0.2.101:11000';
diff --git a/modules/scap/files/manpages/asciidoc/foreachwiki.txt
b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
index 638ec5c..5343536 100644
--- a/modules/scap/files/manpages/asciidoc/foreachwiki.txt
+++ b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
@@ -16,7 +16,7 @@
MediaWiki maintenance script on all the wiki we are hosting. `SCRIPTNAME`
should
be the name of a script relative to the MediaWiki `maintenance` directory on
all the wiki. It acquires the list of wiki using the hardcoded dblist
-`/home/wikipedia/common/all.dblist`.
+`/srv/mediawiki-staging/all.dblist`.
Output is prefixed with the entry listed in `all.dblist`.
diff --git a/modules/scap/files/manpages/asciidoc/set-group-write.txt
b/modules/scap/files/manpages/asciidoc/set-group-write.txt
index 07b227e..e7d5ef3 100644
--- a/modules/scap/files/manpages/asciidoc/set-group-write.txt
+++ b/modules/scap/files/manpages/asciidoc/set-group-write.txt
@@ -20,8 +20,8 @@
`set-group-write2` is only acting on files owned by the wikidev group. It will
make sure they are group
[MediaWiki-commits] [Gerrit] Clean up Redis and slayer stuff - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up Redis and slayer stuff
..
Clean up Redis and slayer stuff
Doesn't affect anything. The main thing I'd like to deploy here is an explicit
dependency on Predis--we've been flying on fumes, apparently I must have left
the library installed in vendor/ at some point in the distant past.
Change-Id: I30be99ee57f2ec4352b30a807202b075d44ea263
---
M DonationInterface.php
M composer.json
M composer.lock
M globalcollect_gateway/scripts/orphans.php
4 files changed, 73 insertions(+), 24 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DonationInterface.php b/DonationInterface.php
index 126cf8a..5d54f14 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -468,26 +468,29 @@
$wgDonationInterfaceQueues = array(
// Incoming donations that we think have been paid for.
'completed' = array(),
+
// So-called limbo queue for GlobalCollect, where we store donor
personal
// information while waiting for the donor to return from iframe or a
// redirect. It's very important that this data is not stored anywhere
// permanent such as logs or the database, until we know this person
// finished making a donation.
// FIXME: Note that this must be an instance of KeyValueStore.
- 'globalcollect-cc-limbo' = array(
- 'type' = 'PHPQueue\Backend\Memcache',
- 'servers' = array( 'localhost' ),
- # 30 days, in seconds
- 'expiry' = 2592000,
- ),
- // The general limbo queue (see above). FIXME: deprecated?
- 'limbo' = array(
- 'type' = 'PHPQueue\Backend\Memcache',
- 'servers' = array( 'localhost' ),
- 'expiry' = 2592000,
- ),
- // Where limbo messages go to die, if the orphan slayer decides they are
- // still in one of the pending states. FIXME: who reads from this
queue?
+ //
+ // Example of a PCI-compliant queue configuration:
+ //
+ // 'globalcollect-cc-limbo' = array(
+ // 'type' = 'PHPQueue\Backend\Predis',
+ // # Note that servers cannot be an array, due to some incompatibility
+ // # with aggregate connections.
+ // 'servers' = 'tcp://payments1003.eqiad.net',
+ // # 1 hour, in seconds
+ // 'expiry' = 3600,
+ // 'score_key' = 'date',
+ // ),
+ // 'limbo' = ...
+
+ // Transactions still needing action before they are settled.
+ // FIXME: who reads from this queue?
'pending' = array(),
// Non-critical queues
diff --git a/composer.json b/composer.json
index 65f6a1d..629394c 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,9 @@
require: {
coderkungfu/php-queue: dev-master,
fusesource/stomp-php: 2.1.*,
- psr/log: 1.0.0,
monolog/monolog: 1.12.0,
+ predis/predis: 1.*,
+ psr/log: 1.0.0,
zordius/lightncandy: 0.18
},
repositories: [
diff --git a/composer.lock b/composer.lock
index 41a9c26..96c5f25 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
{
_readme: [
This file locks the dependencies of your project to a known state,
-Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
+Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
This file is @generated automatically
],
-hash: 2f350a68b09bdf7dee7b4c1a7b2d37bf,
+hash: 548d536bcd2bbb4110e29b3d72294f1c,
packages: [
{
name: clio/clio,
@@ -231,6 +231,56 @@
time: 2014-12-29 21:29:35
},
{
+name: predis/predis,
+version: v1.0.1,
+source: {
+type: git,
+url: https://github.com/nrk/predis.git;,
+reference: 7a170b3d8123c556597b4fbdb88631f99de180c2
+},
+dist: {
+type: zip,
+url:
https://api.github.com/repos/nrk/predis/zipball/7a170b3d8123c556597b4fbdb88631f99de180c2;,
+reference: 7a170b3d8123c556597b4fbdb88631f99de180c2,
+shasum:
+},
+require: {
+php: =5.3.2
+},
+require-dev: {
+phpunit/phpunit: ~4.0
+},
+suggest: {
+ext-curl: Allows access to Webdis when paired with
phpiredis,
+ext-phpiredis: Allows faster serialization and
deserialization of the Redis protocol
+},
+type: library,
+autoload: {
+psr-4: {
+Predis\\: src/
+
