[MediaWiki-commits] [Gerrit] Connect to db2 and import the math table there - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104916
Change subject: Connect to db2 and import the math table there
..
Connect to db2 and import the math table there
Change-Id: I064622eb875db2259405cf1868a3256e3637aa72
---
M maintenance/ExportMathTable.php
M maintenance/IndexBase.php
M maintenance/UpdateMath.php
A maintenance/db2test.php
4 files changed, 71 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/16/104916/1
diff --git a/maintenance/ExportMathTable.php b/maintenance/ExportMathTable.php
index ca01daf..7338740 100644
--- a/maintenance/ExportMathTable.php
+++ b/maintenance/ExportMathTable.php
@@ -28,12 +28,16 @@
*
*/
class ExportMathTable extends IndexBase {
+ private $db2Pass;
+ private $statment;
/**
*
*/
public function __construct() {
parent::__construct();
$this-mDescription = 'Exports a db2 compatible math index
table.';
+ $this-addArg( 'passw', If set, the data is directly imported
to db2, false );
+ $this-addArg( 'truncate', If true, db2 math table is deleted
before import, false );
}
/**
@@ -44,9 +48,12 @@
$mo = MathObject::constructformpagerow($row);
$out = ''. $mo-getMd5().'';
$out .= ','. $mo-getTex().'';
- $out .= ','. $row-mathindex_page_id .'';
- $out .= ','. $row-mathindex_anchor.'';
- $out .= ','.str_replace(array('',\n),array('',' '),
$mo-getMathml()).'';
+ $out .= ','. $row-mathindex_page_id .'';
+ $out .= ','. $row-mathindex_anchor.'';
+ $out .= ','.str_replace(array('',\n),array('',' '),
$mo-getMathml()).'';
+ if( $this-db2Pass ) {
+
$this-statment-execute(array($mo-getMd5(),$mo-getTex(),$row-mathindex_page_id,$row-mathindex_anchor,$mo-getMathml()));
+}
return $out.\n;
}
@@ -55,6 +62,22 @@
*
*/
public function execute() {
+ $this-db2Pass = $this-getOption( 'passw',false );
+ if ( $this-db2Pass ){
+ try {
+ $connection = new PDO(ibm:MATH, db2inst1,
$this-db2Pass, array(
+ PDO::ATTR_PERSISTENT = TRUE,
+ PDO::ATTR_ERRMODE =
PDO::ERRMODE_EXCEPTION)
+ );
+ } catch (Exception $e) {
+ echo($e-getMessage());
+ }
+ if ( $this-getOption('truncate' , false ) ){
+$connection-query('TRUNCATE TABLE
wiki.math IMMEDIATE');
+ }
+ $this-statment = $connection-prepare('insert into
wiki.math (math_md5, math_tex, mathindex_pageid, mathindex_anchord,
math_mathml) values(?, ?, ?, ?, ?)');
+
+ }
parent::execute();
}
}
diff --git a/maintenance/IndexBase.php b/maintenance/IndexBase.php
index 4958703..5edfe95 100644
--- a/maintenance/IndexBase.php
+++ b/maintenance/IndexBase.php
@@ -38,6 +38,7 @@
$this-mDescription = 'Exports data';
$this-addArg( 'dir', 'The directory where the harvest files go
to.' );
$this-addArg( 'ffmax', The maximal number of formula per
file., false );
+ $this-addOption( 'limit', 'The maximal number of database
entries to be considered', false );
}
/**
@@ -86,8 +87,11 @@
array( 'mathindex', 'mathoid' ),
array( 'mathindex_page_id', 'mathindex_anchor',
'math_mathml', 'math_inputhash', 'mathindex_inputhash' ),// $vars
(columns of the table)
'math_inputhash = mathindex_inputhash'
- , __METHOD__,
- array( 'ORDER BY' = 'mathindex_page_id' ) );
+ , __METHOD__
+ ,array(
+ 'LIMIT'= $this-getOption(
'limit',1 ) ,
+ 'ORDER BY' = 'mathindex_page_id' )
+ );
echo write . $this-res-numRows() . results to index\n;
do {
$fn = $this-getArg( 0 ) . '/math' . sprintf( '%012d',
$i ) . '.xml';
diff --git a/maintenance/UpdateMath.php b/maintenance/UpdateMath.php
index c3b2c7c..bfb2c61 100644
--- a/maintenance/UpdateMath.php
+++ b/maintenance/UpdateMath.php
@@ -22,7 +22,7 @@
require_once( dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
class UpdateMath extends Maintenance {
- const RTI_CHUNK_SIZE = 500;
+
[MediaWiki-commits] [Gerrit] Add job for labs/toollabs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add job for labs/toollabs
..
Add job for labs/toollabs
Change-Id: I784a96b6da6620e39e97831c275781cfb19a892c
---
M labs.yaml
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/labs.yaml b/labs.yaml
index 1549fb2..553a00c 100644
--- a/labs.yaml
+++ b/labs.yaml
@@ -11,6 +11,11 @@
- python-jobs
- project:
+name: 'labs-toollabs'
+jobs:
+ - '{name}-debian-glue'
+
+- project:
name: 'labs-tools-grrrit'
jobs:
- '{name}-jslint'
--
To view, visit https://gerrit.wikimedia.org/r/104748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I784a96b6da6620e39e97831c275781cfb19a892c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: AzaToth azat...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Petrb benap...@gmail.com
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de
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] Add job for labs/toollabs - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add job for labs/toollabs .. Add job for labs/toollabs Change-Id: I9da6ea332b0854a5cc0f9c516129d060637dad86 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 2d44461..441fe05 100644 --- a/layout.yaml +++ b/layout.yaml @@ -820,6 +820,10 @@ - name: 'python-lint' prefix: 'labs-nagios-builder' + - name: labs/toollabs +test: + - labs-toollabs-debian-glue + - name: labs/tools/grrrit check-voter: - labs-tools-grrrit-jslint -- To view, visit https://gerrit.wikimedia.org/r/104747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9da6ea332b0854a5cc0f9c516129d060637dad86 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de Gerrit-Reviewer: AzaToth azat...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Petrb benap...@gmail.com Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de 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] Jenkins job validation (DO NOT SUBMIT) - change (labs/toollabs)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104917 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Idd2b006c6ad7299b4eddf42135ae688556dd2a0a --- A jenkins-testfile.py A jenkins.js A jenkins.php A jenkins.rb 4 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/17/104917/1 diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/104917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd2b006c6ad7299b4eddf42135ae688556dd2a0a Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Complete initial FirstSteps import - change (mediawiki...FirstSteps)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/104918 Change subject: Complete initial FirstSteps import .. Complete initial FirstSteps import Just the complement of I52d5959c3a08ad28193936b10401512c713bec27 with some name changes two minor changes to a template and the LQT page. Change-Id: I7aed7dd5c2f8985ab6a7d45a18f6fce1d91ed8a9 --- D CHANGELOG D Doxyfile A FirstSteps.alias.php A FirstSteps.php D MediaWikiMessageChecker.php D Message.php D MessageChecks.php D MessageCollection.php D MessageGroups.php D PageTranslation.i18n.php D README D Resources.php R SpecialFirstSteps.php D Translate.alias.php D Translate.i18n.php D Translate.php D TranslateEditAddons.php D TranslateGroupDescriptions.i18n.php D TranslateHooks.php D TranslateSandbox.i18n.php D TranslateSearch.i18n.php D TranslateTasks.php D TranslateUtils.php M _autoload.php D api/ApiAggregateGroups.php D api/ApiGroupReview.php D api/ApiHardMessages.php D api/ApiQueryLanguageStats.php D api/ApiQueryMessageCollection.php D api/ApiQueryMessageGroupStats.php D api/ApiQueryMessageGroups.php D api/ApiQueryMessageTranslations.php D api/ApiQueryTranslationAids.php D api/ApiStatsQuery.php D api/ApiTTMServer.php D api/ApiTranslateSandbox.php D api/ApiTranslateUser.php D api/ApiTranslationReview.php D api/ApiTranslationStash.php D composer.json D data/plural-gettext.txt D data/xliff-core-1.2-transitional.xsd D data/xliff-template.xml D ffs/AndroidXmlFFS.php D ffs/DtdFFS.php D ffs/FFS.php D ffs/FlatPhpFFS.php D ffs/GettextFFS.php D ffs/IniFFS.php D ffs/IntuitionTextdomains.php D ffs/JavaFFS.php D ffs/JavaScriptFFS.php D ffs/JsonFFS.php D ffs/MediaWikiComplexMessages.php D ffs/MediaWikiExtensionFFS.php D ffs/MediaWikiExtensions.php D ffs/PythonSingleFFS.php D ffs/RubyYamlFFS.php D ffs/Simple.php D ffs/Wiki.php D ffs/XliffFFS.php D ffs/YamlFFS.php D hooks.txt R i18n/ar.json R i18n/as.json R i18n/ast.json R i18n/az.json R i18n/azb.json R i18n/ba.json R i18n/bar.json R i18n/be-tarask.json R i18n/bg.json R i18n/bn.json R i18n/bo.json R i18n/br.json R i18n/bs.json R i18n/ca.json R i18n/ce.json R i18n/ckb.json D i18n/core/ace.json D i18n/core/af.json D i18n/core/aln.json D i18n/core/am.json D i18n/core/an.json D i18n/core/ar.json D i18n/core/arc.json D i18n/core/arn.json D i18n/core/ary.json D i18n/core/arz.json D i18n/core/as.json D i18n/core/ast.json D i18n/core/az.json D i18n/core/azb.json D i18n/core/ba.json D i18n/core/bar.json D i18n/core/bcc.json D i18n/core/bcl.json D i18n/core/be-tarask.json D i18n/core/be.json D i18n/core/bg.json D i18n/core/bho.json D i18n/core/bn.json D i18n/core/bo.json D i18n/core/bpy.json D i18n/core/br.json D i18n/core/bs.json D i18n/core/bug.json D i18n/core/bxr.json D i18n/core/ca.json D i18n/core/ce.json D i18n/core/ch.json D i18n/core/ckb.json D i18n/core/cs.json D i18n/core/csb.json D i18n/core/cu.json D i18n/core/cy.json D i18n/core/da.json D i18n/core/de-ch.json D i18n/core/de-formal.json D i18n/core/de.json D i18n/core/diq.json D i18n/core/dsb.json D i18n/core/dtp.json D i18n/core/ee.json D i18n/core/el.json D i18n/core/en-gb.json D i18n/core/en.json D i18n/core/eo.json D i18n/core/es.json D i18n/core/et.json D i18n/core/eu.json D i18n/core/ext.json D i18n/core/fa.json D i18n/core/fi.json D i18n/core/fo.json D i18n/core/fr.json D i18n/core/frc.json D i18n/core/frp.json D i18n/core/frr.json D i18n/core/fur.json D i18n/core/fy.json D i18n/core/ga.json D i18n/core/gl.json D i18n/core/gom-latn.json D i18n/core/grc.json D i18n/core/gsw.json D i18n/core/gu.json D i18n/core/gv.json D i18n/core/ha.json D i18n/core/hak.json D i18n/core/haw.json D i18n/core/he.json D i18n/core/hi.json D i18n/core/hil.json D i18n/core/hr.json D i18n/core/hsb.json D i18n/core/ht.json D i18n/core/hu.json D i18n/core/hy.json D i18n/core/ia.json D i18n/core/id.json D i18n/core/ig.json D i18n/core/ilo.json D i18n/core/io.json D i18n/core/is.json D i18n/core/it.json D i18n/core/ja.json D i18n/core/jam.json D i18n/core/jbo.json D i18n/core/jv.json D i18n/core/ka.json D i18n/core/kaa.json D i18n/core/kab.json D i18n/core/kbd-cyrl.json D i18n/core/khw.json D i18n/core/kiu.json D i18n/core/kk-arab.json D i18n/core/kk-cyrl.json D i18n/core/kk-kz.json D i18n/core/kk-latn.json D i18n/core/kl.json D i18n/core/km.json D i18n/core/kn.json D i18n/core/ko.json D i18n/core/krc.json D i18n/core/kri.json D i18n/core/krl.json D i18n/core/ksh.json D i18n/core/ku-latn.json D i18n/core/ky.json D i18n/core/la.json D i18n/core/lb.json D i18n/core/lg.json D i18n/core/li.json D i18n/core/lmo.json D i18n/core/ln.json D i18n/core/lo.json D i18n/core/lrc.json D i18n/core/lt.json D i18n/core/ltg.json D i18n/core/lus.json D i18n/core/lv.json D i18n/core/lzh.json D i18n/core/lzz.json D i18n/core/map-bms.json D i18n/core/mg.json D i18n/core/mhr.json D i18n/core/min.json D i18n/core/mk.json D i18n/core/ml.json D i18n/core/mn.json D i18n/core/mo.json D i18n/core/mr.json D
[MediaWiki-commits] [Gerrit] stages.pp puppet lint fixes - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104919
Change subject: stages.pp puppet lint fixes
..
stages.pp puppet lint fixes
Change-Id: Ibf95564069628395a993b40a95a01b93dff81b8a
---
M manifests/stages.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/104919/1
diff --git a/manifests/stages.pp b/manifests/stages.pp
index 7d3cfd8..758472d 100644
--- a/manifests/stages.pp
+++ b/manifests/stages.pp
@@ -1,6 +1,6 @@
-stage { first: before = Stage[main] }
-stage { last: require = Stage[main] }
+stage { 'first': before = Stage[main] }
+stage { 'last': require = Stage[main] }
class {
- apt::update: stage = first;
+'apt::update': stage = first;
}
--
To view, visit https://gerrit.wikimedia.org/r/104919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf95564069628395a993b40a95a01b93dff81b8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal error comparing revisions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix fatal error comparing revisions
..
Fix fatal error comparing revisions
Change-Id: I295e387a54cf4d7067245d97c107e8d65deaca2c
---
M templates/compare-revisions.html.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/compare-revisions.html.php
b/templates/compare-revisions.html.php
index ec1258b..47fcf3b 100644
--- a/templates/compare-revisions.html.php
+++ b/templates/compare-revisions.html.php
@@ -20,7 +20,7 @@
$differenceEngine-showDiffStyle();
-$getRevisionHeader = function( $revision ) use ( $templating, $block ) {
+$getRevisionHeader = function( $revision ) use ( $templating, $block, $user ) {
$timestamp = $templating-render(
'flow:timestamp.html.php',
array(
--
To view, visit https://gerrit.wikimedia.org/r/104911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I295e387a54cf4d7067245d97c107e8d65deaca2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] applicationserver: pass puppetlint / retab - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104920
Change subject: applicationserver: pass puppetlint / retab
..
applicationserver: pass puppetlint / retab
Change-Id: I71ff89ec9943050dc9234ba1dd55102394441b9b
---
M modules/applicationserver/manifests/apache_packages.pp
M modules/applicationserver/manifests/config/apache.pp
M modules/applicationserver/manifests/config/base.pp
M modules/applicationserver/manifests/config/php.pp
M modules/applicationserver/manifests/cron.pp
M modules/applicationserver/manifests/init.pp
M modules/applicationserver/manifests/packages.pp
M modules/applicationserver/manifests/pybal_check.pp
M modules/applicationserver/manifests/service.pp
M modules/applicationserver/manifests/sudo.pp
M modules/applicationserver/manifests/syslog.pp
11 files changed, 227 insertions(+), 206 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/104920/1
diff --git a/modules/applicationserver/manifests/apache_packages.pp
b/modules/applicationserver/manifests/apache_packages.pp
index 69c4be8..406e451 100644
--- a/modules/applicationserver/manifests/apache_packages.pp
+++ b/modules/applicationserver/manifests/apache_packages.pp
@@ -1,7 +1,7 @@
class applicationserver::apache_packages {
- include applicationserver::packages
+include applicationserver::packages
- package { 'libapache2-mod-php5':
- ensure = present,
- }
+package { 'libapache2-mod-php5':
+ensure = present,
+}
}
diff --git a/modules/applicationserver/manifests/config/apache.pp
b/modules/applicationserver/manifests/config/apache.pp
index 379a969..ad2e888 100644
--- a/modules/applicationserver/manifests/config/apache.pp
+++ b/modules/applicationserver/manifests/config/apache.pp
@@ -3,51 +3,51 @@
#
# requires applicationserver::packages to be in place
class applicationserver::config::apache(
- $maxclients=40
- ) {
+$maxclients='40'
+) {
- Class[applicationserver::apache_packages] -
Class[applicationserver::config::apache]
+Class['applicationserver::apache_packages'] -
Class['applicationserver::config::apache']
- file {
- /etc/apache2/apache2.conf:
- owner = root,
- group = root,
- mode = 0444,
- content =
template(applicationserver/apache/apache2.conf.erb);
- /etc/apache2/envvars:
- owner = root,
- group = root,
- mode = 0444,
- source =
puppet:///modules/applicationserver/apache/envvars.appserver;
- /etc/cluster:
- mode = 0444,
- owner = root,
- group = root,
- content = $::site;
- }
+file { '/etc/apache2/apache2.conf':
+owner = root,
+group = root,
+mode= '0444',
+content = template('applicationserver/apache/apache2.conf.erb');
+}
+file { '/etc/apache2/envvars':
+owner = root,
+group = root,
+mode = '0444',
+source =
'puppet:///modules/applicationserver/apache/envvars.appserver';
+}
+file { '/etc/cluster':
+owner = root,
+group = root,
+mode= '0444',
+content = $::site;
+}
- if $::realm == 'production' {
- file {
- '/usr/local/apache':
- ensure = directory,
- }
- exec { sync apache wmf config:
- require = File[/usr/local/apache],
- path = /bin:/sbin:/usr/bin:/usr/sbin,
- command = rsync -av 10.0.5.8::httpdconf/
/usr/local/apache/conf,
- creates = /usr/local/apache/conf,
- notify = Service[apache]
- }
- } else { # labs
- # bug 38996 - Apache service does not run on start, need a fake
- # sync to start it up though don't bother restarting it is
already
- # running.
- exec { 'Fake sync apache wmf config on beta':
- command = '/bin/true',
- unless = /bin/ps -C apache2 /dev/null,
- notify = Service[apache],
- }
- }
+if $::realm == 'production' {
+file { '/usr/local/apache':
+ensure = directory,
+}
+exec { 'sync apache wmf config':
+require = File['/usr/local/apache'],
+path= '/bin:/sbin:/usr/bin:/usr/sbin',
+command = 'rsync -av 10.0.5.8::httpdconf/ /usr/local/apache/conf',
+creates = '/usr/local/apache/conf',
+notify = Service[apache]
+}
+} else { # labs
+#
[MediaWiki-commits] [Gerrit] ganglia_new: fix puppet-lint issues - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104921
Change subject: ganglia_new: fix puppet-lint issues
..
ganglia_new: fix puppet-lint issues
Change-Id: I4c1cc6686f502bfe286e138a3ebc1db5c3e2d96a
---
M modules/ganglia_new/manifests/configuration.pp
M modules/ganglia_new/manifests/monitor.pp
M modules/ganglia_new/manifests/monitor/aggregator.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
M modules/ganglia_new/manifests/monitor/config.pp
M modules/ganglia_new/manifests/monitor/packages.pp
M modules/ganglia_new/manifests/monitor/service.pp
7 files changed, 266 insertions(+), 265 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/104921/1
diff --git a/modules/ganglia_new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
index 42f03c7..17ba0a6 100644
--- a/modules/ganglia_new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -1,143 +1,143 @@
# modules/ganglia/manifests/configuration.pp
class ganglia_new::configuration {
- # NOTE: Do *not* add new clusters *per site* anymore,
- # the site name will automatically be appended now,
- # and a different IP prefix will be used.
- $clusters = {
- decommissioned = {
- name = Decommissioned servers,
- id= 1,
- sites = [pmtpa, eqiad, esams] },
- lvs = {
- name = LVS loadbalancers,
- id= 2,
- sites = [pmtpa, eqiad, esams] },
- search= {
- name = Search,
- id= 4 },
- mysql = {
- name = MySQL,
- id= 5 },
- misc = {
- name = Miscellaneous,
- id= 8,
- sites = [pmtpa, eqiad, esams] },
- appserver = {
- name = Application servers,
- id= 11 },
- imagescaler = {
- name = Image scalers,
- id= 12 },
- api_appserver = {
- name = API application servers,
- id= 13 },
- pdf = {
- name = PDF servers,
- id= 15 },
- cache_text= {
- name = Text caches,
- id= 20,
- sites = [eqiad, esams] },
- cache_bits= {
- name = Bits caches,
- id= 21,
- sites = [eqiad, esams] },
- cache_upload = {
- name = Upload caches,
- id= 22,
- sites = [eqiad, esams] },
- payments = {
- name = Fundraiser payments,
- id= 23 },
- bits_appserver= {
- name = Bits application servers,
- id= 24 },
- ssl = {
- name = SSL cluster,
- id= 26,
- sites = [eqiad, esams] },
- swift = {
- name = Swift,
- id= 27 },
- cache_mobile = {
- name = Mobile caches,
- id= 28,
- sites = [eqiad, esams] },
- virt = {
- name = Virtualization cluster,
- id= 29 },
- gluster = {
- name = Glusterfs cluster,
- id= 30 },
- jobrunner = {
- name = Jobrunners,
- id= 31 },
- analytics = {
- name = Analytics cluster,
- id= 32 },
- memcached = {
- name = Memcached,
- id= 33 },
- videoscaler = {
- name = Video scalers,
- id= 34 },
- fundraising = {
- name = Fundraising,
- id= 35 },
- ceph = {
- name = Ceph,
- id= 36 },
-
[MediaWiki-commits] [Gerrit] Fixed failing tests when interface language changes. - change (mediawiki...Translate)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/104922 Change subject: Fixed failing tests when interface language changes. .. Fixed failing tests when interface language changes. Paired with Amir. Change-Id: I9a78fe7877c43550a25287b0ffeae98ee6171a9f --- M tests/browser/features/manage_translator_sandbox.feature M tests/browser/features/step_definitions/common_steps.rb A tests/browser/features/support/pages/reset_preferences.rb 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/22/104922/1 diff --git a/tests/browser/features/manage_translator_sandbox.feature b/tests/browser/features/manage_translator_sandbox.feature index ce8e053..1e077b6 100644 --- a/tests/browser/features/manage_translator_sandbox.feature +++ b/tests/browser/features/manage_translator_sandbox.feature @@ -12,6 +12,7 @@ Background: Given I am logged in as a translation administrator + And I have reset my preferences Scenario: There are no users in the sandbox Given I am on the Translator sandbox management page with no users in the sandbox diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index b1516fe..b8a11e0 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -1,3 +1,7 @@ Given(/^I am logged in$/) do visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]) end + +Given(/^I have reset my preferences$/) do + visit(ResetPreferencesPage).submit_element.click +end diff --git a/tests/browser/features/support/pages/reset_preferences.rb b/tests/browser/features/support/pages/reset_preferences.rb new file mode 100644 index 000..37c6726 --- /dev/null +++ b/tests/browser/features/support/pages/reset_preferences.rb @@ -0,0 +1,7 @@ +class ResetPreferencesPage + include PageObject + include URL + page_url URL.url(Special:Preferences/reset) + + button(:submit, class: mw-htmlform-submit) +end -- To view, visit https://gerrit.wikimedia.org/r/104922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a78fe7877c43550a25287b0ffeae98ee6171a9f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not list groups without changes on Special:ManageMessageG... - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104923
Change subject: Do not list groups without changes on
Special:ManageMessageGroups
..
Do not list groups without changes on Special:ManageMessageGroups
Bug: 59199
Change-Id: Ie2423ac6240372ead5b564bde652e15dae9f5e27
---
M scripts/processMessageChanges.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/23/104923/1
diff --git a/scripts/processMessageChanges.php
b/scripts/processMessageChanges.php
index 5ee40fe..0ec3855 100644
--- a/scripts/processMessageChanges.php
+++ b/scripts/processMessageChanges.php
@@ -66,6 +66,9 @@
$changes[$id] = $comparator-processGroup( $group,
$comparator::ALL_LANGUAGES );
}
+ // Remove all groups without changes
+ $changes = array_filter( $changes );
+
if ( count( $changes ) ) {
ExternalMessageSourceStateComparator::writeChanges(
$changes );
$url = SpecialPage::getTitleFor( 'ManageMessageGroups'
)-getFullUrl();
--
To view, visit https://gerrit.wikimedia.org/r/104923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2423ac6240372ead5b564bde652e15dae9f5e27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Redirect kr.wikimedia - change (operations/apache-config)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Redirect kr.wikimedia
..
Redirect kr.wikimedia
Redirect kr.wikimedia.org to Chapter page on metawiki.
Bug: 54883
Change-Id: Id8b00e74065855bba195a3635a27e307267452cf
---
M redirects.conf
M redirects.dat
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Jeremyb: Looks good to me, but someone else must approve
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/redirects.conf b/redirects.conf
index 1db3c18..7dc37bd 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -341,6 +341,7 @@
ve.wikimedia.org \
cz.wikimedia.org \
cs.wikimedia.org \
+ kr.wikimedia.org \
pk.wikimedia.org \
pt.wikimedia.org \
wikimania.wikimedia.org \
@@ -850,6 +851,9 @@
# funnelcs.wikimedia.org//www.wikimedia.cz
RewriteCond %{HTTP_HOST} =cs.wikimedia.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.cz/
[R=301,L,NE]
+ # funnel kr.wikimedia.org//meta.wikimedia.org/wiki/위키미디어_대한민국
+ RewriteCond %{HTTP_HOST} =kr.wikimedia.org
+ RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://meta.wikimedia.org/wiki/%EC%9C%84%ED%82%A4%EB%AF%B8%EB%94%94%EC%96%B4_%EB%8C%80%ED%95%9C%EB%AF%BC%EA%B5%AD
[R=301,L,NE]
# funnelpk.wikimedia.org
//meta.wikimedia.org/wiki/Wikimedia_Community_User_Group_Pakistan
RewriteCond %{HTTP_HOST} =pk.wikimedia.org
RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://meta.wikimedia.org/wiki/Wikimedia_Community_User_Group_Pakistan
[R=301,L,NE]
diff --git a/redirects.dat b/redirects.dat
index 581d66b..6c80bd9 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -407,6 +407,8 @@
funnel cz.wikimedia.org//www.wikimedia.cz
funnel cs.wikimedia.org//www.wikimedia.cz
+funnel kr.wikimedia.org//meta.wikimedia.org/wiki/위키미디어_대한민국
+
# pk.wikimedia.org (bug 54780)
funnel pk.wikimedia.org
//meta.wikimedia.org/wiki/Wikimedia_Community_User_Group_Pakistan
--
To view, visit https://gerrit.wikimedia.org/r/101220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8b00e74065855bba195a3635a27e307267452cf
Gerrit-PatchSet: 5
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Jeremyb jer...@tuxmachine.com
Gerrit-Reviewer: John F. Lewis johnflewi...@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] Fixed failing tests when interface language changes. - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed failing tests when interface language changes. .. Fixed failing tests when interface language changes. Paired with Amir. Change-Id: I9a78fe7877c43550a25287b0ffeae98ee6171a9f --- M tests/browser/features/manage_translator_sandbox.feature M tests/browser/features/step_definitions/common_steps.rb A tests/browser/features/support/pages/reset_preferences.rb 3 files changed, 12 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/manage_translator_sandbox.feature b/tests/browser/features/manage_translator_sandbox.feature index ce8e053..1e077b6 100644 --- a/tests/browser/features/manage_translator_sandbox.feature +++ b/tests/browser/features/manage_translator_sandbox.feature @@ -12,6 +12,7 @@ Background: Given I am logged in as a translation administrator + And I have reset my preferences Scenario: There are no users in the sandbox Given I am on the Translator sandbox management page with no users in the sandbox diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index b1516fe..b8a11e0 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -1,3 +1,7 @@ Given(/^I am logged in$/) do visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]) end + +Given(/^I have reset my preferences$/) do + visit(ResetPreferencesPage).submit_element.click +end diff --git a/tests/browser/features/support/pages/reset_preferences.rb b/tests/browser/features/support/pages/reset_preferences.rb new file mode 100644 index 000..37c6726 --- /dev/null +++ b/tests/browser/features/support/pages/reset_preferences.rb @@ -0,0 +1,7 @@ +class ResetPreferencesPage + include PageObject + include URL + page_url URL.url(Special:Preferences/reset) + + button(:submit, class: mw-htmlform-submit) +end -- To view, visit https://gerrit.wikimedia.org/r/104922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a78fe7877c43550a25287b0ffeae98ee6171a9f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] 2 new education redirects - change (operations/apache-config)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: 2 new education redirects
..
2 new education redirects
Also moved educacao.wikimedia.org to the education section
Change-Id: Id44bda1fc5f7a19629afe8717b2d56076500ded1
RT: 6532
---
M redirects.conf
M redirects.dat
2 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
Dzahn: Looks good to me, but someone else must approve
diff --git a/redirects.conf b/redirects.conf
index 1db3c18..7dbc411 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -247,7 +247,6 @@
donate.wikiversity.org \
donate.wiktionary.org \
sep11.wikipedia.org \
- educacao.wikimedia.org \
be-x-old.wikisource.org \
de-beta.wikipedia.org \
cz.wikipedia.org \
@@ -289,6 +288,7 @@
wikibook.com \
wikibook.org \
textbook.wikipedia.org \
+ educacao.wikimedia.org \
education.wikimedia.org \
www.wikiipedia.org \
wikipedia.com \
@@ -378,6 +378,12 @@
# override wikibooks.com/
http://en.wikibooks.org/wiki/Wikibooks_portal
RewriteCond %{HTTP_HOST} =wikibooks.com
RewriteRule ^/$ http://en.wikibooks.org/wiki/Wikibooks_portal
[R=301,L,NE]
+ # override education.wikimedia.org/evaluating
//commons.wikimedia.org/wiki/File:Evaluating_Wikipedia_brochure.pdf
+ RewriteCond %{HTTP_HOST} =education.wikimedia.org
+ RewriteRule ^/evaluating$
%{ENV:HTTP_X_Forwarded_Proto}://commons.wikimedia.org/wiki/File:Evaluating_Wikipedia_brochure.pdf
[R=301,L,NE]
+ # override education.wikimedia.org/illustrating
//commons.wikimedia.org/wiki/File:Illustrating_Wikipedia_brochure.pdf
+ RewriteCond %{HTTP_HOST} =education.wikimedia.org
+ RewriteRule ^/illustrating$
%{ENV:HTTP_X_Forwarded_Proto}://commons.wikimedia.org/wiki/File:Illustrating_Wikipedia_brochure.pdf
[R=301,L,NE]
# override education.wikimedia.org/casestudies
//outreach.wikimedia.org/wiki/Education/Case_Studies
RewriteCond %{HTTP_HOST} =education.wikimedia.org
RewriteRule ^/casestudies$
%{ENV:HTTP_X_Forwarded_Proto}://outreach.wikimedia.org/wiki/Education/Case_Studies
[R=301,L,NE]
@@ -565,9 +571,6 @@
# funnelsep11.wikipedia.org
http://wayback.archive.org/web/2003031500*/http://sep11.wikipedia.org/wiki/In_Memoriam
RewriteCond %{HTTP_HOST} =sep11.wikipedia.org
RewriteRule .
http://wayback.archive.org/web/2003031500*/http://sep11.wikipedia.org/wiki/In_Memoriam
[R=301,L,NE]
- # funneleducacao.wikimedia.org
//pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
- RewriteCond %{HTTP_HOST} =educacao.wikimedia.org
- RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
[R=301,L,NE]
# rewrite be-x-old.wikisource.org //be.wikisource.org # Bug 41755
RewriteCond %{HTTP_HOST} =be-x-old.wikisource.org
RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://be.wikisource.org$0
[R=301,L,NE]
@@ -691,6 +694,9 @@
# rewrite textbook.wikipedia.org //www.wikibooks.org
RewriteCond %{HTTP_HOST} =textbook.wikipedia.org
RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikibooks.org$0
[R=301,L,NE]
+ # funneleducacao.wikimedia.org
//pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
+ RewriteCond %{HTTP_HOST} =educacao.wikimedia.org
+ RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
[R=301,L,NE]
# funneleducation.wikimedia.org
//outreach.wikimedia.org/wiki/Wikipedia_Education_Program
RewriteCond %{HTTP_HOST} =education.wikimedia.org
RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://outreach.wikimedia.org/wiki/Wikipedia_Education_Program
[R=301,L,NE]
diff --git a/redirects.dat b/redirects.dat
index 581d66b..381625d 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -87,8 +87,6 @@
funnel *wikijunior.org http://en.wikibooks.org/wiki/Wikijunior
funnel *wikijunior.net http://en.wikibooks.org/wiki/Wikijunior
-funnel educacao.wikimedia.org //pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
-
# Language aliases
rewritebe-x-old.wikisource.org //be.wikisource.org # Bug 41755
rewritede-beta.wikipedia.org //de.wikipedia.org
@@ -161,6 +159,11 @@
# Education program
+funnel educacao.wikimedia.org //pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
+
+override education.wikimedia.org/evaluating
//commons.wikimedia.org/wiki/File:Evaluating_Wikipedia_brochure.pdf
+override education.wikimedia.org/illustrating
//commons.wikimedia.org/wiki/File:Illustrating_Wikipedia_brochure.pdf
+
override education.wikimedia.org/casestudies
//outreach.wikimedia.org/wiki/Education/Case_Studies
override education.wikimedia.org/content
[MediaWiki-commits] [Gerrit] beta: allow ssh from gallium on parsoid instance - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104924
Change subject: beta: allow ssh from gallium on parsoid instance
..
beta: allow ssh from gallium on parsoid instance
I need deployment-parsoid2 to be made a Jenkins slave, since Parsoid
class adds ferm rule, I get to explicitly allow ssh from gallium
(jenkins master).
Will then made the instance a Jenkins slave and made it execute an
update of Parsoid whenever a change is made against the repositories
mediawiki/services/parsoid{,/deploy}
Change-Id: I21d28474cf48390b052d6171978abb86550db167
---
M manifests/role/parsoid.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/104924/1
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 2473e12..0e5e882 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -152,4 +152,13 @@
rule = 'proto tcp dport ssh { saddr 10.4.0.58 ACCEPT; }',
}
+# Instance got to be a Jenkins slave so we can update Parsoid whenever a
+# change is made on mediawiki/services/parsoid repository
+include role::ci::slave::labs::common
+
+# And thus allow ssh access from the Jenkins master (gallium)
+ferm::rule { 'ssh-from-gallium':
+rule = 'proto tcp dport ssh { saddr 208.80.154.135 ACCEPT; }',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/104924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21d28474cf48390b052d6171978abb86550db167
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add clearer classes to Accept and Reject buttons in the sandbox - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104925
Change subject: Add clearer classes to Accept and Reject buttons in the sandbox
..
Add clearer classes to Accept and Reject buttons in the sandbox
This makes the classes more consistent and makes the tests
less dependent on the language.
Change-Id: Icc3e519cc97dbff0da394c3ae270c9199f90
---
M resources/js/ext.translate.special.managetranslatorsandbox.js
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/25/104925/1
diff --git a/resources/js/ext.translate.special.managetranslatorsandbox.js
b/resources/js/ext.translate.special.managetranslatorsandbox.js
index 8672a33..adb5190 100644
--- a/resources/js/ext.translate.special.managetranslatorsandbox.js
+++ b/resources/js/ext.translate.special.managetranslatorsandbox.js
@@ -134,7 +134,7 @@
} );
} ),
$( 'button' )
- .addClass( 'delete destructive
button' )
+ .addClass( 'reject destructive
button' )
.text( mw.msg(
'tsb-reject-button-label' ) )
.on( 'click', function () {
window.tsbUpdatingUsers
= true;
@@ -275,7 +275,7 @@
.addClass( 'actions row' )
.append(
$( 'button' )
- .addClass( 'accept primary
green button' )
+ .addClass( 'accept-all primary
green button' )
.text( mw.msg(
'tsb-accept-all-button-label' ) )
.on( 'click', function () {
window.tsbUpdatingUsers
= true;
@@ -290,7 +290,7 @@
} );
} ),
$( 'button' )
- .addClass( 'delete destructive
button' )
+ .addClass( 'reject-all
destructive button' )
.text( mw.msg(
'tsb-reject-all-button-label' ) )
.on( 'click', function () {
window.tsbUpdatingUsers
= true;
diff --git
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index 0899e6d..e3b0171 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -32,7 +32,8 @@
end
def details_button(label)
- @browser.button(text: label)
+ button_class = label.downcase.gsub( , -)
+ @browser.button(class: button_class)
end
def details_no_translations
--
To view, visit https://gerrit.wikimedia.org/r/104925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc3e519cc97dbff0da394c3ae270c9199f90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: allow ssh from gallium on parsoid instance - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: beta: allow ssh from gallium on parsoid instance
..
beta: allow ssh from gallium on parsoid instance
I need deployment-parsoid2 to be made a Jenkins slave, since Parsoid
class adds ferm rule, I get to explicitly allow ssh from gallium
(jenkins master).
Will then made the instance a Jenkins slave and made it execute an
update of Parsoid whenever a change is made against the repositories
mediawiki/services/parsoid{,/deploy}
Change-Id: I21d28474cf48390b052d6171978abb86550db167
---
M manifests/role/parsoid.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 2473e12..0e5e882 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -152,4 +152,13 @@
rule = 'proto tcp dport ssh { saddr 10.4.0.58 ACCEPT; }',
}
+# Instance got to be a Jenkins slave so we can update Parsoid whenever a
+# change is made on mediawiki/services/parsoid repository
+include role::ci::slave::labs::common
+
+# And thus allow ssh access from the Jenkins master (gallium)
+ferm::rule { 'ssh-from-gallium':
+rule = 'proto tcp dport ssh { saddr 208.80.154.135 ACCEPT; }',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/104924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21d28474cf48390b052d6171978abb86550db167
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Give error on account creation when user name is adjust silence - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104926
Change subject: Give error on account creation when user name is adjust silence
..
Give error on account creation when user name is adjust silence
When a account is created the user name can be adjust silence due to
some technical restrictions are silence adjust, like first letter
capitalized or double spaces.
Give a error, so the user get a hint, that he choose a bad name for
mediawiki rules.
Change-Id: Ia09b3b9f5e05d55b6c1f9839e25c50211be60fe4
---
M RELEASE-NOTES-1.23
M includes/api/ApiCreateAccount.php
M includes/specials/SpecialUserlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
6 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/104926/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index d13f9cd..bbd13f8 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -59,6 +59,8 @@
* Added ApiBeforeMain hook, roughly equivalent to the BeforeInitialize hook:
it's called after everything is set up but before any major processing
happens.
+* Give error on account creation when user name is adjust silence due to
+ technical restrictions (e.g. first letter capitalized)
=== Bug fixes in 1.23 ===
* (bug 41759) The updated since last visit markers (on history pages, recent
diff --git a/includes/api/ApiCreateAccount.php
b/includes/api/ApiCreateAccount.php
index 439f46b..d85c91c 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -254,6 +254,7 @@
'sorbs_create_account_reason',
'noname',
'userexists',
+ 'usercreate-normalisation',
'password-name-match', // from User::getPasswordValidity
'password-login-forbidden', // from
User::getPasswordValidity
'noemailtitle',
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 3e67d56..d4f2c32 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -407,6 +407,14 @@
return Status::newFatal( 'noname' );
} elseif ( 0 != $u-idForName() ) {
return Status::newFatal( 'userexists' );
+ } elseif ( $name !== $u-getName() ) {
+ // user name changed silence due to technical
restrictions (e.g. first letter capitalized)
+ $status = Status::newFatal( 'usercreate-normalisation',
$name, $u-getName() );
+
+ // set the form field to the correct name, so the user
can hit the button again
+ $this-mUsername = $u-getName();
+
+ return $status;
}
if ( $this-mCreateaccountMail ) {
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 344e234..461fa72 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1165,6 +1165,8 @@
'badretype' = 'The passwords you entered do not match.',
'userexists' = 'Username entered already in use.
Please choose a different name.',
+'usercreate-normalisation'= 'Due to technical restrictions the
username $1 is not possible in the given notation.
+You can use $2.',
'loginerror' = 'Login error',
'createacct-error'= 'Account creation error',
'createaccounterror' = 'Could not create account: $1',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 8c56454..debd8e2 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1441,6 +1441,7 @@
* $1 - number of contributors (users)',
'badretype' = 'Used as error message when the new password and its retype do
not match.',
'userexists' = 'Used as error message in creating a user account.',
+'usercreate-normalisation' = 'Used as error message in creating a user
account.',
'loginerror' = 'Used as title of error message.
{{Identical|Login error}}',
'createacct-error' = 'Used as heading for the error message.',
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 2af682e..8374ffc 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -507,6 +507,7 @@
'createacct-benefit-body3',
'badretype',
'userexists',
+ 'usercreate-normalisation',
'loginerror',
'createacct-error',
'createaccounterror',
--
To view, visit https://gerrit.wikimedia.org/r/104926
To unsubscribe,
[MediaWiki-commits] [Gerrit] category: Dummy added -hist option for move action - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: category: Dummy added -hist option for move action
..
category: Dummy added -hist option for move action
Added boilerplate code for -hist option which is
not yet ported from compat to core. Raise a not
Implemented error if it the option is used.
Change-Id: I2f583377b3b32127ce968ed05306cda38247d1b0
---
M scripts/category.py
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/category.py b/scripts/category.py
index e009f86..73988e4 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -38,6 +38,8 @@
English.
Options for move action:
+ * -hist- Creates a nice wikitable on the talk page of target category
+ that contains detailed page history of the source category.
* -nodelete- Don't delete the old category after move
Options for several actions:
@@ -391,7 +393,7 @@
def __init__(self, oldCatTitle, newCatTitle, batchMode=False,
editSummary='', inPlace=False, moveCatPage=True,
deleteEmptySourceCat=True, titleRegex=None,
- useSummaryForDeletion=True):
+ useSummaryForDeletion=True, withHistory=True):
self.editSummary = editSummary
self.oldCat = pywikibot.Category(
pywikibot.Link('Category:' + oldCatTitle))
@@ -402,8 +404,11 @@
self.deleteEmptySourceCat = deleteEmptySourceCat
self.titleRegex = titleRegex
self.useSummaryForDeletion = useSummaryForDeletion
+self.withHistory = withHistory
def run(self):
+if self.withHistory:
+raise NotImplementedError(History printing is not yet enabled.)
site = pywikibot.getSite()
newCat = pywikibot.Category(
pywikibot.Link('Category:' + self.newCatTitle))
@@ -873,6 +878,7 @@
recurse = False
titleRegex = None
pagesonly = False
+withHistory = True
# This factory is responsible for processing command line arguments
# that are also used by other scripts and that determine on which pages
@@ -943,6 +949,8 @@
create_pages = True
elif arg == '-redirect':
follow_redirects = True
+elif arg == '-hist':
+withHistory = True
else:
genFactory.handleArg(arg)
pywikibot.Site().login()
@@ -976,7 +984,8 @@
bot = CategoryMoveRobot(oldCatTitle, newCatTitle, batchMode,
editSummary, inPlace,
deleteEmptySourceCat=deleteEmptySourceCat,
-titleRegex=titleRegex)
+titleRegex=titleRegex,
+withHistory=withHistory)
bot.run()
elif action == 'tidy':
catTitle = pywikibot.input(u'Which category do you want to tidy up?')
--
To view, visit https://gerrit.wikimedia.org/r/104813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f583377b3b32127ce968ed05306cda38247d1b0
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Pyfisch pyfi...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Pyfisch pyfi...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.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] Fix FlowSetUserIp to run against larger-than-mBatchSize revi... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104927
Change subject: Fix FlowSetUserIp to run against larger-than-mBatchSize
revision sets
..
Fix FlowSetUserIp to run against larger-than-mBatchSize revision sets
Previously, updateRevision ignored $continue returned nothing, so it
would only run once, with a limit of mBatchSize.
Change-Id: Ie973ca84f9900737261d1bbe72c4f366b14bd1bb
---
M maintenance/FlowSetUserIp.php
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/27/104927/1
diff --git a/maintenance/FlowSetUserIp.php b/maintenance/FlowSetUserIp.php
index 2dbee2e..96d1a65 100644
--- a/maintenance/FlowSetUserIp.php
+++ b/maintenance/FlowSetUserIp.php
@@ -113,18 +113,20 @@
$rows = $dbw-select(
/* table */'flow_revision',
/* select */array( 'rev_id', 'rev_user_id',
'rev_user_text', 'rev_mod_user_id', 'rev_mod_user_text', 'rev_edit_user_id',
'rev_edit_user_text' ),
- /* conditions */ $dbw-makeList(
- array(
- 'rev_user_id' = 0,
- 'rev_mod_user_id' = 0,
- 'rev_edit_user_id' = 0,
+ /* conditions */ array(
+ 'rev_id ' . $dbw-addQuotes( $continue ),
+ $dbw-makeList(
+ array(
+ 'rev_user_id' = 0,
+ 'rev_mod_user_id' = 0,
+ 'rev_edit_user_id' = 0,
+ ),
+ LIST_OR
),
- LIST_OR
),
__METHOD__,
/* options */array( 'LIMIT' = $this-mBatchSize,
'ORDER BY' = 'rev_id' )
);
-
$continue = null;
foreach ( $rows as $row ) {
@@ -149,6 +151,8 @@
);
}
}
+
+ return $continue;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/104927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie973ca84f9900737261d1bbe72c4f366b14bd1bb
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] Add JobQueueDB::selectFields and use it - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104928
Change subject: Add JobQueueDB::selectFields and use it
..
Add JobQueueDB::selectFields and use it
It is good practice to name the selected fields
Change-Id: Ic12fbdbac6e8f48abbd9f5053a69f9553492cead
---
M includes/job/JobQueueDB.php
1 file changed, 25 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/28/104928/1
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index 79ff4e8..e7a269a 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -358,7 +358,7 @@
// Instead, this uses job_random to pick a row
(possibly checking both directions).
$ineq = $gte ? '=' : '=';
$dir = $gte ? 'ASC' : 'DESC';
- $row = $dbw-selectRow( 'job', '*', // find a
random job
+ $row = $dbw-selectRow( 'job',
self::selectFields(), // find a random job
array(
'job_cmd' = $this-type,
'job_token' = '', // unclaimed
@@ -375,7 +375,7 @@
// Bug 42614: ORDER BY job_random with a
job_random inequality causes high CPU
// in MySQL if there are many rows for some
reason. This uses a small OFFSET
// instead of job_random for reducing excess
claim retries.
- $row = $dbw-selectRow( 'job', '*', // find a
random job
+ $row = $dbw-selectRow( 'job',
self::selectFields(), // find a random job
array(
'job_cmd' = $this-type,
'job_token' = '', // unclaimed
@@ -459,7 +459,7 @@
}
// Fetch any row that we just reserved...
if ( $dbw-affectedRows() ) {
- $row = $dbw-selectRow( 'job', '*',
+ $row = $dbw-selectRow( 'job',
self::selectFields(),
array( 'job_cmd' = $this-type,
'job_token' = $uuid ), __METHOD__
);
if ( !$row ) { // raced out by duplicate job
removal
@@ -589,7 +589,7 @@
$dbr = $this-getSlaveDB();
try {
return new MappedIterator(
- $dbr-select( 'job', '*',
+ $dbr-select( 'job', self::selectFields(),
array( 'job_cmd' = $this-getType(),
'job_token' = '' ) ),
function ( $row ) use ( $dbr ) {
$job = Job::factory(
@@ -824,4 +824,25 @@
protected function throwDBException( DBError $e ) {
throw new JobQueueError( get_class( $e ) . : .
$e-getMessage() );
}
+
+ /**
+* Return the list of job fields that should be selected.
+* @since 1.23
+* @return array
+*/
+ public static function selectFields() {
+ return array(
+ 'job_id',
+ 'job_cmd',
+ 'job_namespace',
+ 'job_title',
+ 'job_timestamp',
+ 'job_params',
+ 'job_random',
+ 'job_attempts',
+ 'job_token',
+ 'job_token_timestamp',
+ 'job_sha1',
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/104928
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic12fbdbac6e8f48abbd9f5053a69f9553492cead
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install python{, 3}-dev packages on stat1 - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104929
Change subject: Install python{,3}-dev packages on stat1
..
Install python{,3}-dev packages on stat1
Aaron Halfaker asked for python3-dev in order to be able to compile
oursql python package on his local environment. python-dev for python2.7
was already installed but not puppetized. This commit installs both
packages through puppet.
Change-Id: I9f586f2fc0c9184139a5c91e46c24eb1babefb5a
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/104929/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 4a5f9fd..3e607b2 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -525,6 +525,16 @@
}
}
+# Install dev environments
+class misc::statistics::dev {
+package [
+'python-dev', # RT 6561
+'python3-dev', # RT 6561
+]: {
+ensure = installed,
+}
+}
+
# == Class misc::statistics::gerrit_stats
#
# Installs diederik's gerrit-stats python
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 419c264..16e8fec 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -19,6 +19,9 @@
misc::statistics::plotting,
# Aaron Halfaker (halfak) wants MongoDB for his project.
misc::statistics::db::mongo,
+ # Aaron Halfaker (halfak) wants python{,3}-dev environments for
module
+ # oursql
+ misc::statistics::dev,
misc::udp2log::udp_filter,
# generate gerrit stats from stat1.
misc::statistics::gerrit_stats,
--
To view, visit https://gerrit.wikimedia.org/r/104929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f586f2fc0c9184139a5c91e46c24eb1babefb5a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Automatically run FlowSetUserIp on update.php - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104930
Change subject: Automatically run FlowSetUserIp on update.php
..
Automatically run FlowSetUserIp on update.php
* Added checks to make sure columns exist (may not be the case with
current sqlite patch, which drops the columns)
* Removed script output, to keep update.php output clean.
Change-Id: I2269c7744930f3039528b4c4abd39659c6986193
---
M Hooks.php
M maintenance/FlowSetUserIp.php
2 files changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/30/104930/1
diff --git a/Hooks.php b/Hooks.php
index b8ba3cd..dc722e7 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -58,6 +58,9 @@
require_once __DIR__.'/maintenance/FlowUpdateRecentChanges.php';
$updater-addPostDatabaseUpdateMaintenance(
'FlowUpdateRecentChanges' );
+ require_once __DIR__.'/maintenance/FlowSetUserIp.php';
+ $updater-addPostDatabaseUpdateMaintenance( 'FlowSetUserIp' );
+
return true;
}
diff --git a/maintenance/FlowSetUserIp.php b/maintenance/FlowSetUserIp.php
index 96d1a65..01d7f3e 100644
--- a/maintenance/FlowSetUserIp.php
+++ b/maintenance/FlowSetUserIp.php
@@ -31,15 +31,24 @@
do {
$continue = call_user_func( $callback, $dbw,
$continue );
$dbf-waitForSlaves();
- echo .;
} while ( $continue !== null );
};
- $runUpdate( array( $this, 'updateWorkflow' ) );
- $runUpdate( array( $this, 'updateTreeRevision' ) );
- $runUpdate( array( $this, 'updateRevision' ) );
+ // run updates only if we have the required tables
+ if ( $dbw-fieldExists( 'flow_workflow', 'workflow_user_ip' ) )
{
+ $runUpdate( array( $this, 'updateWorkflow' ) );
+ }
+ if ( $dbw-fieldExists( 'flow_tree_revision',
'tree_orig_user_ip' ) ) {
+ $runUpdate( array( $this, 'updateTreeRevision' ) );
+ }
+ if (
+ $dbw-fieldExists( 'flow_revision', 'rev_user_ip' )
+ $dbw-fieldExists( 'flow_revision', 'rev_mod_user_ip' )
+ $dbw-fieldExists( 'flow_revision', 'rev_edit_user_ip' )
+ ) {
+ $runUpdate( array( $this, 'updateRevision' ) );
+ }
- echo \n\nDone\n\n;
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/104930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2269c7744930f3039528b4c4abd39659c6986193
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] Install python{, 3}-dev packages on stat1 - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Install python{,3}-dev packages on stat1
..
Install python{,3}-dev packages on stat1
Aaron Halfaker asked for python3-dev in order to be able to compile
oursql python package on his local environment. python-dev for python2.7
was already installed but not puppetized. This commit installs both
packages through puppet.
Change-Id: I9f586f2fc0c9184139a5c91e46c24eb1babefb5a
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
2 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 4a5f9fd..b78d1a5 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -525,6 +525,16 @@
}
}
+# Install dev environments
+class misc::statistics::dev {
+package { [
+'python-dev', # RT 6561
+'python3-dev', # RT 6561
+]:
+ensure = installed,
+}
+}
+
# == Class misc::statistics::gerrit_stats
#
# Installs diederik's gerrit-stats python
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 419c264..16e8fec 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -19,6 +19,9 @@
misc::statistics::plotting,
# Aaron Halfaker (halfak) wants MongoDB for his project.
misc::statistics::db::mongo,
+ # Aaron Halfaker (halfak) wants python{,3}-dev environments for
module
+ # oursql
+ misc::statistics::dev,
misc::udp2log::udp_filter,
# generate gerrit stats from stat1.
misc::statistics::gerrit_stats,
--
To view, visit https://gerrit.wikimedia.org/r/104929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f586f2fc0c9184139a5c91e46c24eb1babefb5a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Untested] Drop sqlite-specific script to add *_user_ip columns - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104931
Change subject: [Untested] Drop sqlite-specific script to add *_user_ip columns
..
[Untested] Drop sqlite-specific script to add *_user_ip columns
I'm pretty sure sqlite is capable of ALTER TABLE x ADD y, and some
UPDATE-statements, which is all that patch-remove_usernames.sql does.
I suggest removing this sqlite-specific patch, because it differs
from the default patch: in sqlite, *_user_text columns will be
dropped, in the default patch, these will not be dropped.
Change-Id: Ieae18fa24de8da55c5e1e45e3532a6c2ca53b482
---
M Hooks.php
D db_patches/patch-remove_usernames.sqlite.sql
2 files changed, 1 insertion(+), 108 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/31/104931/1
diff --git a/Hooks.php b/Hooks.php
index dc722e7..106ff73 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -31,8 +31,6 @@
if ( $updater-getDB()-getType() === 'sqlite' ) {
$updater-modifyExtensionField(
'flow_summary_revision', 'summary_workflow_id',
$dir/db_patches/patch-summary2header.sqlite.sql );
$updater-modifyExtensionField( 'flow_revision',
'rev_comment', $dir/db_patches/patch-rev_change_type.sqlite.sql );
- // add *_user_ip fields, drop *_user_text
- $updater-dropExtensionField( 'flow_workflow',
'workflow_user_text', $dir/db_patches/patch-remove_usernames.sqlite.sql );
} else {
// sqlite doesn't support alter table change, it also
considers all types the same so
// this patch doesn't matter to it.
@@ -41,9 +39,6 @@
$updater-modifyExtensionField(
'flow_summary_revision', 'summary_workflow_id',
$dir/db_patches/patch-summary2header.sql );
// rename rev_change_type - rev_comment, alternate
patch is above for sqlite
$updater-modifyExtensionField( 'flow_revision',
'rev_comment', $dir/db_patches/patch-rev_change_type.sql );
- // add *_user_ip fields, only populated when
*_user_text = 0.
- // Alternate patch above for sqlite
- $updater-addExtensionField( 'flow_workflow',
'workflow_user_ip', $dir/db_patches/patch-remove_usernames.sql );
}
$updater-addExtensionIndex( 'flow_workflow',
'flow_workflow_lookup', $dir/db_patches/patch-workflow_lookup_idx.sql );
@@ -51,6 +46,7 @@
$updater-modifyExtensionField( 'flow_revision',
'rev_change_type', $dir/db_patches/patch-rev_change_type_update.sql );
$updater-modifyExtensionField( 'recentchanges', 'rc_source',
$dir/db_patches/patch-rc_source.sql );
$updater-modifyExtensionField( 'flow_revision',
'rev_change_type', $dir/db_patches/patch-censor_to_suppress.sql );
+ $updater-addExtensionField( 'flow_workflow',
'workflow_user_ip', $dir/db_patches/patch-remove_usernames.sql );
require_once
__DIR__.'/maintenance/FlowInsertDefaultDefinitions.php';
$updater-addPostDatabaseUpdateMaintenance(
'FlowInsertDefaultDefinitions' );
diff --git a/db_patches/patch-remove_usernames.sqlite.sql
b/db_patches/patch-remove_usernames.sqlite.sql
deleted file mode 100644
index 82474ce..000
--- a/db_patches/patch-remove_usernames.sqlite.sql
+++ /dev/null
@@ -1,103 +0,0 @@
--- Rename current table to temporary name
-ALTER TABLE /*_*/flow_workflow RENAME TO
/*_*/temp_flow_workflow_remove_usernames;
-ALTER TABLE /*_*/flow_tree_revision RENAME TO
/*_*/temp_flow_tree_revision_remove_usernames;
-ALTER TABLE /*_*/flow_revision RENAME TO
/*_*/temp_flow_revision_remove_usernames;
-
--- RECREATE tables with user_id renamed to user_ip
-CREATE TABLE /*_*/flow_workflow (
-workflow_id binary(16) not null,
-workflow_wiki varchar(16) binary not null,
-workflow_namespace int not null,
-workflow_page_id int unsigned not null,
-workflow_title_text varchar(255) binary not null,
-workflow_name varchar(255) binary not null,
-workflow_last_update_timestamp binary(14) not null,
-workflow_user_id bigint unsigned not null,
-workflow_user_ip varbinary(39) default null,
-workflow_lock_state int unsigned not null,
-workflow_definition_id binary(16) not null,
-PRIMARY KEY (workflow_id)
-) /*$wgDBTableOptions*/;
-
-CREATE TABLE /*_*/flow_tree_revision (
-tree_rev_descendant_id binary(16) not null,
-tree_rev_id binary(16) not null,
-tree_orig_create_time varchar(12) binary not null,
-tree_orig_user_id bigint unsigned not null,
-tree_orig_user_ip varbinary(39) default null,
-tree_parent_id binary(16),
-PRIMARY KEY( tree_rev_id )
-) /*$wgDBTableOptions*/;
-
-CREATE TABLE /*_*/flow_revision (
-rev_id binary(16) not
[MediaWiki-commits] [Gerrit] beta: parsoid switch to jenkins deployed parsoid - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104932
Change subject: beta: parsoid switch to jenkins deployed parsoid
..
beta: parsoid switch to jenkins deployed parsoid
Parsoid will be deployed by a new job under /srv/deployment/parsoid,
this patch make it possible to adjust the NODE_PATH in the upstart
configuration so it points to the 'deploy' checkout.
Change-Id: I8e0bed78fdeac765dec25a0f8b865dd6ade38e36
---
M manifests/role/parsoid.pp
M templates/misc/parsoid.default.erb
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/104932/1
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 0e5e882..d14067a 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -112,6 +112,8 @@
}
$parsoid_log_file = '/var/log/parsoid/parsoid.log'
+# For beta, override NODE_PATH:
+$parsoid_node_path = '/srv/deployment/parsoid/deploy/node_modules'
file { '/etc/default/parsoid':
ensure = present,
diff --git a/templates/misc/parsoid.default.erb
b/templates/misc/parsoid.default.erb
index 77643f4..176f64a 100644
--- a/templates/misc/parsoid.default.erb
+++ b/templates/misc/parsoid.default.erb
@@ -5,3 +5,11 @@
# File where the parsoid daemon will write stdin and stdout to
PARSOID_LOG_FILE=%= parsoid_log_file %
+
+# Checkout of mediawiki/services/parsoid/deploy
+% if has_variable?(parsoide_node_path) then %
+NODE_PATH=%= parsoid_node_path %
+% else %
+# Override in puppet using parsoid_node_path
+#NODE_PATH=
+% end %
--
To view, visit https://gerrit.wikimedia.org/r/104932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e0bed78fdeac765dec25a0f8b865dd6ade38e36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta-parsoid-update job - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104933 Change subject: beta-parsoid-update job .. beta-parsoid-update job Meant to be run directly on the deployment-parsoid2 instance which is now a Jenkins slave. That basically fetch the repositories, copy the content under /srv/deployment/parsoid then restart parsoid. Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 TODO: inject configuration file. --- M beta.yaml 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/33/104933/1 diff --git a/beta.yaml b/beta.yaml index 3e1691d..200bea3 100644 --- a/beta.yaml +++ b/beta.yaml @@ -190,3 +190,22 @@ triggers: # Every six minutes: - timed: '*/6 * * * *' + +- job: +name: beta-parsoid-update +defaults: beta +node: deployment-parsoid2 +triggers: + - zuul + +builders: + - git-parsoid-and-deploy-repos + - shell: | + PARSOID_TARGET=/srv/deployment/parsoid + mkdir -p $PARSOID_TARGET + # sync workspace and deployment target + RSYNC_OPTS=--update --times --recursive --links --delete-after --delay-updates --exclude=.git + rsync $RSYNC_OPTS $WORKSPACE/parsoid $PARSOID_TARGET + rsync $RSYNC_OPTS $WORKSPACE/deploy $PARSOID_TARGET +- shell: | +sudo /etc/init.d/parsoid restart -- To view, visit https://gerrit.wikimedia.org/r/104933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Editor shortcuts, only accept Alt alone - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104934
Change subject: Editor shortcuts, only accept Alt alone
..
Editor shortcuts, only accept Alt alone
Avoid taking over things where Alt is used with other modifiers.
https://translatewiki.net/wiki/Thread:Support/Disabling_Ctrl%2BAlt%2B
Change-Id: I1d236261521420fc4c6e86952461c5d9455b224e
---
M resources/js/ext.translate.editor.js
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/34/104934/1
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 4573674..1252974 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -529,7 +529,13 @@
}
// 0..9 ~ 48..57
- if ( e.type === 'keydown' e.altKey === true
index = 0 index 10 ) {
+ if (
+ e.type === 'keydown'
+ e.altKey === true
+ e.ctrlKey === false
+ e.shiftKey === false
+ index = 0 index 10
+ ) {
e.preventDefault();
e.stopPropagation();
translateEditor.$editor.find(
'.shortcut-activated:visible' ).eq( index ).trigger( 'click' );
--
To view, visit https://gerrit.wikimedia.org/r/104934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d236261521420fc4c6e86952461c5d9455b224e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: parsoid switch to jenkins deployed parsoid - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: beta: parsoid switch to jenkins deployed parsoid
..
beta: parsoid switch to jenkins deployed parsoid
Parsoid will be deployed by a new job under /srv/deployment/parsoid,
this patch make it possible to adjust the NODE_PATH in the upstart
configuration so it points to the 'deploy' checkout.
Change-Id: I8e0bed78fdeac765dec25a0f8b865dd6ade38e36
---
M manifests/role/parsoid.pp
M templates/misc/parsoid.default.erb
2 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 0e5e882..d14067a 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -112,6 +112,8 @@
}
$parsoid_log_file = '/var/log/parsoid/parsoid.log'
+# For beta, override NODE_PATH:
+$parsoid_node_path = '/srv/deployment/parsoid/deploy/node_modules'
file { '/etc/default/parsoid':
ensure = present,
diff --git a/templates/misc/parsoid.default.erb
b/templates/misc/parsoid.default.erb
index 77643f4..4cd7012 100644
--- a/templates/misc/parsoid.default.erb
+++ b/templates/misc/parsoid.default.erb
@@ -4,4 +4,12 @@
#
# File where the parsoid daemon will write stdin and stdout to
-PARSOID_LOG_FILE=%= parsoid_log_file %
+PARSOID_LOG_FILE=%= @parsoid_log_file %
+
+# Checkout of mediawiki/services/parsoid/deploy
+% if @parsoid_node_path then %
+NODE_PATH=%= @parsoid_node_path %
+% else %
+# Override in puppet using parsoid_node_path
+#NODE_PATH=
+% end %
--
To view, visit https://gerrit.wikimedia.org/r/104932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e0bed78fdeac765dec25a0f8b865dd6ade38e36
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@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] Use AbstractRevision::getRevisionType instead of array['rev_... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104935
Change subject: Use AbstractRevision::getRevisionType instead of
array['rev_type']
..
Use AbstractRevision::getRevisionType instead of array['rev_type']
Change-Id: Ie10c5c65c8456ee277c87e10f5acb136e53d1a1c
---
M includes/Data/BoardHistoryStorage.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/35/104935/1
diff --git a/includes/Data/BoardHistoryStorage.php
b/includes/Data/BoardHistoryStorage.php
index 036cf72..5b074a7 100644
--- a/includes/Data/BoardHistoryStorage.php
+++ b/includes/Data/BoardHistoryStorage.php
@@ -128,10 +128,10 @@
}
public function onAfterInsert( $object, array $new ) {
- if ( $new['rev_type'] === 'header' ) {
+ if ( $object-getRevisionType() === 'header' ) {
$new['topic_list_id'] = $new['header_workflow_id'];
parent::onAfterInsert( $object, $new );
- } elseif ( $new['rev_type'] === 'post' ) {
+ } elseif ( $object-getRevisionType() === 'post' ) {
$topicListId = $this-findTopicListIdForRootPost(
$object );
if ( $topicListId ) {
$new['topic_list_id'] = $topicListId;
@@ -141,10 +141,10 @@
}
public function onAfterUpdate( $object, array $old, array $new ) {
- if ( $new['rev_type'] === 'header' ) {
+ if ( $object-getRevisionType() === 'header' ) {
$new['topic_list_id'] = $old['topic_list_id'] =
$new['header_workflow_id'];
parent::onAfterUpdate( $object, $old, $new );
- } elseif ( $new['rev_type'] === 'post' ) {
+ } elseif ( $object-getRevisionType() === 'post' ) {
$topicListId = $this-findTopicListIdForRootPost(
$object );
if ( $topicListId ) {
$new['topic_list_id'] = $old['topic_list_id'] =
$topicListId;
@@ -154,10 +154,10 @@
}
public function onAfterRemove( $object, array $old ) {
- if ( $new['rev_type'] === 'header' ) {
+ if ( $object-getRevisionType() === 'header' ) {
$old['topic_list_id'] = $old['header_workflow_id'];
parent::onAfterRemove( $object, $old );
- } elseif ( $new['rev_type'] === 'post' ) {
+ } elseif ( $object-getRevisionType() === 'post' ) {
$topicListId = $this-findTopicListIdForRootPost(
$object );
if ( $topicListId ) {
$old['topic_list_id'] = $topicListId;
--
To view, visit https://gerrit.wikimedia.org/r/104935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie10c5c65c8456ee277c87e10f5acb136e53d1a1c
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] Change Title::isExternal to use strict comparsion - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104936
Change subject: Change Title::isExternal to use strict comparsion
..
Change Title::isExternal to use strict comparsion
Change-Id: Ib4e646f98dc6d17a8cb1ca837dcdc9d48f85e2a7
---
M includes/Title.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/104936/1
diff --git a/includes/Title.php b/includes/Title.php
index 0b4b99c..64cea91 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -59,7 +59,7 @@
var $mDbkeyform = ''; // / Main part with underscores
var $mUserCaseDBKey; // / DB key with the initial letter
in the case specified by the user
var $mNamespace = NS_MAIN;// / Namespace index, i.e. one of
the NS_ constants
- var $mInterwiki = ''; // / Interwiki prefix (or null
string)
+ var $mInterwiki = ''; // / Interwiki prefix
var $mFragment; // / Title fragment (i.e. the bit
after the #)
var $mArticleID = -1; // / Article ID, fetched from the
link cache on demand
var $mLatestID = false; // / ID of most recent revision
@@ -700,11 +700,11 @@
* @return Bool
*/
public function isExternal() {
- return ( $this-mInterwiki != '' );
+ return $this-mInterwiki !== '';
}
/**
-* Get the interwiki prefix (or null string)
+* Get the interwiki prefix
*
* @return String Interwiki prefix
*/
--
To view, visit https://gerrit.wikimedia.org/r/104936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4e646f98dc6d17a8cb1ca837dcdc9d48f85e2a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update A/AAAA records of SLD project domain records - change (operations/dns)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/104937 Change subject: Update A/ records of SLD project domain records .. Update A/ records of SLD project domain records Change-Id: I79442171d3dc15ab08321874acddb5fa362386a7 --- M templates/mediawiki.org M templates/wikibooks.org M templates/wikidata.org M templates/wikimediafoundation.org M templates/wikinews.org M templates/wikipedia.org M templates/wikiquote.org M templates/wikisource.org M templates/wikiversity.org M templates/wikivoyage.org M templates/wiktionary.org M templates/wmftest.org 12 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/37/104937/1 diff --git a/templates/mediawiki.org b/templates/mediawiki.org index a52d1ae..45e07ae 100644 --- a/templates/mediawiki.org +++ b/templates/mediawiki.org @@ -21,8 +21,8 @@ ; Canonical names -1H IN A208.80.154.232 - 1H IN 2620:0:861:ed1a::8 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikibooks.org b/templates/wikibooks.org index d77403c..56d5fb5 100644 --- a/templates/wikibooks.org +++ b/templates/wikibooks.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.228 - 1H IN 2620:0:861:ed1a::4 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikidata.org b/templates/wikidata.org index b42dad7..8cbf141 100644 --- a/templates/wikidata.org +++ b/templates/wikidata.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A 208.80.154.242 -1H IN 2620:0:861:ed1a::12 +1H IN A 208.80.154.224 +1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikimediafoundation.org b/templates/wikimediafoundation.org index 7a02f53..d36faa4 100644 --- a/templates/wikimediafoundation.org +++ b/templates/wikimediafoundation.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.233 - 1H IN 2620:0:861:ed1a::9 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; DKIM domain policy record _domainkey 1H IN TXT o=~; r=hostmas...@wikimediafoundation.org; diff --git a/templates/wikinews.org b/templates/wikinews.org index c7ea249..17e3707 100644 --- a/templates/wikinews.org +++ b/templates/wikinews.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.230 - 1H IN 2620:0:861:ed1a::6 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikipedia.org b/templates/wikipedia.org index 84c042b..3f92561 100644 --- a/templates/wikipedia.org +++ b/templates/wikipedia.org @@ -22,7 +22,7 @@ ; Canonical names -1H IN A208.80.154.225 +1H IN A208.80.154.224 1H IN 2620:0:861:ed1a::1 ; Google Webmaster Tools verification record for search management diff --git a/templates/wikiquote.org b/templates/wikiquote.org index d88aad4..ec11fca 100644 --- a/templates/wikiquote.org +++ b/templates/wikiquote.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.227 - 1H IN 2620:0:861:ed1a::3 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikisource.org b/templates/wikisource.org index 2aa78cb..358b938 100644 --- a/templates/wikisource.org +++ b/templates/wikisource.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.229 - 1H IN 2620:0:861:ed1a::5 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikiversity.org b/templates/wikiversity.org index f5b5e56..1ac900b 100644 --- a/templates/wikiversity.org +++ b/templates/wikiversity.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.231 - 1H IN 2620:0:861:ed1a::7 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1
[MediaWiki-commits] [Gerrit] beta: parsoid localsettings.js - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104938
Change subject: beta: parsoid localsettings.js
..
beta: parsoid localsettings.js
Parsoid need a configuration file, track it under puppet and get it
under /srv/deployment/parsoid which is where the Jenkins job copy the
Parsoid files already. The Job will symlink to that file.
Change-Id: I46158543d9099d675160f5aa47c666a9f302e987
---
A files/misc/parsoid-localsettings-beta.js
M manifests/role/parsoid.pp
2 files changed, 57 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/104938/1
diff --git a/files/misc/parsoid-localsettings-beta.js
b/files/misc/parsoid-localsettings-beta.js
new file mode 100644
index 000..5aa436e
--- /dev/null
+++ b/files/misc/parsoid-localsettings-beta.js
@@ -0,0 +1,36 @@
+/*
+ * THIS FILE IS MANAGED BY PUPPET
+ * puppet:///files/misc/parsoid-localsettings-beta.js
+ */
+
+exports.setup = function( parsoidConfig ) {
+ parsoidConfig.setInterwiki( 'labs',
'http://deployment.wikimedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwiki',
'http://en.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'dewiki',
'http://de.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'dewikinews',
'http://de.wikinews.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwiktionary',
'http://en.wikitionary.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwikibooks',
'http://en.wikibooks.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwikinews',
'http://en.wikinews.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'frwiki',
'http://fr.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswiki',
'http://cs.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswikisource',
'http://cs.wikisource.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswikibooks',
'http://cs.wikibooks.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswikinews',
'http://cs.wikinews.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'commonswiki',
'http://commons.wikimedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'simplewiki',
'http://simple.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'trwiki',
'http://tr.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'diqwiki',
'http://diq.wikipedia.beta.wmflabs.org/w/api.php' );
+
+ // Use the PHP preprocessor to expand templates via the MW API (default
true)
+ parsoidConfig.usePHPPreProcessor = true;
+
+ // Use selective serialization (default false)
+ parsoidConfig.useSelser = true;
+
+ // allow cross-domain requests to the API (default disallowed)
+ //parsoidConfig.allowCORS = '*';
+ //
+ parsoidConfig.parsoidCacheURI = 'http://10.4.0.61/'; //
deployment-parsoidcache3
+
+ // parsoidConfig.apiProxyURI = 'http://en.wikipedia.org';
+};
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index d14067a..3aed096 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -92,6 +92,27 @@
mode = '2775',
}
+# Jenkins copy repositories and config under /srv/deployment
+file { '/srv/deployment':
+ensure = directory,
+owner = root,
+group = root,
+mode = '0755',
+}
+file { '/srv/deployment/parsoid':
+ensure = directory,
+owner = jenkins-deploy,
+group = wikidev,
+mode = '0755',
+}
+file { '/srv/deployment/parsoid/localsettings.js':
+ensure = present,
+owner = jenkins-deploy,
+group = wikidev,
+mode = '0555',
+source = 'puppet://files/misc/parsoid-localsettings-beta.js',
+}
+
# beta uses upstart:
file { '/etc/init.d/parsoid':
ensure = 'link',
--
To view, visit https://gerrit.wikimedia.org/r/104938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46158543d9099d675160f5aa47c666a9f302e987
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve code to update related revision tables - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104939
Change subject: Improve code to update related revision tables
..
Improve code to update related revision tables
* Changed method splitUpdate; it will now accept a column prefix return only
columns matching that prefix (updateRelated can fetch it's own using
splitUpdate with the appropriate prefix)
* Changed updateRelated: it'll now accept (all, not just related) $changes,
(whereupon it can call splitUpdate itself) old $row
* PostRevisionStorage::updateRelated is no longer unimplemented: it will be run
if the changed columns are in $allowedUpdateColumns (similar to update())
* Update will now check for allowed columns in static (we're on PHP5.3 already)
instead of self, so specific implementations can overwrite/add their own.
Change-Id: I31eacc2839f03d0200cce2f41bb9a17745537f37
---
M includes/Data/RevisionStorage.php
1 file changed, 51 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/39/104939/1
diff --git a/includes/Data/RevisionStorage.php
b/includes/Data/RevisionStorage.php
index 848dfce..7fd0bd7 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -25,8 +25,8 @@
abstract protected function relatedPk();
abstract protected function joinField();
- abstract protected function insertRelated( array $row, array $related );
- abstract protected function updateRelated( array $rev, array $related );
+ abstract protected function insertRelated( array $row );
+ abstract protected function updateRelated( array $changes, array $old );
abstract protected function removeRelated( array $row );
public function __construct( DbFactory $dbFactory, $externalStore ) {
@@ -240,7 +240,7 @@
if ( $this-externalStore !isset( $row['rev_content_url'] )
) {
$row = $this-insertExternalStore( $row );
}
- list( $rev, $related ) = $this-splitUpdate( $row );
+ $rev = $this-splitUpdate( $row, 'rev' );
// If a content url is available store that in the db
// instead of real content.
if ( isset( $rev['rev_content_url'] ) ) {
@@ -259,7 +259,7 @@
return false;
}
- return $this-insertRelated( $row, $related );
+ return $this-insertRelated( $row );
}
protected function insertExternalStore( array $row ) {
@@ -282,12 +282,12 @@
// for suppressing?
public function update( array $old, array $new ) {
$changeSet = ObjectManager::calcUpdates( $old, $new );
- $extra = array_diff( array_keys( $changeSet ),
self::$allowedUpdateColumns );
+ $extra = array_diff( array_keys( $changeSet ),
static::$allowedUpdateColumns );
if ( $extra ) {
throw new DataModelException( 'Update not allowed on: '
. implode( ', ', $extra ), 'process-data' );
}
- list( $rev, $related ) = $this-splitUpdate( $changeSet );
+ $rev = $this-splitUpdate( $changeSet, 'rev' );
if ( $rev ) {
$dbw = $this-dbFactory-getDB( DB_MASTER );
@@ -301,8 +301,7 @@
return false;
}
}
- // TODO: this probably wont work, it needs $row
- return $this-updateRelated( $rev, $related );
+ return $this-updateRelated( $changeSet, $old );
}
@@ -334,20 +333,23 @@
throw new DataModelException( 'Not Implemented', 'process-data'
);
}
- // Separates $row into two arrays, one with the rev_ prefix
- // and the other with everything else. May need to split more
- // specifically if we want 2 prefixes.
- protected function splitUpdate( array $row ) {
- $rev = $related = array();
+ /**
+* Gets all columns from $row that start with a given prefix and omits
other
+* columns.
+*
+* @param array $row Rows to split
+* @param string[optional] $prefix
+* @return array Remaining rows
+*/
+ protected function splitUpdate( array $row, $prefix = 'rev' ) {
+ $rev = array();
foreach ( $row as $key = $value ) {
- $prefix = substr( $key, 0, 4 );
- if ( $prefix === 'rev_' ) {
+ $keyPrefix = strstr( $key, '_', true );
+ if ( $keyPrefix === $prefix ) {
$rev[$key] = $value;
- } else {
- $related[$key] = $value;
}
[MediaWiki-commits] [Gerrit] Update A/AAAA records of SLD project domain records - change (operations/dns)
Mark Bergsma has submitted this change and it was merged. Change subject: Update A/ records of SLD project domain records .. Update A/ records of SLD project domain records Change-Id: I79442171d3dc15ab08321874acddb5fa362386a7 --- M templates/mediawiki.org M templates/wikibooks.org M templates/wikidata.org M templates/wikimediafoundation.org M templates/wikinews.org M templates/wikipedia.org M templates/wikiquote.org M templates/wikisource.org M templates/wikiversity.org M templates/wikivoyage.org M templates/wiktionary.org M templates/wmftest.org 12 files changed, 22 insertions(+), 22 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mediawiki.org b/templates/mediawiki.org index a52d1ae..45e07ae 100644 --- a/templates/mediawiki.org +++ b/templates/mediawiki.org @@ -21,8 +21,8 @@ ; Canonical names -1H IN A208.80.154.232 - 1H IN 2620:0:861:ed1a::8 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikibooks.org b/templates/wikibooks.org index d77403c..56d5fb5 100644 --- a/templates/wikibooks.org +++ b/templates/wikibooks.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.228 - 1H IN 2620:0:861:ed1a::4 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikidata.org b/templates/wikidata.org index b42dad7..8cbf141 100644 --- a/templates/wikidata.org +++ b/templates/wikidata.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A 208.80.154.242 -1H IN 2620:0:861:ed1a::12 +1H IN A 208.80.154.224 +1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikimediafoundation.org b/templates/wikimediafoundation.org index 7a02f53..d36faa4 100644 --- a/templates/wikimediafoundation.org +++ b/templates/wikimediafoundation.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.233 - 1H IN 2620:0:861:ed1a::9 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; DKIM domain policy record _domainkey 1H IN TXT o=~; r=hostmas...@wikimediafoundation.org; diff --git a/templates/wikinews.org b/templates/wikinews.org index c7ea249..17e3707 100644 --- a/templates/wikinews.org +++ b/templates/wikinews.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.230 - 1H IN 2620:0:861:ed1a::6 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikipedia.org b/templates/wikipedia.org index 84c042b..3f92561 100644 --- a/templates/wikipedia.org +++ b/templates/wikipedia.org @@ -22,7 +22,7 @@ ; Canonical names -1H IN A208.80.154.225 +1H IN A208.80.154.224 1H IN 2620:0:861:ed1a::1 ; Google Webmaster Tools verification record for search management diff --git a/templates/wikiquote.org b/templates/wikiquote.org index d88aad4..ec11fca 100644 --- a/templates/wikiquote.org +++ b/templates/wikiquote.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.227 - 1H IN 2620:0:861:ed1a::3 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikisource.org b/templates/wikisource.org index 2aa78cb..358b938 100644 --- a/templates/wikisource.org +++ b/templates/wikisource.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.229 - 1H IN 2620:0:861:ed1a::5 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff --git a/templates/wikiversity.org b/templates/wikiversity.org index f5b5e56..1ac900b 100644 --- a/templates/wikiversity.org +++ b/templates/wikiversity.org @@ -23,8 +23,8 @@ ; Canonical names -1H IN A208.80.154.231 - 1H IN 2620:0:861:ed1a::7 +1H IN A208.80.154.224 + 1H IN 2620:0:861:ed1a::1 ; Servers (alphabetic order) diff
[MediaWiki-commits] [Gerrit] Swap new and old bits-lb LVS service IPs for esams - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104940
Change subject: Swap new and old bits-lb LVS service IPs for esams
..
Swap new and old bits-lb LVS service IPs for esams
This will move monitoring to the new IP.
Change-Id: I703485af3dba3a9b317d4ae1ff9bbca67143fe74
---
M modules/lvs/manifests/configuration.pp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/104940/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 3b6cdae..360a6d6 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -199,16 +199,16 @@
'esams' = {
'textlbsecure' = '91.198.174.192',
'loginlbsecure' = '91.198.174.201',
-'bitslbsecure-new' = '91.198.174.202',
-'bitslbsecure' = 91.198.174.233,
+'bitslbsecure' = '91.198.174.202',
+'bitslbsecure-old' = 91.198.174.233,
'uploadlbsecure' = '91.198.174.208',
'mobilelbsecure' = '91.198.174.236',
'donatelbsecure' = '91.198.174.224',
'textlb6secure' = '2620:0:862:ed1a::1',
'loginlbsecure6' = '2620:0:862:ed1a::1:9',
-'bitslbsecure6-new' = '2620:0:862:ed1a::1:a',
-'bitslbsecure6' = 2620:0:862:ed1a::a,
+'bitslbsecure6' = '2620:0:862:ed1a::1:a',
+'bitslbsecure6-old' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = '2620:0:862:ed1a::2:b',
'mobilelbsecure6' = '2620:0:862:ed1a::c',
},
@@ -217,7 +217,7 @@
'bits' = {
'pmtpa' = { 'bitslb' = 208.80.152.210, 'bitslb6' =
2620:0:860:ed1a::a, 'bitssvc' = 10.2.1.23 },
'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6-new' =
'2620:0:861:ed1a::1:a', 'bitslb6' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
-'esams' = { 'bitslb-new' = '91.198.174.202', 'bitslb' =
91.198.174.233, 'bitslb6-new' = '2620:0:862:ed1a::1:a', 'bitslb6' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
+'esams' = { 'bitslb' = '91.198.174.202', 'bitslb-old' =
91.198.174.233, 'bitslb6' = '2620:0:862:ed1a::1:a', 'bitslb6-old' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
'ulsfo' = { 'bitslb' = 198.35.26.106, 'bitslb6-new' =
'2620:0:863:ed1a::1:a', 'bitslb6' = 2620:0:863:ed1a::a, 'bitssvc' =
10.2.4.23 },
},
'upload' = {
--
To view, visit https://gerrit.wikimedia.org/r/104940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I703485af3dba3a9b317d4ae1ff9bbca67143fe74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swap new and old bits-lb LVS service IPs for esams - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Swap new and old bits-lb LVS service IPs for esams
..
Swap new and old bits-lb LVS service IPs for esams
This will move monitoring to the new IP.
Change-Id: I703485af3dba3a9b317d4ae1ff9bbca67143fe74
---
M modules/lvs/manifests/configuration.pp
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 3b6cdae..360a6d6 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -199,16 +199,16 @@
'esams' = {
'textlbsecure' = '91.198.174.192',
'loginlbsecure' = '91.198.174.201',
-'bitslbsecure-new' = '91.198.174.202',
-'bitslbsecure' = 91.198.174.233,
+'bitslbsecure' = '91.198.174.202',
+'bitslbsecure-old' = 91.198.174.233,
'uploadlbsecure' = '91.198.174.208',
'mobilelbsecure' = '91.198.174.236',
'donatelbsecure' = '91.198.174.224',
'textlb6secure' = '2620:0:862:ed1a::1',
'loginlbsecure6' = '2620:0:862:ed1a::1:9',
-'bitslbsecure6-new' = '2620:0:862:ed1a::1:a',
-'bitslbsecure6' = 2620:0:862:ed1a::a,
+'bitslbsecure6' = '2620:0:862:ed1a::1:a',
+'bitslbsecure6-old' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = '2620:0:862:ed1a::2:b',
'mobilelbsecure6' = '2620:0:862:ed1a::c',
},
@@ -217,7 +217,7 @@
'bits' = {
'pmtpa' = { 'bitslb' = 208.80.152.210, 'bitslb6' =
2620:0:860:ed1a::a, 'bitssvc' = 10.2.1.23 },
'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6-new' =
'2620:0:861:ed1a::1:a', 'bitslb6' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
-'esams' = { 'bitslb-new' = '91.198.174.202', 'bitslb' =
91.198.174.233, 'bitslb6-new' = '2620:0:862:ed1a::1:a', 'bitslb6' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
+'esams' = { 'bitslb' = '91.198.174.202', 'bitslb-old' =
91.198.174.233, 'bitslb6' = '2620:0:862:ed1a::1:a', 'bitslb6-old' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
'ulsfo' = { 'bitslb' = 198.35.26.106, 'bitslb6-new' =
'2620:0:863:ed1a::1:a', 'bitslb6' = 2620:0:863:ed1a::a, 'bitssvc' =
10.2.4.23 },
},
'upload' = {
--
To view, visit https://gerrit.wikimedia.org/r/104940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I703485af3dba3a9b317d4ae1ff9bbca67143fe74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Update bits-lb.esams IP addresses to the new Zero scheme - change (operations/dns)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/104941 Change subject: Update bits-lb.esams IP addresses to the new Zero scheme .. Update bits-lb.esams IP addresses to the new Zero scheme Change-Id: Ie873ad4d934e5f87657c096c2cc1d514f5b660b2 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/41/104941/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e3a8588..09aea70 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -935,8 +935,8 @@ 1H IN 2620:0:862:ed1a::8 foundation-lb 1H IN A91.198.174.235 1H IN 2620:0:862:ed1a::9 -bits-lb1H IN A91.198.174.233 - 1H IN 2620:0:862:ed1a::a +bits-lb1H IN A91.198.174.202 + 1H IN 2620:0:862:ed1a::1:a upload-lb 1H IN A91.198.174.208 1H IN 2620:0:862:ed1a::2:b mobile-lb 1H IN A91.198.174.236 -- To view, visit https://gerrit.wikimedia.org/r/104941 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie873ad4d934e5f87657c096c2cc1d514f5b660b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix small errors in board history page - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104942
Change subject: Fix small errors in board history page
..
Fix small errors in board history page
* Fixed typo: getPostId-getHex() - getPostId-getHex()
* Added isset( $needed[$id] ) check; may have already been unset for a previous
entry.
Change-Id: Ic8349946736b27e6f2486e8ad4d1951d99e4c152
---
M includes/Block/Header.php
1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/42/104942/1
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index a272148..3847cec 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -170,11 +170,11 @@
// headers can't be moderated
break;
case 'post':
- // comments should not be in board
history
if ( $revision-isTopicTitle() ) {
$needed[$revision-getPostId()-getHex()] = $i;
$query[] = array(
'tree_rev_descendant_id' = $revision-getPostId() );
} else {
+ // comments should not be in
board history
unset( $history[$i] );
}
break;
@@ -193,12 +193,18 @@
);
foreach ( $found as $newest ) {
$newest = reset( $newest );
- $i = $needed[$newest-getPostId()-getHex()];
- unset( $needed[$newest-getPostId()-getHex()] );
- if ( !$this-permissions-isAllowed( $newest,
'board-history' ) ) {
- unset( $history[$i] );
+ $id = $newest-getPostId()-getHex();
+
+ if ( isset( $needed[$id] ) ) {
+ $i = $needed[$id];
+ unset( $needed[$id] );
+
+ if ( !$this-permissions-isAllowed( $newest,
'board-history' ) ) {
+ unset( $history[$i] );
+ }
}
}
+
// not found
foreach ( $needed as $i ) {
unset( $history[$i] );
--
To view, visit https://gerrit.wikimedia.org/r/104942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8349946736b27e6f2486e8ad4d1951d99e4c152
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] Update bits-lb.esams IP addresses to the new Zero scheme - change (operations/dns)
Mark Bergsma has submitted this change and it was merged. Change subject: Update bits-lb.esams IP addresses to the new Zero scheme .. Update bits-lb.esams IP addresses to the new Zero scheme Change-Id: Ie873ad4d934e5f87657c096c2cc1d514f5b660b2 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e3a8588..09aea70 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -935,8 +935,8 @@ 1H IN 2620:0:862:ed1a::8 foundation-lb 1H IN A91.198.174.235 1H IN 2620:0:862:ed1a::9 -bits-lb1H IN A91.198.174.233 - 1H IN 2620:0:862:ed1a::a +bits-lb1H IN A91.198.174.202 + 1H IN 2620:0:862:ed1a::1:a upload-lb 1H IN A91.198.174.208 1H IN 2620:0:862:ed1a::2:b mobile-lb 1H IN A91.198.174.236 -- To view, visit https://gerrit.wikimedia.org/r/104941 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie873ad4d934e5f87657c096c2cc1d514f5b660b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@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 container namespace - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/104943 Change subject: Use container namespace .. Use container namespace Fatal error: Class 'Container' not found in extensions/Flow/FlowActions.php on line 102 Change-Id: I00d32ecec87ac198a265180c0485d84ff1579101 --- M FlowActions.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/43/104943/1 diff --git a/FlowActions.php b/FlowActions.php index e3b6465..f2b4cf1 100644 --- a/FlowActions.php +++ b/FlowActions.php @@ -7,6 +7,7 @@ use Flow\Log\Logger; use Flow\Block\Block; use Flow\Templating; +use Flow\Container; use \Message; /** -- To view, visit https://gerrit.wikimedia.org/r/104943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00d32ecec87ac198a265180c0485d84ff1579101 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] Misc fixes to UploadSourceField - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104944
Change subject: Misc fixes to UploadSourceField
..
Misc fixes to UploadSourceField
Follow-up I7c15fd4250 (00ca365).
- Added 'radio-id' configuration option to set the id of the radio button,
and changed Special:Upload to use it. Had to keep the old way to set it
since this class is used by some extensions.
- Always set the for attribute of the label to the field and the not the
radio, since the text it contains does not describes the radio button.
Change-Id: I524f8743fd03546024f8c97852a2bcb3c23c6019
---
M includes/specials/SpecialUpload.php
1 file changed, 15 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/104944/1
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index 5175ec9..2e544d4 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -828,6 +828,7 @@
'section' = 'source',
'type' = 'file',
'id' = 'wpUploadFile',
+ 'radio-id' = 'wpSourceTypeFile',
'label-message' = 'sourcefilename',
'upload-type' = 'File',
'radio' = $radio,
@@ -845,6 +846,7 @@
'class' = 'UploadSourceField',
'section' = 'source',
'id' = 'wpUploadFileURL',
+ 'radio-id' = 'wpSourceTypeurl',
'label-message' = 'sourceurl',
'upload-type' = 'url',
'radio' = $radio,
@@ -1107,23 +1109,30 @@
* @return string
*/
function getLabelHtml( $cellAttributes = array() ) {
+ $id = $this-mParams['id'];
+ $label = Html::rawElement( 'label', array( 'for' = $id ),
$this-mLabel );
+
if ( !empty( $this-mParams['radio'] ) ) {
- $id = wpSourceType{$this-mParams['upload-type']};
+ if ( isset( $this-mParams['radio-id'] ) ) {
+ $radioId = $this-mParams['radio-id'];
+ } else {
+ $radioId = 'wpSourceType' .
$this-mParams['upload-type'];
+ }
+
$attribs = array(
'name' = 'wpSourceType',
'type' = 'radio',
- 'id' = $id,
+ 'id' = $radioId,
'value' = $this-mParams['upload-type'],
);
+
if ( !empty( $this-mParams['checked'] ) ) {
$attribs['checked'] = 'checked';
}
- $label = Html::rawElement( 'label', array( 'for' = $id
), $this-mLabel );
+
$label .= Html::element( 'input', $attribs );
- } else {
- $id = $this-mParams['id'];
- $label = Html::rawElement( 'label', array( 'for' = $id
), $this-mLabel );
}
+
return Html::rawElement( 'td', array( 'class' = 'mw-label' ) +
$cellAttributes, $label );
}
--
To view, visit https://gerrit.wikimedia.org/r/104944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I524f8743fd03546024f8c97852a2bcb3c23c6019
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swap old and new bits-lb.eqiad IPv6 LVS service IPs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104945
Change subject: Swap old and new bits-lb.eqiad IPv6 LVS service IPs
..
Swap old and new bits-lb.eqiad IPv6 LVS service IPs
This moves monitoring to the new IP.
Change-Id: I9a63fe6e3bd20806ee84606d56118db38e77275e
---
M modules/lvs/manifests/configuration.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/104945/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 360a6d6..687fe1e 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -189,8 +189,8 @@
'wikiversitylbsecure6' = 2620:0:861:ed1a::7,
'mediawikilbsecure6' = 2620:0:861:ed1a::8,
'foundationlbsecure6' = 2620:0:861:ed1a::9,
-'bitslb6secure6-new' = '2620:0:861:ed1a::1:a',
-'bitslbsecure6' = 2620:0:861:ed1a::a,
+'bitslbsecure6' = '2620:0:861:ed1a::1:a',
+'bitslbsecure6-old' = 2620:0:861:ed1a::a,
'uploadlbsecure6' = '2620:0:861:ed1a::2:b',
'mobilelbsecure6' = 2620:0:861:ed1a::c,
'wikidatalbsecure6' = 2620:0:861:ed1a::12,
@@ -216,7 +216,7 @@
},
'bits' = {
'pmtpa' = { 'bitslb' = 208.80.152.210, 'bitslb6' =
2620:0:860:ed1a::a, 'bitssvc' = 10.2.1.23 },
-'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6-new' =
'2620:0:861:ed1a::1:a', 'bitslb6' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
+'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6' =
'2620:0:861:ed1a::1:a', 'bitslb6-old' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
'esams' = { 'bitslb' = '91.198.174.202', 'bitslb-old' =
91.198.174.233, 'bitslb6' = '2620:0:862:ed1a::1:a', 'bitslb6-old' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
'ulsfo' = { 'bitslb' = 198.35.26.106, 'bitslb6-new' =
'2620:0:863:ed1a::1:a', 'bitslb6' = 2620:0:863:ed1a::a, 'bitssvc' =
10.2.4.23 },
},
--
To view, visit https://gerrit.wikimedia.org/r/104945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a63fe6e3bd20806ee84606d56118db38e77275e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swap old and new bits-lb.eqiad IPv6 LVS service IPs - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Swap old and new bits-lb.eqiad IPv6 LVS service IPs
..
Swap old and new bits-lb.eqiad IPv6 LVS service IPs
This moves monitoring to the new IP.
Change-Id: I9a63fe6e3bd20806ee84606d56118db38e77275e
---
M modules/lvs/manifests/configuration.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 360a6d6..687fe1e 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -189,8 +189,8 @@
'wikiversitylbsecure6' = 2620:0:861:ed1a::7,
'mediawikilbsecure6' = 2620:0:861:ed1a::8,
'foundationlbsecure6' = 2620:0:861:ed1a::9,
-'bitslb6secure6-new' = '2620:0:861:ed1a::1:a',
-'bitslbsecure6' = 2620:0:861:ed1a::a,
+'bitslbsecure6' = '2620:0:861:ed1a::1:a',
+'bitslbsecure6-old' = 2620:0:861:ed1a::a,
'uploadlbsecure6' = '2620:0:861:ed1a::2:b',
'mobilelbsecure6' = 2620:0:861:ed1a::c,
'wikidatalbsecure6' = 2620:0:861:ed1a::12,
@@ -216,7 +216,7 @@
},
'bits' = {
'pmtpa' = { 'bitslb' = 208.80.152.210, 'bitslb6' =
2620:0:860:ed1a::a, 'bitssvc' = 10.2.1.23 },
-'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6-new' =
'2620:0:861:ed1a::1:a', 'bitslb6' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
+'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6' =
'2620:0:861:ed1a::1:a', 'bitslb6-old' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
'esams' = { 'bitslb' = '91.198.174.202', 'bitslb-old' =
91.198.174.233, 'bitslb6' = '2620:0:862:ed1a::1:a', 'bitslb6-old' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
'ulsfo' = { 'bitslb' = 198.35.26.106, 'bitslb6-new' =
'2620:0:863:ed1a::1:a', 'bitslb6' = 2620:0:863:ed1a::a, 'bitssvc' =
10.2.4.23 },
},
--
To view, visit https://gerrit.wikimedia.org/r/104945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a63fe6e3bd20806ee84606d56118db38e77275e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] translatewiki-issues - change (mediawiki...GWToolset)
Dan-nl has submitted this change and it was merged.
Change subject: translatewiki-issues
..
translatewiki-issues
received an email with two translatewiki issues:
*
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Gwtoolset-no-xml-element-found/en
i have adjusted the parametes and code for Gwtoolset-no-xml-element-found;
hopefully that will
help with translation
*
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Gwtoolset-mediafile-throttle/en
we want to keep the term throttle over the term threshold. i did re-write the
copy for
Gwtoolset-mediafile-throttle-description, which will hopefully make its use
clearer.
Change-Id: Ibd4f4089a92de73d3bcc85814c84f959ef91949e
---
M GWToolset.i18n.php
M includes/Handlers/Xml/XmlDetectHandler.php
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Dan-nl: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/GWToolset.i18n.php b/GWToolset.i18n.php
index 9732fcd..ec51199 100644
--- a/GWToolset.i18n.php
+++ b/GWToolset.i18n.php
@@ -150,7 +150,7 @@
'gwtoolset-ensure-well-formed-xml' = 'Make sure the XML file is
well-formed with this $1.',
'gwtoolset-file-url-invalid' = 'The file URL was invalid; The file
does not yet exist in the wiki. You need to first upload the file from your
computer if you want to use the file URL reference in the form.',
'gwtoolset-mediafile-throttle' = 'Mediafile throttle:',
- 'gwtoolset-mediafile-throttle-description' = 'The throttle controls
the load Wikimedia Commons will put on your media server during the batch
upload. You can set the throttle between 1-20 where the number corresponds to
the number of media requests per minute.',
+ 'gwtoolset-mediafile-throttle-description' = 'After the batch preview,
in step 3, GWToolset uploads the remaining records in your batch upload via
background jobs. The mediafile throttle controls the number of mediafile
requests Wikimedia Commons will make against your mediafile server each time a
background job is run. You can set the mediafile throttle between 1-20. For
example, if the total number of records in your batch upload is 100 and you set
the throttle to 20, Wikimedia Commons will run 5 background jobs in order to
process your entire batch upload. The time between each background upload job
varies depending on server load and configuration; we anticipate that on
Wikimedia Commons a GWToolset background job will run at least every 5
minutes.',
'gwtoolset-mediawiki-template-does-not-exist' = 'MediaWiki template
strong$1/strong does not exist in the wiki.
Either import the template or select another MediaWiki template to use for
mapping.',
@@ -174,7 +174,8 @@
It should be in the namespace strong$3strong.',
'gwtoolset-no-xml-element-found' = 'No XML element found for mapping.
* Did you enter a value in the form for
{{int:gwtoolset-record-element-name}}?
-* Is the XML file well-formed? Try this $1.',
+* Is the XML file well-formed? Try this $1.
+$2',
'gwtoolset-page-title-contains-url' = 'The page $1 contains the
entire wiki URL. Make sure you only enter the page title, e.g. the part of the
URL after /wiki/',
'gwtoolset-record-element-name' = 'What is the XML element that
contains each metadata record:',
'gwtoolset-step-1-heading' = 'Step 1: Metadata detection',
@@ -494,7 +495,8 @@
Refers to {{msg-mw|Gwtoolset-record-element-name}}.
Parameters:
-* $1 - http://www.w3schools.com/xml/xml_validator.asp, a line-break, and
{{msg-mw|Gwtoolset-back-text-link}}',
+* $1 - http://www.w3schools.com/xml/xml_validator.asp
+* $2 - {{msg-mw|Gwtoolset-back-text-link}}',
'gwtoolset-page-title-contains-url' = 'Appears when the page title
being requested contains the URL of the site and not just the page title',
'gwtoolset-record-element-name' = 'Label for record element name in
the HTML form.
diff --git a/includes/Handlers/Xml/XmlDetectHandler.php
b/includes/Handlers/Xml/XmlDetectHandler.php
index b0eae41..d51e944 100644
--- a/includes/Handlers/Xml/XmlDetectHandler.php
+++ b/includes/Handlers/Xml/XmlDetectHandler.php
@@ -454,11 +454,11 @@
}
if ( empty( $this-_metadata_example_dom_element ) ) {
- $msg = 'http://www.w3schools.com/xml/xml_validator.asp'
. PHP_EOL .
- $this-_SpecialPage-getBackToFormLink();
+ $msg1 =
'http://www.w3schools.com/xml/xml_validator.asp';
+ $msg2 = $this-_SpecialPage-getBackToFormLink();
throw new GWTException(
- array( 'gwtoolset-no-xml-element-found' =
array( $msg ) )
+ array( 'gwtoolset-no-xml-element-found' =
array( $msg1, $msg2 ) )
);
}
--
To view, visit
[MediaWiki-commits] [Gerrit] Update AAAA record of bits-lb.eqiad to the new Zero scheme - change (operations/dns)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104947
Change subject: Update record of bits-lb.eqiad to the new Zero scheme
..
Update record of bits-lb.eqiad to the new Zero scheme
Change-Id: Idcd94d336290bd69442a72fb94a3575ee4d3e61b
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/47/104947/1
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 467f1b4..24b6c0a 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -170,6 +170,8 @@
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+a.0.0.0 1H IN PTR
bits-lb.eqiad.wikimedia.org.
+
; LVS Multimedia, 2620:0:861:ed1a::2:0/96
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 09aea70..4530ef0 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -312,7 +312,7 @@
foundation-lb.eqiad1H IN A208.80.154.233
1H IN 2620:0:861:ed1a::9
bits-lb.eqiad 1H IN A208.80.154.234
- 1H IN 2620:0:861:ed1a::a
+ 1H IN 2620:0:861:ed1a::1:a
upload-lb.eqiad1H IN A208.80.154.240
1H IN 2620:0:861:ed1a::2:b
mobile-lb.eqiad1H IN A208.80.154.236
--
To view, visit https://gerrit.wikimedia.org/r/104947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcd94d336290bd69442a72fb94a3575ee4d3e61b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update AAAA record of bits-lb.eqiad to the new Zero scheme - change (operations/dns)
Mark Bergsma has submitted this change and it was merged.
Change subject: Update record of bits-lb.eqiad to the new Zero scheme
..
Update record of bits-lb.eqiad to the new Zero scheme
Change-Id: Idcd94d336290bd69442a72fb94a3575ee4d3e61b
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 467f1b4..24b6c0a 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -170,6 +170,8 @@
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+a.0.0.0 1H IN PTR
bits-lb.eqiad.wikimedia.org.
+
; LVS Multimedia, 2620:0:861:ed1a::2:0/96
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 09aea70..4530ef0 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -312,7 +312,7 @@
foundation-lb.eqiad1H IN A208.80.154.233
1H IN 2620:0:861:ed1a::9
bits-lb.eqiad 1H IN A208.80.154.234
- 1H IN 2620:0:861:ed1a::a
+ 1H IN 2620:0:861:ed1a::1:a
upload-lb.eqiad1H IN A208.80.154.240
1H IN 2620:0:861:ed1a::2:b
mobile-lb.eqiad1H IN A208.80.154.236
--
To view, visit https://gerrit.wikimedia.org/r/104947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcd94d336290bd69442a72fb94a3575ee4d3e61b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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 new mobile-lb LVS service IPs (Zero scheme) - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104948
Change subject: Add new mobile-lb LVS service IPs (Zero scheme)
..
Add new mobile-lb LVS service IPs (Zero scheme)
Change-Id: I2f66a76e98550fa22eccb8c6ebb971cabf44231b
---
M modules/lvs/manifests/configuration.pp
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/104948/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 687fe1e..a1c9419 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -192,6 +192,7 @@
'bitslbsecure6' = '2620:0:861:ed1a::1:a',
'bitslbsecure6-old' = 2620:0:861:ed1a::a,
'uploadlbsecure6' = '2620:0:861:ed1a::2:b',
+'mobilelbsecure6-new' = '2620:0:861:ed1a::1:c',
'mobilelbsecure6' = 2620:0:861:ed1a::c,
'wikidatalbsecure6' = 2620:0:861:ed1a::12,
'wikivoyagelbsecure6' = 2620:0:861:ed1a::13
@@ -202,6 +203,7 @@
'bitslbsecure' = '91.198.174.202',
'bitslbsecure-old' = 91.198.174.233,
'uploadlbsecure' = '91.198.174.208',
+'mobilelbsecure-new' = '91.198.174.204',
'mobilelbsecure' = '91.198.174.236',
'donatelbsecure' = '91.198.174.224',
@@ -210,6 +212,7 @@
'bitslbsecure6' = '2620:0:862:ed1a::1:a',
'bitslbsecure6-old' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = '2620:0:862:ed1a::2:b',
+'mobilelbsecure6-new' = '2620:0:862:ed1a::1:c',
'mobilelbsecure6' = '2620:0:862:ed1a::c',
},
'ulsfo' = {}
@@ -268,9 +271,9 @@
},
'mobile' = {
'pmtpa' = {},
-'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6' =
2620:0:861:ed1a::c, 'mobilesvc' = 10.2.2.26},
-'esams' = { 'mobilelb' = '91.198.174.236', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
-'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6' =
'2620:0:863:ed1a::c', 'mobilesvc' = '10.2.4.26'},
+'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6-new'
= '2620:0:861:ed1a::1:c', 'mobilelb6' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
+'esams' = { 'mobilelb-new' = '91.198.174.204', 'mobilelb' =
'91.198.174.236', 'mobilelb6-new' = '2620:0:862:ed1a::1:c', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
+'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6-new' =
'2620:0:863:ed1a::1:c', 'mobilelb6' = '2620:0:863:ed1a::c', 'mobilesvc' =
'10.2.4.26'},
},
'swift' = {
'pmtpa' = 10.2.1.27,
--
To view, visit https://gerrit.wikimedia.org/r/104948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f66a76e98550fa22eccb8c6ebb971cabf44231b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new mobile-lb LVS service IPs (Zero scheme) - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add new mobile-lb LVS service IPs (Zero scheme)
..
Add new mobile-lb LVS service IPs (Zero scheme)
Change-Id: I2f66a76e98550fa22eccb8c6ebb971cabf44231b
---
M modules/lvs/manifests/configuration.pp
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 687fe1e..a1c9419 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -192,6 +192,7 @@
'bitslbsecure6' = '2620:0:861:ed1a::1:a',
'bitslbsecure6-old' = 2620:0:861:ed1a::a,
'uploadlbsecure6' = '2620:0:861:ed1a::2:b',
+'mobilelbsecure6-new' = '2620:0:861:ed1a::1:c',
'mobilelbsecure6' = 2620:0:861:ed1a::c,
'wikidatalbsecure6' = 2620:0:861:ed1a::12,
'wikivoyagelbsecure6' = 2620:0:861:ed1a::13
@@ -202,6 +203,7 @@
'bitslbsecure' = '91.198.174.202',
'bitslbsecure-old' = 91.198.174.233,
'uploadlbsecure' = '91.198.174.208',
+'mobilelbsecure-new' = '91.198.174.204',
'mobilelbsecure' = '91.198.174.236',
'donatelbsecure' = '91.198.174.224',
@@ -210,6 +212,7 @@
'bitslbsecure6' = '2620:0:862:ed1a::1:a',
'bitslbsecure6-old' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = '2620:0:862:ed1a::2:b',
+'mobilelbsecure6-new' = '2620:0:862:ed1a::1:c',
'mobilelbsecure6' = '2620:0:862:ed1a::c',
},
'ulsfo' = {}
@@ -268,9 +271,9 @@
},
'mobile' = {
'pmtpa' = {},
-'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6' =
2620:0:861:ed1a::c, 'mobilesvc' = 10.2.2.26},
-'esams' = { 'mobilelb' = '91.198.174.236', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
-'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6' =
'2620:0:863:ed1a::c', 'mobilesvc' = '10.2.4.26'},
+'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6-new'
= '2620:0:861:ed1a::1:c', 'mobilelb6' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
+'esams' = { 'mobilelb-new' = '91.198.174.204', 'mobilelb' =
'91.198.174.236', 'mobilelb6-new' = '2620:0:862:ed1a::1:c', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
+'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6-new' =
'2620:0:863:ed1a::1:c', 'mobilelb6' = '2620:0:863:ed1a::c', 'mobilesvc' =
'10.2.4.26'},
},
'swift' = {
'pmtpa' = 10.2.1.27,
--
To view, visit https://gerrit.wikimedia.org/r/104948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f66a76e98550fa22eccb8c6ebb971cabf44231b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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 site pmtpa from the protoproxy configuration - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104949
Change subject: Remove site pmtpa from the protoproxy configuration
..
Remove site pmtpa from the protoproxy configuration
Change-Id: Iecf20c6c84fd36777ecbaced5d20edbae0f5da6e
---
M manifests/role/protoproxy.pp
1 file changed, 0 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/104949/1
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index d6fb5ea..458d2d1 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -79,14 +79,12 @@
protoproxy{ 'wikimedia':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.200', '[2620:0:860:ed1a::]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:861:ed1a::]' ],
'esams' = [ '91.198.174.192', '91.198.174.201', '91.198.174.224',
'[2620:0:862:ed1a::1:9]' ],
},
proxy_server_name = '*.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -96,14 +94,12 @@
}
protoproxy{ 'bits':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.210', '[2620:0:860:ed1a::a]' ],
'eqiad' = [ '208.80.154.234', '[2620:0:861:ed1a::1:a]',
'[2620:0:861:ed1a::a]' ],
'esams' = [ '91.198.174.202', '91.198.174.233',
'[2620:0:862:ed1a::1:a]', '[2620:0:862:ed1a::a]' ],
},
proxy_server_name = 'bits.wikimedia.org geoiplookup.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.23' },
'eqiad' = { 'primary' = '10.2.2.23' },
'esams' = { 'primary' = '10.2.3.23', 'secondary' =
'208.80.154.234' },
},
@@ -112,14 +108,12 @@
}
protoproxy{ 'upload':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.211', '[2620:0:860:ed1a::b]' ],
'eqiad' = [ '208.80.154.240', '[2620:0:861:ed1a::2:b]' ],
'esams' = [ '91.198.174.208', '[2620:0:862:ed1a::2:b]' ],
},
proxy_server_name = 'upload.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.24' },
'eqiad' = { 'primary' = '10.2.2.24' },
'esams' = { 'primary' = '10.2.3.24', 'secondary' =
'208.80.154.240' },
},
@@ -128,14 +122,12 @@
}
protoproxy{ 'wikipedia':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.201', '[2620:0:860:ed1a::1]' ],
'eqiad' = [ '208.80.154.225', '[2620:0:861:ed1a::1]' ],
'esams' = [ '[2620:0:862:ed1a::1]' ],
},
proxy_server_name = '*.wikipedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -144,14 +136,12 @@
}
protoproxy{ 'wiktionary':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.202', '[2620:0:860:ed1a::2]' ],
'eqiad' = [ '208.80.154.226', '[2620:0:861:ed1a::2]' ],
'esams' = [],
},
proxy_server_name = '*.wiktionary.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -160,14 +150,12 @@
}
protoproxy{ 'wikiquote':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.203', '[2620:0:860:ed1a::3]' ],
'eqiad' = [ '208.80.154.227', '[2620:0:861:ed1a::3]' ],
'esams' = [],
},
proxy_server_name = '*.wikiquote.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -176,14 +164,12 @@
}
protoproxy{ 'wikibooks':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.204', '[2620:0:860:ed1a::4]' ],
'eqiad' = [ '208.80.154.228', '[2620:0:861:ed1a::4]' ],
'esams' = [],
},
proxy_server_name = '*.wikibooks.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' =
[MediaWiki-commits] [Gerrit] Remove site pmtpa from the protoproxy configuration - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove site pmtpa from the protoproxy configuration
..
Remove site pmtpa from the protoproxy configuration
Change-Id: Iecf20c6c84fd36777ecbaced5d20edbae0f5da6e
---
M manifests/role/protoproxy.pp
1 file changed, 0 insertions(+), 32 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index d6fb5ea..458d2d1 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -79,14 +79,12 @@
protoproxy{ 'wikimedia':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.200', '[2620:0:860:ed1a::]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:861:ed1a::]' ],
'esams' = [ '91.198.174.192', '91.198.174.201', '91.198.174.224',
'[2620:0:862:ed1a::1:9]' ],
},
proxy_server_name = '*.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -96,14 +94,12 @@
}
protoproxy{ 'bits':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.210', '[2620:0:860:ed1a::a]' ],
'eqiad' = [ '208.80.154.234', '[2620:0:861:ed1a::1:a]',
'[2620:0:861:ed1a::a]' ],
'esams' = [ '91.198.174.202', '91.198.174.233',
'[2620:0:862:ed1a::1:a]', '[2620:0:862:ed1a::a]' ],
},
proxy_server_name = 'bits.wikimedia.org geoiplookup.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.23' },
'eqiad' = { 'primary' = '10.2.2.23' },
'esams' = { 'primary' = '10.2.3.23', 'secondary' =
'208.80.154.234' },
},
@@ -112,14 +108,12 @@
}
protoproxy{ 'upload':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.211', '[2620:0:860:ed1a::b]' ],
'eqiad' = [ '208.80.154.240', '[2620:0:861:ed1a::2:b]' ],
'esams' = [ '91.198.174.208', '[2620:0:862:ed1a::2:b]' ],
},
proxy_server_name = 'upload.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.24' },
'eqiad' = { 'primary' = '10.2.2.24' },
'esams' = { 'primary' = '10.2.3.24', 'secondary' =
'208.80.154.240' },
},
@@ -128,14 +122,12 @@
}
protoproxy{ 'wikipedia':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.201', '[2620:0:860:ed1a::1]' ],
'eqiad' = [ '208.80.154.225', '[2620:0:861:ed1a::1]' ],
'esams' = [ '[2620:0:862:ed1a::1]' ],
},
proxy_server_name = '*.wikipedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -144,14 +136,12 @@
}
protoproxy{ 'wiktionary':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.202', '[2620:0:860:ed1a::2]' ],
'eqiad' = [ '208.80.154.226', '[2620:0:861:ed1a::2]' ],
'esams' = [],
},
proxy_server_name = '*.wiktionary.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -160,14 +150,12 @@
}
protoproxy{ 'wikiquote':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.203', '[2620:0:860:ed1a::3]' ],
'eqiad' = [ '208.80.154.227', '[2620:0:861:ed1a::3]' ],
'esams' = [],
},
proxy_server_name = '*.wikiquote.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
@@ -176,14 +164,12 @@
}
protoproxy{ 'wikibooks':
proxy_addresses = {
-'pmtpa' = [ '208.80.152.204', '[2620:0:860:ed1a::4]' ],
'eqiad' = [ '208.80.154.228', '[2620:0:861:ed1a::4]' ],
'esams' = [],
},
proxy_server_name = '*.wikibooks.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
-'pmtpa' = { 'primary' = '10.2.1.25' },
[MediaWiki-commits] [Gerrit] Remove underscore from class names LBFactory_* - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove underscore from class names LBFactory_*
..
Remove underscore from class names LBFactory_*
Depends on merging of MediaWiki core patch
https://gerrit.wikimedia.org/r/#/c/96469/
Change-Id: If442db60ca105dea1216f307b7f8f75fc0bf677f
---
M client/config/WikibaseClient.example.php
M client/includes/store/sql/DirectSqlStore.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/config/WikibaseClient.example.php
b/client/config/WikibaseClient.example.php
index ab32f23..2d072e8 100644
--- a/client/config/WikibaseClient.example.php
+++ b/client/config/WikibaseClient.example.php
@@ -57,12 +57,12 @@
$wgWBClientSettings['sharedCacheKeyPrefix'] =
$wgWBClientSettings['repoDatabase'] . ':WBL/' . WBL_VERSION;
// In order to access a remote repo using a different database server,
-// LBFactory_Multi must be used. In that case, enabled the block below.
+// LBFactoryMulti must be used. In that case, enabled the block below.
// If the repo is on the same server, this is not necessary.
// This does not work with database types other than mysql.
if ( false ) {
$wgLBFactoryConf = array(
- 'class' = 'LBFactory_Multi',
+ 'class' = 'LBFactoryMulti',
// Connect to all databases using the same credentials.
'serverTemplate' = array(
diff --git a/client/includes/store/sql/DirectSqlStore.php
b/client/includes/store/sql/DirectSqlStore.php
index 71719d1..ff35c7a 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -8,7 +8,7 @@
/**
* Implementation of the client store interface using direct access to the
repository's
- * database via MediaWiki's foreign wiki mechanism as implemented by
LBFactory_multi.
+ * database via MediaWiki's foreign wiki mechanism as implemented by
LBFactoryMulti.
*
* 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
--
To view, visit https://gerrit.wikimedia.org/r/96459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If442db60ca105dea1216f307b7f8f75fc0bf677f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new mobile LVS service IPs to protoproxies (Zero scheme) - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104950
Change subject: Add new mobile LVS service IPs to protoproxies (Zero scheme)
..
Add new mobile LVS service IPs to protoproxies (Zero scheme)
Change-Id: I564fb22cb8bf6ea18b1273e312c2a8f3d3516046
---
M manifests/role/protoproxy.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/104950/1
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 458d2d1..24cefff 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -248,8 +248,8 @@
}
protoproxy{ 'mobilewikipedia':
proxy_addresses = {
-'eqiad' = [ '208.80.154.236', '[2620:0:861:ed1a::c]' ],
-'esams' = [ '91.198.174.236', '[2620:0:862:ed1a::c]' ],
+'eqiad' = [ '208.80.154.236', '[2620:0:861:ed1a::1:c]',
'[2620:0:861:ed1a::c]' ],
+'esams' = [ '91.198.174.204', '91.198.174.236',
'[2620:0:862:ed1a::1:c]', '[2620:0:862:ed1a::c]' ],
},
proxy_server_name = '*.m.wikipedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/104950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I564fb22cb8bf6ea18b1273e312c2a8f3d3516046
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new mobile LVS service IPs to protoproxies (Zero scheme) - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add new mobile LVS service IPs to protoproxies (Zero scheme)
..
Add new mobile LVS service IPs to protoproxies (Zero scheme)
Change-Id: I564fb22cb8bf6ea18b1273e312c2a8f3d3516046
---
M manifests/role/protoproxy.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 458d2d1..24cefff 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -248,8 +248,8 @@
}
protoproxy{ 'mobilewikipedia':
proxy_addresses = {
-'eqiad' = [ '208.80.154.236', '[2620:0:861:ed1a::c]' ],
-'esams' = [ '91.198.174.236', '[2620:0:862:ed1a::c]' ],
+'eqiad' = [ '208.80.154.236', '[2620:0:861:ed1a::1:c]',
'[2620:0:861:ed1a::c]' ],
+'esams' = [ '91.198.174.204', '91.198.174.236',
'[2620:0:862:ed1a::1:c]', '[2620:0:862:ed1a::c]' ],
},
proxy_server_name = '*.m.wikipedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/104950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I564fb22cb8bf6ea18b1273e312c2a8f3d3516046
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Make messages more detailed in EntityContentTest - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make messages more detailed in EntityContentTest
..
Make messages more detailed in EntityContentTest
Change-Id: Id4243a0fcc2e43b33cbd30734c4b5ee6f4d2fe3b
---
M repo/tests/phpunit/includes/content/EntityContentTest.php
1 file changed, 29 insertions(+), 13 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php
b/repo/tests/phpunit/includes/content/EntityContentTest.php
index d39f887..38fe59f 100644
--- a/repo/tests/phpunit/includes/content/EntityContentTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentTest.php
@@ -112,18 +112,28 @@
$entityContent-getEntity()-setLabel( 'en', 'one' );
$status = $entityContent-save( 'create item' );
$this-assertFalse( $status-isOK(), save should have failed
);
- $this-assertTrue( $status-hasMessage( 'edit-gone-missing' ) );
+ $this-assertTrue(
+ $status-hasMessage( 'edit-gone-missing' ),
+ 'try to create without flags, edit gone missing'
+ );
// try to create with EDIT_UPDATE flag
$entityContent-getEntity()-setLabel( 'en', 'two' );
$status = $entityContent-save( 'create item', null,
EDIT_UPDATE );
$this-assertFalse( $status-isOK(), save should have failed
);
- $this-assertTrue( $status-hasMessage( 'edit-gone-missing' ) );
+ $this-assertTrue(
+ $status-hasMessage( 'edit-gone-missing' ),
+ 'edit gone missing, try to create with EDIT_UPDATE'
+ );
// try to create with EDIT_NEW flag
$entityContent-getEntity()-setLabel( 'en', 'three' );
$status = $entityContent-save( 'create item', null, EDIT_NEW );
- $this-assertTrue( $status-isOK(),
$entityContent-getEntity()-getId()-getPrefixedId() );
+ $this-assertTrue(
+ $status-isOK(),
+ 'create with EDIT_NEW flag for ' .
+ $entityContent-getEntity()-getId()-getPrefixedId()
+ );
// ok, the item exists now in the database.
@@ -131,17 +141,23 @@
$entityContent-getEntity()-setLabel( 'en', 'four' );
$status = $entityContent-save( 'create item', null, EDIT_NEW );
$this-assertFalse( $status-isOK(), save should have failed
);
- $this-assertTrue( $status-hasMessage( 'edit-already-exists' )
);
+ $this-assertTrue(
+ $status-hasMessage( 'edit-already-exists' ),
+ 'try to save with EDIT_NEW flag, edit already exists'
+ );
// try to save with EDIT_UPDATE flag
$entityContent-getEntity()-setLabel( 'en', 'five' );
$status = $entityContent-save( 'create item', null,
EDIT_UPDATE );
- $this-assertTrue( $status-isOK(), save failed );
+ $this-assertTrue(
+ $status-isOK(),
+ 'try to save with EDIT_UPDATE flag, save failed'
+ );
// try to save without flags
$entityContent-getEntity()-setLabel( 'en', 'six' );
$status = $entityContent-save( 'create item' );
- $this-assertTrue( $status-isOK(), save failed );
+ $this-assertTrue( $status-isOK(), 'try to save without flags,
save failed' );
}
public function testRepeatedSave() {
@@ -152,29 +168,29 @@
// create
$entityContent-getEntity()-setLabel( 'en', First );
$status = $entityContent-save( 'create item', null, EDIT_NEW );
- $this-assertTrue( $status-isOK(), save failed );
- $this-assertTrue( $status-isGood(), $status-getMessage() );
+ $this-assertTrue( $status-isOK(), 'create, save failed,
status ok' );
+ $this-assertTrue( $status-isGood(), 'create, status is good'
);
// change
$prev_id = $entityContent-getWikiPage()-getLatest();
$entityContent-getEntity()-setLabel( 'en', Second );
$status = $entityContent-save( 'modify item', null,
EDIT_UPDATE );
- $this-assertTrue( $status-isOK(), save failed );
- $this-assertTrue( $status-isGood(), $status-getMessage() );
+ $this-assertTrue( $status-isOK(), 'change, status ok' );
+ $this-assertTrue( $status-isGood(), 'change, status good' );
$this-assertNotEquals( $prev_id,
$entityContent-getWikiPage()-getLatest(), revision ID should change on edit
);
[MediaWiki-commits] [Gerrit] Enable Wikidata build on beta labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable Wikidata build on beta labs
..
Enable Wikidata build on beta labs
This keeps current configuration for loading extensions in production.
We want to initially try the new configuration in beta labs only.
This allows having separate extension list files for labs and production
Change-Id: I7cf7af5525f3223dbd044e7676b5c0255b45928c
---
M wmf-config/Wikibase.php
M wmf-config/extension-list
A wmf-config/extension-list-wikidata
A wmf-config/extension-list-wikidata-labs
4 files changed, 33 insertions(+), 22 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 76658d4..70dfb95 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -1,23 +1,24 @@
?php
-require_once( $IP/extensions/DataValues/DataValues.php );
+if ( $wmfRealm === 'production' ) {
+ require_once( $IP/extensions/DataValues/DataValues.php );
+ require_once( $IP/extensions/DataTypes/DataTypes.php );
+ require_once( $IP/extensions/Diff/Diff.php );
+ require_once(
$IP/extensions/WikibaseDataModel/WikibaseDataModel.php );
+ require_once( $IP/extensions/Wikibase/lib/WikibaseLib.php );
-// DataTypes is being moved out of the DataValues git repo.
-// this allows DataTypes in DataValues to be used if it exists, such as older
code.
-// if it is not found in DataValues, then load it below.
-//
-// For localisation update, there is an empty dummy branch of DataTypes
-// so that localisation update can run okay.
-if ( !defined( 'DataTypes_VERSION' ) ) {
- require_once( $IP/extensions/DataTypes/DataTypes.php );
+ $wgExtensionEntryPointListFiles[] = 'extension-list-wikidata';
+} else {
+ require_once( $IP/extensions/Wikidata/Wikidata.php );
+
+ $wgExtensionEntryPointListFiles[] =
'extension-list-wikidata-labs';
}
-require_once( $IP/extensions/Diff/Diff.php );
-require_once( $IP/extensions/WikibaseDataModel/WikibaseDataModel.php );
-require_once( $IP/extensions/Wikibase/lib/WikibaseLib.php );
-
if ( $wmgUseWikibaseRepo ) {
- require_once( $IP/extensions/Wikibase/repo/Wikibase.php );
+
+ if ( $wmfRealm === 'production' ) {
+ require_once( $IP/extensions/Wikibase/repo/Wikibase.php );
+ }
$baseNs = 120;
@@ -91,7 +92,10 @@
}
if ( $wmgUseWikibaseClient ) {
- require_once( $IP/extensions/Wikibase/client/WikibaseClient.php );
+
+ if ( $wmfRealm === 'production' ) {
+ require_once(
$IP/extensions/Wikibase/client/WikibaseClient.php );
+ }
$wgWBClientSettings['changesDatabase'] = 'wikidatawiki';
$wgWBClientSettings['repoDatabase'] = 'wikidatawiki';
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index e1fbf39..3ea55ee 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -32,9 +32,6 @@
$IP/extensions/ContributionTracking/ContributionTracking.php
$IP/extensions/CreditsSource/CreditsSource.php
$IP/extensions/CustomData/CustomData.php
-$IP/extensions/DataTypes/DataTypes.i18n.php
-$IP/extensions/DataValues/DataValues/DataValues.i18n.php
-$IP/extensions/Diff/Diff.php
$IP/extensions/DisableAccount/DisableAccount.php
$IP/extensions/Disambiguator/Disambiguator.php
$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php
@@ -137,10 +134,6 @@
$IP/extensions/VipsScaler/VipsScaler.php
$IP/extensions/VipsScaler/VipsTest.php
$IP/extensions/VisualEditor/VisualEditor.php
-$IP/extensions/Wikibase/client/WikibaseClient.php
-$IP/extensions/WikibaseDataModel/WikibaseDataModel.php
-$IP/extensions/Wikibase/lib/WikibaseLib.php
-$IP/extensions/Wikibase/repo/Wikibase.php
$IP/extensions/WikiEditor/WikiEditor.php
$IP/extensions/wikihiero/wikihiero.php
$IP/extensions/WikiLove/WikiLove.php
diff --git a/wmf-config/extension-list-wikidata
b/wmf-config/extension-list-wikidata
new file mode 100644
index 000..c9d70df
--- /dev/null
+++ b/wmf-config/extension-list-wikidata
@@ -0,0 +1,7 @@
+$IP/extensions/DataTypes/DataTypes.i18n.php
+$IP/extensions/DataValues/DataValues/DataValues.i18n.php
+$IP/extensions/Diff/Diff.php
+$IP/extensions/Wikibase/client/WikibaseClient.php
+$IP/extensions/WikibaseDataModel/WikibaseDataModel.php
+$IP/extensions/Wikibase/lib/WikibaseLib.php
+$IP/extensions/Wikibase/repo/Wikibase.php
diff --git a/wmf-config/extension-list-wikidata-labs
b/wmf-config/extension-list-wikidata-labs
new file mode 100644
index 000..70c6f7e
--- /dev/null
+++ b/wmf-config/extension-list-wikidata-labs
@@ -0,0 +1,7 @@
+$IP/extensions/Wikidata/DataTypes/DataTypes.i18n.php
+$IP/extensions/Wikidata/DataValues/DataValues/DataValues.i18n.php
+$IP/extensions/Wikidata/Diff/Diff.php
+$IP/extensions/Wikidata/Wikibase/client/WikibaseClient.php
[MediaWiki-commits] [Gerrit] Fix build and run-time dependencies - change (labs/toollabs)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104951
Change subject: Fix build and run-time dependencies
..
Fix build and run-time dependencies
Change-Id: Iab527750c55b0d56080cc5d424f0d1532d619e91
---
M debian/control
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/51/104951/1
diff --git a/debian/control b/debian/control
index 1590106..465c5bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,20 +5,20 @@
Uploaders: Marc-André Pelletier mpellet...@wikimedia.org,
Carl Fürstenberg azat...@gmail.com,
Petr Bena benap...@gmail.com
-Build-Depends: debhelper (= 8.0.0), dh-autoreconf
+Build-Depends: debhelper (= 8.0.0), dh-autoreconf, libipc-run-perl,
libstring-shellquote-perl
Standards-Version: 3.9.3
Vcs-Git: https://gerrit.wikimedia.org/r/labs/toollabs
Vcs-Browser: https://git.wikimedia.org/summary/labs%2Ftoollabs
Package: misctools
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}
Description: Miscellaneous Labs-specific tools
Miscellaneous Labs-specific Tools used on Tool Labs
Package: jobutils
Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, gridengine-client,
libstring-shellquote-perl
+Depends: ${misc:Depends}, ${perl:Depends}, gridengine-client, libipc-run-perl,
libstring-shellquote-perl
Description: Set of utilities to use on wikimedia bots and tools cluster
This package will install jstart (jsub) and jstop, the Tool Labs (more)
user-friendly wrappers to submit jobs to the gridengine
--
To view, visit https://gerrit.wikimedia.org/r/104951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab527750c55b0d56080cc5d424f0d1532d619e91
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use transactions for faster import - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104952
Change subject: use transactions for faster import
..
use transactions for faster import
Change-Id: Ibd6dd2e318c2b18bb60e10b845076ee33d2dbc04
---
M maintenance/ExportMathTable.php
M maintenance/IndexBase.php
2 files changed, 23 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/52/104952/1
diff --git a/maintenance/ExportMathTable.php b/maintenance/ExportMathTable.php
index 7338740..a5c7f30 100644
--- a/maintenance/ExportMathTable.php
+++ b/maintenance/ExportMathTable.php
@@ -30,6 +30,7 @@
class ExportMathTable extends IndexBase {
private $db2Pass;
private $statment;
+ private $dbh;
/**
*
*/
@@ -52,11 +53,27 @@
$out .= ','. $row-mathindex_anchor.'';
$out .= ','.str_replace(array('',\n),array('',' '),
$mo-getMathml()).'';
if( $this-db2Pass ) {
-
$this-statment-execute(array($mo-getMd5(),$mo-getTex(),$row-mathindex_page_id,$row-mathindex_anchor,$mo-getMathml()));
+ try {
+
$this-statment-execute(array($mo-getMd5(),$mo-getTex(),$row-mathindex_page_id,$row-mathindex_anchor,$mo-getMathml()));
+ } catch (Exception $e) {
+ echo($e-getMessage());
+ }
+
}
return $out.\n;
}
+protected function wFile( $fn, $min, $inc ) {
+ if( $this-db2Pass ) {
+ try{
+ $this-dbh-commit();
+ } catch (Exception $e) {
+ echo($e-getMessage());
+ }
+ $this-dbh-beginTransaction();
+ }
+ return parent::wFile( $fn, $min, $inc );
+}
/**
*
@@ -65,7 +82,7 @@
$this-db2Pass = $this-getOption( 'passw',false );
if ( $this-db2Pass ){
try {
- $connection = new PDO(ibm:MATH, db2inst1,
$this-db2Pass, array(
+ $this-dbh = new PDO(ibm:MATH, db2inst1,
$this-db2Pass, array(
PDO::ATTR_PERSISTENT = TRUE,
PDO::ATTR_ERRMODE =
PDO::ERRMODE_EXCEPTION)
);
@@ -73,9 +90,10 @@
echo($e-getMessage());
}
if ( $this-getOption('truncate' , false ) ){
-$connection-query('TRUNCATE TABLE
wiki.math IMMEDIATE');
+$this-dbh-query('TRUNCATE TABLE
wiki.math IMMEDIATE');
}
- $this-statment = $connection-prepare('insert into
wiki.math (math_md5, math_tex, mathindex_pageid, mathindex_anchord,
math_mathml) values(?, ?, ?, ?, ?)');
+ $this-dbh-beginTransaction();
+ $this-statment = $this-dbh-prepare('insert into
wiki.math (math_md5, math_tex, mathindex_pageid, mathindex_anchord,
math_mathml) values(?, ?, ?, ?, ?)');
}
parent::execute();
diff --git a/maintenance/IndexBase.php b/maintenance/IndexBase.php
index 5edfe95..68d919d 100644
--- a/maintenance/IndexBase.php
+++ b/maintenance/IndexBase.php
@@ -53,7 +53,7 @@
* @param unknown $inc
* @return boolean
*/
- private function wFile( $fn, $min, $inc ) {
+ protected function wFile( $fn, $min, $inc ) {
$out = $this-getHead();
$max = min( $min + $inc, $this-res-numRows() -1 );
for ( $i = $min; $i $max; $i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/104952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd6dd2e318c2b18bb60e10b845076ee33d2dbc04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] missing extension-list-labs - change (operations/mediawiki-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104953 Change subject: missing extension-list-labs .. missing extension-list-labs mergeMessageFileList.php can be passed files using the $wgExtensionEntryPointListFiles global variable. Whenever a file is missing it bails out with an error. The extension-list-labs was removed previously by 976f2e9, causing beta to no more update the messages :-( Change-Id: Ib97f5b882f8654b926bd277dae1266543ec26f6d --- A wmf-config/extension-list-labs 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/53/104953/1 diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs new file mode 100644 index 000..e69de29 --- /dev/null +++ b/wmf-config/extension-list-labs -- To view, visit https://gerrit.wikimedia.org/r/104953 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib97f5b882f8654b926bd277dae1266543ec26f6d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] missing extension-list-labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: missing extension-list-labs .. missing extension-list-labs mergeMessageFileList.php can be passed files using the $wgExtensionEntryPointListFiles global variable. Whenever a file is missing it bails out with an error. The extension-list-labs was removed previously by 976f2e9, causing beta to no more update the messages :-( Change-Id: Ib97f5b882f8654b926bd277dae1266543ec26f6d --- A wmf-config/extension-list-labs 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs new file mode 100644 index 000..e69de29 --- /dev/null +++ b/wmf-config/extension-list-labs -- To view, visit https://gerrit.wikimedia.org/r/104953 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib97f5b882f8654b926bd277dae1266543ec26f6d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikibase: fix extension-list paths - change (operations/mediawiki-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104954
Change subject: Wikibase: fix extension-list paths
..
Wikibase: fix extension-list paths
$wgExtensionEntryPointListFiles should use full paths, not relative
ones. Simply prepend the file names with $wmfConfigDir.
Change-Id: I49a405d8a4826f0aef74a7ef3cf9b5aa43857dd9
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/54/104954/1
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 70dfb95..d1d5f14 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -7,11 +7,11 @@
require_once(
$IP/extensions/WikibaseDataModel/WikibaseDataModel.php );
require_once( $IP/extensions/Wikibase/lib/WikibaseLib.php );
- $wgExtensionEntryPointListFiles[] = 'extension-list-wikidata';
+ $wgExtensionEntryPointListFiles[] =
$wmfConfigDir/extension-list-wikidata;
} else {
require_once( $IP/extensions/Wikidata/Wikidata.php );
- $wgExtensionEntryPointListFiles[] =
'extension-list-wikidata-labs';
+ $wgExtensionEntryPointListFiles[] =
$wmfConfigDir/extension-list-wikidata-labs;
}
if ( $wmgUseWikibaseRepo ) {
--
To view, visit https://gerrit.wikimedia.org/r/104954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49a405d8a4826f0aef74a7ef3cf9b5aa43857dd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikibase: fix extension-list paths - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Wikibase: fix extension-list paths
..
Wikibase: fix extension-list paths
$wgExtensionEntryPointListFiles should use full paths, not relative
ones. Simply prepend the file names with $wmfConfigDir.
Follow up e6fc8d9
Change-Id: I49a405d8a4826f0aef74a7ef3cf9b5aa43857dd9
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 70dfb95..d1d5f14 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -7,11 +7,11 @@
require_once(
$IP/extensions/WikibaseDataModel/WikibaseDataModel.php );
require_once( $IP/extensions/Wikibase/lib/WikibaseLib.php );
- $wgExtensionEntryPointListFiles[] = 'extension-list-wikidata';
+ $wgExtensionEntryPointListFiles[] =
$wmfConfigDir/extension-list-wikidata;
} else {
require_once( $IP/extensions/Wikidata/Wikidata.php );
- $wgExtensionEntryPointListFiles[] =
'extension-list-wikidata-labs';
+ $wgExtensionEntryPointListFiles[] =
$wmfConfigDir/extension-list-wikidata-labs;
}
if ( $wmgUseWikibaseRepo ) {
--
To view, visit https://gerrit.wikimedia.org/r/104954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49a405d8a4826f0aef74a7ef3cf9b5aa43857dd9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Connect to db2 and import the math table there - change (mediawiki...MathSearch)
Physikerwelt has submitted this change and it was merged.
Change subject: Connect to db2 and import the math table there
..
Connect to db2 and import the math table there
Change-Id: I064622eb875db2259405cf1868a3256e3637aa72
---
M maintenance/ExportMathTable.php
M maintenance/IndexBase.php
M maintenance/UpdateMath.php
A maintenance/db2test.php
4 files changed, 71 insertions(+), 27 deletions(-)
Approvals:
Physikerwelt: Verified; Looks good to me, approved
diff --git a/maintenance/ExportMathTable.php b/maintenance/ExportMathTable.php
index ca01daf..7338740 100644
--- a/maintenance/ExportMathTable.php
+++ b/maintenance/ExportMathTable.php
@@ -28,12 +28,16 @@
*
*/
class ExportMathTable extends IndexBase {
+ private $db2Pass;
+ private $statment;
/**
*
*/
public function __construct() {
parent::__construct();
$this-mDescription = 'Exports a db2 compatible math index
table.';
+ $this-addArg( 'passw', If set, the data is directly imported
to db2, false );
+ $this-addArg( 'truncate', If true, db2 math table is deleted
before import, false );
}
/**
@@ -44,9 +48,12 @@
$mo = MathObject::constructformpagerow($row);
$out = ''. $mo-getMd5().'';
$out .= ','. $mo-getTex().'';
- $out .= ','. $row-mathindex_page_id .'';
- $out .= ','. $row-mathindex_anchor.'';
- $out .= ','.str_replace(array('',\n),array('',' '),
$mo-getMathml()).'';
+ $out .= ','. $row-mathindex_page_id .'';
+ $out .= ','. $row-mathindex_anchor.'';
+ $out .= ','.str_replace(array('',\n),array('',' '),
$mo-getMathml()).'';
+ if( $this-db2Pass ) {
+
$this-statment-execute(array($mo-getMd5(),$mo-getTex(),$row-mathindex_page_id,$row-mathindex_anchor,$mo-getMathml()));
+}
return $out.\n;
}
@@ -55,6 +62,22 @@
*
*/
public function execute() {
+ $this-db2Pass = $this-getOption( 'passw',false );
+ if ( $this-db2Pass ){
+ try {
+ $connection = new PDO(ibm:MATH, db2inst1,
$this-db2Pass, array(
+ PDO::ATTR_PERSISTENT = TRUE,
+ PDO::ATTR_ERRMODE =
PDO::ERRMODE_EXCEPTION)
+ );
+ } catch (Exception $e) {
+ echo($e-getMessage());
+ }
+ if ( $this-getOption('truncate' , false ) ){
+$connection-query('TRUNCATE TABLE
wiki.math IMMEDIATE');
+ }
+ $this-statment = $connection-prepare('insert into
wiki.math (math_md5, math_tex, mathindex_pageid, mathindex_anchord,
math_mathml) values(?, ?, ?, ?, ?)');
+
+ }
parent::execute();
}
}
diff --git a/maintenance/IndexBase.php b/maintenance/IndexBase.php
index 4958703..5edfe95 100644
--- a/maintenance/IndexBase.php
+++ b/maintenance/IndexBase.php
@@ -38,6 +38,7 @@
$this-mDescription = 'Exports data';
$this-addArg( 'dir', 'The directory where the harvest files go
to.' );
$this-addArg( 'ffmax', The maximal number of formula per
file., false );
+ $this-addOption( 'limit', 'The maximal number of database
entries to be considered', false );
}
/**
@@ -86,8 +87,11 @@
array( 'mathindex', 'mathoid' ),
array( 'mathindex_page_id', 'mathindex_anchor',
'math_mathml', 'math_inputhash', 'mathindex_inputhash' ),// $vars
(columns of the table)
'math_inputhash = mathindex_inputhash'
- , __METHOD__,
- array( 'ORDER BY' = 'mathindex_page_id' ) );
+ , __METHOD__
+ ,array(
+ 'LIMIT'= $this-getOption(
'limit',1 ) ,
+ 'ORDER BY' = 'mathindex_page_id' )
+ );
echo write . $this-res-numRows() . results to index\n;
do {
$fn = $this-getArg( 0 ) . '/math' . sprintf( '%012d',
$i ) . '.xml';
diff --git a/maintenance/UpdateMath.php b/maintenance/UpdateMath.php
index c3b2c7c..bfb2c61 100644
--- a/maintenance/UpdateMath.php
+++ b/maintenance/UpdateMath.php
@@ -22,7 +22,7 @@
require_once( dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
class UpdateMath extends Maintenance {
- const RTI_CHUNK_SIZE = 500;
+ const RTI_CHUNK_SIZE = 100;
var $purge = false;
[MediaWiki-commits] [Gerrit] Swap old and new mobile-lb.eqiad LVS service IPs (IPv6) - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104955
Change subject: Swap old and new mobile-lb.eqiad LVS service IPs (IPv6)
..
Swap old and new mobile-lb.eqiad LVS service IPs (IPv6)
This will move monitoring to the new IP.
Change-Id: Ib364f8684a1582b6f22ac4076291c1bf4a0f325c
---
M modules/lvs/manifests/configuration.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/104955/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index a1c9419..990aba8 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -192,8 +192,8 @@
'bitslbsecure6' = '2620:0:861:ed1a::1:a',
'bitslbsecure6-old' = 2620:0:861:ed1a::a,
'uploadlbsecure6' = '2620:0:861:ed1a::2:b',
-'mobilelbsecure6-new' = '2620:0:861:ed1a::1:c',
-'mobilelbsecure6' = 2620:0:861:ed1a::c,
+'mobilelbsecure6' = '2620:0:861:ed1a::1:c',
+'mobilelbsecure6-old' = 2620:0:861:ed1a::c,
'wikidatalbsecure6' = 2620:0:861:ed1a::12,
'wikivoyagelbsecure6' = 2620:0:861:ed1a::13
},
@@ -271,7 +271,7 @@
},
'mobile' = {
'pmtpa' = {},
-'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6-new'
= '2620:0:861:ed1a::1:c', 'mobilelb6' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
+'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6' =
'2620:0:861:ed1a::1:c', 'mobilelb6-old' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
'esams' = { 'mobilelb-new' = '91.198.174.204', 'mobilelb' =
'91.198.174.236', 'mobilelb6-new' = '2620:0:862:ed1a::1:c', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6-new' =
'2620:0:863:ed1a::1:c', 'mobilelb6' = '2620:0:863:ed1a::c', 'mobilesvc' =
'10.2.4.26'},
},
--
To view, visit https://gerrit.wikimedia.org/r/104955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib364f8684a1582b6f22ac4076291c1bf4a0f325c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use transactions for faster import - change (mediawiki...MathSearch)
Physikerwelt has submitted this change and it was merged.
Change subject: use transactions for faster import
..
use transactions for faster import
Change-Id: Ibd6dd2e318c2b18bb60e10b845076ee33d2dbc04
---
M maintenance/ExportMathTable.php
M maintenance/IndexBase.php
2 files changed, 23 insertions(+), 5 deletions(-)
Approvals:
Physikerwelt: Verified; Looks good to me, approved
diff --git a/maintenance/ExportMathTable.php b/maintenance/ExportMathTable.php
index 7338740..a5c7f30 100644
--- a/maintenance/ExportMathTable.php
+++ b/maintenance/ExportMathTable.php
@@ -30,6 +30,7 @@
class ExportMathTable extends IndexBase {
private $db2Pass;
private $statment;
+ private $dbh;
/**
*
*/
@@ -52,11 +53,27 @@
$out .= ','. $row-mathindex_anchor.'';
$out .= ','.str_replace(array('',\n),array('',' '),
$mo-getMathml()).'';
if( $this-db2Pass ) {
-
$this-statment-execute(array($mo-getMd5(),$mo-getTex(),$row-mathindex_page_id,$row-mathindex_anchor,$mo-getMathml()));
+ try {
+
$this-statment-execute(array($mo-getMd5(),$mo-getTex(),$row-mathindex_page_id,$row-mathindex_anchor,$mo-getMathml()));
+ } catch (Exception $e) {
+ echo($e-getMessage());
+ }
+
}
return $out.\n;
}
+protected function wFile( $fn, $min, $inc ) {
+ if( $this-db2Pass ) {
+ try{
+ $this-dbh-commit();
+ } catch (Exception $e) {
+ echo($e-getMessage());
+ }
+ $this-dbh-beginTransaction();
+ }
+ return parent::wFile( $fn, $min, $inc );
+}
/**
*
@@ -65,7 +82,7 @@
$this-db2Pass = $this-getOption( 'passw',false );
if ( $this-db2Pass ){
try {
- $connection = new PDO(ibm:MATH, db2inst1,
$this-db2Pass, array(
+ $this-dbh = new PDO(ibm:MATH, db2inst1,
$this-db2Pass, array(
PDO::ATTR_PERSISTENT = TRUE,
PDO::ATTR_ERRMODE =
PDO::ERRMODE_EXCEPTION)
);
@@ -73,9 +90,10 @@
echo($e-getMessage());
}
if ( $this-getOption('truncate' , false ) ){
-$connection-query('TRUNCATE TABLE
wiki.math IMMEDIATE');
+$this-dbh-query('TRUNCATE TABLE
wiki.math IMMEDIATE');
}
- $this-statment = $connection-prepare('insert into
wiki.math (math_md5, math_tex, mathindex_pageid, mathindex_anchord,
math_mathml) values(?, ?, ?, ?, ?)');
+ $this-dbh-beginTransaction();
+ $this-statment = $this-dbh-prepare('insert into
wiki.math (math_md5, math_tex, mathindex_pageid, mathindex_anchord,
math_mathml) values(?, ?, ?, ?, ?)');
}
parent::execute();
diff --git a/maintenance/IndexBase.php b/maintenance/IndexBase.php
index 5edfe95..68d919d 100644
--- a/maintenance/IndexBase.php
+++ b/maintenance/IndexBase.php
@@ -53,7 +53,7 @@
* @param unknown $inc
* @return boolean
*/
- private function wFile( $fn, $min, $inc ) {
+ protected function wFile( $fn, $min, $inc ) {
$out = $this-getHead();
$max = min( $min + $inc, $this-res-numRows() -1 );
for ( $i = $min; $i $max; $i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/104952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd6dd2e318c2b18bb60e10b845076ee33d2dbc04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: make mw-update-l10n verbose - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104956 Change subject: beta: make mw-update-l10n verbose .. beta: make mw-update-l10n verbose The script can use a bit more verbosity to provide useful output in Jenkins console. Change-Id: I7945bb193784141f43276d1d7d94108c2d5669e4 --- M files/misc/beta/wmf-beta-autoupdate.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/104956/1 diff --git a/files/misc/beta/wmf-beta-autoupdate.py b/files/misc/beta/wmf-beta-autoupdate.py index d31ed09..e23d407 100755 --- a/files/misc/beta/wmf-beta-autoupdate.py +++ b/files/misc/beta/wmf-beta-autoupdate.py @@ -169,7 +169,7 @@ def update_l10n(): Localisation cache update -return runner(name='mw-update-l10n', cmd=['mw-update-l10n']) +return runner(name='mw-update-l10n', cmd=['mw-update-l10n', '--verbose']) def runner(cmd, path=None, name=None): -- To view, visit https://gerrit.wikimedia.org/r/104956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7945bb193784141f43276d1d7d94108c2d5669e4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swap old and new mobile-lb.eqiad LVS service IPs (IPv6) - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Swap old and new mobile-lb.eqiad LVS service IPs (IPv6)
..
Swap old and new mobile-lb.eqiad LVS service IPs (IPv6)
This will move monitoring to the new IP.
Change-Id: Ib364f8684a1582b6f22ac4076291c1bf4a0f325c
---
M modules/lvs/manifests/configuration.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index a1c9419..990aba8 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -192,8 +192,8 @@
'bitslbsecure6' = '2620:0:861:ed1a::1:a',
'bitslbsecure6-old' = 2620:0:861:ed1a::a,
'uploadlbsecure6' = '2620:0:861:ed1a::2:b',
-'mobilelbsecure6-new' = '2620:0:861:ed1a::1:c',
-'mobilelbsecure6' = 2620:0:861:ed1a::c,
+'mobilelbsecure6' = '2620:0:861:ed1a::1:c',
+'mobilelbsecure6-old' = 2620:0:861:ed1a::c,
'wikidatalbsecure6' = 2620:0:861:ed1a::12,
'wikivoyagelbsecure6' = 2620:0:861:ed1a::13
},
@@ -271,7 +271,7 @@
},
'mobile' = {
'pmtpa' = {},
-'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6-new'
= '2620:0:861:ed1a::1:c', 'mobilelb6' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
+'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6' =
'2620:0:861:ed1a::1:c', 'mobilelb6-old' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
'esams' = { 'mobilelb-new' = '91.198.174.204', 'mobilelb' =
'91.198.174.236', 'mobilelb6-new' = '2620:0:862:ed1a::1:c', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6-new' =
'2620:0:863:ed1a::1:c', 'mobilelb6' = '2620:0:863:ed1a::c', 'mobilesvc' =
'10.2.4.26'},
},
--
To view, visit https://gerrit.wikimedia.org/r/104955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib364f8684a1582b6f22ac4076291c1bf4a0f325c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] icinga: capitalize Faidon's name remove Asher - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/104957 Change subject: icinga: capitalize Faidon's name remove Asher .. icinga: capitalize Faidon's name remove Asher I use the capitalized form of my name to login, and while Apache mod auth LDAP happily accepts it, Icinga was less happy to. Switch the config to that. Also while at it, remove Asher from the config, per his remove access request. Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/57/104957/1 diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index 2a93ee6..becb750 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -- To view, visit https://gerrit.wikimedia.org/r/104957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa 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] icinga: capitalize Faidon's name remove Asher - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: icinga: capitalize Faidon's name remove Asher .. icinga: capitalize Faidon's name remove Asher I use the capitalized form of my name to login, and while Apache mod auth LDAP happily accepts it, Icinga was less happy to. Switch the config to that. Also while at it, remove Asher from the config, per his remove access request. Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index 2a93ee6..becb750 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -- To view, visit https://gerrit.wikimedia.org/r/104957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa 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] Better i18n for user creation log when promoted from sandbox - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104958
Change subject: Better i18n for user creation log when promoted from sandbox
..
Better i18n for user creation log when promoted from sandbox
Bug: 58707
Change-Id: I9ad4855950cae83569c025f08eda4f1f54d86750
---
M Translate.php
M api/ApiTranslateSandbox.php
M i18n/sandbox/en.json
M i18n/sandbox/qqq.json
4 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/58/104958/1
diff --git a/Translate.php b/Translate.php
index b54ccb2..ca4e725 100644
--- a/Translate.php
+++ b/Translate.php
@@ -219,6 +219,7 @@
$wgLogTypes[] = 'translatorsandbox';
$wgLogActionsHandlers['translatorsandbox/promoted'] = 'TranslateLogFormatter';
$wgLogActionsHandlers['translatorsandbox/rejected'] = 'TranslateLogFormatter';
+$wgLogActionsHandlers['newusers/tsbpromoted'] = 'LogFormatter';
// New jobs
$wgJobClasses['MessageIndexRebuildJob'] = 'MessageIndexRebuildJob';
diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 0b956b5..2aa267b 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
@@ -131,11 +131,7 @@
$logid = $logEntry-insert();
$logEntry-publish( $logid );
- global $wgContLang;
- $user-addNewUserLogEntry(
- 'create',
- $this-msg( 'tsb-promoted-from-sandbox'
)-inLanguage( $wgContLang )-text()
- );
+ $user-addNewUserLogEntry( 'tsbpromoted' );
$this-createUserPage( $user );
}
}
diff --git a/i18n/sandbox/en.json b/i18n/sandbox/en.json
index cafe244..5c2aea3 100644
--- a/i18n/sandbox/en.json
+++ b/i18n/sandbox/en.json
@@ -44,10 +44,10 @@
tsb-limit-reached-title: Thanks for your translations,
tsb-limit-reached-body: You reached the translation limit for new
translators.\nOur team will verify and upgrade your account soon.\nThen you
will be able to translate without limits.,
tsb-no-requests-from-new-users: No requests from new users,
-tsb-promoted-from-sandbox: User has been promoted to translator,
tsb-create-user-page: Create basic user page,
log-name-translatorsandbox: Translation sandbox,
log-description-translatorsandbox: A log of actions on translation
sandbox users,
logentry-translatorsandbox-promoted: $1 {{GENDER:$2|promoted}} $3 to
{{GENDER:$4|translator}},
-logentry-translatorsandbox-rejected: $1 {{GENDER:$2|rejected}} the
request from \$3\ to become a translator
+logentry-translatorsandbox-rejected: $1 {{GENDER:$2|rejected}} the
request from \$3\ to become a translator,
+logentry-newusers-tsbpromoted: User account $3 was
{{GENDER:$2|created}} by promotion from sandbox
}
diff --git a/i18n/sandbox/qqq.json b/i18n/sandbox/qqq.json
index 302afba..259a67e 100644
--- a/i18n/sandbox/qqq.json
+++ b/i18n/sandbox/qqq.json
@@ -50,5 +50,6 @@
log-name-translatorsandbox: {{doc-logpage}},
log-description-translatorsandbox: Log page description,
logentry-translatorsandbox-promoted: {{logentry}}\n* $4 - The name of
the user that was promoted, can be used for GENDER.,
-logentry-translatorsandbox-rejected: {{logentry}}
-}
\ No newline at end of file
+logentry-translatorsandbox-rejected: {{logentry}},
+logentry-newusers-tsbpromoted: {{logentry}}
+}
--
To view, visit https://gerrit.wikimedia.org/r/104958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad4855950cae83569c025f08eda4f1f54d86750
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mobile-lb.eqiad AAAA record - change (operations/dns)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104959
Change subject: Update mobile-lb.eqiad record
..
Update mobile-lb.eqiad record
Change-Id: I621c47713ed8c99cf3d9f8663c25df118337f492
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/59/104959/1
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 24b6c0a..e296af3 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -171,6 +171,7 @@
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
a.0.0.0 1H IN PTR
bits-lb.eqiad.wikimedia.org.
+c.0.0.0 1H IN PTR
mobile-lb.eqiad.wikimedia.org.
; LVS Multimedia, 2620:0:861:ed1a::2:0/96
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4530ef0..f46be02 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -316,7 +316,7 @@
upload-lb.eqiad1H IN A208.80.154.240
1H IN 2620:0:861:ed1a::2:b
mobile-lb.eqiad1H IN A208.80.154.236
- 1H IN 2620:0:861:ed1a::c
+ 1H IN 2620:0:861:ed1a::1:c
payments-lb.eqiad 1H IN A208.80.154.237
;;; ns0208.80.154.238
dns-rec-lb.eqiad 1H IN A208.80.154.239
--
To view, visit https://gerrit.wikimedia.org/r/104959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I621c47713ed8c99cf3d9f8663c25df118337f492
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mobile-lb.eqiad AAAA record - change (operations/dns)
Mark Bergsma has submitted this change and it was merged.
Change subject: Update mobile-lb.eqiad record
..
Update mobile-lb.eqiad record
Change-Id: I621c47713ed8c99cf3d9f8663c25df118337f492
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 24b6c0a..e296af3 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -171,6 +171,7 @@
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
a.0.0.0 1H IN PTR
bits-lb.eqiad.wikimedia.org.
+c.0.0.0 1H IN PTR
mobile-lb.eqiad.wikimedia.org.
; LVS Multimedia, 2620:0:861:ed1a::2:0/96
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4530ef0..f46be02 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -316,7 +316,7 @@
upload-lb.eqiad1H IN A208.80.154.240
1H IN 2620:0:861:ed1a::2:b
mobile-lb.eqiad1H IN A208.80.154.236
- 1H IN 2620:0:861:ed1a::c
+ 1H IN 2620:0:861:ed1a::1:c
payments-lb.eqiad 1H IN A208.80.154.237
;;; ns0208.80.154.238
dns-rec-lb.eqiad 1H IN A208.80.154.239
--
To view, visit https://gerrit.wikimedia.org/r/104959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I621c47713ed8c99cf3d9f8663c25df118337f492
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Prioritize priority CirrusSearch jobs - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Prioritize priority CirrusSearch jobs .. Prioritize priority CirrusSearch jobs Change-Id: If8c330d715bee3c4fd3e5809206e7ea19eff5c09 --- M modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb index ed9e9a6..5a72fc5 100755 --- a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb +++ b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb @@ -210,6 +210,7 @@ hpriotypes=$hpriotypes TranslateRenderJob TranslateMoveJob TranslateDeleteJob # translate hpriotypes=$hpriotypes uploadFromUrl # upload hpriotypes=$hpriotypes MassMessageJob MassMessageSubmitJob # MassMessage + hpriotypes=$hpriotypes cirrusSearchLinksUpdatePrioritized # CirrusSearch priority jobs (runJobsLoopService $hpriotypes y %= dprioprocs %) # Start loops for highly I/O bound jobs that work on special services (e.g. not the DBs) -- To view, visit https://gerrit.wikimedia.org/r/104763 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8c330d715bee3c4fd3e5809206e7ea19eff5c09 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad ch...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Throw exception for unknown field in SpecialListfiles::forma... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Throw exception for unknown field in
SpecialListfiles::formatValue()
..
Throw exception for unknown field in SpecialListfiles::formatValue()
Change-Id: I99fedfb28aaf9b09b5d9fee27020601f3c06e8d4
---
M includes/specials/SpecialListfiles.php
A tests/phpunit/includes/specials/SpecialListFilesTest.php
2 files changed, 37 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialListfiles.php
b/includes/specials/SpecialListfiles.php
index b518140..ba3e73f 100644
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -387,6 +387,20 @@
UserCache::singleton()-doQuery( $userIds, array( 'userpage' ),
__METHOD__ );
}
+ /**
+* @param string $field
+* @param string $value
+* @return Message|string|int The return type depends on the value of
$field:
+* - thumb: string
+* - img_timestamp: string
+* - img_name: string
+* - img_user_text: string
+* - img_size: string
+* - img_description: string
+* - count: int
+* - top: Message
+* @throws MWException
+*/
function formatValue( $field, $value ) {
switch ( $field ) {
case 'thumb':
@@ -446,6 +460,8 @@
case 'top':
// Messages: listfiles-latestversion-yes,
listfiles-latestversion-no
return $this-msg( 'listfiles-latestversion-' .
$value );
+ default:
+ throw new MWException( Unknown field '$field'
);
}
}
diff --git a/tests/phpunit/includes/specials/SpecialListFilesTest.php
b/tests/phpunit/includes/specials/SpecialListFilesTest.php
new file mode 100644
index 000..2689236
--- /dev/null
+++ b/tests/phpunit/includes/specials/SpecialListFilesTest.php
@@ -0,0 +1,21 @@
+?php
+/**
+ * Test class for SpecialListFiles class.
+ *
+ * Copyright © 2013, Antoine Musso
+ * Copyright © 2013, Siebrand Mazeland
+ * Copyright © 2013, Wikimedia Foundation Inc.
+ *
+ */
+
+class SpecialListFilesTest extends MediaWikiTestCase {
+ /**
+* @expectedException MWException
+* @expectedExceptionMesage invalid_field
+* @covers ImageListPager::formatValue
+*/
+ public function testFormatValuesThrowException() {
+ $page = new ImageListPager( RequestContext::getMain() );
+ $page-formatValue( 'invalid_field', 'invalid_value' );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/104058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99fedfb28aaf9b09b5d9fee27020601f3c06e8d4
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@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 db2 support, core MW did this a while ago - change (mediawiki...Math)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104960
Change subject: Remove db2 support, core MW did this a while ago
..
Remove db2 support, core MW did this a while ago
Change-Id: I78124660e7bad31c81726e8723d73ce92af42e4d
---
M Math.hooks.php
D db/math.db2.sql
2 files changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/60/104960/1
diff --git a/Math.hooks.php b/Math.hooks.php
index 78ba874..3c26d1f 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -129,7 +129,6 @@
'postgres' = 'math.pg.sql',
'oracle' = 'math.oracle.sql',
'mssql' = 'math.mssql.sql',
- 'db2' = 'math.db2.sql',
);
$type = $updater-getDB()-getType();
if ( isset( $map[$type] ) ) {
diff --git a/db/math.db2.sql b/db/math.db2.sql
deleted file mode 100644
index 0c44c30..000
--- a/db/math.db2.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE math (
- math_inputhash VARCHAR(16) FOR BIT DATA NOT NULL UNIQUE,
- math_outputhash VARCHAR(16) FOR BIT DATA NOT NULL,
- math_html_conservativeness SMALLINT NOT NULL,
- math_html CLOB(64K) INLINE LENGTH 4096,
- math_mathml CLOB(64K) INLINE LENGTH 4096
-);
--
To view, visit https://gerrit.wikimedia.org/r/104960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78124660e7bad31c81726e8723d73ce92af42e4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: make mw-update-l10n verbose - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: beta: make mw-update-l10n verbose .. beta: make mw-update-l10n verbose The script can use a bit more verbosity to provide useful output in Jenkins console. Change-Id: I7945bb193784141f43276d1d7d94108c2d5669e4 --- M files/misc/beta/wmf-beta-autoupdate.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/files/misc/beta/wmf-beta-autoupdate.py b/files/misc/beta/wmf-beta-autoupdate.py index d31ed09..e23d407 100755 --- a/files/misc/beta/wmf-beta-autoupdate.py +++ b/files/misc/beta/wmf-beta-autoupdate.py @@ -169,7 +169,7 @@ def update_l10n(): Localisation cache update -return runner(name='mw-update-l10n', cmd=['mw-update-l10n']) +return runner(name='mw-update-l10n', cmd=['mw-update-l10n', '--verbose']) def runner(cmd, path=None, name=None): -- To view, visit https://gerrit.wikimedia.org/r/104956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7945bb193784141f43276d1d7d94108c2d5669e4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: finish parsoid switching to jenkins job - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104961
Change subject: beta: finish parsoid switching to jenkins job
..
beta: finish parsoid switching to jenkins job
Previous 03239e8 made use of the 'deploy' repository, this change now
switch Parsoid to use the mediawiki/services/parsoid repository. The
checkout is specified using PARSOID_BASE_PATH in the default file.
Change-Id: Ife841de4fc0a705a3fc134b0e0862f0ed8e2d681
---
M files/misc/parsoid.upstart
M manifests/role/parsoid.pp
M templates/misc/parsoid.default.erb
3 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/104961/1
diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart
index a3b9a08..060efd8 100644
--- a/files/misc/parsoid.upstart
+++ b/files/misc/parsoid.upstart
@@ -17,8 +17,12 @@
setgid parsoid
env DEFAULTFILE=/etc/default/parsoid
+
+# Basic build in default, would be overridden by whatever
+# is defined in the DEFAULTFILE defined above
env VCAP_APP_PORT=8000
env NODE_PATH=/var/lib/parsoid/Parsoid/js/node_modules
+env PARSOID_BASE_PATH=/var/lib/parsoid/Parsoid
respawn
@@ -30,6 +34,6 @@
PARSOID_LOG_FILE='/dev/null'
fi
-chdir /var/lib/parsoid/Parsoid
-exec /usr/bin/nodejs js/api/server.js /dev/null $PARSOID_LOG_FILE
21
+chdir $PARSOID_BASE_PATH
+exec /usr/bin/nodejs api/server.js /dev/null $PARSOID_LOG_FILE 21
end script
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index d14067a..83ce922 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -114,6 +114,8 @@
$parsoid_log_file = '/var/log/parsoid/parsoid.log'
# For beta, override NODE_PATH:
$parsoid_node_path = '/srv/deployment/parsoid/deploy/node_modules'
+# Checkout of mediawiki/services/parsoid
+$parsoid_base_path = '/srv/deployment/parsoid/parsoid'
file { '/etc/default/parsoid':
ensure = present,
diff --git a/templates/misc/parsoid.default.erb
b/templates/misc/parsoid.default.erb
index 4cd7012..3ba27e2 100644
--- a/templates/misc/parsoid.default.erb
+++ b/templates/misc/parsoid.default.erb
@@ -6,6 +6,14 @@
# File where the parsoid daemon will write stdin and stdout to
PARSOID_LOG_FILE=%= @parsoid_log_file %
+# Checkout of mediawiki/services/parsoid
+% if @parsoid_base_path then %
+PARSOID_BASE_PATH=%= @parsoid_base_path %
+% else %
+# Override in puppet using parsoid_base_path
+#PARSOID_BASE_PATH
+% end %
+
# Checkout of mediawiki/services/parsoid/deploy
% if @parsoid_node_path then %
NODE_PATH=%= @parsoid_node_path %
--
To view, visit https://gerrit.wikimedia.org/r/104961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife841de4fc0a705a3fc134b0e0862f0ed8e2d681
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: parsoid localsettings.js - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: beta: parsoid localsettings.js
..
beta: parsoid localsettings.js
Parsoid need a configuration file, track it under puppet and get it
under /srv/deployment/parsoid which is where the Jenkins job copy the
Parsoid files already. The Job will symlink to that file.
Change-Id: I46158543d9099d675160f5aa47c666a9f302e987
---
A files/misc/parsoid-localsettings-beta.js
M manifests/role/parsoid.pp
2 files changed, 57 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/parsoid-localsettings-beta.js
b/files/misc/parsoid-localsettings-beta.js
new file mode 100644
index 000..5aa436e
--- /dev/null
+++ b/files/misc/parsoid-localsettings-beta.js
@@ -0,0 +1,36 @@
+/*
+ * THIS FILE IS MANAGED BY PUPPET
+ * puppet:///files/misc/parsoid-localsettings-beta.js
+ */
+
+exports.setup = function( parsoidConfig ) {
+ parsoidConfig.setInterwiki( 'labs',
'http://deployment.wikimedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwiki',
'http://en.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'dewiki',
'http://de.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'dewikinews',
'http://de.wikinews.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwiktionary',
'http://en.wikitionary.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwikibooks',
'http://en.wikibooks.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'enwikinews',
'http://en.wikinews.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'frwiki',
'http://fr.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswiki',
'http://cs.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswikisource',
'http://cs.wikisource.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswikibooks',
'http://cs.wikibooks.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'cswikinews',
'http://cs.wikinews.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'commonswiki',
'http://commons.wikimedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'simplewiki',
'http://simple.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'trwiki',
'http://tr.wikipedia.beta.wmflabs.org/w/api.php' );
+ parsoidConfig.setInterwiki( 'diqwiki',
'http://diq.wikipedia.beta.wmflabs.org/w/api.php' );
+
+ // Use the PHP preprocessor to expand templates via the MW API (default
true)
+ parsoidConfig.usePHPPreProcessor = true;
+
+ // Use selective serialization (default false)
+ parsoidConfig.useSelser = true;
+
+ // allow cross-domain requests to the API (default disallowed)
+ //parsoidConfig.allowCORS = '*';
+ //
+ parsoidConfig.parsoidCacheURI = 'http://10.4.0.61/'; //
deployment-parsoidcache3
+
+ // parsoidConfig.apiProxyURI = 'http://en.wikipedia.org';
+};
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index d14067a..3aed096 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -92,6 +92,27 @@
mode = '2775',
}
+# Jenkins copy repositories and config under /srv/deployment
+file { '/srv/deployment':
+ensure = directory,
+owner = root,
+group = root,
+mode = '0755',
+}
+file { '/srv/deployment/parsoid':
+ensure = directory,
+owner = jenkins-deploy,
+group = wikidev,
+mode = '0755',
+}
+file { '/srv/deployment/parsoid/localsettings.js':
+ensure = present,
+owner = jenkins-deploy,
+group = wikidev,
+mode = '0555',
+source = 'puppet://files/misc/parsoid-localsettings-beta.js',
+}
+
# beta uses upstart:
file { '/etc/init.d/parsoid':
ensure = 'link',
--
To view, visit https://gerrit.wikimedia.org/r/104938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46158543d9099d675160f5aa47c666a9f302e987
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove db2 support, core MW did this a while ago - change (mediawiki...Math)
Hoo man has submitted this change and it was merged.
Change subject: Remove db2 support, core MW did this a while ago
..
Remove db2 support, core MW did this a while ago
Change-Id: I78124660e7bad31c81726e8723d73ce92af42e4d
---
M Math.hooks.php
D db/math.db2.sql
2 files changed, 0 insertions(+), 8 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
diff --git a/Math.hooks.php b/Math.hooks.php
index 78ba874..3c26d1f 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -129,7 +129,6 @@
'postgres' = 'math.pg.sql',
'oracle' = 'math.oracle.sql',
'mssql' = 'math.mssql.sql',
- 'db2' = 'math.db2.sql',
);
$type = $updater-getDB()-getType();
if ( isset( $map[$type] ) ) {
diff --git a/db/math.db2.sql b/db/math.db2.sql
deleted file mode 100644
index 0c44c30..000
--- a/db/math.db2.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE math (
- math_inputhash VARCHAR(16) FOR BIT DATA NOT NULL UNIQUE,
- math_outputhash VARCHAR(16) FOR BIT DATA NOT NULL,
- math_html_conservativeness SMALLINT NOT NULL,
- math_html CLOB(64K) INLINE LENGTH 4096,
- math_mathml CLOB(64K) INLINE LENGTH 4096
-);
--
To view, visit https://gerrit.wikimedia.org/r/104960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78124660e7bad31c81726e8723d73ce92af42e4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not require login for pure logging purposes - change (pywikibot/core)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104962
Change subject: Do not require login for pure logging purposes
..
Do not require login for pure logging purposes
If the user is not logged in, then don't display their talk page status, as
this would require a log-in. This is annoying if one just needs read-only
access, or needs to read a wiki that has a broken login (e.g. toolserver)
Change-Id: Ia46d1938221ef70aaf2a752f1b9a4cc5493d34dc
---
M pywikibot/bot.py
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/62/104962/1
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 13aaf41..2d478c5 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -272,7 +272,14 @@
log(u' %s' % ver)
# messages on bot discussion page?
-log(u'MESSAGES: %s' % ('unanswered' if site.messages() else 'none'))
+if site.logged_in():
+if site.messages():
+messagestate = 'unanswered'
+else:
+messagestate = 'none'
+else:
+messagestate = 'unknown (not logged in)'
+log(u'MESSAGES: %s' % messagestate)
log(u'=== ' * 14)
--
To view, visit https://gerrit.wikimedia.org/r/104962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia46d1938221ef70aaf2a752f1b9a4cc5493d34dc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: finish parsoid switching to jenkins job - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: beta: finish parsoid switching to jenkins job
..
beta: finish parsoid switching to jenkins job
Previous 03239e8 made use of the 'deploy' repository, this change now
switch Parsoid to use the mediawiki/services/parsoid repository. The
checkout is specified using PARSOID_BASE_PATH in the default file.
Change-Id: Ife841de4fc0a705a3fc134b0e0862f0ed8e2d681
---
M files/misc/parsoid.upstart
M manifests/role/parsoid.pp
M templates/misc/parsoid.default.erb
3 files changed, 16 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart
index a3b9a08..060efd8 100644
--- a/files/misc/parsoid.upstart
+++ b/files/misc/parsoid.upstart
@@ -17,8 +17,12 @@
setgid parsoid
env DEFAULTFILE=/etc/default/parsoid
+
+# Basic build in default, would be overridden by whatever
+# is defined in the DEFAULTFILE defined above
env VCAP_APP_PORT=8000
env NODE_PATH=/var/lib/parsoid/Parsoid/js/node_modules
+env PARSOID_BASE_PATH=/var/lib/parsoid/Parsoid
respawn
@@ -30,6 +34,6 @@
PARSOID_LOG_FILE='/dev/null'
fi
-chdir /var/lib/parsoid/Parsoid
-exec /usr/bin/nodejs js/api/server.js /dev/null $PARSOID_LOG_FILE
21
+chdir $PARSOID_BASE_PATH
+exec /usr/bin/nodejs api/server.js /dev/null $PARSOID_LOG_FILE 21
end script
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 3aed096..3a7510b 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -135,6 +135,8 @@
$parsoid_log_file = '/var/log/parsoid/parsoid.log'
# For beta, override NODE_PATH:
$parsoid_node_path = '/srv/deployment/parsoid/deploy/node_modules'
+# Checkout of mediawiki/services/parsoid
+$parsoid_base_path = '/srv/deployment/parsoid/parsoid'
file { '/etc/default/parsoid':
ensure = present,
diff --git a/templates/misc/parsoid.default.erb
b/templates/misc/parsoid.default.erb
index 4cd7012..3ba27e2 100644
--- a/templates/misc/parsoid.default.erb
+++ b/templates/misc/parsoid.default.erb
@@ -6,6 +6,14 @@
# File where the parsoid daemon will write stdin and stdout to
PARSOID_LOG_FILE=%= @parsoid_log_file %
+# Checkout of mediawiki/services/parsoid
+% if @parsoid_base_path then %
+PARSOID_BASE_PATH=%= @parsoid_base_path %
+% else %
+# Override in puppet using parsoid_base_path
+#PARSOID_BASE_PATH
+% end %
+
# Checkout of mediawiki/services/parsoid/deploy
% if @parsoid_node_path then %
NODE_PATH=%= @parsoid_node_path %
--
To view, visit https://gerrit.wikimedia.org/r/104961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife841de4fc0a705a3fc134b0e0862f0ed8e2d681
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Better i18n for user creation log when promoted from sandbox - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Better i18n for user creation log when promoted from sandbox
..
Better i18n for user creation log when promoted from sandbox
Bug: 58707
Change-Id: I9ad4855950cae83569c025f08eda4f1f54d86750
---
M Translate.php
M api/ApiTranslateSandbox.php
M i18n/sandbox/en.json
M i18n/sandbox/qqq.json
4 files changed, 7 insertions(+), 9 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.php b/Translate.php
index b54ccb2..ca4e725 100644
--- a/Translate.php
+++ b/Translate.php
@@ -219,6 +219,7 @@
$wgLogTypes[] = 'translatorsandbox';
$wgLogActionsHandlers['translatorsandbox/promoted'] = 'TranslateLogFormatter';
$wgLogActionsHandlers['translatorsandbox/rejected'] = 'TranslateLogFormatter';
+$wgLogActionsHandlers['newusers/tsbpromoted'] = 'LogFormatter';
// New jobs
$wgJobClasses['MessageIndexRebuildJob'] = 'MessageIndexRebuildJob';
diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 0b956b5..2aa267b 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
@@ -131,11 +131,7 @@
$logid = $logEntry-insert();
$logEntry-publish( $logid );
- global $wgContLang;
- $user-addNewUserLogEntry(
- 'create',
- $this-msg( 'tsb-promoted-from-sandbox'
)-inLanguage( $wgContLang )-text()
- );
+ $user-addNewUserLogEntry( 'tsbpromoted' );
$this-createUserPage( $user );
}
}
diff --git a/i18n/sandbox/en.json b/i18n/sandbox/en.json
index cafe244..5c2aea3 100644
--- a/i18n/sandbox/en.json
+++ b/i18n/sandbox/en.json
@@ -44,10 +44,10 @@
tsb-limit-reached-title: Thanks for your translations,
tsb-limit-reached-body: You reached the translation limit for new
translators.\nOur team will verify and upgrade your account soon.\nThen you
will be able to translate without limits.,
tsb-no-requests-from-new-users: No requests from new users,
-tsb-promoted-from-sandbox: User has been promoted to translator,
tsb-create-user-page: Create basic user page,
log-name-translatorsandbox: Translation sandbox,
log-description-translatorsandbox: A log of actions on translation
sandbox users,
logentry-translatorsandbox-promoted: $1 {{GENDER:$2|promoted}} $3 to
{{GENDER:$4|translator}},
-logentry-translatorsandbox-rejected: $1 {{GENDER:$2|rejected}} the
request from \$3\ to become a translator
+logentry-translatorsandbox-rejected: $1 {{GENDER:$2|rejected}} the
request from \$3\ to become a translator,
+logentry-newusers-tsbpromoted: User account $3 was
{{GENDER:$2|created}} by promotion from sandbox
}
diff --git a/i18n/sandbox/qqq.json b/i18n/sandbox/qqq.json
index 302afba..259a67e 100644
--- a/i18n/sandbox/qqq.json
+++ b/i18n/sandbox/qqq.json
@@ -50,5 +50,6 @@
log-name-translatorsandbox: {{doc-logpage}},
log-description-translatorsandbox: Log page description,
logentry-translatorsandbox-promoted: {{logentry}}\n* $4 - The name of
the user that was promoted, can be used for GENDER.,
-logentry-translatorsandbox-rejected: {{logentry}}
-}
\ No newline at end of file
+logentry-translatorsandbox-rejected: {{logentry}},
+logentry-newusers-tsbpromoted: {{logentry}}
+}
--
To view, visit https://gerrit.wikimedia.org/r/104958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ad4855950cae83569c025f08eda4f1f54d86750
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Don't hard code the remoteExtPath for ResourceLoader - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104963
Change subject: Don't hard code the remoteExtPath for ResourceLoader
..
Don't hard code the remoteExtPath for ResourceLoader
Change-Id: I934b95ca3dd221f5f059ab21a8f01ba9a199faaf
---
M client/resources/Resources.php
M lib/WikibaseLib.hooks.php
M lib/resources/Resources.php
M repo/resources/Resources.php
4 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/63/104963/1
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index c2a2f46..f667eee 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -1,10 +1,11 @@
?php
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__,
- 'remoteExtPath' = 'Wikibase/client/resources'
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ )
);
return array(
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index 0111ded..5c69471 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -59,9 +59,11 @@
* @return boolean
*/
public static function registerQUnitTests( array $testModules,
\ResourceLoader $resourceLoader ) {
+ global $wgExtensionAssetsPath;
+
$moduleBase = array(
'localBasePath' = __DIR__,
- 'remoteExtPath' = 'Wikibase/lib',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath,
'', __DIR__ ),
);
// TODO: Split into test modules per QUnit module.
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 9b1d346..4f6ea47 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -15,10 +15,11 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__,
- 'remoteExtPath' = 'Wikibase/lib/resources',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ),
);
$modules = array(
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index b4f6e6c..43f1c4d 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -11,10 +11,11 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__,
- 'remoteExtPath' = 'Wikibase/repo/resources',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ),
'position' = 'top' // reducing the time between DOM
construction and JS initialisation
);
--
To view, visit https://gerrit.wikimedia.org/r/104963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I934b95ca3dd221f5f059ab21a8f01ba9a199faaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define labs-toollabs-debbuild and dump tests/testsuite.log o... - change (integration/jenkins-job-builder-config)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104964
Change subject: Define labs-toollabs-debbuild and dump tests/testsuite.log on
failure
..
Define labs-toollabs-debbuild and dump tests/testsuite.log on failure
Change-Id: I41d3f1b47cd31d83f3b744b189a85a6b9084cc50
---
M labs.yaml
1 file changed, 13 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/64/104964/1
diff --git a/labs.yaml b/labs.yaml
index 553a00c..57202ee 100644
--- a/labs.yaml
+++ b/labs.yaml
@@ -15,6 +15,19 @@
jobs:
- '{name}-debian-glue'
+- job:
+name: 'labs-toollabs-debbuild'
+node: hasContintPackages
+defaults: use-remote-zuul
+
+scm:
+ - git-deb-package
+
+builders:
+ - shell: 'cd source uscan --verbose --rename
--download-current-version'
+ - shell: 'cd source (dpkg-buildpackage -rfakeroot -us -uc || cat
tests/testsuite.log)'
+ - shell: 'lintian --info *.deb'
+
- project:
name: 'labs-tools-grrrit'
jobs:
--
To view, visit https://gerrit.wikimedia.org/r/104964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41d3f1b47cd31d83f3b744b189a85a6b9084cc50
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: parsoid: typo in file definition - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104965 Change subject: beta: parsoid: typo in file definition .. beta: parsoid: typo in file definition file source should have three slashes in the protocol :( Change-Id: Ifa92e55220f0f77e77c549cdb2d631c71a97d77a --- M manifests/role/parsoid.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/104965/1 diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp index 3a7510b..9d5d277 100644 --- a/manifests/role/parsoid.pp +++ b/manifests/role/parsoid.pp @@ -110,7 +110,7 @@ owner = jenkins-deploy, group = wikidev, mode = '0555', -source = 'puppet://files/misc/parsoid-localsettings-beta.js', +source = 'puppet:///files/misc/parsoid-localsettings-beta.js', } # beta uses upstart: -- To view, visit https://gerrit.wikimedia.org/r/104965 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa92e55220f0f77e77c549cdb2d631c71a97d77a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: parsoid: typo in file definition - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: beta: parsoid: typo in file definition .. beta: parsoid: typo in file definition file source should have three slashes in the protocol :( Change-Id: Ifa92e55220f0f77e77c549cdb2d631c71a97d77a --- M manifests/role/parsoid.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp index 3a7510b..9d5d277 100644 --- a/manifests/role/parsoid.pp +++ b/manifests/role/parsoid.pp @@ -110,7 +110,7 @@ owner = jenkins-deploy, group = wikidev, mode = '0555', -source = 'puppet://files/misc/parsoid-localsettings-beta.js', +source = 'puppet:///files/misc/parsoid-localsettings-beta.js', } # beta uses upstart: -- To view, visit https://gerrit.wikimedia.org/r/104965 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa92e55220f0f77e77c549cdb2d631c71a97d77a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update Parsoid service on beta cluster - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104967 Change subject: update Parsoid service on beta cluster .. update Parsoid service on beta cluster Trigger beta-parsoid-update whenever a change is merged in the master branch of mediawiki/services/parsoid bug: 57233 Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 --- M layout.yaml 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/67/104967/1 diff --git a/layout.yaml b/layout.yaml index 441fe05..df8e425 100644 --- a/layout.yaml +++ b/layout.yaml @@ -330,6 +330,12 @@ success-message: 'Change has been deployed on the beta cluster' failure-message: 'Failed deployment on the beta cluster :-/ Please contact a member of the beta project to fixup the working directory on the destination server.' + - name: beta-parsoid-update +branch: ^master$ +success-message: 'Change has been deployed on the beta cluster' +failure-message: 'Failed deployment on the beta cluster :-/ Please contact a member of the beta project to investigate.' + + - name: integration-docroot-deploy branch: ^master$ success-message: 'Change has been deployed on the server and should be now live on https://integration.wikimedia.org/. Build ' @@ -1995,6 +2001,8 @@ - parsoidsvc-jslint - parsoidsvc-parsertests-run-harder - parsoidsvc-php-parsertests +postmerge: + - beta-parsoid-update - name: mediawiki/services/parsoid/deploy test: -- To view, visit https://gerrit.wikimedia.org/r/104967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dashboard: add beta-parsoid-update - change (integration/docroot)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104968 Change subject: dashboard: add beta-parsoid-update .. dashboard: add beta-parsoid-update Will show up the status of Parsoid updating job on the integration dashboard. bug: 57233 Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 --- M org/wikimedia/integration/dashboard/index.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/68/104968/1 diff --git a/org/wikimedia/integration/dashboard/index.php b/org/wikimedia/integration/dashboard/index.php index f04b270..8f0102c 100644 --- a/org/wikimedia/integration/dashboard/index.php +++ b/org/wikimedia/integration/dashboard/index.php @@ -13,6 +13,7 @@ 'beta-code-update' = 'MW code', 'beta-mediawiki-config-update' = 'MW conf', 'beta-update-databases' = 'DB update', + 'beta-parsoid-update' = 'Parsoid update', 'beta-recompile-math-texvc' = 'texvc (math)', ), 'MediaWiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/104968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update Parsoid service on beta cluster - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: update Parsoid service on beta cluster .. update Parsoid service on beta cluster Trigger beta-parsoid-update whenever a change is merged in the master branch of mediawiki/services/parsoid bug: 57233 Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 --- M layout.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 441fe05..df8e425 100644 --- a/layout.yaml +++ b/layout.yaml @@ -330,6 +330,12 @@ success-message: 'Change has been deployed on the beta cluster' failure-message: 'Failed deployment on the beta cluster :-/ Please contact a member of the beta project to fixup the working directory on the destination server.' + - name: beta-parsoid-update +branch: ^master$ +success-message: 'Change has been deployed on the beta cluster' +failure-message: 'Failed deployment on the beta cluster :-/ Please contact a member of the beta project to investigate.' + + - name: integration-docroot-deploy branch: ^master$ success-message: 'Change has been deployed on the server and should be now live on https://integration.wikimedia.org/. Build ' @@ -1995,6 +2001,8 @@ - parsoidsvc-jslint - parsoidsvc-parsertests-run-harder - parsoidsvc-php-parsertests +postmerge: + - beta-parsoid-update - name: mediawiki/services/parsoid/deploy test: -- To view, visit https://gerrit.wikimedia.org/r/104967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta-parsoid-update job - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: beta-parsoid-update job .. beta-parsoid-update job Meant to be run directly on the deployment-parsoid2 instance which is now a Jenkins slave. That basically fetch the repositories, copy the content under /srv/deployment/parsoid then restart parsoid. The configuration file is managed by puppet and maintained at /srv/deployment/parsoid/localsettings.js bug: 57233 Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 --- M beta.yaml 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/beta.yaml b/beta.yaml index 3e1691d..8eadc32 100644 --- a/beta.yaml +++ b/beta.yaml @@ -190,3 +190,25 @@ triggers: # Every six minutes: - timed: '*/6 * * * *' + +- job: +name: beta-parsoid-update +defaults: beta +node: deployment-parsoid2 +triggers: + - zuul + +builders: + - git-parsoid-and-deploy-repos + - shell: | + PARSOID_TARGET=/srv/deployment/parsoid + mkdir -p $PARSOID_TARGET + # sync workspace and deployment target + RSYNC_OPTS=--update --times --recursive --links --delete-after --delay-updates --exclude=.git + rsync $RSYNC_OPTS $WORKSPACE/parsoid $PARSOID_TARGET + rsync $RSYNC_OPTS $WORKSPACE/deploy $PARSOID_TARGET + # Configuration file is managed by puppet + ln -s /srv/deployment/parsoid/localsettings.js $PARSOID_TARGET/parsoid/api/localsettings.js + + - shell: | + sudo /etc/init.d/parsoid restart -- To view, visit https://gerrit.wikimedia.org/r/104933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 Gerrit-PatchSet: 4 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't hard code the remoteExtPath for ResourceLoader - change (mediawiki...DataTypes)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104966
Change subject: Don't hard code the remoteExtPath for ResourceLoader
..
Don't hard code the remoteExtPath for ResourceLoader
Change-Id: I437c093ada44d4cb5cd0cee5acf2741c53732d45
---
M DataTypes.mw.php
M DataTypes.resources.php
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataTypes
refs/changes/66/104966/1
diff --git a/DataTypes.mw.php b/DataTypes.mw.php
index a6a6b3f..989710e 100644
--- a/DataTypes.mw.php
+++ b/DataTypes.mw.php
@@ -86,9 +86,11 @@
* @return boolean
*/
$wgHooks['ResourceLoaderTestModules'][] = function ( array $testModules,
\ResourceLoader $resourceLoader ) {
+ global $wgExtensionAssetsPath;
+
$moduleTemplate = array(
'localBasePath' = __DIR__ . '/tests/qunit',
- 'remoteExtPath' = 'DataTypes/tests/qunit',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ) . '/tests/qunit',
);
$testModules['qunit']['dataTypes.tests'] = $moduleTemplate + array(
diff --git a/DataTypes.resources.php b/DataTypes.resources.php
index adeb6b7..9490f72 100644
--- a/DataTypes.resources.php
+++ b/DataTypes.resources.php
@@ -14,10 +14,11 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__ . '/resources',
- 'remoteExtPath' = 'DataTypes/resources',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ) . '/resources',
);
return array(
--
To view, visit https://gerrit.wikimedia.org/r/104966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I437c093ada44d4cb5cd0cee5acf2741c53732d45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTypes
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dashboard: add beta-parsoid-update - change (integration/docroot)
Hashar has submitted this change and it was merged. Change subject: dashboard: add beta-parsoid-update .. dashboard: add beta-parsoid-update Will show up the status of Parsoid updating job on the integration dashboard. bug: 57233 Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 --- M org/wikimedia/integration/dashboard/index.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/org/wikimedia/integration/dashboard/index.php b/org/wikimedia/integration/dashboard/index.php index f04b270..8f0102c 100644 --- a/org/wikimedia/integration/dashboard/index.php +++ b/org/wikimedia/integration/dashboard/index.php @@ -13,6 +13,7 @@ 'beta-code-update' = 'MW code', 'beta-mediawiki-config-update' = 'MW conf', 'beta-update-databases' = 'DB update', + 'beta-parsoid-update' = 'Parsoid update', 'beta-recompile-math-texvc' = 'texvc (math)', ), 'MediaWiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/104968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ec5e18d46cec8a897ede21110a863db643a3507 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't hard code the remoteExtPath for ResourceLoader - change (mediawiki...DataValues)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104969
Change subject: Don't hard code the remoteExtPath for ResourceLoader
..
Don't hard code the remoteExtPath for ResourceLoader
Change-Id: I88760cce12b6d2444f98cd7cf6d88a2aea9fa99d
---
M DataValues/DataValues.mw.php
M DataValues/DataValues.resources.mw.php
M DataValues/DataValues.resources.php
M DataValuesCommon/DataValuesCommon.mw.php
M DataValuesCommon/js/ValueParsers.resources.mw.php
M DataValuesCommon/js/ValueParsers.resources.php
M ValueView/ValueView.mw.php
M ValueView/ValueView.resources.mw.php
M ValueView/ValueView.resources.php
9 files changed, 21 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/69/104969/1
diff --git a/DataValues/DataValues.mw.php b/DataValues/DataValues.mw.php
index 05d0a3c..891a6c7 100644
--- a/DataValues/DataValues.mw.php
+++ b/DataValues/DataValues.mw.php
@@ -70,12 +70,14 @@
* @return boolean
*/
$wgHooks['ResourceLoaderTestModules'][] = function ( array $testModules,
\ResourceLoader $resourceLoader ) {
+ global $wgExtensionAssetsPath;
+
// Register DataValue QUnit tests. Take the predefined test definitions
and make them
// suitable for registration with MediaWiki's resource loader.
$ownModules = include( __DIR__ . '/DataValues.tests.qunit.php' );
$ownModulesTemplate = array(
'localBasePath' = __DIR__,
- 'remoteExtPath' = 'DataValues/DataValues',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ),
);
foreach( $ownModules as $ownModuleName = $ownModule ) {
$testModules['qunit'][ $ownModuleName ] = $ownModule +
$ownModulesTemplate;
diff --git a/DataValues/DataValues.resources.mw.php
b/DataValues/DataValues.resources.mw.php
index de0de06..64e5fb2 100644
--- a/DataValues/DataValues.resources.mw.php
+++ b/DataValues/DataValues.resources.mw.php
@@ -14,10 +14,11 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__ . '/resources',
- 'remoteExtPath' = 'DataValues/DataValues/resources',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ) . '/resources',
);
$mwVvResources = array(
diff --git a/DataValues/DataValues.resources.php
b/DataValues/DataValues.resources.php
index 366fb20..9cd05e8 100644
--- a/DataValues/DataValues.resources.php
+++ b/DataValues/DataValues.resources.php
@@ -19,10 +19,11 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__ . '/resources',
- 'remoteExtPath' = 'DataValues/DataValues/resources',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ) . '/resources',
);
return array(
diff --git a/DataValuesCommon/DataValuesCommon.mw.php
b/DataValuesCommon/DataValuesCommon.mw.php
index d2f6296..cd10b2e 100644
--- a/DataValuesCommon/DataValuesCommon.mw.php
+++ b/DataValuesCommon/DataValuesCommon.mw.php
@@ -115,10 +115,12 @@
* @return boolean
*/
$wgHooks['ResourceLoaderTestModules'][] = function ( array $testModules,
\ResourceLoader $resourceLoader ) {
+ global $wgExtensionAssetsPath;
+
// @codeCoverageIgnoreStart
$moduleTemplate = array(
'localBasePath' = __DIR__ . '/js/tests/ValueParsers',
- 'remoteExtPath' =
'DataValues/DataValuesCommon/js/tests/ValueParsers',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ) . '/js/tests/ValueParsers',
);
$testModules['qunit']['ext.valueParsers.tests'] = $moduleTemplate +
array(
diff --git a/DataValuesCommon/js/ValueParsers.resources.mw.php
b/DataValuesCommon/js/ValueParsers.resources.mw.php
index 21f4b90..b81172e 100644
--- a/DataValuesCommon/js/ValueParsers.resources.mw.php
+++ b/DataValuesCommon/js/ValueParsers.resources.mw.php
@@ -9,10 +9,11 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ global $wgExtensionAssetsPath;
$moduleTemplate = array(
'localBasePath' = __DIR__ . '/src/ValueParsers/',
- 'remoteExtPath' =
'DataValues/DataValuesCommon/js/src/ValueParsers',
+ 'remoteExtPath' = str_replace( $wgExtensionAssetsPath, '',
__DIR__ ) . '/src/ValueParsers',
);
$mwVpResources = array(
diff --git a/DataValuesCommon/js/ValueParsers.resources.php
b/DataValuesCommon/js/ValueParsers.resources.php
index daf27ea..69efc17 100644
--- a/DataValuesCommon/js/ValueParsers.resources.php
+++ b/DataValuesCommon/js/ValueParsers.resources.php
@@ -15,10 +15,11 @@
[MediaWiki-commits] [Gerrit] WIP Retry commands if failed - change (mediawiki...release)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104970
Change subject: WIP Retry commands if failed
..
WIP Retry commands if failed
TODO: Don't retry for ever.
This is intermediatery so I can branch 1.23wmf9...
Bug: 59213
Change-Id: I7e5990641ac8f29e40d571a581a04bfd916d5306
---
M make-wmf-branch/make-wmf-branch
1 file changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/70/104970/1
diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch
index 05148e0..bf979cc 100755
--- a/make-wmf-branch/make-wmf-branch
+++ b/make-wmf-branch/make-wmf-branch
@@ -56,11 +56,25 @@
}
$encArgs = array_map( 'escapeshellarg', $args );
$cmd = implode( ' ', $encArgs );
- echo $cmd\n;
- passthru( $cmd, $ret );
- if ( $ret ) {
- $this-croak( $args[0] . exit with status $ret\n );
- }
+
+ do {
+ echo $cmd\n;
+ passthru( $cmd, $ret );
+
+ if ( !$ret ) {
+ // It worked!
+ break;
+ } elseif ( in_array( $ret, array( 128 ) ) ) {
+ // Recoverable errors
+ // 128 from Permission denied (publickey) etc
+ echo sleeping for 5\n;
+ sleep( 5 );
+ continue;
+ } else {
+ $this-croak( $args[0] . exit with status
$ret\n );
+ return; // Redundant
+ }
+ } while ( true );
}
function runWriteCmd( /*...*/ ) {
--
To view, visit https://gerrit.wikimedia.org/r/104970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e5990641ac8f29e40d571a581a04bfd916d5306
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Recommission virt1001, 1002, 1003 - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Recommission virt1001, 1002, 1003 .. Recommission virt1001, 1002, 1003 These were briefly analytics machines but now they're back part of the soon-to-be-glorious eqiad labs cluster. Change-Id: I75bbf31397edeac10a4eedcc0f1ccf556d22b49d --- M manifests/decommissioning.pp 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp index b68b996..7abc1c7 100644 --- a/manifests/decommissioning.pp +++ b/manifests/decommissioning.pp @@ -128,9 +128,6 @@ 'sq85', #6520 decommed 'sq86', #6520 decommed 'ssl3004', #added 9/17 -'virt1001', #3687 renamed virt1001-3 -'virt1002', -'virt1003', 'virt1', #5645 decommed 'virt3', 'virt4', -- To view, visit https://gerrit.wikimedia.org/r/104676 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75bbf31397edeac10a4eedcc0f1ccf556d22b49d Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Christopher Johnson christopher.john...@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] update parsoid on beta when deploy is updated - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/104971 Change subject: update parsoid on beta when deploy is updated .. update parsoid on beta when deploy is updated Trigger betta-parsoid-update whenever a change is merged in the master branch of mediawiki/services/parsoid/deploy. bug: 57233 Change-Id: If25875808ac832d9d7c6cace4844ac0f46dd2583 --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/71/104971/1 diff --git a/layout.yaml b/layout.yaml index df8e425..d37eae2 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2013,6 +2013,8 @@ - parsoidsvc-parsertests-run-harder - parsoidsvc-parse-tool-check - parsoidsvc-roundtrip-test-check +postmerge: + - beta-parsoid-update # SSS: Till we migrate all our WIP and unreviewed patches over # to the new repository, let us keep this in place. -- To view, visit https://gerrit.wikimedia.org/r/104971 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If25875808ac832d9d7c6cace4844ac0f46dd2583 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update parsoid on beta when deploy is updated - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: update parsoid on beta when deploy is updated .. update parsoid on beta when deploy is updated Trigger betta-parsoid-update whenever a change is merged in the master branch of mediawiki/services/parsoid/deploy. bug: 57233 Change-Id: If25875808ac832d9d7c6cace4844ac0f46dd2583 --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index df8e425..d37eae2 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2013,6 +2013,8 @@ - parsoidsvc-parsertests-run-harder - parsoidsvc-parse-tool-check - parsoidsvc-roundtrip-test-check +postmerge: + - beta-parsoid-update # SSS: Till we migrate all our WIP and unreviewed patches over # to the new repository, let us keep this in place. -- To view, visit https://gerrit.wikimedia.org/r/104971 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If25875808ac832d9d7c6cace4844ac0f46dd2583 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swap old and new LVS service IPs for ulsfo - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104972
Change subject: Swap old and new LVS service IPs for ulsfo
..
Swap old and new LVS service IPs for ulsfo
Change-Id: I899e064d588e60300b01b93900b9f175c4e7a637
---
M modules/lvs/manifests/configuration.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/104972/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 990aba8..0b45d61 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -221,7 +221,7 @@
'pmtpa' = { 'bitslb' = 208.80.152.210, 'bitslb6' =
2620:0:860:ed1a::a, 'bitssvc' = 10.2.1.23 },
'eqiad' = { 'bitslb' = 208.80.154.234, 'bitslb6' =
'2620:0:861:ed1a::1:a', 'bitslb6-old' = 2620:0:861:ed1a::a, 'bitssvc' =
10.2.2.23 },
'esams' = { 'bitslb' = '91.198.174.202', 'bitslb-old' =
91.198.174.233, 'bitslb6' = '2620:0:862:ed1a::1:a', 'bitslb6-old' =
2620:0:862:ed1a::a, 'bitssvc' = 10.2.3.23 },
-'ulsfo' = { 'bitslb' = 198.35.26.106, 'bitslb6-new' =
'2620:0:863:ed1a::1:a', 'bitslb6' = 2620:0:863:ed1a::a, 'bitssvc' =
10.2.4.23 },
+'ulsfo' = { 'bitslb' = 198.35.26.106, 'bitslb6' =
'2620:0:863:ed1a::1:a', 'bitslb6-old' = 2620:0:863:ed1a::a, 'bitssvc' =
10.2.4.23 },
},
'upload' = {
'pmtpa' = { 'uploadlb' = 208.80.152.211, 'uploadsvc' =
10.2.1.24 },
@@ -273,7 +273,7 @@
'pmtpa' = {},
'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6' =
'2620:0:861:ed1a::1:c', 'mobilelb6-old' = 2620:0:861:ed1a::c, 'mobilesvc' =
10.2.2.26},
'esams' = { 'mobilelb-new' = '91.198.174.204', 'mobilelb' =
'91.198.174.236', 'mobilelb6-new' = '2620:0:862:ed1a::1:c', 'mobilelb6' =
'2620:0:862:ed1a::c', 'mobilesvc' = '10.2.3.26'},
-'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6-new' =
'2620:0:863:ed1a::1:c', 'mobilelb6' = '2620:0:863:ed1a::c', 'mobilesvc' =
'10.2.4.26'},
+'ulsfo' = { 'mobilelb' = '198.35.26.108', 'mobilelb6' =
'2620:0:863:ed1a::1:c', 'mobilelb6-old' = '2620:0:863:ed1a::c', 'mobilesvc' =
'10.2.4.26'},
},
'swift' = {
'pmtpa' = 10.2.1.27,
--
To view, visit https://gerrit.wikimedia.org/r/104972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I899e064d588e60300b01b93900b9f175c4e7a637
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added Maria Pacana to trusted users for check/test pipeline - change (integration/zuul-config)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/104973 Change subject: Added Maria Pacana to trusted users for check/test pipeline .. Added Maria Pacana to trusted users for check/test pipeline Change-Id: Id7aa7cf1e37a549b8f892e5d602588e5a1406945 --- M layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/73/104973/1 diff --git a/layout.yaml b/layout.yaml index d37eae2..8d5acab 100644 --- a/layout.yaml +++ b/layout.yaml @@ -36,7 +36,7 @@ # TODO: Figure out a way to not have to repeat this from pipeline 'test'. # This email_filter and the one for 'test' can be removed once we have fixed bug 45499. email_filter: - - ^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|tomasz@twkozlowski\.net|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at)).*$ + - ^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|tomasz@twkozlowski\.net|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com)).*$ - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ success: @@ -163,6 +163,9 @@ - ^wiki@physikerwelt\.de$ - ^yaron57@gmail\.com$ +# OPW interns + - ^maria\.pacana@gmail\.com$ + success: verified: 2 failure: -- To view, visit https://gerrit.wikimedia.org/r/104973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7aa7cf1e37a549b8f892e5d602588e5a1406945 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] void methods don't return anything. Especially when they alw... - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104975
Change subject: void methods don't return anything. Especially when they always
throw an exception
..
void methods don't return anything. Especially when they always throw an
exception
Change-Id: I6c959b44b64fdc38e248ea6594c12a10b6b4
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/104975/1
diff --git a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index 08fb2c9..14369bf 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -95,7 +95,7 @@
wfProfileOut( __METHOD__ );
- return $this-reportConnectionError( $error );
+ $this-reportConnectionError( $error );
}
if ( $dbName != '' ) {
@@ -109,13 +109,13 @@
wfProfileOut( __METHOD__ );
- return $this-reportConnectionError( Error
selecting database $dbName );
+ $this-reportConnectionError( Error selecting
database $dbName );
}
}
// Tell the server what we're communicating with
if ( !$this-connectInitCharset() ) {
- return $this-reportConnectionError( Error setting
character set );
+ $this-reportConnectionError( Error setting character
set );
}
// Set SQL mode, default is turning them all off, can be
overridden or skipped with null
@@ -126,7 +126,7 @@
if ( !$success ) {
wfLogDBError( Error setting sql_mode to $mode
on server {$this-mServer} );
wfProfileOut( __METHOD__ );
- return $this-reportConnectionError( Error
setting sql_mode to $mode );
+ $this-reportConnectionError( Error setting
sql_mode to $mode );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/104975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c959b44b64fdc38e248ea6594c12a10b6b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
