date:20170124

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

2017-01-24 Thread Marostegui (Code Review)

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "db-codfw.php Depool db2054"
..

Revert "db-codfw.php Depool db2054"

ALTER table finished

This reverts commit 621662d2bb1b4edc390a8407c1c5692a0df7071b.

Change-Id: I53908cd6a2d9fa62c4e7e42723f68bfe7c0878c8
---
M wmf-config/db-codfw.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 946849c..af03cbe 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -146,9 +146,9 @@
'db2029' => 0,   # 2.9TB  96GB, master
'db2040' => 200, # 2.9TB 160GB, rc, log
'db2047' => 400, # 2.9TB 160GB
-#  'db2054' => 200, # 2.9TB 160GB, dump (inactive), vslow
+   'db2054' => 200, # 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # 3.3TB 160GB, api
-   'db2068' => 200, # 3.3TB 160GB #temporarily vslow,dump #T153300
+   'db2068' => 300, # 3.3TB 160GB
],
'silver' => [
'silver' => 100,   # I have no idea if this is right
@@ -401,10 +401,10 @@
'db2040' => 1,
],
'dump' => [
-   'db2068' => 1,
+   'db2054' => 1,
],
'vslow' => [
-   'db2068' => 1,
+   'db2054' => 1,
],
'api' => [
'db2061' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53908cd6a2d9fa62c4e7e42723f68bfe7c0878c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: do not print stacktrace when check_ripe_atlas exits ...

2017-01-24 Thread Ema (Code Review)

Ema has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334028 )

Change subject: icinga: do not print stacktrace when check_ripe_atlas exits 
with 2
..

icinga: do not print stacktrace when check_ripe_atlas exits with 2

Explicitly catch Exception to avoid printing a stacktrace when
sys.exit(2) is called. SystemExit inherits from BaseException instead of
StandardError or Exception so that it is not accidentally caught by code
that catches Exception.

Ref: https://docs.python.org/2/library/exceptions.html#exceptions.SystemExit
Change-Id: I290c90ffa4d2a373187bcb84d7d933e13e8bcc7c
---
M modules/icinga/files/check_ripe_atlas.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/icinga/files/check_ripe_atlas.py 
b/modules/icinga/files/check_ripe_atlas.py
index d06049d..63c34b9 100644
--- a/modules/icinga/files/check_ripe_atlas.py
+++ b/modules/icinga/files/check_ripe_atlas.py
@@ -65,6 +65,6 @@
 if __name__ == "__main__":
 try:
 main()
-except:
+except Exception:
 traceback.print_exc()
 sys.exit(2)

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Repool db1066 after reimage

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334022 )

Change subject: mariadb: Repool db1066 after reimage
..


mariadb: Repool db1066 after reimage

Bug: T156005
Change-Id: I16b2d3c3463303df176568ed7368b95516c3fac6
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3b5cf3c..151dceb 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -98,11 +98,11 @@
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
-#  'db1066' => 50,  # D1 2.8TB 160GB, api # maintenance T156005
+   'db1066' => 50,  # D1 2.8TB 160GB, api
 #  'db1072' => 0,   # D1 2.8TB 160GB #maintenance T156166
'db1073' => 50,  # D1 2.8TB 160GB, api
'db1080' => 500, # A2 3.6TB 512GB
-   'db1083' => 200, # B1 3.6TB 512GB, temp. api
+   'db1083' => 500, # B1 3.6TB 512GB
'db1089' => 500, # C3 3.6TB 512GB
],
's2' => [
@@ -264,9 +264,8 @@
'db1065' => 1,
],
'api' => [
-#  'db1066' => 1,
+   'db1066' => 1,
'db1073' => 1,
-   'db1083' => 1,
],
],
's2' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable expiring user groups on beta

2017-01-24 Thread TTO (Code Review)

TTO has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333652 )

Change subject: Enable expiring user groups on beta
..

Enable expiring user groups on beta

Change-Id: Ib33c85ee9988d30ca9e2a0e4558c30ad0967363f
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/52/333652/2

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 718bc92..52f6f51 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -261,7 +261,7 @@
],
 
'-wgDisableUserGroupExpiry' => [
-   'default' => true,
+   'default' => false,
],
 
///

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib33c85ee9988d30ca9e2a0e4558c30ad0967363f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Add 'remove' and 'restore defaults' to filter ...

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326208 )

Change subject: RCFilters UI: Add 'remove' and 'restore defaults' to filter list
..


RCFilters UI: Add 'remove' and 'restore defaults' to filter list

Bug: T18
Bug: T149391
Change-Id: I418ad6b34ae8a7456a7e66bc703d4dccf36764a5
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
9 files changed, 180 insertions(+), 3 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index f2ff14b..9f03ce9 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1360,8 +1360,11 @@
"recentchanges-legend-plusminus": "(±123)",
"recentchanges-submit": "Show",
"rcfilters-activefilters": "Active filters",
+   "rcfilters-restore-default-filters": "Restore default filters",
+   "rcfilters-clear-all-filters": "Clear all filters",
"rcfilters-search-placeholder": "Filter recent changes (browse or start 
typing)",
"rcfilters-invalid-filter": "Invalid filter",
+   "rcfilters-empty-filter": "No active filters. All contributions are 
shown.",
"rcfilters-filterlist-title": "Filters",
"rcfilters-filterlist-noresults": "No filters found",
"rcfilters-filtergroup-registration": "User registration",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 1e71b88..2219ef6 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1546,8 +1546,11 @@
"recentchanges-legend-plusminus": "{{optional}}\nA plus/minus sign with 
a number for the legend.",
"recentchanges-submit": "Label for submit button in 
[[Special:RecentChanges]]\n{{Identical|Show}}",
"rcfilters-activefilters": "Title for the filters selection showing the 
active filters.",
+   "rcfilters-restore-default-filters": "Label for the button that resets 
filters to defaults",
+   "rcfilters-clear-all-filters": "Title for the button that clears all 
filters",
"rcfilters-search-placeholder": "Placeholder for the filter search 
input.",
"rcfilters-invalid-filter": "A label for an invalid filter.",
+   "rcfilters-empty-filter": "Placeholder for the filter list when no 
filters were chosen.",
"rcfilters-filterlist-title": "Title for the filters 
list.\n{{Identical|Filter}}",
"rcfilters-filterlist-noresults": "Message showing no results found for 
searching a filter.",
"rcfilters-filtergroup-registration": "Title for the filter group for 
editor registration type.",
diff --git a/resources/Resources.php b/resources/Resources.php
index bd7f68e..f7aa97f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1756,8 +1756,11 @@
],
'messages' => [
'rcfilters-activefilters',
+   'rcfilters-restore-default-filters',
+   'rcfilters-clear-all-filters',
'rcfilters-search-placeholder',
'rcfilters-invalid-filter',
+   'rcfilters-empty-filter',
'rcfilters-filterlist-title',
'rcfilters-filterlist-noresults',
'rcfilters-filtergroup-registration',
@@ -1800,6 +1803,7 @@
'dependencies' => [
'oojs-ui',
'mediawiki.Uri',
+   'oojs-ui.styles.icons-moderation'
],
],
'mediawiki.special' => [
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 2496961..3f7fa53 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -15,6 +15,7 @@
this.groups = {};
this.excludedByMap = {};
this.defaultParams = {};
+   this.defaultFiltersEmpty = null;
 
// Events
this.aggregate( { update: 'filterItemUpdate' } );
@@ -432,6 +433,39 @@
};
 
/**
+* Check whether the current filter state is set to all false.
+*
+* @return {boolean} Current filters are all empty
+

[MediaWiki-commits] [Gerrit] mediawiki...ShowMe[master]: Initial commit

2017-01-24 Thread tosfos (Code Review)

tosfos has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334027 )

Change subject: Initial commit
..

Initial commit

Change-Id: Ic3c26955a2941afcc03927799ed0df0a0d6d2c76
---
A .eslintrc.json
A .gitignore
A Gruntfile.js
A README.md
A ShowMe.class.php
A ShowMe.hooks.php
A ShowMe.php
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A modules/ext.showMe.js
A package.json
A phpcs.xml
14 files changed, 293 insertions(+), 0 deletions(-)


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

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "mediaWiki": false
+   }
+}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..59a2a36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.*.swp
+*~
+/.project
+/composer.lock
+/vendor
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..c30a729
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,29 @@
+/* eslint-env node */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-eslint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   eslint: {
+   all: [
+   '*.js',
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/README.md b/README.md
new file mode 100644
index 000..4f59de1
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+This is a MediaWiki extension. Find the docs 
[https://www.mediawiki.org/wiki/Extension:ShowMe here].
diff --git a/ShowMe.class.php b/ShowMe.class.php
new file mode 100644
index 000..45b2a06
--- /dev/null
+++ b/ShowMe.class.php
@@ -0,0 +1,54 @@
+
+ */
+class ShowMe {
+   private $type;
+   private $name;
+   private $options;
+   static protected $num = 0;
+
+   /**
+*
+* @param string $type The type of input field, currently must be 
'dropdown'
+* @param string $name The name and ID to be assigned to the input field
+* @param array $options Use the form label => value
+* @param ParserOutput $out
+*/
+   function __construct( $type, $name, array $options, ParserOutput $out ) 
{
+   $this->type = $type;
+   $this->name = $name;
+   $this->options = $options;
+
+   // Add this $name to he array of ShowMe field IDs that exist on 
this page
+   $configVars = $out->getJsConfigVars();
+   $configVars['wgShowMeDropdownIDs'][] = $name;
+   $out->addJsConfigVars( 'wgShowMeDropdownIDs', 
$configVars['wgShowMeDropdownIDs'] );
+   }
+
+   /**
+* Get the output HTML
+*
+* @return string
+*/
+   public function getHTML() {
+   // Theoretically, other types may be added in the future, such 
as radio buttons.
+   if ( $this->type == 'dropdown' ) {
+   return $this->getDropdownHTML();
+   }
+   // invalid type
+   return ''; // Throw error?
+   }
+
+   /**
+* Get the output HTML for a dropdown
+*
+* @return string
+*/
+   protected function getDropdownHTML() {
+   $select = new XmlSelect( $this->name, $this->name );
+   $select->addOptions( $this->options );
+   return $select->getHTML();
+   }
+}
diff --git a/ShowMe.hooks.php b/ShowMe.hooks.php
new file mode 100644
index 000..4109ced
--- /dev/null
+++ b/ShowMe.hooks.php
@@ -0,0 +1,57 @@
+setHook( 'showme', [ __CLASS__, 'showMeRender' ] );
+   return true;
+   }
+
+   /**
+*
+* @staticvar int $num
+* @param string $input
+* @param array $args
+* @param Parser $parser
+* @param PPFrame $frame
+* @return string Output HTML
+*/
+   public static function showMeRender( $input, array $args, Parser 
$parser, PPFrame $frame ) {
+   $parser->getOutput()->addModuleScripts( 'ext.showMe' );
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Read default states of filters

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326064 )

Change subject: RCFilters UI: Read default states of filters
..


RCFilters UI: Read default states of filters

Add the functionality to read the default state of filters
and preserve them, so that they are considered when either
base state is requested or when filters are explicitly told
to revert to default.

Bug: T149391
Bug: T18
Change-Id: I9e8e3430ca2f80d3f67422681e8fb69a43ee4bef
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
6 files changed, 190 insertions(+), 159 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index f6fef5b..5dfb68d 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -10,10 +10,10 @@
 * @cfg {string} [group] The group this item belongs to
 * @cfg {string} [label] The label for the filter
 * @cfg {string} [description] The description of the filter
-* @cfg {boolean} [selected] Filter is selected
 * @cfg {boolean} [active=true] The filter is active and affecting the 
result
 * @cfg {string[]} [excludes=[]] A list of filter names this filter, if
 *  selected, makes inactive.
+* @cfg {boolean} [default] The default state of this filter
 */
mw.rcfilters.dm.FilterItem = function MwRcfiltersDmFilterItem( name, 
config ) {
config = config || {};
@@ -25,10 +25,11 @@
this.group = config.group || '';
this.label = config.label || this.name;
this.description = config.description;
+   this.default = !!config.default;
 
-   this.selected = !!config.selected;
this.active = config.active === undefined ? true : 
!!config.active;
this.excludes = config.excludes || [];
+   this.selected = this.default;
};
 
/* Initialization */
@@ -83,6 +84,15 @@
};
 
/**
+* Get the default value of this filter
+*
+* @return {boolean} Filter default
+*/
+   mw.rcfilters.dm.FilterItem.prototype.getDefault = function () {
+   return this.default;
+   };
+
+   /**
 * Get the selected state of this filter
 *
 * @return {boolean} Filter is selected
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 59a34f4..2496961 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -14,6 +14,7 @@
 
this.groups = {};
this.excludedByMap = {};
+   this.defaultParams = {};
 
// Events
this.aggregate( { update: 'filterItemUpdate' } );
@@ -139,7 +140,7 @@
 * @param {Object} filters Filter group definition
 */
mw.rcfilters.dm.FiltersViewModel.prototype.initializeFilters = function 
( filters ) {
-   var i, filterItem, excludedFilters,
+   var i, filterItem, selectedFilterNames, excludedFilters,
model = this,
items = [],
addToMap = function ( excludedFilters ) {
@@ -163,6 +164,7 @@
model.groups[ group ].separator = data.separator || '|';
model.groups[ group ].exclusionType = 
data.exclusionType || 'default';
 
+   selectedFilterNames = [];
for ( i = 0; i < data.filters.length; i++ ) {
excludedFilters = data.filters[ i ].excludes || 
[];
 
@@ -171,18 +173,38 @@
label: data.filters[ i ].label,
description: data.filters[ i 
].description,
selected: data.filters[ i ].selected,
-   excludes: excludedFilters
+   excludes: excludedFilters,
+   'default': data.filters[ i ].default
} );

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use new article recommendation API

2017-01-24 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334026 )

Change subject: Use new article recommendation API
..

Use new article recommendation API

Bug: T155657
Change-Id: I525706c5e435155078ad33a75f42ff2a5365e4e3
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index 67fdfbc..5ff5b7e 100644
--- a/extension.json
+++ b/extension.json
@@ -152,7 +152,7 @@
},
"ContentTranslationEnableSuggestions": false,
"@RecommendToolAPIURL": "Web API URL for translation 
recommendation tool",
-   "RecommendToolAPIURL": 
"https://recommend-test.wmflabs.org/types/translation/v1/articles;
+   "RecommendToolAPIURL": 
"https://recommend.wmflabs.org/types/translation/v1/articles;
},
"ResourceModules": {
"Base64.js": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I525706c5e435155078ad33a75f42ff2a5365e4e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: CentralNotice config: make mediawiki its own CN project

2017-01-24 Thread AndyRussG (Code Review)

AndyRussG has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334025 )

Change subject: CentralNotice config: make mediawiki its own CN project
..

CentralNotice config: make mediawiki its own CN project

This should be deployed at the same time as Iaab98fde7

Change-Id: I09ac490cf01b69f9a3a3334be9a5881ec8a76cdb
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 10d9f29..921b8f7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4509,7 +4509,7 @@
'commonswiki' => 'commons',
'foundationwiki' => 'wikimedia',
'incubatorwiki' => 'wikimedia',
-   'mediawikiwiki' => 'wikimedia',
+   'mediawikiwiki' => 'mediawiki',
'metawiki' => 'meta',
'outreachwiki' => 'wikimedia',
'usabilitywiki' => 'wikimedia',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Add mediawiki to list of wikis

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333679 )

Change subject: Add mediawiki to list of wikis
..


Add mediawiki to list of wikis

Not sure if something else is needed.

Bug: T155997
Change-Id: Iaab98fde7aa87091bf13840f22c880b797879576
---
M extension.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index cee025b..3ace61c 100644
--- a/extension.json
+++ b/extension.json
@@ -411,7 +411,8 @@
"commons",
"meta",
"wikispecies",
-   "test"
+   "test",
+   "mediawiki"
],
"NoticeInfrastructure": true,
"CentralDBname": false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaab98fde7aa87091bf13840f22c880b797879576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: DatGuy 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: Remove warning suppression

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333999 )

Change subject: Remove warning suppression
..


Remove warning suppression

There are many valid use cases of the error suppression functions, but
this isn't one of those. If there are some undefined indexes somewhere,
that's a problem that should be fixed properly instead of warnings being
suppressed in one skin.

Change-Id: I88dfd3b9d94774686c168766a56afb5186684a61
---
M MonoBookTemplate.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 58453ac..97a949d 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -36,9 +36,6 @@
 * outputs a formatted page.
 */
public function execute() {
-   // Suppress warnings to prevent notices about missing indexes 
in $this->data
-   wfSuppressWarnings();
-
$this->html( 'headelement' );
?>

@@ -206,7 +203,6 @@
echo Html::closeElement( 'body' );
echo Html::closeElement( 'html' );
echo "\n";
-   wfRestoreWarnings();
} // end of execute() method
 

/*/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88dfd3b9d94774686c168766a56afb5186684a61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Use action=query=tokens to get login token

2017-01-24 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334024 )

Change subject: Use action=query=tokens to get login token
..

Use action=query=tokens to get login token

Bug: T155532
Change-Id: Id73ba121a77599adcc6127cdf26115d213305284
---
M includes/JCUtils.php
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig 
refs/changes/24/334024/1

diff --git a/includes/JCUtils.php b/includes/JCUtils.php
index 83328a1..9bb9cca 100644
--- a/includes/JCUtils.php
+++ b/includes/JCUtils.php
@@ -69,22 +69,27 @@
$req = MWHttpRequest::factory( $apiUri, $options );
 
if ( $username && $password ) {
+   $tokenQuery = [
+   'action' => 'query',
+   'meta' => 'tokens',
+   'type' => 'login',
+   ];
$query = [
'action' => 'login',
'lgname' => $username,
'lgpassword' => $password,
];
-   $res = self::callApi( $req, $query, 'login' );
+   $res = self::callApi( $req, $tokenQuery, 'login' );
if ( $res !== false ) {
-   if ( isset( $res['login']['token'] ) ) {
-   $query['lgtoken'] = 
$res['login']['token'];
+   if ( isset( 
$res['query']['tokens']['logintoken'] ) ) {
+   $query['lgtoken'] = 
$res['query']['tokens']['logintoken'];
$res = self::callApi( $req, $query, 
'login with token' );
}
}
if ( $res === false ) {
$req = false;
} elseif ( !isset( $res['login']['result'] ) ||
-$res['login']['result'] !== 'Success'
+   $res['login']['result'] !== 'Success'
) {
self::warn( 'Failed to login', [
'url' => $url,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Fix typo in eventlogging units

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334023 )

Change subject: Fix typo in eventlogging units
..


Fix typo in eventlogging units

Bug: T154265
Change-Id: I4749e8c49cb4d31c4ab61d44042f005a9b1de126
---
M puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
M puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
index eb7532d..7befeaf 100644
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
@@ -2,7 +2,7 @@
 Description=EventLogging Dev Server
 Requires=network.target
 
-[service]
+[Service]
 User=www-data
 Group=www-data
 ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-devserver 
--append-to <%= @output_file %>
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
index 0381fe0..76d1689 100644
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
@@ -2,7 +2,7 @@
 Description=EventLogging Produce HTTP Service
 Requires=network.target
 
-[service]
+[Service]
 User=www-data
 Group=www-data
 ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-service @<%= 
@config_file %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4749e8c49cb4d31c4ab61d44042f005a9b1de126
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Fix typo in eventlogging units

2017-01-24 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334023 )

Change subject: Fix typo in eventlogging units
..

Fix typo in eventlogging units

Bug: T154265
Change-Id: I4749e8c49cb4d31c4ab61d44042f005a9b1de126
---
M puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
M puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/23/334023/1

diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
index eb7532d..7befeaf 100644
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
@@ -2,7 +2,7 @@
 Description=EventLogging Dev Server
 Requires=network.target
 
-[service]
+[Service]
 User=www-data
 Group=www-data
 ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-devserver 
--append-to <%= @output_file %>
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
index 0381fe0..76d1689 100644
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
@@ -2,7 +2,7 @@
 Description=EventLogging Produce HTTP Service
 Requires=network.target
 
-[service]
+[Service]
 User=www-data
 Group=www-data
 ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-service @<%= 
@config_file %>

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Repool db1066 after reimage

2017-01-24 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334022 )

Change subject: mariadb: Repool db1066 after reimage
..

mariadb: Repool db1066 after reimage

Bug: T156005
Change-Id: I16b2d3c3463303df176568ed7368b95516c3fac6
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3b5cf3c..151dceb 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -98,11 +98,11 @@
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
-#  'db1066' => 50,  # D1 2.8TB 160GB, api # maintenance T156005
+   'db1066' => 50,  # D1 2.8TB 160GB, api
 #  'db1072' => 0,   # D1 2.8TB 160GB #maintenance T156166
'db1073' => 50,  # D1 2.8TB 160GB, api
'db1080' => 500, # A2 3.6TB 512GB
-   'db1083' => 200, # B1 3.6TB 512GB, temp. api
+   'db1083' => 500, # B1 3.6TB 512GB
'db1089' => 500, # C3 3.6TB 512GB
],
's2' => [
@@ -264,9 +264,8 @@
'db1065' => 1,
],
'api' => [
-#  'db1066' => 1,
+   'db1066' => 1,
'db1073' => 1,
-   'db1083' => 1,
],
],
's2' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Provide PLURAL support for a few i18n messages

2017-01-24 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334021 )

Change subject: Provide PLURAL support for a few i18n messages
..

Provide PLURAL support for a few i18n messages

Bug: T156213
Change-Id: Idf6de962cce692be5faae823d743ded23e9951d4
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 46d9de7..c49a06c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -59,7 +59,7 @@
"quizgame-leaderboard-menu-pct": "Highest percentage",
"quizgame-leaderboard-desc-pct": "$1%",
"quizgame-leaderboard-desc-correct": "$1 correct",
-   "quizgame-leaderboard-desc-points": "$1 points",
+   "quizgame-leaderboard-desc-points": "{{PLURAL:$1|1 point|$1 points}}",
"quizgame-login-or-create-to-climb": "[[Special:UserLogin|Login]] or 
[[Special:UserLogin/signup|create an account]] to compete and climb the 
leaderboard!",
"quizgame-pct-answered-correct": "$1% got this question right",
"quizgame-answered-correctly": "You answered correctly",
@@ -70,7 +70,7 @@
"quizgame-js-loading": "Loading...",
"quizgame-js-reloading": "Re-loading...",
"quizgame-js-timesup": "Time's up! You won't earn any points, but try 
to answer it anyway!",
-   "quizgame-js-points": "$1 points",
+   "quizgame-js-points": "{{PLURAL:$1|1 point|$1 points}}",
"quizgame-js-seconds": "seconds",
"quizgame-lightbox-pause-quiz": "Pause quiz",
"quizgame-lightbox-breakdown": "View breakdown for this question",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix indentation in CirrusSearchIndexFieldFactory

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334018 )

Change subject: Fix indentation in CirrusSearchIndexFieldFactory
..


Fix indentation in CirrusSearchIndexFieldFactory

spaces -> tabs

Change-Id: I0588a14968386e9c3c94e2b79c5ee4c33992476d
---
M includes/Search/CirrusSearchIndexFieldFactory.php
1 file changed, 24 insertions(+), 24 deletions(-)

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



diff --git a/includes/Search/CirrusSearchIndexFieldFactory.php 
b/includes/Search/CirrusSearchIndexFieldFactory.php
index ae91558..579990e 100644
--- a/includes/Search/CirrusSearchIndexFieldFactory.php
+++ b/includes/Search/CirrusSearchIndexFieldFactory.php
@@ -39,32 +39,32 @@
$this->searchConfig = $searchConfig;
}
 
-/**
- * Create a search field definition
- * @param string $name
- * @param int$type
- * @throws Exception
- * @return SearchIndexField
- */
-public function makeSearchFieldMapping( $name, $type ) {
-$overrides = $this->searchConfig->get( 
'CirrusSearchFieldTypeOverrides' );
-$mappings = $this->searchConfig->get( 'CirrusSearchFieldTypes' );
-if ( !isset( $mappings[$type] ) ) {
-return new NullIndexField();
-}
-$klass = $mappings[$type];
+   /**
+* Create a search field definition
+* @param string $name
+* @param int$type
+* @throws Exception
+* @return SearchIndexField
+*/
+   public function makeSearchFieldMapping( $name, $type ) {
+   $overrides = $this->searchConfig->get( 
'CirrusSearchFieldTypeOverrides' );
+   $mappings = $this->searchConfig->get( 'CirrusSearchFieldTypes' 
);
+   if ( !isset( $mappings[$type] ) ) {
+   return new NullIndexField();
+   }
+   $klass = $mappings[$type];
 
-// Check if a specific class is provided for this field
-if ( isset( $overrides[$name] ) ) {
-if ( $klass !== $overrides[$name] && !is_subclass_of( 
$overrides[$name], $klass ) ) {
-throw new Exception( "Specialized class " . $overrides[$name] .
-" for field $name is not compatible with type class 
$klass" );
-}
-$klass = $overrides[$name];
-}
+   // Check if a specific class is provided for this field
+   if ( isset( $overrides[$name] ) ) {
+   if ( $klass !== $overrides[$name] && !is_subclass_of( 
$overrides[$name], $klass ) ) {
+   throw new Exception( "Specialized class " . 
$overrides[$name] .
+   " for field $name is not compatible 
with type class $klass" );
+   }
+   $klass = $overrides[$name];
+   }
 
-return new $klass( $name, $type, $this->searchConfig );
-}
+   return new $klass( $name, $type, $this->searchConfig );
+   }
 
/**
 * Build a string field that does standard analysis for the language.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Shadow href w/ the original value, not the current one

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333828 )

Change subject: Shadow href w/ the original value, not the current one
..


Shadow href w/ the original value, not the current one

 * Follow up to fa6906a1 to fix all the regressions in rt.

Change-Id: Ieaf91b6622981b5ed6153d6c383aa66c044393f4
---
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
2 files changed, 16 insertions(+), 4 deletions(-)

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



diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 9917933..65a0b0c 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -666,13 +666,14 @@
}
var hrefKV = Util.lookupKV(token.attribs, 'href');
if (hrefKV !== null) {
-   var origHref = hrefKV.v;
-   console.assert(typeof origHref === 'string');
-   var newHref = Sanitizer.cleanUrl(this.manager.env, origHref);
+   var origHref = token.getAttributeShadowInfo('href').value;
+   var curVal = hrefKV.v;
+   console.assert(typeof curVal === 'string');
+   var newHref = Sanitizer.cleanUrl(this.manager.env, curVal);
if (newHref === null) {
token.removeAttribute('href');
token.setShadowInfo('href', newHref, origHref);
-   } else if (newHref !== origHref) {
+   } else if (newHref !== curVal) {
hrefKV.v = newHref;
token.setShadowInfo('href', newHref, origHref);
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 7d99c89..52209d2 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7845,6 +7845,17 @@
 !! end
 
 !! test
+Link containing double quotes and spaces
+!! wikitext
+[[Cool "Gator"]]
+!! html/php
+Cool 
"Gator"
+
+!! html/parsoid
+Cool 
"Gator"
+!! end
+
+!! test
 Link containing double-single-quotes '' in text (bug 4598 sanity check)
 !! wikitext
 Some [[Link|pretty ''italics'' and stuff]]!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaf91b6622981b5ed6153d6c383aa66c044393f4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Provide PLURAL support for a few i18n messages in QuizGame

2017-01-24 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334020 )

Change subject: Provide PLURAL support for a few i18n messages in QuizGame
..

Provide PLURAL support for a few i18n messages in QuizGame

Bug: T156213
Change-Id: I16e107ad532647cee61d0af8030c8b82c3fb82e6
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 6ef59b9..45a4bd7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -57,7 +57,7 @@
"quizgame-leaderboard-menu-pct": "Highest percentage",
"quizgame-leaderboard-desc-pct": "$1%",
"quizgame-leaderboard-desc-correct": "$1 correct",
-   "quizgame-leaderboard-desc-points": "$1 points",
+   "quizgame-leaderboard-desc-points": "{{PLURAL:$1|1 point|$1 points}}",
"quizgame-login-or-create-to-climb": "[[Special:UserLogin|Login]] or 
[[Special:UserLogin/signup|create an account]] to compete and climb the 
leaderboard!",
"quizgame-pct-answered-correct": "$1% got this question right",
"quizgame-answered-correctly": "You answered correctly",
@@ -68,7 +68,7 @@
"quizgame-js-loading": "Loading...",
"quizgame-js-reloading": "Re-loading...",
"quizgame-js-timesup": "Time's up! You won't earn any points, but try 
to answer it anyway!",
-   "quizgame-js-points": "$1 points",
+   "quizgame-js-points": "{{PLURAL:$1|1 point|$1 points}}",
"quizgame-js-seconds": "seconds",
"quizgame-lightbox-pause-quiz": "Pause quiz",
"quizgame-lightbox-breakdown": "View breakdown for this question",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Generalize field definitions for Items and Properties

2017-01-24 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334019 )

Change subject: [WIP] Generalize field definitions for Items and Properties
..

[WIP] Generalize field definitions for Items and Properties

NOTE: Labels & descriptions not handled yet here, this will be next patch.

Change-Id: I781113f489267b092998a27c4ed76240db20f9ac
NOTE: The change in EntityHandler will require updating MediaInfo handler too.
---
M repo/includes/Content/EntityHandler.php
M repo/includes/Content/ItemHandler.php
M repo/includes/Content/PropertyHandler.php
A repo/includes/Search/Elastic/Fields/DescriptionProviderFieldDefinitions.php
A repo/includes/Search/Elastic/Fields/FieldDefinitions.php
A repo/includes/Search/Elastic/Fields/ItemFieldDefinitions.php
A repo/includes/Search/Elastic/Fields/LabelsProviderFieldDefinitons.php
A repo/includes/Search/Elastic/Fields/PropertyFieldDefinitions.php
D repo/includes/Search/Elastic/Fields/WikibaseFieldDefinitions.php
M repo/includes/Search/Elastic/Fields/WikibaseNumericField.php
M repo/includes/WikibaseRepo.php
11 files changed, 255 insertions(+), 29 deletions(-)


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

diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index 2ca307c..ab6ef5c 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -29,6 +29,7 @@
 use Wikibase\EntityContent;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Repo\Diff\EntityContentDiffView;
+use Wikibase\Repo\Search\Elastic\Fields\FieldDefinitions;
 use Wikibase\Repo\Search\Elastic\Fields\WikibaseFieldDefinitions;
 use Wikibase\Repo\Store\EntityPerPage;
 use Wikibase\Repo\Validators\EntityConstraintProvider;
@@ -55,6 +56,9 @@
 * to parser output.
 */
const PARSER_VERSION = 3;
+   /**
+* @var FieldDefinitions
+*/
protected $fieldDefinitions;
 
/**
@@ -101,12 +105,12 @@
 * @param EntityConstraintProvider $constraintProvider
 * @param ValidatorErrorLocalizer $errorLocalizer
 * @param EntityIdParser $entityIdParser
+* @param FieldDefinitions $fieldDefinitions
 * @param callable|null $legacyExportFormatDetector Callback to 
determine whether a serialized
 *blob needs to be re-serialized on export. The callback must 
take two parameters,
 *the blob an the serialization format. It must return true if 
re-serialization is needed.
 *False positives are acceptable, false negatives are not.
 *
-* @throws InvalidArgumentException
 */
public function __construct(
$modelId,
@@ -116,6 +120,7 @@
EntityConstraintProvider $constraintProvider,
ValidatorErrorLocalizer $errorLocalizer,
EntityIdParser $entityIdParser,
+   FieldDefinitions $fieldDefinitions,
$legacyExportFormatDetector = null
) {
$formats = $contentCodec->getSupportedFormats();
@@ -133,8 +138,7 @@
$this->errorLocalizer = $errorLocalizer;
$this->entityIdParser = $entityIdParser;
$this->legacyExportFormatDetector = $legacyExportFormatDetector;
-   // FIXME: convert to DI, will be in the next patch
-   $this->fieldDefinitions = new WikibaseFieldDefinitions();
+   $this->fieldDefinitions = $fieldDefinitions;
}
 
/**
diff --git a/repo/includes/Content/ItemHandler.php 
b/repo/includes/Content/ItemHandler.php
index 97e4d44..34b0daa 100644
--- a/repo/includes/Content/ItemHandler.php
+++ b/repo/includes/Content/ItemHandler.php
@@ -18,6 +18,7 @@
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
 use Wikibase\Lib\Store\SiteLinkStore;
+use Wikibase\Repo\Search\Elastic\Fields\ItemFieldDefinitions;
 use Wikibase\Repo\Store\EntityPerPage;
 use Wikibase\Repo\Validators\EntityConstraintProvider;
 use Wikibase\Repo\Validators\ValidatorErrorLocalizer;
@@ -61,6 +62,7 @@
 * @param SiteLinkStore $siteLinkStore
 * @param EntityIdLookup $entityIdLookup
 * @param LanguageFallbackLabelDescriptionLookupFactory 
$labelLookupFactory
+* @param ItemFieldDefinitions $itemFieldDefinitions
 * @param callable|null $legacyExportFormatDetector
 */
public function __construct(
@@ -73,6 +75,7 @@
SiteLinkStore $siteLinkStore,
EntityIdLookup $entityIdLookup,
LanguageFallbackLabelDescriptionLookupFactory 
$labelLookupFactory,
+   ItemFieldDefinitions $itemFieldDefinitions,
$legacyExportFormatDetector = null
) {
parent::__construct(
@@ -83,6 +86,7 @@

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix indentation in CirrusSearchIndexFieldFactory

2017-01-24 Thread Aude (Code Review)

Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334018 )

Change subject: Fix indentation in CirrusSearchIndexFieldFactory
..

Fix indentation in CirrusSearchIndexFieldFactory

spaces -> tabs

Change-Id: I0588a14968386e9c3c94e2b79c5ee4c33992476d
---
M includes/Search/CirrusSearchIndexFieldFactory.php
1 file changed, 24 insertions(+), 24 deletions(-)


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

diff --git a/includes/Search/CirrusSearchIndexFieldFactory.php 
b/includes/Search/CirrusSearchIndexFieldFactory.php
index ae91558..358855e 100644
--- a/includes/Search/CirrusSearchIndexFieldFactory.php
+++ b/includes/Search/CirrusSearchIndexFieldFactory.php
@@ -39,32 +39,32 @@
$this->searchConfig = $searchConfig;
}
 
-/**
- * Create a search field definition
- * @param string $name
- * @param int$type
- * @throws Exception
- * @return SearchIndexField
- */
-public function makeSearchFieldMapping( $name, $type ) {
-$overrides = $this->searchConfig->get( 
'CirrusSearchFieldTypeOverrides' );
-$mappings = $this->searchConfig->get( 'CirrusSearchFieldTypes' );
-if ( !isset( $mappings[$type] ) ) {
-return new NullIndexField();
-}
-$klass = $mappings[$type];
+   /**
+* Create a search field definition
+* @param string $name
+* @param int   $type
+* @throws Exception
+* @return SearchIndexField
+*/
+   public function makeSearchFieldMapping( $name, $type ) {
+   $overrides = $this->searchConfig->get( 
'CirrusSearchFieldTypeOverrides' );
+   $mappings = $this->searchConfig->get( 'CirrusSearchFieldTypes' 
);
+   if ( !isset( $mappings[$type] ) ) {
+   return new NullIndexField();
+   }
+   $klass = $mappings[$type];
 
-// Check if a specific class is provided for this field
-if ( isset( $overrides[$name] ) ) {
-if ( $klass !== $overrides[$name] && !is_subclass_of( 
$overrides[$name], $klass ) ) {
-throw new Exception( "Specialized class " . $overrides[$name] .
-" for field $name is not compatible with type class 
$klass" );
-}
-$klass = $overrides[$name];
-}
+   // Check if a specific class is provided for this field
+   if ( isset( $overrides[$name] ) ) {
+   if ( $klass !== $overrides[$name] && !is_subclass_of( 
$overrides[$name], $klass ) ) {
+   throw new Exception( "Specialized class " . 
$overrides[$name] .
+   " for field $name is not compatible 
with type class $klass" );
+   }
+   $klass = $overrides[$name];
+   }
 
-return new $klass( $name, $type, $this->searchConfig );
-}
+   return new $klass( $name, $type, $this->searchConfig );
+   }
 
/**
 * Build a string field that does standard analysis for the language.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0588a14968386e9c3c94e2b79c5ee4c33992476d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: Allow checkusers to see spam blacklist hits

2017-01-24 Thread Cenarium (Code Review)

Cenarium has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334017 )

Change subject: Allow checkusers to see spam blacklist hits
..

Allow checkusers to see spam blacklist hits

Spam blacklist hits are logged (if enabled) but the
log is not published in recent changes since it is
restricted (unless overriden in config).
This allows checkusers to see the spam blacklist hits,
even if the recent change isn't published.

Change-Id: I0506f08c4a2e78708fba4e6327f3202cb60d9562
---
M SpamBlacklist_body.php
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/SpamBlacklist_body.php b/SpamBlacklist_body.php
index e14fa44..5de442e 100644
--- a/SpamBlacklist_body.php
+++ b/SpamBlacklist_body.php
@@ -327,6 +327,13 @@
'4::url' => $url,
) );
$logid = $logEntry->insert();
+   if ( class_exists( CheckUserHooks ) ) {
+   // make sure checkusers can see this action
+   // (the log is restricted by default so no rc 
is created)
+   $rc = $logEntry->getRecentChange( $logid );
+   CheckUserHooks::updateCheckUserData( $rc );
+   }
+   // publish rc just in case the log is unrestricted in 
config
$logEntry->publish( $logid, "rc" );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0506f08c4a2e78708fba4e6327f3202cb60d9562
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

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

[MediaWiki-commits] [Gerrit] mediawiki...SpamRegex[master]: Refactor backend logic (DB + memcache) into one class

2017-01-24 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334016 )

Change subject: Refactor backend logic (DB + memcache) into one class
..

Refactor backend logic (DB + memcache) into one class

This will allow to write an API module without duplicating the internals
for adding an entry to SpamRegex or deleting from SpamRegex.
Also there was no point in having things like validateRegex() inside the
spamRegexList class since that function doesn't seem like something
specific to the *form* class, but rather appears to be a generic utility
function.

Change-Id: I57802716596a7f8a03e02a808fd8e91ab047eb3d
---
A backend/SpamRegex.php
M backend/SpamRegexHooks.php
M backend/spamRegexForm.php
M backend/spamRegexList.php
M extension.json
5 files changed, 199 insertions(+), 140 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamRegex 
refs/changes/16/334016/1

diff --git a/backend/SpamRegex.php b/backend/SpamRegex.php
new file mode 100644
index 000..c69da9b
--- /dev/null
+++ b/backend/SpamRegex.php
@@ -0,0 +1,171 @@
+escaped() );
+   }
+
+   /* validate expression */
+   $simple_regex = self::validateRegex( $phrase );
+   if ( !$simple_regex ) {
+   return Status::newFatal( wfMessage( 'spamregex-error-1' 
)->escaped() );
+   }
+
+   /* we need at least one block mode specified... we can have 
them both, of course */
+   $textbox = isset( $modes['text'] ) && $modes['text'];
+   $summary = isset( $modes['summary'] ) && $modes['summary'];
+   if ( !$textbox && !$summary ) {
+   return Status::newFatal( wfMessage( 
'spamregex-warning-2' )->escaped() );
+   }
+
+   /* make sure that we have a good reason for doing all this... */
+   if ( !$reason ) {
+   return Status::newFatal( wfMessage( 
'spamregex-error-no-reason' )->escaped() );
+   }
+
+   /* insert to memc */
+   if ( !empty( $textbox ) ) {
+   self::updateMemcKeys( 'add', $phrase, 0 );
+   }
+   if ( !empty( $summary ) ) {
+   self::updateMemcKeys( 'add', $phrase, 1 );
+   }
+
+   /* make insert to DB */
+   $dbw = wfGetDB( DB_MASTER );
+   $dbw->insert(
+   'spam_regex',
+   array(
+   'spam_text' => $phrase,
+   'spam_timestamp' => wfTimestampNow(),
+   'spam_user' => $blocker->getName(),
+   'spam_textbox' => $textbox,
+   'spam_summary' => $summary,
+   'spam_reason' => $reason
+   ),
+   __METHOD__,
+   array( 'IGNORE' )
+   );
+
+   /* duplicate entry */
+   if ( !$dbw->affectedRows() ) {
+   return Status::newFatal( wfMessage( 
'spamregex-already-blocked', $phrase )->escaped() );
+   } else {
+   return Status::newGood();
+   }
+   }
+
+   /**
+* Delete a phrase from SpamRegex and update caches accordingly.
+*
+* @param string $phrase Phrase to delete from SpamRegex
+* @return bool Operation status; true on success, false on failure
+*/
+   public static function delete( $phrase ) {
+   $text = urldecode( $phrase );
+
+   /* delete in memc */
+   self::updateMemcKeys( 'delete', $text );
+
+   /* delete in DB */
+   $dbw = wfGetDB( DB_MASTER );
+   $dbw->delete(
+   'spam_regex',
+   array( 'spam_text' => $text ),
+   __METHOD__
+   );
+
+   return (bool)$dbw->affectedRows();
+   }
+
+   /**
+* Get the correct cache key, depending on if we're on a wiki farm like
+* setup where the spam_regex DB table is shared, or if we're on a
+* single-wiki setup.
+*
+* @return string The proper memcached key, depending on whether 
spamRegex's DB table is shared or not
+*/
+   public static function getCacheKey( /*...*/ ) {
+   global $wgSharedDB, $wgSharedTables, $wgSharedPrefix;
+   $args = func_get_args();
+   if ( in_array( 'spam_regex', $wgSharedTables ) ) {
+   $args = array_merge( array( $wgSharedDB, 
$wgSharedPrefix ), $args );
+   return call_user_func_array( 'wfForeignMemcKey', $args 
);
+   } else {
+   return call_user_func_array( 'wfMemcKey', $args );
+

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove cp3011-cp3022 incl. mgmt

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334015 )

Change subject: remove cp3011-cp3022 incl. mgmt
..

remove cp3011-cp3022 incl. mgmt

Bug: T130883
Change-Id: Ia7dc69ab4d73258244a7914040a279e1486a44db
---
M templates/10.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wmnet
3 files changed, 0 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/15/334015/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index d691229..b4cb200 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -120,18 +120,6 @@
 108 1H  IN PTR  cp3008.esams.wmnet.
 109 1H  IN PTR  cp3009.esams.wmnet.
 110 1H  IN PTR  cp3010.esams.wmnet.
-111 1H  IN PTR  cp3011.esams.wmnet.
-112 1H  IN PTR  cp3012.esams.wmnet.
-113 1H  IN PTR  cp3013.esams.wmnet.
-114 1H  IN PTR  cp3014.esams.wmnet.
-115 1H  IN PTR  cp3015.esams.wmnet.
-116 1H  IN PTR  cp3016.esams.wmnet.
-117 1H  IN PTR  cp3017.esams.wmnet.
-118 1H  IN PTR  cp3018.esams.wmnet.
-119 1H  IN PTR  cp3019.esams.wmnet.
-120 1H  IN PTR  cp3020.esams.wmnet.
-121 1H  IN PTR  cp3021.esams.wmnet.
-122 1H  IN PTR  cp3022.esams.wmnet.
 
 165 1H  IN PTR  cp3030.esams.wmnet.
 166 1H  IN PTR  cp3031.esams.wmnet.
@@ -196,18 +184,6 @@
 132 1H  IN PTR  cp3008.mgmt.esams.wmnet.
 133 1H  IN PTR  cp3009.mgmt.esams.wmnet.
 134 1H  IN PTR  cp3010.mgmt.esams.wmnet.
-135 1H  IN PTR  cp3011.mgmt.esams.wmnet.
-136 1H  IN PTR  cp3012.mgmt.esams.wmnet.
-137 1H  IN PTR  cp3013.mgmt.esams.wmnet.
-138 1H  IN PTR  cp3014.mgmt.esams.wmnet.
-139 1H  IN PTR  cp3015.mgmt.esams.wmnet.
-140 1H  IN PTR  cp3016.mgmt.esams.wmnet.
-141 1H  IN PTR  cp3017.mgmt.esams.wmnet.
-142 1H  IN PTR  cp3018.mgmt.esams.wmnet.
-143 1H  IN PTR  cp3019.mgmt.esams.wmnet.
-144 1H  IN PTR  cp3020.mgmt.esams.wmnet.
-145 1H  IN PTR  cp3021.mgmt.esams.wmnet.
-146 1H  IN PTR  cp3022.mgmt.esams.wmnet.
 147 1H  IN PTR  lvs3001.mgmt.esams.wmnet.
 148 1H  IN PTR  lvs3002.mgmt.esams.wmnet.
 149 1H  IN PTR  lvs3003.mgmt.esams.wmnet.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7d1d13e..6c97193 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -55,18 +55,6 @@
 8.0.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3008.esams.wmnet.
 9.0.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3009.esams.wmnet.
 0.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3010.esams.wmnet.
-1.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3011.esams.wmnet.
-2.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3012.esams.wmnet.
-3.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3013.esams.wmnet.
-4.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3014.esams.wmnet.
-5.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3015.esams.wmnet.
-6.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3016.esams.wmnet.
-7.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3017.esams.wmnet.
-8.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3018.esams.wmnet.
-9.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3019.esams.wmnet.
-0.2.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3020.esams.wmnet.
-1.2.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3021.esams.wmnet.
-2.2.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3022.esams.wmnet.
 
 5.6.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3030.esams.wmnet.
 6.6.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3031.esams.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f022901..a48f1e3 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3947,30 +3947,6 @@
 1H  IN  2620:0:862:102:10:20:0:109
 cp3010  1H  IN A10.20.0.110
 1H  IN  2620:0:862:102:10:20:0:110
-cp3011  1H  IN A10.20.0.111
-1H  IN  2620:0:862:102:10:20:0:111
-cp3012  1H  IN A10.20.0.112
-1H  IN  2620:0:862:102:10:20:0:112
-cp3013  1H  IN A10.20.0.113
-1H  IN  2620:0:862:102:10:20:0:113
-cp3014  1H  IN A10.20.0.114
-1H  IN  2620:0:862:102:10:20:0:114
-cp3015  1H  IN A10.20.0.115
-1H  IN  2620:0:862:102:10:20:0:115
-cp3016  1H  IN A10.20.0.116
-1H  IN  2620:0:862:102:10:20:0:116
-cp3017  1H  IN A10.20.0.117
-1H  IN  2620:0:862:102:10:20:0:117
-cp3018  1H  IN A10.20.0.118
-1H  IN  2620:0:862:102:10:20:0:118
-cp3019  1H  IN A10.20.0.119
-1H  IN  2620:0:862:102:10:20:0:119
-cp3020  1H  IN A10.20.0.120
-1H  IN  2620:0:862:102:10:20:0:120
-cp3021  1H  IN A10.20.0.121
-1H  IN  2620:0:862:102:10:20:0:121
-cp3022  1H  IN A10.20.0.122
-1H  IN

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove db1019, db1042 incl. mgmt

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334014 )

Change subject: remove db1019, db1042 incl. mgmt
..

remove db1019, db1042 incl. mgmt

Bug: T149793
Bug: T146265
Change-Id: I916899c8f698a67685319f479b79a55a0df8a6b6
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/14/334014/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index d691229..6d531cd 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -453,7 +453,6 @@
 3   1H IN PTR   ae2-1018.cr2-eqiad.wikimedia.org.
 6   1H IN PTR   graphite1002.eqiad.wmnet.
 7   1H IN PTR   db1018.eqiad.wmnet.
-8   1H IN PTR   db1019.eqiad.wmnet.
 9   1H IN PTR   db1020.eqiad.wmnet.
 10  1H IN PTR   db1021.eqiad.wmnet.
 11  1H IN PTR   db1022.eqiad.wmnet.
@@ -475,7 +474,6 @@
 28  1H IN PTR   db1039.eqiad.wmnet.
 29  1H IN PTR   db1040.eqiad.wmnet.
 30  1H IN PTR   db1041.eqiad.wmnet.
-31  1H IN PTR   db1042.eqiad.wmnet.
 32  1H IN PTR   db1043.eqiad.wmnet.
 33  1H IN PTR   db1044.eqiad.wmnet.
 34  1H IN PTR   db1045.eqiad.wmnet.
@@ -2121,7 +2119,6 @@
 17  1H IN PTR   wmf3269.mgmt.eqiad.wmnet.
 18  1H IN PTR   db1018.mgmt.eqiad.wmnet.
 18  1H IN PTR   wmf3268.mgmt.eqiad.wmnet.
-19  1H IN PTR   db1019.mgmt.eqiad.wmnet.
 19  1H IN PTR   wmf3267.mgmt.eqiad.wmnet.
 20  1H IN PTR   db1020.mgmt.eqiad.wmnet.
 20  1H IN PTR   wmf3266.mgmt.eqiad.wmnet.
@@ -2166,7 +2163,6 @@
 40  1H IN PTR   wmf3279.mgmt.eqiad.wmnet.
 41  1H IN PTR   db1041.mgmt.eqiad.wmnet.
 41  1H IN PTR   wmf3278.mgmt.eqiad.wmnet.
-42  1H IN PTR   db1042.mgmt.eqiad.wmnet.
 42  1H IN PTR   wmf3277.mgmt.eqiad.wmnet.
 43  1H IN PTR   db1043.mgmt.eqiad.wmnet.
 43  1H IN PTR   wmf3276.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f022901..8f77e3d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -249,7 +249,6 @@
 graphite10021H  IN A10.64.16.6
 graphite10031H  IN A10.64.0.106
 db1018  1H  IN A10.64.16.7
-db1019  1H  IN A10.64.16.8
 db1020  1H  IN A10.64.16.9
 db1021  1H  IN A10.64.16.10
 db1022  1H  IN A10.64.16.11
@@ -269,7 +268,6 @@
 db1039  1H  IN A10.64.16.28
 db1040  1H  IN A10.64.16.29
 db1041  1H  IN A10.64.16.30
-db1042  1H  IN A10.64.16.31
 db1043  1H  IN A10.64.16.32
 db1044  1H  IN A10.64.16.33
 db1045  1H  IN A10.64.16.34
@@ -1175,7 +1173,6 @@
 wmf3269 1H  IN A10.65.6.17
 db1018  1H  IN A10.65.6.18
 wmf3268 1H  IN A10.65.6.18
-db1019  1H  IN A10.65.6.19
 wmf3267 1H  IN A10.65.6.19
 db1020  1H  IN A10.65.6.20
 wmf3266 1H  IN A10.65.6.20
@@ -1220,7 +1217,6 @@
 wmf3279 1H  IN A10.65.6.40
 db1041  1H  IN A10.65.6.41
 wmf3278 1H  IN A10.65.6.41
-db1042  1H  IN A10.65.6.42
 wmf3277 1H  IN A10.65.6.42
 db1043  1H  IN A10.65.6.43
 wmf3276 1H  IN A10.65.6.43

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I916899c8f698a67685319f479b79a55a0df8a6b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove analytics1015, analytics1026. incl. mgmt

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334013 )

Change subject: remove analytics1015, analytics1026. incl. mgmt
..

remove analytics1015, analytics1026. incl. mgmt

Bug: T147313
Change-Id: I1874e1af766b0d45f53ed5a4ca653a8c317b8273
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/13/334013/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index d691229..a024184 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -876,12 +876,10 @@
 103 1H IN PTR   stat1003.eqiad.wmnet.
 
 114 1H IN PTR   kafka1014.eqiad.wmnet.
-115 1H IN PTR   analytics1015.eqiad.wmnet.
 116 1H IN PTR   analytics1003.eqiad.wmnet.
 117 1H IN PTR   notebook1001.eqiad.wmnet.
 118 1H IN PTR   analytics1001.eqiad.wmnet.
 122 1H IN PTR   kafka1022.eqiad.wmnet.
-126 1H IN PTR   analytics1026.eqiad.wmnet.
 127 1H IN PTR   analytics1027.eqiad.wmnet.
 128 1H IN PTR   analytics1028.eqiad.wmnet.
 129 1H IN PTR   analytics1029.eqiad.wmnet.
@@ -1679,8 +1677,8 @@
 95  1H  IN PTR  kafka1012.mgmt.eqiad.wmnet.
 96  1H  IN PTR  kafka1013.mgmt.eqiad.wmnet.
 97  1H  IN PTR  kafka1014.mgmt.eqiad.wmnet.
-98  1H  IN PTR  analytics1015.mgmt.eqiad.wmnet.
 99  1H  IN PTR  restbase-dev1002.mgmt.eqiad.wmnet.
+99  1H  IN PTR  restbase-test1002.mgmt.eqiad.wmnet.
 99  1H  IN PTR  WMF4091.mgmt.eqiad.wmnet.
 100 1H  IN PTR  notebook1001.mgmt.eqiad.wmnet.
 101 1H  IN PTR  kafka1018.mgmt.eqiad.wmnet.
@@ -1698,7 +1696,6 @@
 112 1H  IN PTR  conf1001.mgmt.eqiad.wmnet.
 113 1H  IN PTR  conf1002.mgmt.eqiad.wmnet.
 114 1H  IN PTR  conf1003.mgmt.eqiad.wmnet.
-115 1H  IN PTR  analytics1026.mgmt.eqiad.wmnet.
 116 1H  IN PTR  analytics1027.mgmt.eqiad.wmnet.
 117 1H  IN PTR  indium.mgmt.eqiad.wmnet.
 118 1H  IN PTR  wmf4073.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f022901..c385296 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -126,12 +126,10 @@
 1H  IN   2620:0:861:108:10:64:53:12
 kafka1022   1H  IN A 10.64.36.122
 1H  IN   2620:0:861:106:10:64:36:122
-analytics1015   1H  IN A 10.64.36.115
 notebook10011H  IN A 10.64.36.117
 notebook10021H  IN A 10.64.5.14
 1H  IN   2620:0:861:104:10:64:5:14
 
-analytics10261H IN A 10.64.36.126
 analytics10271H IN A 10.64.36.127
 analytics10281H IN A 10.64.36.128
 analytics10291H IN A 10.64.36.129
@@ -1048,8 +1046,8 @@
 kafka1012   1H  IN A10.65.3.95
 kafka1013   1H  IN A10.65.3.96
 kafka1014   1H  IN A10.65.3.97
-analytics1015   1H  IN A10.65.3.98
 restbase-dev1002  1H  IN A10.65.3.99
+restbase-test1002  1H  IN A10.65.3.99
 WMF4091 1H  IN A10.65.3.99
 notebook10011H  IN A10.65.3.100
 kafka1018   1H  IN A10.65.3.101
@@ -1081,7 +1079,6 @@
 conf10011H  IN A10.65.3.112
 conf10021H  IN A10.65.3.113
 conf10031H  IN A10.65.3.114
-analytics1026   1H  IN A10.65.3.115
 analytics1027   1H  IN A10.65.3.116
 wmf4580 1H  IN A10.65.3.211
 analytics1028   1H  IN A10.65.3.211

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1874e1af766b0d45f53ed5a4ca653a8c317b8273
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Repool db1052 after maintenance

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334008 )

Change subject: mariadb: Repool db1052 after maintenance
..


mariadb: Repool db1052 after maintenance

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4e98a1e..3b5cf3c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1057' => 0,   # C2 2.8TB  96GB, master
-#  'db1052' => 1,   # B3 2.8TB  96GB, old master #maintenance 
T156008
+   'db1052' => 50,  # B3 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove multatuli.wikimedia.org, keep mgmt

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334012 )

Change subject: remove multatuli.wikimedia.org, keep mgmt
..

remove multatuli.wikimedia.org, keep mgmt

Bug: T156208
Change-Id: I5ab0df9ea6b2e96d355dcc5b252a3e5b7b662f2f
---
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
3 files changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/12/334012/1

diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index cecabe3..e2b4701 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -29,8 +29,6 @@
 
 112 1H IN PTR   bast3001.wikimedia.org.
 
-114 1H IN PTR   multatuli.wikimedia.org.
-
 121 1H IN PTR   eeden.wikimedia.org.
 122 1H IN PTR   maerlant.wikimedia.org.
 
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7d1d13e..88168b7 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -27,7 +27,6 @@
 1.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   eeden.wikimedia.org.
 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   nescio.wikimedia.org.
 2.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3001.wikimedia.org.
-4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   multatuli.wikimedia.org.
 2.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   maerlant.wikimedia.org.
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-100.cr1-esams.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 487ca66..de9c6ae 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -161,8 +161,6 @@
 sodium  1H  IN  2620:0:861:1:208:80:154:15
 ms1001  1H  IN A208.80.154.16
 ms1001  1H  IN  2620:0:861:1:208:80:154:16
-multatuli   1H  IN A91.198.174.114
-multatuli   1H  IN  2620:0:862:1:91:198:174:114
 mx1001  1H  IN A208.80.154.76 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 1H  IN  2620:0:861:3:208:80:154:76
 mx2001  1H  IN A208.80.153.45 ; VM on the ganeti01.svc.codfw.wmnet 
cluster

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ab0df9ea6b2e96d355dcc5b252a3e5b7b662f2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp, DHCP: remove multatuli

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334011 )

Change subject: site.pp, DHCP: remove multatuli
..

site.pp, DHCP: remove multatuli

Bug: T156208
Change-Id: I9dc852819ac683b973c7ace8500a1abca9769f04
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 1 insertion(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/334011/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b1f5a0..551fa55 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1958,14 +1958,6 @@
 role(otrs::webserver)
 }
 
-node 'multatuli.wikimedia.org' {
-role(spare::system)
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
 # also see dataset1001
 node 'ms1001.wikimedia.org' {
 $cluster = 'misc'
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 531cb89..61004c1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
 d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
 druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
-eeden|maerlant|multatuli|nescio) echo partman/raid1-1partition.cfg ;; \
+eeden|maerlant|nescio) echo partman/raid1-1partition.cfg ;; \
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic20[0-2][0-9]|elastic203[0-6]) 
echo partman/elasticsearch-raid1.cfg ;; \
 labmon1001|mwlog[12]001|relforge100[12]|scb200[1-4]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 247bb68..62207d7 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4043,11 +4043,6 @@
 fixed-address ms-fe3002.esams.wmnet;
 }
 
-host multatuli {
-hardware ethernet a4:ba:db:30:d5:99;
-fixed-address multatuli.wikimedia.org;
-}
-
 host mwlog1001 {
 hardware ethernet 14:18:77:33:4A:C0;
 fixed-address mwlog1001.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Fix save button on Special:Preferences

2017-01-24 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333811 )

Change subject: Fix save button on Special:Preferences
..


Fix save button on Special:Preferences

Given that the preftoc CSS was copied from core, that rule was once
necessary but these days it's certainly not wanted.

Change-Id: I33a9313994bc1feaa1b0b3996ef6ad9b87bcd065
---
M truglass/main.css
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/truglass/main.css b/truglass/main.css
index b303518..a149b90 100644
--- a/truglass/main.css
+++ b/truglass/main.css
@@ -1567,7 +1567,6 @@
text-decoration: none;
 }
 #prefcontrol {
-   padding-top: 2em;
clear: both;
 }
 #preferences {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33a9313994bc1feaa1b0b3996ef6ad9b87bcd065
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp, DHCP: remove db1019

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334010 )

Change subject: site.pp, DHCP: remove db1019
..

site.pp, DHCP: remove db1019

Bug: T146265
Change-Id: I6be5d51a99f36887330f1007fb0f1008e8c38c27
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b1f5a0..4a9e203 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -550,10 +550,6 @@
 }
 }
 
-node /^db10(19|42)\.eqiad\.wmnet/ {
-role(spare::system) # to be decommed (T146265, T149793)
-}
-
 # s4 (commons) core production dbs on codfw
 # codfw master
 node 'db2019.codfw.wmnet' {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 247bb68..c3c0352 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1034,13 +1034,6 @@
 fixed-address db1018.eqiad.wmnet;
 }
 
-host db1019 {
-hardware ethernet 78:2b:cb:0a:12:ee;
-fixed-address db1019.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host db1020 {
 hardware ethernet 78:2b:cb:04:fd:a5;
 fixed-address db1020.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[es5]: [WIP] Replace reindexing with _reindex API

2017-01-24 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334009 )

Change subject: [WIP] Replace reindexing with _reindex API
..

[WIP] Replace reindexing with _reindex API

Initial replacement of the internals of our Reindexer class with the
_reindex API in es 5.  This generally appears to work for the basic case
of copying an index for mapping updates, but it needs further testing.

Tested working:
* Basic mapping change and copy from old index to new on same cluster
* Delete specific fields from all documents while reindexing
* Can still vary chunk size as necessary.

TODO:
* Have not yet implemented indexing from a remote ES server, which is
  needed for the copySearchIndex.php script.
* Needs decisions about some specific parameters, such as request
  throttling and timeouts. In the past request throttling was done
  through parallelism limits rather than a requests per second, likely
  will switch to a flag on the maint scripts?
* What happens when batch sizes are too big? not sure yet. We used to
  have a bunch of code for handling it. Need to review upstream code.
* There was mapping information passed into the reindexer, but it was
  never used. I've removed that but need to trace back some history and
  figure out if something was lost.

Bug: T155506
Change-Id: Ifbbae065038cfe6e07a84f6a1b46dd317c3081d3
---
M includes/Maintenance/Reindexer.php
M includes/SearchConfig.php
M maintenance/copySearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
4 files changed, 60 insertions(+), 361 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/09/334009/1

diff --git a/includes/Maintenance/Reindexer.php 
b/includes/Maintenance/Reindexer.php
index 16a8f21..ffe9f3c 100644
--- a/includes/Maintenance/Reindexer.php
+++ b/includes/Maintenance/Reindexer.php
@@ -10,6 +10,7 @@
 use Elastica\Exception\ExceptionInterface;
 use Elastica\Index;
 use Elastica\Query;
+use Elastica\Request;
 use Elastica\Type;
 use ForkController;
 use MediaWiki\Logger\LoggerFactory;
@@ -86,11 +87,6 @@
private $mergeSettings;
 
/**
-* @var array
-*/
-   private $mappingConfig;
-
-   /**
 * @var Maintenance
 */
private $out;
@@ -109,11 +105,10 @@
 * @param int $shardCount
 * @param string $replicaCount
 * @param array $mergeSettings
-* @param array $mappingConfig
 * @param Maintenance $out
 * @throws \Exception
 */
-   public function __construct( SearchConfig $searchConfig, Connection 
$source, Connection $target, array $types, array $oldTypes, $shardCount, 
$replicaCount, array $mergeSettings, array $mappingConfig, Maintenance $out = 
null, $fieldsToDelete = [] ) {
+   public function __construct( SearchConfig $searchConfig, Connection 
$source, Connection $target, array $types, array $oldTypes, $shardCount, 
$replicaCount, array $mergeSettings, Maintenance $out = null, $fieldsToDelete = 
[] ) {
// @todo: this constructor has too many arguments - refactor!
$this->searchConfig = $searchConfig;
$this->oldConnection = $source;
@@ -123,7 +118,6 @@
$this->shardCount = $shardCount;
$this->replicaCount = $replicaCount;
$this->mergeSettings = $mergeSettings;
-   $this->mappingConfig = $mappingConfig;
$this->out = $out;
$this->fieldsToDelete = $fieldsToDelete;
 
@@ -137,13 +131,11 @@
/**
 * Dump everything from the live index into the one being worked on.
 *
-* @param int $processes
 * @param int $refreshInterval
-* @param int $retryAttempts
 * @param int $chunkSize
 * @param float $acceptableCountDeviation
 */
-   public function reindex( $processes = 1, $refreshInterval = 1, 
$retryAttempts = 5, $chunkSize = 100, $acceptableCountDeviation = .05 ) {
+   public function reindex( $refreshInterval = 1, $chunkSize = 100, 
$acceptableCountDeviation = .05 ) {
global $wgCirrusSearchWikimediaExtraPlugin;
 
// Set some settings that should help io load during bulk 
indexing.  We'll have to
@@ -160,41 +152,38 @@
'routing.allocation.total_shards_per_node' => 
$maxShardsPerNode,
] );
 
-   if ( $processes > 1 ) {
-   if ( !isset( $wgCirrusSearchWikimediaExtraPlugin[ 
'id_hash_mod_filter' ] ) ||
-   !$wgCirrusSearchWikimediaExtraPlugin[ 
'id_hash_mod_filter' ] ) {
-   $this->error( "Can't use multiple processes 
without \$wgCirrusSearchWikimediaExtraPlugin[ 'id_hash_mod_filter' ] = true", 1 
);
+   $script = $this->generateDeleteFieldsScript();
+
+   foreach ( $this->types as

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Repool db1052 after maintenance

2017-01-24 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334008 )

Change subject: mariadb: Repool db1052 after maintenance
..

mariadb: Repool db1052 after maintenance

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4e98a1e..3b5cf3c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,7 +94,7 @@
 'sectionLoads' => [
's1' => [
'db1057' => 0,   # C2 2.8TB  96GB, master
-#  'db1052' => 1,   # B3 2.8TB  96GB, old master #maintenance 
T156008
+   'db1052' => 50,  # B3 2.8TB  96GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki module: Linting changes

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332103 )

Change subject: mediawiki module: Linting changes
..


mediawiki module: Linting changes

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

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645

Change-Id: Ib4418247bf579bf15f489ad04e3ea13702127ae5
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
M modules/mediawiki/manifests/maintenance/pagetriage.pp
M modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
M modules/mediawiki/manifests/maintenance/refreshlinks.pp
M modules/mediawiki/manifests/maintenance/wikidata.pp
M modules/mediawiki/manifests/monitoring/graphite.pp
M modules/mediawiki/manifests/php_enmod.pp
M modules/mediawiki/manifests/users.pp
M modules/mediawiki/manifests/web.pp
M modules/mediawiki_singlenode/manifests/init.pp
11 files changed, 21 insertions(+), 21 deletions(-)

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



diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index ebe0db0..667f5c0 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -41,7 +41,7 @@
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-before => Service['jobrunner']
+before => Service['jobrunner'],
 }
 
 file { '/etc/jobrunner/jobrunner.conf':
@@ -58,7 +58,7 @@
 enable => $state ? {
 'stopped' => false,
 default   => true,
-}
+},
 }
 
 # We declare the service, but override its status with
@@ -96,7 +96,7 @@
 
 include ::apache::mod::proxy_fcgi
 
-class { 'apache::mpm':
+class { '::apache::mpm':
 mpm => 'worker',
 }
 
@@ -107,7 +107,7 @@
 
 apache::site{ 'hhvm_jobrunner':
 priority => 1,
-content  => template('mediawiki/jobrunner/site.conf.erb')
+content  => template('mediawiki/jobrunner/site.conf.erb'),
 }
 
 # Hack for T122069: on servers running GWT jobs, restart HHVM
@@ -119,7 +119,7 @@
 }
 } else {
 cron { 'periodic_hhvm_restart':
-ensure => absent
+ensure => absent,
 }
 }
 }
diff --git a/modules/mediawiki/manifests/maintenance/cirrussearch.pp 
b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
index abfdf22..7352ba5 100644
--- a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
+++ b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
@@ -1,5 +1,5 @@
 class mediawiki::maintenance::cirrussearch( $ensure = present ) {
-require mediawiki::users
+require ::mediawiki::users
 
 Cron {
 ensure  => $ensure,
@@ -34,7 +34,7 @@
 ensure => ensure_directory($ensure),
 owner  => $::mediawiki::users::web,
 group  => $::mediawiki::users::web,
-mode   => '0775'
+mode   => '0775',
 }
 
 logrotate::conf { 'cirrus-suggest':
@@ -46,7 +46,7 @@
 ensure => ensure_directory($ensure),
 owner  => $::mediawiki::users::web,
 group  => $::mediawiki::users::web,
-mode   => '0775'
+mode   => '0775',
 }
 
 logrotate::conf { 'cirrus-sanitize':
diff --git a/modules/mediawiki/manifests/maintenance/pagetriage.pp 
b/modules/mediawiki/manifests/maintenance/pagetriage.pp
index e67adb7..32b4e76 100644
--- a/modules/mediawiki/manifests/maintenance/pagetriage.pp
+++ b/modules/mediawiki/manifests/maintenance/pagetriage.pp
@@ -1,6 +1,6 @@
 class mediawiki::maintenance::pagetriage( $ensure = present ) {
 
-require mediawiki
+require ::mediawiki
 
 system::role { 'mediawiki::maintenance::pagetriage': description => 
'Mediawiki Maintenance Server: pagetriage extension' }
 
diff --git a/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp 
b/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
index 1aa7a29..01598c2 100644
--- a/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
+++ b/modules/mediawiki/manifests/maintenance/purge_abusefilter.pp
@@ -4,6 +4,6 @@
 command => '/usr/local/bin/foreachwiki 
extensions/AbuseFilter/maintenance/purgeOldLogIPData.php >/dev/null 2>&1',
 user=> $::mediawiki::users::web,
 hour=> 1,
-minute  => 15
+minute  => 15,
 }
 }
diff --git a/modules/mediawiki/manifests/maintenance/refreshlinks.pp 
b/modules/mediawiki/manifests/maintenance/refreshlinks.pp
index 1ccac35..d76475f 100644
--- a/modules/mediawiki/manifests/maintenance/refreshlinks.pp
+++ b/modules/mediawiki/manifests/maintenance/refreshlinks.pp
@@ -1,7 +1,7 @@
 # Include this to add cron jobs calling refreshLinks.php on all clusters. 
(RT-2355)
 class mediawiki::maintenance::refreshlinks( $ensure = present ) {
 
-require

[MediaWiki-commits] [Gerrit] operations/puppet[production]: apache-fast-test: replace mw1017 with mwdebug1001

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334007 )

Change subject: apache-fast-test: replace mw1017 with mwdebug1001
..

apache-fast-test: replace mw1017 with mwdebug1001

As site.pp says, mwdebug1001 replaces mw1017.
Let apache-fast-test use it as new default staging server.

Change-Id: I1d46fa3b99b1655b641064cf5dbbcc5a7468b5d8
---
M modules/apache/files/apache-fast-test
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/334007/1

diff --git a/modules/apache/files/apache-fast-test 
b/modules/apache/files/apache-fast-test
index d6b9c52..1761782 100755
--- a/modules/apache/files/apache-fast-test
+++ b/modules/apache/files/apache-fast-test
@@ -32,7 +32,7 @@
 my $timeout_limit = 3; # how many timeouts to tolerate before dropping a server
 my $timeout = 10; # seconds before LWP gives up on a web request
 my $pad_length = 25; # server hostname column width in report
-my $default_staging_server = 'mw1017.eqiad.wmnet';
+my $default_staging_server = 'mwdebug1001.eqiad.wmnet';
 
 # get a list of servers to test
 my $servers;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rcfilters: Remove implemented filters from list of links

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333837 )

Change subject: rcfilters: Remove implemented filters from list of links
..


rcfilters: Remove implemented filters from list of links

This is a bit hacky because the filter name needs to be inferred
from the class on each span, and because the separators aren't
wrapped.

Change-Id: Ib39ad435d3b48fa38533926e4ab49942c3bd5d6f
---
M resources/Resources.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
D resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
3 files changed, 38 insertions(+), 6 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index bd7f68e..cd5e3b9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1747,7 +1747,6 @@

'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
],
'styles' => [
-   
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterGroupWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FiltersListWidget.less',
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index ce0fc8a..9f4ad48 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -146,6 +146,44 @@
// Initialize values
controller.initialize();
 
+   // HACK: Remove old-style filter links for filters 
handled by the widget
+   // Ideally the widget would handle all filters and we'd 
just remove .rcshowhide entirely
+   $( '.rcshowhide' ).children().each( function () {
+   // HACK: Interpret the class name to get the 
filter name
+   // This should really be set as a data attribute
+   var i,
+   name = null,
+   // Some of the older browsers we 
support don't have .classList,
+   // so we have to interpret the class 
attribute manually.
+   classes = this.getAttribute( 'class' 
).split( ' ' );
+   for ( i = 0; i < classes.length; i++ ) {
+   if ( classes[ i ].substr( 0, 
'rcshow'.length ) === 'rcshow' ) {
+   name = classes[ i ].substr( 
'rcshow'.length );
+   break;
+   }
+   }
+   if ( name === null ) {
+   return;
+   }
+   if ( name === 'hidemine' ) {
+   // HACK: the span for hidemyself is 
called hidemine
+   name = 'hidemyself';
+   }
+   // This span corresponds to a filter that's in 
our model, so remove it
+   if ( model.getItemByName( name ) ) {
+   // HACK: Remove the text node after the 
span.
+   // If there isn't one, we're at the 
end, so remove the text node before the span.
+   // This would be unnecessary if we 
added separators with CSS.
+   if ( this.nextSibling && 
this.nextSibling.nodeType === Node.TEXT_NODE ) {
+   this.parentNode.removeChild( 
this.nextSibling );
+   } else if ( this.previousSibling && 
this.previousSibling.nodeType === Node.TEXT_NODE ) {
+   this.parentNode.removeChild( 
this.previousSibling );
+   }
+   // Remove the span itself
+   this.parentNode.removeChild( this );
+   }
+   } );
+
$( '.rcoptions form' ).submit( function () {
var $form = $( this );
 
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
deleted file mode 100644
index

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp, DHCP: remove mw1017, mw1099

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334006 )

Change subject: site.pp, DHCP: remove mw1017,mw1099
..

site.pp, DHCP: remove mw1017,mw1099

The ticket that is mentioned here was already closed
and had comments how they were removed from DNS.

But they are still here in site.pp !?

Bug: T151303
Change-Id: Iadb7eeafc766d6ace091914b4760d5fa0a7bb403
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 17 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b1f5a0..a474d68 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2037,13 +2037,6 @@
 include ::base::firewall
 }
 
-# mw1017 and mw1099 are former test appservers
-# HW decom ticket: T151303
-node /^mw10(17|99)\.eqiad\.wmnet$/ {
-role(spare::system)
-include ::base::firewall
-}
-
 # mw1161-1167 are job runners
 node /^mw116[1-7]\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 247bb68..405d67b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4058,16 +4058,6 @@
 fixed-address mwlog2001.codfw.wmnet;
 }
 
-host mw1017 {
-hardware ethernet 78:2b:cb:08:79:0c;
-fixed-address mw1017.eqiad.wmnet;
-}
-
-host mw1099 {
-hardware ethernet 84:2b:2b:77:e7:72;
-fixed-address mw1099.eqiad.wmnet;
-}
-
 host mw1161 {
 hardware ethernet 90:B1:1C:27:90:98;
 fixed-address mw1161.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Fix cross-wiki title normalization

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332089 )

Change subject: Fix cross-wiki title normalization
..


Fix cross-wiki title normalization

* Remove a nasty hack of using a well known interwiki name
* Capitalize title

Bug: T155214
Change-Id: I72ca4c5ca36b7e04f1f002ad4df74dff3b2600b8
---
M extension.json
A includes/FauxInterwikiLookup.php
M includes/JCSingleton.php
M tests/phpunit/JCTitleParsingTest.php
4 files changed, 89 insertions(+), 35 deletions(-)

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



diff --git a/extension.json b/extension.json
index 43e4578..b7cc0c0 100644
--- a/extension.json
+++ b/extension.json
@@ -43,6 +43,7 @@
"JsonConfigNamespaces": "JsonConfig.namespaces.php"
},
"AutoloadClasses": {
+   "JsonConfig\\FauxInterwikiLookup": 
"includes/FauxInterwikiLookup.php",
"JsonConfig\\JCApi": "includes/JCApi.php",
"JsonConfig\\JCCache": "includes/JCCache.php",
"JsonConfig\\JCContent": "includes/JCContent.php",
diff --git a/includes/FauxInterwikiLookup.php b/includes/FauxInterwikiLookup.php
new file mode 100644
index 000..63c23c8
--- /dev/null
+++ b/includes/FauxInterwikiLookup.php
@@ -0,0 +1,59 @@
+fetch( $prefix );
+   }
+
+   /**
+* Fetch an Interwiki object
+*
+* @param string $prefix Interwiki prefix to use
+* @return Interwiki|null|bool
+*/
+   public function fetch( $prefix ) {
+   if ( $prefix !== self::INTERWIKI_PREFIX ) {
+   return false;
+   }
+   return new Interwiki( self::INTERWIKI_PREFIX );
+   }
+
+   /**
+* Returns all interwiki prefixes
+*
+* @param string|null $local If set, limits output to local/non-local 
interwikis
+* @return string[] List of prefixes
+*/
+   public function getAllPrefixes( $local = null ) {
+   return ( $local === null || $local === false ) ? [ 
self::INTERWIKI_PREFIX ] : [ ];
+   }
+
+   /**
+* Purge the in-process and persistent object cache for an interwiki 
prefix
+* @param string $prefix
+*/
+   public function invalidateCache( $prefix ) {}
+}
diff --git a/includes/JCSingleton.php b/includes/JCSingleton.php
index 797cd90..f545b28 100644
--- a/includes/JCSingleton.php
+++ b/includes/JCSingleton.php
@@ -461,28 +461,40 @@
// Parse string if needed
// TODO: should the string parsing also be cached?
if ( is_string( $value ) ) {
+   $language = Language::factory( 'en' );
if ( !self::$titleParser ) {
self::$titleParser =
-   new MediaWikiTitleCodec( 
Language::factory( 'en' ), new GenderCache() );
+   new MediaWikiTitleCodec(
+   $language,
+   new GenderCache(),
+   [],
+   new 
FauxInterwikiLookup() );
}
-   // Major hack, but until MediaWikiTitleCodec 
has global state, I can't think of a
-   // better way. Interwiki prefixes are a special 
case for title parsing:
+   // Interwiki prefixes are a special case for 
title parsing:
// first letter is not capitalized, namespaces 
are not resolved, etc.
// So we prepend an interwiki prefix to fool 
title codec, and later remove it.
-   global $wgJsonConfigInterwikiPrefix;
try {
-   $value = $wgJsonConfigInterwikiPrefix . 
':' . $value;
+   $value = 
FauxInterwikiLookup::INTERWIKI_PREFIX . ':' . $value;
$parts = 
self::$titleParser->splitTitleString( $value );
+
+   // Defensive coding - ensure the 
parsing has proceeded as expected
if ( $parts['dbkey'] === '' || 
$parts['namespace'] !== 0 ||
 $parts['fragment'] !== '' || 
$parts['local_interwiki'] !== false ||
-$parts['interwiki'] !== 
$wgJsonConfigInterwikiPrefix
+$parts['interwiki'] !== 
FauxInterwikiLookup::INTERWIKI_PREFIX
) {

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up e3da2e23: Fix typo in hideanons filter name

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333835 )

Change subject: Follow-up e3da2e23: Fix typo in hideanons filter name
..


Follow-up e3da2e23: Fix typo in hideanons filter name

Change-Id: I5d3d72147f1c0ce7994e253801128dbe145f72e8
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 34df2f5..ce0fc8a 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -24,7 +24,7 @@
description: mw.msg( 
'rcfilters-filter-registered-description' )
},
{
-   name: 'hideanon',
+   name: 'hideanons',
label: mw.msg( 
'rcfilters-filter-unregistered-label' ),
description: mw.msg( 
'rcfilters-filter-unregistered-description' )
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d3d72147f1c0ce7994e253801128dbe145f72e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp, DHCP: remove cp3011-cp3022

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334005 )

Change subject: site.pp, DHCP: remove cp3011-cp3022
..

site.pp, DHCP: remove cp3011-cp3022

Bug: T130883
Change-Id: Ibf6f0f38df660d3b1502046a5526430ba3569627
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 76 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index bee872e..6062704 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,21 +341,6 @@
 role(cache::misc, ipsec)
 }
 
-node /^cp301[1-4]\.esams\.wmnet$/ {
-interface::add_ip6_mapped { 'main': }
-role(spare::system) # to be decommed (T130883)
-}
-
-node /^cp301[5678]\.esams\.wmnet$/ {
-interface::add_ip6_mapped { 'main': }
-role(spare::system) # to be decommed (T130883)
-}
-
-node /^cp30(19|2[0-1])\.esams\.wmnet$/ {
-interface::add_ip6_mapped { 'main': }
-role(spare::system) # to be decommed (T130883)
-}
-
 node 'cp3022.esams.wmnet' {
 include ::standard
 }
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 8be27cf..2ff79bb 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -708,67 +708,6 @@
 fixed-address cp3010.esams.wmnet;
 }
 
-host cp3011 {
-hardware ethernet 24:B6:FD:F5:B2:D4;
-fixed-address cp3011.esams.wmnet;
-}
-
-host cp3012 {
-hardware ethernet 24:B6:FD:F5:AB:B4;
-fixed-address cp3012.esams.wmnet;
-}
-
-host cp3013 {
-hardware ethernet 24:B6:FD:F5:AD:9C;
-fixed-address cp3013.esams.wmnet;
-}
-
-host cp3014 {
-hardware ethernet 24:B6:FD:F5:7C:38;
-fixed-address cp3014.esams.wmnet;
-}
-
-host cp3015 {
-hardware ethernet D4:AE:52:8C:7C:E9;
-fixed-address cp3015.esams.wmnet;
-}
-
-host cp3016 {
-hardware ethernet D4:AE:52:7A:C4:AB;
-fixed-address cp3016.esams.wmnet;
-}
-
-host cp3017 {
-hardware ethernet D4:AE:52:7A:C3:CE;
-fixed-address cp3017.esams.wmnet;
-}
-
-host cp3018 {
-hardware ethernet D4:AE:52:8C:86:31;
-fixed-address cp3018.esams.wmnet;
-}
-
-host cp3019 {
-hardware ethernet D4:AE:52:8A:73:9A;
-fixed-address cp3019.esams.wmnet;
-}
-
-host cp3020 {
-hardware ethernet D4:AE:52:8A:75:62;
-fixed-address cp3020.esams.wmnet;
-}
-
-host cp3021 {
-hardware ethernet D4:AE:52:8A:70:82;
-fixed-address cp3021.esams.wmnet;
-}
-
-host cp3022 {
-hardware ethernet D4:AE:52:8A:6E:03;
-fixed-address cp3022.esams.wmnet;
-}
-
-
 host cp3030 {
 hardware ethernet 44:a8:42:0a:11:18;
 fixed-address cp3030.esams.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp, DHCP: remove analytics1015, analytics1026

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334004 )

Change subject: site.pp, DHCP: remove analytics1015, analytics1026
..


site.pp, DHCP: remove analytics1015, analytics1026

Bug: T147313
Change-Id: I29648018f021ab823310b33830e5720661ccdb21
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 0 insertions(+), 24 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index e83d785..1ad61b9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -95,15 +95,6 @@
 include ::standard
 }
 
-
-node 'analytics1015.eqiad.wmnet' {
-role(spare::system)
-}
-
-node 'analytics1026.eqiad.wmnet' {
-role(spare::system)
-}
-
 # analytics1027 hosts hue.wikimedia.org, and is used for launching
 # cron based Hadoop jobs.
 node 'analytics1027.eqiad.wmnet' {
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 531cb89..c4149bf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -48,7 +48,6 @@
 case $(debconf-get netcfg/get_hostname) in \
 acamar|achernar|baham|radon|rhodium) echo partman/raid1-lvm.cfg ;; \
 analytics1017) echo partman/raid1-30G.cfg ;; \
-analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
 analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
 
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]) echo 
partman/analytics-flex.cfg ;; \
 aqs100[456789]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 247bb68..8be27cf 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -38,20 +38,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host analytics1015 {
-hardware ethernet 90:b1:1c:09:7f:f6;
-fixed-address analytics1015.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host analytics1026 {
-hardware ethernet d4:ae:52:7c:c2:70;
-fixed-address analytics1026.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host analytics1027 {
 hardware ethernet d4:ae:52:7a:b9:e5;
 fixed-address analytics1027.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29648018f021ab823310b33830e5720661ccdb21
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Cmjohnson 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp, DHCP: remove analytics1015, analytics1026

2017-01-24 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334004 )

Change subject: site.pp, DHCP: remove analytics1015, analytics1026
..

site.pp, DHCP: remove analytics1015, analytics1026

Bug: T147313
Change-Id: I29648018f021ab823310b33830e5720661ccdb21
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 0 insertions(+), 24 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b1f5a0..bee872e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -95,15 +95,6 @@
 include ::standard
 }
 
-
-node 'analytics1015.eqiad.wmnet' {
-role(spare::system)
-}
-
-node 'analytics1026.eqiad.wmnet' {
-role(spare::system)
-}
-
 # analytics1027 hosts hue.wikimedia.org, and is used for launching
 # cron based Hadoop jobs.
 node 'analytics1027.eqiad.wmnet' {
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 531cb89..c4149bf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -48,7 +48,6 @@
 case $(debconf-get netcfg/get_hostname) in \
 acamar|achernar|baham|radon|rhodium) echo partman/raid1-lvm.cfg ;; \
 analytics1017) echo partman/raid1-30G.cfg ;; \
-analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
 analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
 
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]) echo 
partman/analytics-flex.cfg ;; \
 aqs100[456789]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 247bb68..8be27cf 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -38,20 +38,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host analytics1015 {
-hardware ethernet 90:b1:1c:09:7f:f6;
-fixed-address analytics1015.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host analytics1026 {
-hardware ethernet d4:ae:52:7c:c2:70;
-fixed-address analytics1026.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host analytics1027 {
 hardware ethernet d4:ae:52:7a:b9:e5;
 fixed-address analytics1027.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Amend import sources for en.wikisource

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333487 )

Change subject: Amend import sources for en.wikisource
..


Amend import sources for en.wikisource

Bug: T155922
Change-Id: Ia74cbf42ca863f01050752d68dafd1c733359898
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 86abd20..10d9f29 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10789,7 +10789,7 @@
'roa-rup', 'ru', 'rw', 'sa', 'sc', 'scn', 'sd', 'sg', 'sh', 
'si', 'simple', 'sk', 'sl', 'sm', 'sn', 'so', 'sq', 'sr', 'ss', 'st', 'su', 
'sv', 'sw', 'ta', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to',
'tpi', 'tr', 'ts', 'tt', 'tw', 'ug', 'uk', 'ur', 'uz', 'vi', 
'vo', 'wa', 'wo', 'xh', 'yi', 'yo', 'za', 'zh', 'zh-min-nan', 'zu'
], // T25900
-   'enwikisource' => [ 'w', 'OldWikisource', 'b', 'commons', 'q', ], // 
T17571
+   'enwikisource' => [ 'w', 'mul', 'b', 'commons', 'q', 'mw' ], // T17571 
T155922
'enwikibooks' => [ 'w', 's', 'q', 'v', 'wikt', 'n', 'meta', 'simple', 
'species', 'OldWikisource', 'commons' ], // T13226, T14665, T142333
'enwikiversity' => [ 'betawikiversity', 'w', 'b', 'q', 's', 'w:simple', 
'commons' ], // T115938, T123212
'enwikivoyage' => [ 'b', 'meta', 'w' ], // T44450, T65095

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia74cbf42ca863f01050752d68dafd1c733359898
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

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

2017-01-24 Thread Gilles (Code Review)

Gilles has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334002 )

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

Migrate Thumbor role from upstart to systemd

Bug: T154270
Change-Id: I4aff8987a948381a04633564e41fa52487d58c74
---
M Vagrantfile
M puppet/modules/apache/templates/ports.conf.erb
M puppet/modules/nginx
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/manifests/service.pp
M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
A puppet/modules/thumbor/templates/systemd.erb
D puppet/modules/thumbor/templates/upstart.erb
A puppet/modules/wmflib/lib/puppet/parser/functions/os_version.rb
9 files changed, 181 insertions(+), 104 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/02/334002/1

diff --git a/Vagrantfile b/Vagrantfile
index 49554e5..9db9e7d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -104,7 +104,7 @@
   # end
 
   config.vm.network :forwarded_port,
-guest: 80, host: settings[:http_port], host_ip: settings[:host_ip],
+guest: 8080, host: settings[:http_port], host_ip: settings[:host_ip],
 id: 'http'
 
   config.vm.network :forwarded_port,
diff --git a/puppet/modules/apache/templates/ports.conf.erb 
b/puppet/modules/apache/templates/ports.conf.erb
index 10b63e9..1af1ef4 100644
--- a/puppet/modules/apache/templates/ports.conf.erb
+++ b/puppet/modules/apache/templates/ports.conf.erb
@@ -1,5 +1,2 @@
 # This file is managed by Puppet.
-Listen 80
-<%- if @forwarded_port and @forwarded_port.to_s != "80" -%>
-Listen <%= @forwarded_port %>
-<%- end -%>
+Listen 8080
diff --git a/puppet/modules/nginx b/puppet/modules/nginx
index 10a1e92..d41ab2c 16
--- a/puppet/modules/nginx
+++ b/puppet/modules/nginx
@@ -1 +1 @@
-Subproject commit 10a1e925fa707654102f39092b46a64c61710614
+Subproject commit d41ab2cc4dd560f1483247bf2e1487d77b7e451c
diff --git a/puppet/modules/thumbor/manifests/init.pp 
b/puppet/modules/thumbor/manifests/init.pp
index ea8f4d0..49c7378 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -29,47 +29,41 @@
 $statsd_port,
 $sentry_dsn_file,
 ) {
-require ::virtualenv
-# Needed by the venv, which clones a few git repos
-require ::git
+apt::pin { 'gifsicle-jessie-backports':
+package  => 'gifsicle',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
 
-# jpegtran
-require_package('libjpeg-progs')
+apt::pin { 'python-tornado-jessie-backports':
+package  => 'python-tornado',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
 
-# exiftool is needed by exif-optimizer
-require_package('libimage-exiftool-perl')
+apt::pin { 'python-pil-jessie-backports':
+package  => 'python-pil',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
 
-# For Pillow
-require_package('libjpeg-dev')
+apt::pin { 'python-swiftclient-jessie-backports':
+package  => 'python-swiftclient',
+pin  => 'release n=jessie-backports',
+priority => 1000,
+}
 
-# For GIF engine
-require_package('gifsicle')
+package { 'raven':
+provider => 'pip',
+}
 
-# For Video engine
-require_package('ffmpeg')
+package { 'python-thumbor-wikimedia':
+notify => Exec['stop-and-disable-default-thumbor-service']
+}
 
-# For XCF engine
-require_package('xcftools')
-
-# For DjVu engine
-require_package('libdjvulibre-dev')
-require_package('cython')
-
-# For Ghostscript engine (PDF)
-require_package('ghostscript')
-
-# For pycurl, a dependency of thumbor
-require_package('libcurl4-gnutls-dev')
-
-# For Mediawiki's IM/RSVG SVG support
-require_package('librsvg2-bin')
-
-# For Mediawiki's DJVU support
-require_package('djvulibre-bin')
-require_package('netpbm')
-
-# For lxml, a dependency of thumbor-plugins
-require_package('libxml2-dev', 'libxslt1-dev')
+exec { 'stop-and-disable-default-thumbor-service':
+command => '/bin/systemctl stop thumbor'
+}
 
 require_package('firejail')
 
@@ -88,42 +82,18 @@
 }
 
 file { '/etc/firejail/thumbor.profile':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/thumbor/thumbor.profile',
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+source  => 'puppet:///modules/thumbor/thumbor.profile',
+require => Package['firejail'],
 }
 
-virtualenv::environment { $deploy_dir:
-ensure   => present,
-packages => [
-'pgi',
-'raven',
-'python-swiftclient',
-'pympler',
-

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: fix up

2017-01-24 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334003 )

Change subject: fix up
..

fix up

Change-Id: Id1412975c4d06f362e69692c44b7842c5c0ce876
---
M minerva.less/minerva.variables.less
M resources/skins.minerva.tablet.styles/common.less
2 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 214bffa..76dd15d 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -21,11 +21,12 @@
 @headerTitleFontSize: 1em;
 @headerHeight: 56px;
 @headerMarginTop: -1px;  // used to hide the header border top when a banner 
is not present
-@brandingWidth: 202px;
 @searchBoxWidth: 375px;
 // we override the core value so we can use pixels.
 @iconGutterWidth: 16px;
 @iconSize: 24px;
+@iconSizeTotal: @iconSize + @iconGutterWidth + @iconGutterWidth;
+@brandingWidth: @deviceWidthTablet - (@iconSizeTotal * 3) - @searchBoxWidth;
 
 @titleSectionSpacingTop: 20px;
 @titleSectionSpacingBottom: 25px;
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 9be0ad2..c916b09 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -9,7 +9,7 @@
 @media all and ( min-width: @deviceWidthTablet ) {
.client-js {
#searchIcon {
-   display: none;
+   visibility: hidden;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1412975c4d06f362e69692c44b7842c5c0ce876
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: Random coding style tweaks + documentation clarification

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333918 )

Change subject: Random coding style tweaks + documentation clarification
..


Random coding style tweaks + documentation clarification

Change-Id: I3d7946507bd489edf248c201877fab580875ed68
---
M MonoBookTemplate.php
1 file changed, 15 insertions(+), 17 deletions(-)

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



diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index a1bda6e..58453ac 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -101,8 +101,7 @@

data['dataAfterContent'] ) {
-   $this->html( 'dataAfterContent'
-   );
+   $this->html( 'dataAfterContent' 
);
}
?>

@@ -122,8 +121,8 @@
$personalTools = 
$this->getPersonalTools();
 
if ( array_key_exists( 'uls', 
$personalTools ) ) {
-   echo 
$this->makeListItem( 'uls', $personalTools[ 'uls' ] );
-   unset( $personalTools[ 
'uls' ] );
+   echo 
$this->makeListItem( 'uls', $personalTools['uls'] );
+   unset( 
$personalTools['uls'] );
}
 
if ( 
!$this->getSkin()->getUser()->isLoggedIn() &&
@@ -132,7 +131,6 @@
echo Html::rawElement( 
'li', array(
'id' => 
'pt-anonuserpage'
), $this->getMsg( 
'notloggedin' )->escaped() );
-
}
 
foreach ( $personalTools as 
$key => $item ) { ?>
@@ -160,8 +158,8 @@


getFooterIcons( "icononly" );
-   $validFooterLinks = $this->getFooterLinks( "flat" ); // 
Additional footer links
+   $validFooterIcons = $this->getFooterIcons( 'icononly' );
+   $validFooterLinks = $this->getFooterLinks( 'flat' ); // 
Additional footer links
 
if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
?>
@@ -254,20 +252,20 @@
 


-   
-   makeSearchInput( 
array( "id" => "searchInput" ) ); ?>
+   
+   makeSearchInput( 
array( 'id' => 'searchInput' ) ); ?>
 
makeSearchButton(
-   "go",
-   array( "id" => 
"searchGoButton", "class" => "searchButton" )
+   'go',
+   array( 'id' => 
'searchGoButton', 'class' => 'searchButton' )
);
 
if ( $this->config->get( 
'UseTwoButtonsSearchForm' ) ) {
?>
makeSearchButton(
-   "fulltext",
-   array( "id" => 
"mw-searchButton", "class" => "searchButton" )
+   'fulltext',
+   array( 'id' => 
'mw-searchButton', 'class' => 'searchButton' )
);
} else {
?>
@@ -286,7 +284,7 @@
}
 
/**
-* Prints the cactions bar.
+* Prints the content actions (cactions) bar.
 * Shared between MonoBook and Modern
 */
function cactions() {
@@ -342,8 +340,8 @@
 


-   data['language_urls'] as $key => $langlink ) { ?>
-   makeListItem( $key, $langlink ); ?>
+   data['language_urls'] as $key => $langLink ) { ?>
+

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: Remove warning suppression

2017-01-24 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333999 )

Change subject: Remove warning suppression
..

Remove warning suppression

There are many valid use cases of the error suppression functions, but
this isn't one of those. If there are some undefined indexes somewhere,
that's a problem that should be fixed properly instead of warnings being
suppressed in one skin.

Change-Id: I88dfd3b9d94774686c168766a56afb5186684a61
---
M MonoBookTemplate.php
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/99/333999/1

diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 58453ac..97a949d 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -36,9 +36,6 @@
 * outputs a formatted page.
 */
public function execute() {
-   // Suppress warnings to prevent notices about missing indexes 
in $this->data
-   wfSuppressWarnings();
-
$this->html( 'headelement' );
?>

@@ -206,7 +203,6 @@
echo Html::closeElement( 'body' );
echo Html::closeElement( 'html' );
echo "\n";
-   wfRestoreWarnings();
} // end of execute() method
 

/*/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88dfd3b9d94774686c168766a56afb5186684a61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Fix displaying images with uppercase extension.

2017-01-24 Thread Phantom42 (Code Review)

Phantom42 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333998 )

Change subject: Fix displaying images with uppercase extension.
..

Fix displaying images with uppercase extension.

Bug: T154862
Change-Id: Ib74066340a869a49036215a6ea1df39daa17890c
---
M resources/mmv/mmv.js
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index 9fcef6d..f7b2eee 100644
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -178,7 +178,7 @@
var imageWidths, canvasDimensions,
viewer = this,
image = this.thumbs[ this.currentIndex ].image,
-   ext = this.thumbs[ this.currentIndex ].title.ext;
+   ext = this.thumbs[ this.currentIndex 
].title.ext.toLowerCase();
 
this.preloadThumbnails();
 
@@ -242,7 +242,7 @@
$initialImage = $( initialImage ),
extraStatsDeferred = $.Deferred();
 
-   pluginsPromise = this.loadExtensionPlugins( 
image.filePageTitle.ext );
+   pluginsPromise = this.loadExtensionPlugins( 
image.filePageTitle.ext.toLowerCase() );
 
this.currentIndex = image.index;
 
@@ -262,7 +262,7 @@
// the aspect ratio
$initialImage.hide();
$initialImage.addClass( 'mw-mmv-placeholder-image' );
-   $initialImage.addClass( image.filePageTitle.ext );
+   $initialImage.addClass( image.filePageTitle.ext.toLowerCase() );
 
this.ui.canvas.set( image, $initialImage );
 
@@ -307,7 +307,7 @@
} );
}
 
-   imageElement.className = 'mw-mmv-final-image ' + 
image.filePageTitle.ext;
+   imageElement.className = 'mw-mmv-final-image ' + 
image.filePageTitle.ext.toLowerCase();
imageElement.alt = image.alt;
 
$.when( metadataPromise, pluginsPromise ).done( 
function ( metadata ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib74066340a869a49036215a6ea1df39daa17890c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Phantom42 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Hygiene: Switch from ems to pixels for layout elements

2017-01-24 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334001 )

Change subject: Hygiene: Switch from ems to pixels for layout elements
..

Hygiene: Switch from ems to pixels for layout elements

This makes it easier to control the layout of the header. em widths
can be hard to manage as we are finding here.

Change-Id: I7d74c6662077951d85563e43185b300a26312c79
---
M minerva.less/minerva.variables.less
1 file changed, 7 insertions(+), 4 deletions(-)


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

diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 14b469f..214bffa 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -19,10 +19,13 @@
 
 // Header
 @headerTitleFontSize: 1em;
-@headerHeight: 3.35em;
+@headerHeight: 56px;
 @headerMarginTop: -1px;  // used to hide the header border top when a banner 
is not present
-@brandingWidth: 13em;
+@brandingWidth: 202px;
 @searchBoxWidth: 375px;
+// we override the core value so we can use pixels.
+@iconGutterWidth: 16px;
+@iconSize: 24px;
 
 @titleSectionSpacingTop: 20px;
 @titleSectionSpacingBottom: 25px;
@@ -75,10 +78,10 @@
 @blockquotePaddingLeft: 30px;
 
 // custom tablet styling
-@contentPaddingTablet: 3.35em;
+@contentPaddingTablet: @headerHeight;
 
 // FIXME: To be moved to includes/Config in a follow up patch.
-@wgMFDeviceWidthDesktop: 62.5em; // 1000px / 16 px;
+@wgMFDeviceWidthDesktop: 1000px;
 
 // note since content does not use view border box we have to include padding.
 @contentMaxWidthTablet: @wgMFDeviceWidthDesktop - ( 2 * @contentPaddingTablet 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d74c6662077951d85563e43185b300a26312c79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Remove unused method

2017-01-24 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334000 )

Change subject: Hygiene: Remove unused method
..

Hygiene: Remove unused method

Change-Id: I6f8159db3ef49deb22699da18714f8088f78aa1b
---
M app/src/main/java/org/wikipedia/views/ViewUtil.java
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/views/ViewUtil.java 
b/app/src/main/java/org/wikipedia/views/ViewUtil.java
index 61144c3..ad79762 100644
--- a/app/src/main/java/org/wikipedia/views/ViewUtil.java
+++ b/app/src/main/java/org/wikipedia/views/ViewUtil.java
@@ -44,10 +44,6 @@
 return false;
 }
 
-public static void setPadding(@NonNull View view, int padding) {
-view.setPadding(padding, padding, padding, padding);
-}
-
 public static void setTopPaddingDp(@NonNull View view, int padding) {
 view.setPadding(view.getPaddingLeft(), (int) (padding * 
DimenUtil.getDensityScalar()),
 view.getPaddingRight(), view.getPaddingBottom());

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f8159db3ef49deb22699da18714f8088f78aa1b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update html/php clauses for subpage parserTests.

2017-01-24 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333996 )

Change subject: Update html/php clauses for subpage parserTests.
..

Update html/php clauses for subpage parserTests.

The NS_USER namespace needs to have subpages enabled before these tests
work on the PHP parser.

Change-Id: I8e5e3bbd0dea6fc12f3b9ff9feeb58812fc51af1
---
M tests/parser/ParserTestRunner.php
M tests/parser/parserTests.txt
2 files changed, 21 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/333996/1

diff --git a/tests/parser/ParserTestRunner.php 
b/tests/parser/ParserTestRunner.php
index 281e1df..298feae 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -974,7 +974,10 @@
'wgEnableUploads' => self::getOptionValue( 
'wgEnableUploads', $opts, true ),
'wgLanguageCode' => $langCode,
'wgRawHtml' => self::getOptionValue( 'wgRawHtml', 
$opts, false ),
-   'wgNamespacesWithSubpages' => [ 0 => isset( 
$opts['subpage'] ) ],
+   'wgNamespacesWithSubpages' => [
+   0 => isset( $opts['subpage'] ),
+   2 => isset( $opts['subpage'] ),
+],
'wgMaxTocLevel' => $maxtoclevel,
'wgAllowExternalImages' => self::getOptionValue( 
'wgAllowExternalImages', $opts, true ),
'wgThumbLimits' => [ self::getOptionValue( 'thumbsize', 
$opts, 180 ) ],
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 3853a12..42a1d1c 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -8134,19 +8134,32 @@
 Handle title parsing for subpages
 !! options
 title=[[/123123]]
+subpage
 !! wikitext
 123
+!! html/php
+123
+
 !! html/parsoid
 123
 !! end
 
-## FIXME: Add a working php section here
+!! article
+User:Test/123
+!! text
+test 123
+!! endarticle
+
 !! test
 Link to a subpage from a namespace other than main
 !! options
-title=[[User:test]]
+title=[[User:Test]]
+subpage
 !! wikitext
 [[/123]]
+!! html/php
+/123
+
 !! html/parsoid
 /123
 !! end
@@ -8168,7 +8181,8 @@
 !! test
 Purely hash wikilink
 !! options
-title=[[User:test/123]]
+title=[[User:Test/123]]
+subpage
 !! wikitext
 [[#a|b]]
 !! html/php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e5e3bbd0dea6fc12f3b9ff9feeb58812fc51af1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Protect language converter markup in the preprocessor (take 2).

2017-01-24 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333997 )

Change subject: Protect language converter markup in the preprocessor (take 2).
..

Protect language converter markup in the preprocessor (take 2).

This revises 28774022769d2273be16c6c6e1cca710a1fd97ef, which was
reverted in master due to unexpected issues with `-{{...}} ` markup
on translatewiki and enwiki.  Test cases are added to ensure that this
is parsed as a template, not as language converter markup.

https://www.mediawiki.org/wiki/Preprocessor_ABNF is the canonical
documentation for the preprocessor; this will be updated after this
patch is merged.  The basic principles described in that page are
maintained in this patch:

* Rightmost opening structure has precedence: `-{{` is parsed as a
dash followed by template opening.

* `{{{` has precedence over `{{` and `-{`: `-` is parsed as
`-{` `{{{` since we first grab the rightmost `{{{`.

A bunch of test cases were added to verify the "ideal precedence"
order described on that wiki page.

Bug: T153761
Change-Id: I2f0c186c75e392c95e1a3d89266cae2586349150
---
M includes/parser/Preprocessor.php
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
4 files changed, 245 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/333997/1

diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php
index 426b550..cb8e3a7 100644
--- a/includes/parser/Preprocessor.php
+++ b/includes/parser/Preprocessor.php
@@ -51,9 +51,9 @@
],
'-{' => [
'end' => '}-',
-   'names' => [ 1 => null ],
-   'min' => 1,
-   'max' => 1,
+   'names' => [ 2 => null ],
+   'min' => 2,
+   'max' => 2,
],
];
 
diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 661318b..3cdd38c 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -223,8 +223,7 @@
 
$searchBase = "[{<\n"; # }
if ( !$wgDisableLangConversion ) {
-   // FIXME: disabled due to T153761
-   // $searchBase .= '-';
+   $searchBase .= '-';
}
 
// For fast reverse searches
@@ -277,6 +276,13 @@
$search = $searchBase;
if ( $stack->top === false ) {
$currentClosing = '';
+   } else if (
+   $stack->top->close === '}-' &&
+   $stack->top->count > 2
+   ) {
+   # adjust closing for -{{{...{{
+   $currentClosing = '}';
+   $search .= $currentClosing;
} else {
$currentClosing = $stack->top->close;
$search .= $currentClosing;
@@ -333,11 +339,15 @@
} elseif ( isset( 
$this->rules[$curChar] ) ) {
$found = 'open';
$rule = $this->rules[$curChar];
-   } elseif ( $curChar == '-' ) {
-   $found = 'dash';
} else {
-   # Some versions of PHP have a 
strcspn which stops on null characters
-   # Ignore and continue
+   # Some versions of PHP have a 
strcspn which stops on
+   # null characters; ignore these 
and continue.
+   # We also may get '-' and '}' 
characters here which
+   # don't match -{ or 
$currentClosing.  Add these to
+   # output and continue.
+   if ( $curChar == '-' || 
$curChar == '}' ) {
+   $accum .= $curChar;
+   }
++$i;
continue;
}
@@ -615,7 +625,10 @@
} elseif ( $found == 'open' ) {
# count opening brace

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Refactor search fields: use ContentHandler instead of ...

2017-01-24 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333995 )

Change subject: [WIP] Refactor search fields: use ContentHandler instead of 
hooks
..

[WIP] Refactor search fields: use ContentHandler instead of hooks

Change-Id: If9e945a7730a2d9797b8b57ce08dec6b882f588b
---
M repo/Wikibase.php
M repo/includes/Content/EntityHandler.php
M repo/includes/Content/ItemHandler.php
D repo/includes/Hooks/CirrusSearchHookHandlers.php
M repo/includes/Search/Elastic/Fields/LabelCountField.php
M repo/includes/Search/Elastic/Fields/SearchIndexField.php
M repo/includes/Search/Elastic/Fields/SiteLinkCountField.php
M repo/includes/Search/Elastic/Fields/StatementCountField.php
A repo/includes/Search/Elastic/Fields/WikibaseNumericField.php
D repo/tests/phpunit/includes/Hooks/CirrusSearchHookHandlersTest.php
10 files changed, 77 insertions(+), 326 deletions(-)


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

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 732986d..8a4be58 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -402,10 +402,6 @@
$wgHooks['BeforeDisplayNoArticleText'][] = 
'Wikibase\ViewEntityAction::onBeforeDisplayNoArticleText';
$wgHooks['InfoAction'][] = '\Wikibase\RepoHooks::onInfoAction';
 
-   // CirrusSearch hooks
-   $wgHooks['CirrusSearchMappingConfig'][] = 
'Wikibase\Repo\Hooks\CirrusSearchHookHandlers::onCirrusSearchMappingConfig';
-   $wgHooks['CirrusSearchBuildDocumentParse'][] = 
'Wikibase\Repo\Hooks\CirrusSearchHookHandlers::onCirrusSearchBuildDocumentParse';
-
// update hooks
$wgHooks['LoadExtensionSchemaUpdates'][] = 
'\Wikibase\Repo\Store\Sql\ChangesSubscriptionSchemaUpdater::onSchemaUpdate';
 
diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index e4c7269..2ed296b 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -13,8 +13,10 @@
 use MWContentSerializationException;
 use MWException;
 use ParserOptions;
+use ParserOutput;
 use RequestContext;
 use Revision;
+use SearchEngine;
 use Title;
 use User;
 use Wikibase\Content\DeferredDecodingEntityHolder;
@@ -27,6 +29,7 @@
 use Wikibase\EntityContent;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Repo\Diff\EntityContentDiffView;
+use Wikibase\Repo\Search\Elastic\Fields\WikibaseFieldDefinitions;
 use Wikibase\Repo\Store\EntityPerPage;
 use Wikibase\Repo\Validators\EntityConstraintProvider;
 use Wikibase\Repo\Validators\EntityValidator;
@@ -34,6 +37,7 @@
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\TermIndex;
 use Wikibase\Updates\DataUpdateAdapter;
+use WikiPage;
 
 /**
  * Base handler class for Entity content classes.
@@ -52,6 +56,7 @@
 * to parser output.
 */
const PARSER_VERSION = 3;
+   protected $fieldDefinitions;
 
/**
 * @var EntityPerPage
@@ -129,6 +134,8 @@
$this->errorLocalizer = $errorLocalizer;
$this->entityIdParser = $entityIdParser;
$this->legacyExportFormatDetector = $legacyExportFormatDetector;
+   // FIXME: convert to DI
+   $this->fieldDefinitions = new WikibaseFieldDefinitions();
}
 
/**
@@ -331,7 +338,7 @@
 * @param string $blob
 * @param string|null $format
 *
-* @return string|void
+* @return string
 */
public function exportTransform( $blob, $format = null ) {
if ( !$this->legacyExportFormatDetector ) {
@@ -758,4 +765,36 @@
return false;
}
 
+   public function getFieldsForSearchIndex( SearchEngine $engine ) {
+   $fields = [];
+
+   foreach ( $this->fieldDefinitions->getFields() as $name => 
$field ) {
+   $fields[$name] = $field->getMapping( $engine, $name );
+   }
+
+   return $fields;
+   }
+
+   /**
+* @param WikiPage $page
+* @param ParserOutput $output
+* @param SearchEngine $engine
+* @return array
+*/
+   public function getDataForSearchIndex( WikiPage $page, ParserOutput 
$output,
+  SearchEngine $engine ) {
+   $fieldsData = parent::getDataForSearchIndex( $page, $output, 
$engine );
+
+   $content = $page->getContent();
+   if ( ( $content instanceof EntityContent ) && 
!$content->isRedirect() ) {
+   $entity = $content->getEntity();
+   $fields = $this->fieldDefinitions->getFields();
+
+   foreach ( $fields as $fieldName => $field ) {
+   $fieldsData[$fieldName] = $field->getFieldData( 
$entity );
+   }
+   }
+
+   return $fieldsData;
+   }

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix failing keyholder arming check

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/312947 )

Change subject: Fix failing keyholder arming check
..


Fix failing keyholder arming check

The latest version of openssh-client no longer stores or outputs the
key filenames along with the ssh public-key fingerprint as part of
ssh-add -l.

This changes the keyholder check script to just compare public key
fingerprints rather than private-key filenames.

Bug: T154943
Change-Id: Ic6784e505d4734a725bda2a278745cf53575c11f
---
M modules/keyholder/files/check_keyholder
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Alex Monk: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, but someone else must approve
  Hashar: Looks good to me, but someone else must approve
  20after4: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/keyholder/files/check_keyholder 
b/modules/keyholder/files/check_keyholder
index 448d645..2361ddf 100755
--- a/modules/keyholder/files/check_keyholder
+++ b/modules/keyholder/files/check_keyholder
@@ -5,12 +5,14 @@
 
 configured_keys() {
   # Get a sorted list of all key files in /etc/keyholder.d
-  /usr/bin/find /etc/keyholder.d -type f -not -name '*.pub' 2>/dev/null | 
/usr/bin/sort
+  for key in /etc/keyholder.d/*.pub; do
+  /usr/bin/ssh-keygen -l -f "$key" | /usr/bin/cut -d' ' -f2 2>/dev/null;
+  done | sort
 }
 
 active_keys() {
   # Get a sorted list of all keys currently represented by the agent.
-  /usr/bin/ssh-add -l 2>/dev/null | /usr/bin/cut -d' ' -f 3 | /usr/bin/sort
+  /usr/bin/ssh-add -l 2>/dev/null | /usr/bin/cut -d' ' -f 2 | /usr/bin/sort
 }
 
 [ -S "$SSH_AUTH_SOCK" ] || {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6784e505d4734a725bda2a278745cf53575c11f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: wrap long description inputs across multiple lines

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333920 )

Change subject: Fix: wrap long description inputs across multiple lines
..


Fix: wrap long description inputs across multiple lines

Setting the IME options to "actionDone" unexpectedly disables the
multiline wrap behavior of the EditText. Add a workaround to
PlainPasteEditText after the input connection is made

Change-Id: Iea367c06f238c4bf62d01feea631f13bba6d0c15
---
M app/src/main/java/org/wikipedia/views/PlainPasteEditText.java
M app/src/main/res/layout/view_description_edit.xml
2 files changed, 19 insertions(+), 1 deletion(-)

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



diff --git a/app/src/main/java/org/wikipedia/views/PlainPasteEditText.java 
b/app/src/main/java/org/wikipedia/views/PlainPasteEditText.java
index 4dbf47f..227c53e 100644
--- a/app/src/main/java/org/wikipedia/views/PlainPasteEditText.java
+++ b/app/src/main/java/org/wikipedia/views/PlainPasteEditText.java
@@ -5,8 +5,12 @@
 import android.content.Context;
 import android.support.design.widget.TextInputEditText;
 import android.util.AttributeSet;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 
 import org.wikipedia.util.ClipboardUtil;
+
+import static android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE;
 
 public class PlainPasteEditText extends TextInputEditText {
 public PlainPasteEditText(Context context) {
@@ -29,6 +33,20 @@
 return super.onTextContextMenuItem(id);
 }
 
+@Override public InputConnection onCreateInputConnection(EditorInfo 
outAttrs) {
+InputConnection connection = super.onCreateInputConnection(outAttrs);
+
+// For multiline EditTexts that specify a done keyboard action, unset 
the no carriage return
+// flag which otherwise limits the EditText to a single line
+boolean multilineInput = (getInputType() & TYPE_TEXT_FLAG_MULTI_LINE) 
== TYPE_TEXT_FLAG_MULTI_LINE;
+boolean actionDone = (outAttrs.imeOptions & 
EditorInfo.IME_ACTION_DONE) == EditorInfo.IME_ACTION_DONE;
+if (actionDone && multilineInput) {
+outAttrs.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
+}
+
+return connection;
+}
+
 private boolean onTextContextMenuPaste() {
 // Do not allow pasting of formatted text!
 // We do this by intercepting the clipboard and temporarily replacing 
its
diff --git a/app/src/main/res/layout/view_description_edit.xml 
b/app/src/main/res/layout/view_description_edit.xml
index dd6e630..7ec2a27 100644
--- a/app/src/main/res/layout/view_description_edit.xml
+++ b/app/src/main/res/layout/view_description_edit.xml
@@ -120,7 +120,7 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:imeOptions="actionDone"
-android:inputType="text"
+android:inputType="textMultiLine"
 android:hint="@string/description_edit_text_hint"/>
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea367c06f238c4bf62d01feea631f13bba6d0c15
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Rename ArticleHeaderView to PageHeaderView

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333954 )

Change subject: Rename ArticleHeaderView to PageHeaderView
..


Rename ArticleHeaderView to PageHeaderView

Since all pages are not articles, ArticleHeaderView becomes a misnomer. Hence, 
this task has renamed the ArticleHeaderView with PageHeaderView.

Bug: T155920
Change-Id: I3d307164eddea99292070fe7bc8b951628a8df3f
---
R app/src/androidTest/java/org/wikipedia/page/leadimages/PageHeaderViewTest.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
R app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
R app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
M app/src/main/res/layout/fragment_page.xml
R app/src/main/res/layout/view_page_header.xml
R app/src/main/res/layout/view_page_header_image.xml
R app/src/main/res/menu/menu_page_header_edit.xml
9 files changed, 72 insertions(+), 71 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/page/leadimages/ArticleHeaderViewTest.java
 
b/app/src/androidTest/java/org/wikipedia/page/leadimages/PageHeaderViewTest.java
similarity index 98%
rename from 
app/src/androidTest/java/org/wikipedia/page/leadimages/ArticleHeaderViewTest.java
rename to 
app/src/androidTest/java/org/wikipedia/page/leadimages/PageHeaderViewTest.java
index 8b689c2..e0dfc04 100644
--- 
a/app/src/androidTest/java/org/wikipedia/page/leadimages/ArticleHeaderViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/page/leadimages/PageHeaderViewTest.java
@@ -13,7 +13,7 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.Constants;
-import org.wikipedia.page.leadimages.ArticleHeaderView.Callback;
+import org.wikipedia.page.leadimages.PageHeaderView.Callback;
 import org.wikipedia.test.theories.TestedOnBool;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
@@ -38,8 +38,8 @@
 import static org.mockito.Mockito.verify;
 import static org.wikipedia.test.TestUtil.runOnMainSync;
 
-@SmallTest public class ArticleHeaderViewTest extends ViewTest {
-private ArticleHeaderView subject;
+@SmallTest public class PageHeaderViewTest extends ViewTest {
+private PageHeaderView subject;
 
 @Theory public void testLayout(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) 
int widthDp,
// @TestedOn(ints = {HEIGHT_DP_L, 
WIDTH_DP_S}) int heightDp,
@@ -312,7 +312,7 @@
 setUp(widthDp, layoutDirection, fontScale, theme);
 
 Uri imageUri = frescoUri(image.id());
-subject = new ArticleHeaderView(ctx());
+subject = new PageHeaderView(ctx());
 subject.loadImage(imageUri == null ? null : imageUri.toString());
 setTitle(str(title));
 setSubtitle(str(subtitle));
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 4247789..9d1b795 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -55,8 +55,8 @@
 import org.wikipedia.onboarding.PrefsOnboardingStateMachine;
 import org.wikipedia.page.action.PageActionTab;
 import org.wikipedia.page.action.PageActionToolbarHideHandler;
-import org.wikipedia.page.leadimages.ArticleHeaderView;
 import org.wikipedia.page.leadimages.LeadImagesHandler;
+import org.wikipedia.page.leadimages.PageHeaderView;
 import org.wikipedia.page.snippet.CompatActionMode;
 import org.wikipedia.page.snippet.ShareHandler;
 import org.wikipedia.page.tabs.Tab;
@@ -355,8 +355,8 @@
 tocHandler = new ToCHandler(this, tocDrawer, bridge);
 
 // TODO: initialize View references in onCreateView().
-ArticleHeaderView articleHeaderView = findById(getView(), 
R.id.page_header_view);
-leadImagesHandler = new LeadImagesHandler(this, bridge, webView, 
articleHeaderView);
+PageHeaderView pageHeaderView = findById(getView(), 
R.id.page_header_view);
+leadImagesHandler = new LeadImagesHandler(this, bridge, webView, 
pageHeaderView);
 toolbarHideHandler = getSearchBarHideHandler();
 toolbarHideHandler.setScrollView(webView);
 
diff --git 
a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java 
b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index 8ae69bf..fa837c7 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -58,7 +58,7 @@
 @NonNull private final CommunicationBridge bridge;
 @NonNull private final ObservableWebView webView;
 
-@NonNull private final

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1066 for reimage

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333991 )

Change subject: mariadb: Depool db1066 for reimage
..


mariadb: Depool db1066 for reimage

Use temporarely db1083 as 2nd api node.

Bug: T156005
Change-Id: Ie64a1f96798219f1b8c788714ba448d2c34f0036
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ab6acbb..4e98a1e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -98,11 +98,11 @@
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
-   'db1066' => 50,  # D1 2.8TB 160GB, api
+#  'db1066' => 50,  # D1 2.8TB 160GB, api # maintenance T156005
 #  'db1072' => 0,   # D1 2.8TB 160GB #maintenance T156166
'db1073' => 50,  # D1 2.8TB 160GB, api
'db1080' => 500, # A2 3.6TB 512GB
-   'db1083' => 500, # B1 3.6TB 512GB
+   'db1083' => 200, # B1 3.6TB 512GB, temp. api
'db1089' => 500, # C3 3.6TB 512GB
],
's2' => [
@@ -264,8 +264,9 @@
'db1065' => 1,
],
'api' => [
-   'db1066' => 1,
+#  'db1066' => 1,
'db1073' => 1,
+   'db1083' => 1,
],
],
's2' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Fix lint error ModuleLoader defined but not used

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332195 )

Change subject: Fix lint error ModuleLoader defined but not used
..


Fix lint error ModuleLoader defined but not used

Since ModuleLoader is linted it complains that the defined ModuleLoader
is not used anywhere because it is only exposed for testing.

Error: Unused defines from file: resources/mobile.modules/modules.js:
  ModuleLoader

Expose it as a global variable on the mobileFrontend instead

Given that mobile.startup no longer exports a ResourceLoader definition
the test has been updated to remove the test for a non-existence class
in a now non-existent module.

Change-Id: I861f277ade8fe83083c9d1b4dc115b872d190f87
---
M resources/mobile.startup/modules.js
M tests/qunit/mobile.startup/test_modules.js
2 files changed, 4 insertions(+), 8 deletions(-)

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



diff --git a/resources/mobile.startup/modules.js 
b/resources/mobile.startup/modules.js
index 6c93885..6b9a0ab 100644
--- a/resources/mobile.startup/modules.js
+++ b/resources/mobile.startup/modules.js
@@ -109,7 +109,6 @@
mw.mobileFrontend = new ModuleLoader();
 
// inception to support testing (!!)
-   module.exports.ModuleLoader = ModuleLoader;
-   mw.mobileFrontend.define( 'ModuleLoader', ModuleLoader );
+   mw.mobileFrontend.ModuleLoader = ModuleLoader;
 
 }() );
diff --git a/tests/qunit/mobile.startup/test_modules.js 
b/tests/qunit/mobile.startup/test_modules.js
index 86ac0f8..73d7fc9 100644
--- a/tests/qunit/mobile.startup/test_modules.js
+++ b/tests/qunit/mobile.startup/test_modules.js
@@ -1,5 +1,4 @@
-( function ( M ) {
-   var ModuleLoader = M.require( 'ModuleLoader' );
+( function ( ModuleLoader ) {
 
QUnit.module( 'MobileFrontend ModuleLoader', {
setup: function () {
@@ -7,14 +6,12 @@
}
} );
 
-   QUnit.test( '#require', 5, function ( assert ) {
+   QUnit.test( '#require', 4, function ( assert ) {
this.loader.define( 'foo', 1 );
this.loader.define( 'bar', 5 );
 
assert.strictEqual( this.loader.require( 'foo' ), 1, 'Returns 
appropriate module' );
assert.strictEqual( this.loader.require( 'bar' ), 5, 'Returns 
appropriate module' );
-   assert.ok( this.loader.require( 'mobile.startup/ModuleLoader' ),
-   'Retrieving an export from a known ResourceLoader 
module does not throw an exception' );
 
assert.throws( function () {
this.loader.require( 'undefinedmodule' );
@@ -33,4 +30,4 @@
}, 'Cannot define two modules with the same name' );
assert.strictEqual( this.loader.require( 'bar' ), 5, 'Returns 
first definition of module.' );
} );
-}( mw.mobileFrontend ) );
+}( mw.mobileFrontend.ModuleLoader ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I861f277ade8fe83083c9d1b4dc115b872d190f87
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Notification count UI fixes

2017-01-24 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333994 )

Change subject: Notification count UI fixes
..

Notification count UI fixes

Per suggestions by the designer at T152457#2966147:

* Change the border width to 2px;
* Change the notification label font-size to 13px.

Bug: T152457
Change-Id: Ifa0fb68a3ba678148585cca48cdc3b65d27aec65
---
M includes/skins/secondaryButton.mustache
M resources/skins.minerva.base.styles/ui.less
2 files changed, 12 insertions(+), 6 deletions(-)


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

diff --git a/includes/skins/secondaryButton.mustache 
b/includes/skins/secondaryButton.mustache
index 62658b4..d57d176 100644
--- a/includes/skins/secondaryButton.mustache
+++ b/includes/skins/secondaryButton.mustache
@@ -5,7 +5,9 @@
 
-
-{{notificationCount}}
-
+   
+
+   {{notificationCount}}
+   
+   
 
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index bd20f9e..5f9af8e 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -332,19 +332,23 @@
font-weight: bold;
text-align: center;
 
-   span {
+   .circle {
border-radius: @iconSize;
-   border: 1px solid @notificationColorRead;
+   border: 2px solid @notificationColorRead;
box-sizing: border-box;
display: inline-block;
min-width: @iconSize;
padding: 0 5px;
+
+   span {
+   font-size: 13px;
+   }
}
 
&.notification-unseen {
color: @notificationColorUnread;
 
-   span {
+   .circle {
background: @notificationBackgroundUnread;
border-color: @notificationBackgroundUnread;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa0fb68a3ba678148585cca48cdc3b65d27aec65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: branding
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Instrument EventLogging for description editing

2017-01-24 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333993 )

Change subject: Instrument EventLogging for description editing
..

Instrument EventLogging for description editing

Bug: T149915
Change-Id: I45c74605d9fa5bf9036d30bd93f84b17365a3f77
---
M app/src/main/java/org/wikipedia/analytics/EditFunnel.java
M app/src/main/java/org/wikipedia/analytics/FunnelManager.java
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
5 files changed, 77 insertions(+), 14 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/analytics/EditFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/EditFunnel.java
index 5bbd88c..29f912e 100644
--- a/app/src/main/java/org/wikipedia/analytics/EditFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/EditFunnel.java
@@ -11,11 +11,26 @@
 
 public class EditFunnel extends Funnel {
 private static final String SCHEMA_NAME = "MobileWikiAppEdit";
-private static final int REV_ID = 9003125;
+private static final int REV_ID = 16254387;
 
-private final PageTitle title;
+public enum DescriptionEditType {
+NEW("new"),
+EXISTING("existing");
 
-public EditFunnel(WikipediaApp app, PageTitle title) {
+private String logString;
+
+DescriptionEditType(@NonNull String logString) {
+this.logString = logString;
+}
+
+@NonNull public String toLogString() {
+return logString;
+}
+}
+
+@NonNull private final PageTitle title;
+
+public EditFunnel(@NonNull WikipediaApp app, @NonNull PageTitle title) {
 super(app, SCHEMA_NAME, REV_ID, title.getWikiSite());
 this.title = title;
 }
@@ -32,6 +47,13 @@
 );
 }
 
+public void logStart(@NonNull DescriptionEditType type) {
+log(
+"action", "start",
+"wikidataDescriptionEdit", type.toLogString()
+);
+}
+
 public void logPreview() {
 log(
 "action", "preview"
@@ -42,6 +64,13 @@
 log(
 "action", "saved",
 "revID", revID
+);
+}
+
+public void logSaved(@NonNull DescriptionEditType type) {
+log(
+"action", "saved",
+"wikidataDescriptionEdit", type.toLogString()
 );
 }
 
@@ -148,6 +177,20 @@
 );
 }
 
+public void logSaveAttempt(DescriptionEditType type) {
+log(
+"action", "saveAttempt",
+"wikidataDescriptionEdit", type.toLogString()
+);
+}
+
+public void logReady(DescriptionEditType type) {
+log(
+"action", "ready",
+"wikidataDescriptionEdit", type.toLogString()
+);
+}
+
 @Override
 protected JSONObject preprocessData(@NonNull JSONObject eventData) {
 if (User.isLoggedIn()) {
diff --git a/app/src/main/java/org/wikipedia/analytics/FunnelManager.java 
b/app/src/main/java/org/wikipedia/analytics/FunnelManager.java
index 3f7d0e1..3dc98bf 100644
--- a/app/src/main/java/org/wikipedia/analytics/FunnelManager.java
+++ b/app/src/main/java/org/wikipedia/analytics/FunnelManager.java
@@ -1,5 +1,7 @@
 package org.wikipedia.analytics;
 
+import android.support.annotation.NonNull;
+
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.page.PageTitle;
 
@@ -16,7 +18,7 @@
 this.app = app;
 }
 
-public EditFunnel getEditFunnel(PageTitle title) {
+public EditFunnel getEditFunnel(@NonNull PageTitle title) {
 if (!editFunnels.containsKey(title)) {
 editFunnels.put(title, new EditFunnel(app, title));
 }
diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
index cc3586a..6612bbe 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -14,6 +14,7 @@
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.activity.FragmentUtil;
+import org.wikipedia.analytics.EditFunnel;
 import org.wikipedia.csrf.CsrfToken;
 import org.wikipedia.csrf.CsrfTokenClient;
 import org.wikipedia.dataclient.WikiSite;
@@ -46,11 +47,13 @@
 
 private static final String ARG_TITLE = "title";
 
+@NonNull private WikipediaApp app = WikipediaApp.getInstance();
 @BindView(R.id.fragment_description_edit_view) DescriptionEditView 
editView;
 private Unbinder unbinder;
 private PageTitle pageTitle;
 @Nullable private Call editTokenCall;
 @Nullable private

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: WIP Visual diff node type and attribute changes

2017-01-24 Thread Tchanders (Code Review)

Tchanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333992 )

Change subject: WIP Visual diff node type and attribute changes
..

WIP Visual diff node type and attribute changes

Detect and record node type and attribute changes.
To do: work out how to display these

Also display changed sub-trees according to whether
they have content, type and/or attribute changes,
rather than whether they involve content branch
nodes.

Bug: T151404
Bug: T151589
Change-Id: Id00817d05aa08420ad31681eb55ed451ea36ce2f
---
M src/dm/ve.dm.VisualDiff.js
M src/ui/elements/ve.ui.DiffElement.js
2 files changed, 45 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/92/333992/1

diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index c5fad39..48ac90a 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -243,7 +243,7 @@
insertLength,
diffLength = 0,
keepLength = 0,
-   diffInfo = {};
+   diffInfo = [];
 
/**
 * Get the index of the first or last wordbreak in a data array
@@ -436,16 +436,22 @@
!( newNode instanceof ve.dm.ContentBranchNode ) 
) {
 
// There is no content change
+   diffInfo.push( {
+   typeChange: oldNode.type !== 
newNode.type,
+   attributeChange: !ve.compare( 
oldNode.getAttributes(), newNode.getAttributes() )
+   } );
continue;
 
} else if ( !( newNode instanceof 
ve.dm.ContentBranchNode ) ) {
 
// Content was removed
+   diffInfo.push( { replacement: true } );
removeLength = oldNode.length;
 
} else if ( !( oldNode instanceof 
ve.dm.ContentBranchNode ) ) {
 
// Content was inserted
+   diffInfo.push( { replacement: true } );
insertLength = newNode.length;
 
// If we got this far, they are both CBNs
@@ -458,7 +464,11 @@
 
linearDiff = getCleanDiff( linearDiff );
 
-   diffInfo[ i ] = { linearDiff: linearDiff };
+   diffInfo.push( {
+   linearDiff: linearDiff,
+   typeChange: oldNode.type !== 
newNode.type,
+   attributeChange: !ve.compare( 
oldNode.getAttributes(), newNode.getAttributes() )
+   } );
 
// Record how much content was removed and 
inserted
for ( j = 0, jlen = linearDiff.length; j < 
jlen; j++ ) {
diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index d7fad7b..9d87bc1 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -241,7 +241,7 @@
 
// If previous node was found among siblings, insert the 
removed subtree just
// after its corresponding node in the new document. Otherwise 
insert the
-   // removed subtree just inside its parent node's correspondign 
node.
+   // removed subtree just inside its parent node's corresponding 
node.
if ( newPreviousNodeIndex ) {
insertIndex = newNodes[ newPreviousNodeIndex 
].node.getRange().to - nodeRange.from;
} else {
@@ -288,27 +288,38 @@
 * Mark this node as changed and, if it is a content branch node, 
splice in
 * the diff data.
 *
-* @param {number} nodeIndex The index of this node in the subtree 
rooted at
-* this document child
+* @param {number} newNodeIndex The index of the new node in the 
subtree rooted at
+* the new document child
+* @param {number} oldNodeIndex The index of the old node in the 
subtree rooted at
+* the old document child
 */
-   function highlightChangedSubTree( nodeIndex ) {
-   var subTreeRootNode, subTreeRootNodeRangeStart, 
subTreeRootNodeData, annotatedData;
+   function highlightChangedSubTree( newNodeIndex, oldNodeIndex ) {
+   var subTreeRootNode, subTreeRootNodeRangeStart, 
subTreeRootNodeData, annotatedData,
+   subTreeDiffInfo = diffInfo[ k ];
 
// The new node was changed.
// Get data for this node
-   subTreeRootNode = newNodes[ nodeIndex ];
+   subTreeRootNode = newNodes[ newNodeIndex ];

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add .bash_profile to my homedir so my .bashrc works

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333984 )

Change subject: Add .bash_profile to my homedir so my .bashrc works
..


Add .bash_profile to my homedir so my .bashrc works

Change-Id: Id6af9ca88a432b44942988012d9994ef616bcaa4
---
A modules/admin/files/home/demon/.bash_profile
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/files/home/demon/.bash_profile 
b/modules/admin/files/home/demon/.bash_profile
new file mode 100644
index 000..6b304f9
--- /dev/null
+++ b/modules/admin/files/home/demon/.bash_profile
@@ -0,0 +1,5 @@
+#
+
+if [ ~/.bashrc ]; then
+   . ~/.bashrc
+fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6af9ca88a432b44942988012d9994ef616bcaa4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 000942f

2017-01-24 Thread Ppchelko (Code Review)

Ppchelko has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333990 )

Change subject: Update restbase to 000942f
..


Update restbase to 000942f

List of changes:
000942f Bump table dependencies, remove logging that's unnesessary now
xxx Update node module dependencies

Change-Id: I9a64fd0c2b7368d688e3714c3e24c4010fdcc0c9
---
M node_modules/content-type/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
D node_modules/normalize-package-data/test/normalize.js~
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/lib/dbutils.js
M node_modules/restbase-mod-table-cassandra/lib/revisionPolicy.js
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/swagger-ui/package.json
M restbase
14 files changed, 83 insertions(+), 324 deletions(-)

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



diff --git a/node_modules/content-type/package.json 
b/node_modules/content-type/package.json
index b98eea9..aa1bcd3 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b;,
-  "_shasum": "241a59ae56e1c89aefb2ca6908c9dd3411cf7a20",
+  "_shasum": "3ce2d76c982905c4f5212244d9e110b00353c063",
   "_shrinkwrap": null,
   "_spec": 
"content-type@git+https://github.com/wikimedia/content-type.git#master;,
   "_where": "/opt/service",
diff --git a/node_modules/heapdump/build/Makefile 
b/node_modules/heapdump/build/Makefile
index 2f27e5e..80ab260 100644
--- a/node_modules/heapdump/build/Makefile
+++ b/node_modules/heapdump/build/Makefile
@@ -308,8 +308,8 @@
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 
-I/opt/service/node_modules/heapdump/build/config.gypi 
-I/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 -I/root/.node-gyp/6.9.1/include/node/common.gypi "--depth=." "-Goutput_dir=." 
"--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" 
"-Dnode_root_dir=/root/.node-gyp/6.9.1" 
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp"
 "-Dnode_lib_file=node.lib" 
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
-Makefile: 
$(srcdir)/../../../../usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 $(srcdir)/build/config.gypi $(srcdir)/binding.gyp 
$(srcdir)/../../../../root/.node-gyp/6.9.1/include/node/common.gypi
+cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 
-I/opt/service/node_modules/heapdump/build/config.gypi 
-I/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 -I/home/runuser/.node-gyp/6.9.1/include/node/common.gypi "--depth=." 
"-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" 
"-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/6.9.1" 
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp"
 "-Dnode_lib_file=node.lib" 
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
+Makefile: 
$(srcdir)/../../../../home/runuser/.node-gyp/6.9.1/include/node/common.gypi 
$(srcdir)/../../../../usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 $(srcdir)/build/config.gypi $(srcdir)/binding.gyp
$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included
diff --git 
a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
 
b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
index f1c3bd7..e043efc 100644
--- 
a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
+++ 
b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
@@ -1,34 +1,36 @@
-cmd_Release/obj.target/addon/src/heapdump.o := g++ 
'-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' 
'-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' 
'-DBUILDING_NODE_EXTENSION' -I/root/.node-gyp/6.9.1/include/node 
-I/root/.node-gyp/6.9.1/src -I/root/.node-gyp/6.9.1/deps/uv/include 
-I/root/.node-gyp/6.9.1/deps/v8/include  -fPIC -pthread

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1066 for reimage

2017-01-24 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333991 )

Change subject: mariadb: Depool db1066 for reimage
..

mariadb: Depool db1066 for reimage

Use temporarely db1083 as 2nd api node.

Bug: T156005
Change-Id: Ie64a1f96798219f1b8c788714ba448d2c34f0036
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ab6acbb..4e98a1e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -98,11 +98,11 @@
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
-   'db1066' => 50,  # D1 2.8TB 160GB, api
+#  'db1066' => 50,  # D1 2.8TB 160GB, api # maintenance T156005
 #  'db1072' => 0,   # D1 2.8TB 160GB #maintenance T156166
'db1073' => 50,  # D1 2.8TB 160GB, api
'db1080' => 500, # A2 3.6TB 512GB
-   'db1083' => 500, # B1 3.6TB 512GB
+   'db1083' => 200, # B1 3.6TB 512GB, temp. api
'db1089' => 500, # C3 3.6TB 512GB
],
's2' => [
@@ -264,8 +264,9 @@
'db1065' => 1,
],
'api' => [
-   'db1066' => 1,
+#  'db1066' => 1,
'db1073' => 1,
+   'db1083' => 1,
],
],
's2' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 000942f

2017-01-24 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333990 )

Change subject: Update restbase to 000942f
..

Update restbase to 000942f

List of changes:
000942f Bump table dependencies, remove logging that's unnesessary now
xxx Update node module dependencies

Change-Id: I9a64fd0c2b7368d688e3714c3e24c4010fdcc0c9
---
M node_modules/content-type/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
D node_modules/normalize-package-data/test/normalize.js~
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/lib/dbutils.js
M node_modules/restbase-mod-table-cassandra/lib/revisionPolicy.js
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/swagger-ui/package.json
M restbase
14 files changed, 83 insertions(+), 324 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/90/333990/1

diff --git a/node_modules/content-type/package.json 
b/node_modules/content-type/package.json
index b98eea9..aa1bcd3 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -49,7 +49,7 @@
 "/"
   ],
   "_resolved": 
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b;,
-  "_shasum": "241a59ae56e1c89aefb2ca6908c9dd3411cf7a20",
+  "_shasum": "3ce2d76c982905c4f5212244d9e110b00353c063",
   "_shrinkwrap": null,
   "_spec": 
"content-type@git+https://github.com/wikimedia/content-type.git#master;,
   "_where": "/opt/service",
diff --git a/node_modules/heapdump/build/Makefile 
b/node_modules/heapdump/build/Makefile
index 2f27e5e..80ab260 100644
--- a/node_modules/heapdump/build/Makefile
+++ b/node_modules/heapdump/build/Makefile
@@ -308,8 +308,8 @@
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 
-I/opt/service/node_modules/heapdump/build/config.gypi 
-I/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 -I/root/.node-gyp/6.9.1/include/node/common.gypi "--depth=." "-Goutput_dir=." 
"--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" 
"-Dnode_root_dir=/root/.node-gyp/6.9.1" 
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp"
 "-Dnode_lib_file=node.lib" 
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
-Makefile: 
$(srcdir)/../../../../usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 $(srcdir)/build/config.gypi $(srcdir)/binding.gyp 
$(srcdir)/../../../../root/.node-gyp/6.9.1/include/node/common.gypi
+cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 
-I/opt/service/node_modules/heapdump/build/config.gypi 
-I/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 -I/home/runuser/.node-gyp/6.9.1/include/node/common.gypi "--depth=." 
"-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" 
"-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/6.9.1" 
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp"
 "-Dnode_lib_file=node.lib" 
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
+Makefile: 
$(srcdir)/../../../../home/runuser/.node-gyp/6.9.1/include/node/common.gypi 
$(srcdir)/../../../../usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 $(srcdir)/build/config.gypi $(srcdir)/binding.gyp
$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included
diff --git 
a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
 
b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
index f1c3bd7..e043efc 100644
--- 
a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
+++ 
b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
@@ -1,34 +1,36 @@
-cmd_Release/obj.target/addon/src/heapdump.o := g++ 
'-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' 
'-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' 
'-DBUILDING_NODE_EXTENSION' -I/root/.node-gyp/6.9.1/include/node 
-I/root/.node-gyp/6.9.1/src -I/root/.node-gyp/6.9.1/deps/uv/include

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove getWikiBaseItemId util

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332923 )

Change subject: Hygiene: Remove getWikiBaseItemId util
..


Hygiene: Remove getWikiBaseItemId util

Method is not used anywhere.

Bug: T155595
Change-Id: Ic3aaf95791a8e85efa56408ef2a40ed9cac1d4bd
---
M resources/mobile.startup/util.js
1 file changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/resources/mobile.startup/util.js b/resources/mobile.startup/util.js
index 95d7bc8..473722e 100644
--- a/resources/mobile.startup/util.js
+++ b/resources/mobile.startup/util.js
@@ -19,23 +19,6 @@
 */
escapeHash: function ( hash ) {
return hash.replace( /(:|\.)/g, '\\$1' );
-   },
-   /**
-* Return wgWikiBaseItemID config variable or 'wikidataid' 
query parameter if exits
-* @return {null|string}
-*/
-   getWikiBaseItemId: function () {
-   var id = mw.config.get( 'wgWikibaseItemId' ),
-   idOverride;
-
-   if ( !id ) {
-   idOverride = mw.util.getParamValue( 
'wikidataid' );
-   if ( idOverride ) {
-   mw.config.set( 'wgWikibaseItemId', 
idOverride );
-   id = idOverride;
-   }
-   }
-   return id;
}
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3aaf95791a8e85efa56408ef2a40ed9cac1d4bd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...deploy[master]: Bump striker submodule

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333989 )

Change subject: Bump striker submodule
..


Bump striker submodule

* b25908f Add link to OATH documentation on wikitech

Change-Id: I4423df11fa37704bbcd685cc046e32d9ebfa2d9f
---
M striker
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/striker b/striker
index 8f7540d..b25908f 16
--- a/striker
+++ b/striker
@@ -1 +1 @@
-Subproject commit 8f7540d7b7976884942c23e17303a5a9d3b239a2
+Subproject commit b25908f191a23ef9936f43b9455b3a901b07fdee

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4423df11fa37704bbcd685cc046e32d9ebfa2d9f
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker/deploy
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...deploy[master]: Bump striker submodule

2017-01-24 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333989 )

Change subject: Bump striker submodule
..

Bump striker submodule

* b25908f Add link to OATH documentation on wikitech

Change-Id: I4423df11fa37704bbcd685cc046e32d9ebfa2d9f
---
M striker
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker/deploy 
refs/changes/89/333989/1

diff --git a/striker b/striker
index 8f7540d..b25908f 16
--- a/striker
+++ b/striker
@@ -1 +1 @@
-Subproject commit 8f7540d7b7976884942c23e17303a5a9d3b239a2
+Subproject commit b25908f191a23ef9936f43b9455b3a901b07fdee

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4423df11fa37704bbcd685cc046e32d9ebfa2d9f
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker/deploy
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[es5]: Update browsertest search profile for es5

2017-01-24 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333988 )

Change subject: Update browsertest search profile for es5
..

Update browsertest search profile for es5

The browser tests were still using a coordination factor. Updating to
es5 removes that coordination factor and caused a few changes to the
browser test results. Update weights so we get the expected results.

Bug: T155671
Change-Id: Ia65d11d170c9c782e37944fa84330868c42bea56
---
M profiles/FullTextQueryBuilderProfiles.config.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/profiles/FullTextQueryBuilderProfiles.config.php 
b/profiles/FullTextQueryBuilderProfiles.config.php
index ee97d4e..ddfd106 100644
--- a/profiles/FullTextQueryBuilderProfiles.config.php
+++ b/profiles/FullTextQueryBuilderProfiles.config.php
@@ -54,7 +54,7 @@
// include them in a dismax with redirects
'suggest' => [
'is_plain' => true,
-   'boost' => 2.1,
+   'boost' => 1.05,
'in_dismax' => 'redirects_or_shingles',
],
// category should win over heading/opening
@@ -75,9 +75,9 @@
],
'phrase_rescore_fields' => [
// Low boost to counter high phrase rescore 
boost
-   'text' => 0.07,
+   'text' => 0.14,
// higher on text.plain for 
tests/browser/features/relevancy_api.feature:106
-   'text.plain' => 0.1,
+   'text.plain' => 0.2,
],
'dismax_settings' => [
// Use a tie breaker, avg field length is so

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia65d11d170c9c782e37944fa84330868c42bea56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: es5
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Add a favicon (using the wmf one)

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333080 )

Change subject: dumps: Add a favicon (using the wmf one)
..


dumps: Add a favicon (using the wmf one)

Change-Id: I7a2482d5ace3baa6d16ba0d1ade8d1e0fa7687e7
---
A modules/dumps/files/favicon.ico
M modules/dumps/manifests/init.pp
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/dumps/files/favicon.ico b/modules/dumps/files/favicon.ico
new file mode 100644
index 000..2cb5073
--- /dev/null
+++ b/modules/dumps/files/favicon.ico
Binary files differ
diff --git a/modules/dumps/manifests/init.pp b/modules/dumps/manifests/init.pp
index a157d3b..db43ecf 100644
--- a/modules/dumps/manifests/init.pp
+++ b/modules/dumps/manifests/init.pp
@@ -25,4 +25,11 @@
 mode=> '0444',
 require => Package['nginx-extras'],
 }
+
+file { '/data/xmldatadumps/public/favicon.ico':
+source => 'puppet:///modules/dumps/favicon.ico',
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a2482d5ace3baa6d16ba0d1ade8d1e0fa7687e7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Document page property names

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333805 )

Change subject: Document page property names
..


Document page property names

This should protect us when we consider renaming these variables
in future.

Bug: T152239
Change-Id: I227ffd0867f797d6a450b8b51759338cff7ee3a8
---
M includes/PageImages.php
1 file changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/includes/PageImages.php b/includes/PageImages.php
index 8081ffa..8eda85f 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -12,16 +12,24 @@
 * Page property used to store the best page image information.
 * If the best image is the same as the best image with free license,
 * then nothing is stored under this property.
+* Note changing this value is not advised as it will invalidate all
+* existing page property names on a production instance
+* and cause them to be regenerated.
 * @see PageImages::PROP_NAME_FREE
 */
const PROP_NAME = 'page_image';
/**
 * Page property used to store the best free page image information
+* Note changing this value is not advised as it will invalidate all
+* existing page property names on a production instance
+* and cause them to be regenerated.
 */
const PROP_NAME_FREE = 'page_image_free';
 
/**
-* Get property name used in page_props table
+* Get property name used in page_props table. When a page image
+* is stored it will be stored under this property name on the 
corresponding
+* article.
 *
 * @param bool $isFree Whether the image is a free-license image
 * @return string

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I227ffd0867f797d6a450b8b51759338cff7ee3a8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics...deploy[master]: Update AQS scap configuration

2017-01-24 Thread Nuria (Code Review)

Nuria has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333905 )

Change subject: Update AQS scap configuration
..


Update AQS scap configuration

- Added the new aqs100[789] hosts
- Removed the old ones (aqs100[123])
- Added explicit de-pooling/pooling during deployments
  to avoid user impact.
- Serialized deployment to one host at the time (group_size).
- Added aqs1004 as production canary.

Bug: T156049
Change-Id: I6ae9e1d1f998886d86b806ca41c852ea95ed94e2
---
M scap/aqs-prod
A scap/aqs-prod-canary
M scap/checks.yaml
M scap/scap.cfg
4 files changed, 18 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Looks good to me, but someone else must approve
  Nuria: Verified; Looks good to me, approved



diff --git a/scap/aqs-prod b/scap/aqs-prod
index 4ae1754..cca75b5 100644
--- a/scap/aqs-prod
+++ b/scap/aqs-prod
@@ -1,6 +1,6 @@
-aqs1001.eqiad.wmnet
-aqs1002.eqiad.wmnet
-aqs1003.eqiad.wmnet
-aqs1004.eqiad.wmnet
+# aqs1004.eqiad.wmnet is a canary
 aqs1005.eqiad.wmnet
 aqs1006.eqiad.wmnet
+aqs1007.eqiad.wmnet
+aqs1008.eqiad.wmnet
+aqs1009.eqiad.wmnet
diff --git a/scap/aqs-prod-canary b/scap/aqs-prod-canary
new file mode 100644
index 000..402154a
--- /dev/null
+++ b/scap/aqs-prod-canary
@@ -0,0 +1 @@
+aqs1004.eqiad.wmnet
diff --git a/scap/checks.yaml b/scap/checks.yaml
index 1dc3a41..10d9d14 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -3,3 +3,11 @@
 type: nrpe
 stage: restart_service
 command: check_endpoints_aqs
+  depool:
+type: command
+stage: promote
+command: depool-aqs
+  repool:
+type: command
+stage: restart_service
+command: pool-aqs
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 650947b..9941f76 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -19,6 +19,9 @@
 service_name: aqs
 service_port: 7232
 
+# Serialize deployments to one host at the time
+group_size: 1
+
 # Lock file to prevent multiple concurrent deploys
 lock_file: /tmp/scap.aqs.lock
 
@@ -28,4 +31,6 @@
 
 [wmnet]
 git_server: tin.eqiad.wmnet
+server_groups: canary, default
+canary_dsh_targets: aqs-prod-canary
 dsh_targets: aqs-prod

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ae9e1d1f998886d86b806ca41c852ea95ed94e2
Gerrit-PatchSet: 5
Gerrit-Project: analytics/aqs/deploy
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: change drbd link over to /30 192.168

2017-01-24 Thread Rush (Code Review)

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333986 )

Change subject: labstore: change drbd link over to /30 192.168
..


labstore: change drbd link over to /30 192.168

Here I am changing the old mechanism to stop assuming
the address is to be resolved.  It seems more prudent to
protect the drbd.d configs from DNS issues, and also
I am changing this to match the reality of the setup now
post direct connection.

Change-Id: Ie3dc34ba61e189b688dba0dec8727f8fa7972ad4
---
M modules/labstore/templates/drbd/drbd_resource.res.erb
M modules/role/manifests/labs/nfs/secondary.pp
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/modules/labstore/templates/drbd/drbd_resource.res.erb 
b/modules/labstore/templates/drbd/drbd_resource.res.erb
index 8d25202..74c4bf2 100644
--- a/modules/labstore/templates/drbd/drbd_resource.res.erb
+++ b/modules/labstore/templates/drbd/drbd_resource.res.erb
@@ -2,14 +2,14 @@
 
   on <%= @drbd_hosts.first %> {
 device<%= @device %>;
-address   <%= scope.function_ipresolve([@drbd_cluster[@drbd_hosts.first], 
4]) %>:<%= @port %>;
+address   <%= @drbd_cluster[@drbd_hosts.first] %>:<%= @port %>;
 disk  <%= @disk %>;
 meta-disk internal;
   }
 
   on <%= @drbd_hosts.last %> {
 device<%= @device %>;
-address   <%= scope.function_ipresolve([@drbd_cluster[@drbd_hosts.last], 
4]) %>:<%= @port %>;
+address   <%= @drbd_cluster[@drbd_hosts.last] %>:<%= @port %>;
 disk  <%= @disk %>;
 meta-disk internal;
   }
diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index 79bb4bd..ecc5ee8 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -22,8 +22,8 @@
 
 interface::ip { 'drbd-replication':
 interface => 'eth1',
-address   => '10.64.37.26',
-prefixlen => '24',
+address   => '192.168.0.2',
+prefixlen => '30',
 require   => Interface::Manual['eth1'],
 }
 }
@@ -34,8 +34,8 @@
 
 interface::ip { 'drbd-replication':
 interface => 'eth1',
-address   => '10.64.37.25',
-prefixlen => '24',
+address   => '192.168.0.1',
+prefixlen => '30',
 require   => Interface::Manual['eth1'],
 }
 }
@@ -71,8 +71,8 @@
 
 $drbd_defaults = {
 'drbd_cluster' => {
-'labstore1004' => 'eth1.labstore1004.eqiad.wmnet',
-'labstore1005' => 'eth1.labstore1005.eqiad.wmnet',
+'labstore1004' => '192.168.0.1',
+'labstore1005' => '192.168.0.2',
 },
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3dc34ba61e189b688dba0dec8727f8fa7972ad4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: designate/glance/keystone not in autoload module

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332955 )

Change subject: openstack: designate/glance/keystone not in autoload module
..


openstack: designate/glance/keystone not in autoload module

Change-Id: I1af45f39994e350277ded63d644c2943f80f6ead
---
R modules/role/manifests/labs/openstack/designate/server.pp
R modules/role/manifests/labs/openstack/glance/server.pp
R modules/role/manifests/labs/openstack/keystone/server.pp
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/labs/openstack/designate.pp 
b/modules/role/manifests/labs/openstack/designate/server.pp
similarity index 100%
rename from modules/role/manifests/labs/openstack/designate.pp
rename to modules/role/manifests/labs/openstack/designate/server.pp
diff --git a/modules/role/manifests/labs/openstack/glance.pp 
b/modules/role/manifests/labs/openstack/glance/server.pp
similarity index 100%
rename from modules/role/manifests/labs/openstack/glance.pp
rename to modules/role/manifests/labs/openstack/glance/server.pp
diff --git a/modules/role/manifests/labs/openstack/keystone.pp 
b/modules/role/manifests/labs/openstack/keystone/server.pp
similarity index 100%
rename from modules/role/manifests/labs/openstack/keystone.pp
rename to modules/role/manifests/labs/openstack/keystone/server.pp

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1af45f39994e350277ded63d644c2943f80f6ead
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Juniorsys 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: repool db1065 as dump/vslow & clean up s1 comments

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333976 )

Change subject: mariadb: repool db1065 as dump/vslow & clean up s1 comments
..


mariadb: repool db1065 as dump/vslow & clean up s1 comments

Also change s1 weights to be sensible after some forgotten patches.

Bug: T155999
Change-Id: Ica098472e9c2d5aa6acff14304fe9783524202e4
---
M wmf-config/db-eqiad.php
1 file changed, 20 insertions(+), 21 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5891e9c..ab6acbb 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -93,17 +93,17 @@
 
 'sectionLoads' => [
's1' => [
-   'db1057' => 0,   # 2.8TB  96GB, master #C2
-#  'db1052' => 1,   # 2.8TB  96GB, old master #Temporary master 
for db1095 - new sanitarium #T150960 #B3
-   'db1051' => 1,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager #B3
-   'db1055' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager #C2
-#  'db1065' => 50,  # 2.8TB 160GB, api #D1 #Maintenance T156006
-   'db1066' => 50,  # 2.8TB 160GB, api #D1
-#  'db1072' => 0,   # 2.8TB 160GB, vslow, dump #D1 #T156006
-   'db1073' => 50,  # 2.8TB 160GB, api #D1
-   'db1080' => 100, # 3.6TB 512GB #A2
-   'db1083' => 500, # 3.6TB 512GB #B1
-   'db1089' => 500, # 3.6TB 512GB #C3
+   'db1057' => 0,   # C2 2.8TB  96GB, master
+#  'db1052' => 1,   # B3 2.8TB  96GB, old master #maintenance 
T156008
+   'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
+   'db1066' => 50,  # D1 2.8TB 160GB, api
+#  'db1072' => 0,   # D1 2.8TB 160GB #maintenance T156166
+   'db1073' => 50,  # D1 2.8TB 160GB, api
+   'db1080' => 500, # A2 3.6TB 512GB
+   'db1083' => 500, # B1 3.6TB 512GB
+   'db1089' => 500, # C3 3.6TB 512GB
],
's2' => [
'db1018' => 0,   # 1.4TB  64GB, master
@@ -239,34 +239,33 @@
's1' => [
'watchlist' => [
'db1051' => 1,
-   'db1055' => 2,
+   'db1055' => 1,
],
'recentchanges' => [
'db1051' => 1,
-   'db1055' => 2,
+   'db1055' => 1,
],
'recentchangeslinked' => [
'db1051' => 1,
-   'db1055' => 2,
+   'db1055' => 1,
],
'contributions' => [
'db1051' => 1,
-   'db1055' => 2,
+   'db1055' => 1,
],
'logpager' => [
'db1051' => 1,
-   'db1055' => 2,
+   'db1055' => 1,
],
'dump' => [
-   'db1080' => 1,
+   'db1065' => 1,
],
'vslow' => [
-   'db1080' => 1,
+   'db1065' => 1,
],
'api' => [
-#  'db1065' => 5,
-   'db1066' => 5,
-   'db1073' => 5,
+   'db1066' => 1,
+   'db1073' => 1,
],
],
's2' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: instancersync not in autoload module layout

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332954 )

Change subject: openstack: instancersync not in autoload module layout
..


openstack: instancersync not in autoload module layout

Change-Id: I0e89b1be4068c705bb7bf15b8c7c15a87e1fc434
---
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/instancersync.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/openstack/manifests/nova/compute.pp 
b/modules/openstack/manifests/nova/compute.pp
index 9129c34..35061cd 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -74,7 +74,7 @@
 use_chroot => 'no',
 }
 # Support rsyncing instance files between labvirts.
-@@instancersync { "${::hostname}instancersync":
+@@openstack::nova::instancersync { "${::hostname}instancersync":
 hostname => $::hostname,
 }
 Instancersync <<| |>>
diff --git a/modules/openstack/manifests/nova/instancersync.pp 
b/modules/openstack/manifests/nova/instancersync.pp
index 9827fdd..71ebdad 100644
--- a/modules/openstack/manifests/nova/instancersync.pp
+++ b/modules/openstack/manifests/nova/instancersync.pp
@@ -1,5 +1,5 @@
 # defines an rsync server on an instance
-define instancersync (
+define openstack::nova::instancersync (
 $hostname = undef) {
 
 rsync::server::module { "nova_instance_rsync_${hostname}":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e89b1be4068c705bb7bf15b8c7c15a87e1fc434
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Juniorsys 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Horizon: Add mitaka version of the puppetpanel.

2017-01-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333987 )

Change subject: Horizon:  Add mitaka version of the puppetpanel.
..


Horizon:  Add mitaka version of the puppetpanel.

No doubt this will require some future tweaking.

Change-Id: I916270346bf4eed9bea1ff0dfe430379bb66267e
---
A modules/openstack/files/mitaka/horizon/puppettab/__init__.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/prefixpanel.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/urls.py
A modules/openstack/files/mitaka/horizon/puppettab/projectpanel.py
A modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
A modules/openstack/files/mitaka/horizon/puppettab/puppet_roles.py
A modules/openstack/files/mitaka/horizon/puppettab/puppet_tables.py
A 
modules/openstack/files/mitaka/horizon/puppettab/static/dashboard/puppet/puppet.scss
A modules/openstack/files/mitaka/horizon/puppettab/tab.py
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_apply.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_detail_puppet.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_edithiera.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_editotherclasses.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_hiera.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_other_classes.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_remove.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_removeprefix.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/apply.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/edithiera.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/editotherclasses.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/plus_tab.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/prefix_panel.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/project_panel.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/remove.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/removeprefix.html
A modules/openstack/files/mitaka/horizon/puppettab/urls.py
A modules/openstack/files/mitaka/horizon/puppettab/views.py
29 files changed, 1,426 insertions(+), 0 deletions(-)

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



diff --git a/modules/openstack/files/mitaka/horizon/puppettab/__init__.py 
b/modules/openstack/files/mitaka/horizon/puppettab/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/puppettab/__init__.py
diff --git 
a/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py 
b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py
diff --git 
a/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py 
b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py
new file mode 100644
index 000..73b1776
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py
@@ -0,0 +1,64 @@
+# Copyright (c) 2016 Andrew Bogott for Wikimedia Foundation
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+import logging
+import re
+
+from django import template
+from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
+
+from wikimediapuppettab.puppet_config import puppet_config
+
+from horizon import exceptions
+from horizon import tabs
+
+logging.basicConfig()
+LOG = logging.getLogger(__name__)
+
+
+class PlusTab(tabs.Tab):
+name = _("+")
+slug = "puppetprefixplus"
+template_name = "project/puppet/plus_tab.html"
+prefix_name = False
+
+def __init__(self, *args, **kwargs):
+if 'tenant_id' in kwargs:
+self.tenant_id = kwargs['tenant_id']
+del

[MediaWiki-commits] [Gerrit] operations/puppet[production]: delete dumps.wikimedia.org SSL cert

2017-01-24 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333833 )

Change subject: delete dumps.wikimedia.org SSL cert
..


delete dumps.wikimedia.org SSL cert

replaced by Letsencrypt. Not needed anymore.
Don't forget to delete key in private repo too.

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

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



diff --git a/files/ssl/dumps.wikimedia.org.crt 
b/files/ssl/dumps.wikimedia.org.crt
deleted file mode 100644
index 7e04e79..000
--- a/files/ssl/dumps.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFSDCCBDCgAwIBAgISESHHodmEG6aWLluEPhIvg+s9MA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUxMjIzMTkwNjE0WhcNMTcwNDI2MTA0NzM4WjB9MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHDAaBgNV
-BAMTE2R1bXBzLndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDIUsiJIMzv38vS9P+VJVWVB1JzNve6eyMMZ6cO86awtLiKE2P/PChW
-8lUFXFfPuhXycbJ2Dycwor/UxL9XMUnd5ckCDkRCBDpuJtFq1XjYgixlj5YIjJMJ
-3jSbxGtRzPFDmsVGlrjdAZ6D264JByl7mqttZhDdu58RFEvfnubfuZ10ioAlRqy6
-DkPbnEI4ycSNteTqEnQZWU8rtdiu8kPcBeDEuCgqqXD1mkabJMYQV5bxHed6RWo2
-SZyMJudh8/UnD552t5h+LhkiKTtResaGKb6B0ZaYP8diI3SxF1Lqb+Hs5MpuXoW9
-qQdV4U7IyILBv2IK+FI4oQZS/XaPVBx7AgMBAAGjggHXMIIB0zAOBgNVHQ8BAf8E
-BAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6
-Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wHgYDVR0RBBcwFYITZHVt
-cHMud2lraW1lZGlhLm9yZzAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmdsb2JhbHNp
-Z24uY29tL2dzL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyLmNybDCBoAYIKwYBBQUH
-AQEEgZMwgZAwTQYIKwYBBQUHMAKGQWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5j
-b20vY2FjZXJ0L2dzb3JnYW5pemF0aW9udmFsc2hhMmcycjEuY3J0MD8GCCsGAQUF
-BzABhjNodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252
-YWxzaGEyZzIwHQYDVR0OBBYEFKcK885oqxfYFjbkaztJQbRnzZMQMB8GA1UdIwQY
-MBaAFJbeYfG9HBYpUxzAzH07gwBA5hp8MA0GCSqGSIb3DQEBCwUAA4IBAQA6Qbu5
-DF1JAueUNx52rG/i412C3Kz0vZGq6zkmX9IDqgU2ZWSaicMCaTJDYR61gE/BSYsg
-mOlWSTPrXeLzPwNWDeL0d7G9IXHDpJCXFmGETd3FoiSstA1gLann6FACVouZIdNf
-jUf0M2jCloNGa974QN9vl5rQq091Q49VxeHHuI2ZBq45kFl9f312P1UNPnx0LULs
-/vXv1Yg/Z081GdwhDshTGGwDAUf3L3NZ1f+SzJVqnKkcpj1MPoSXVdAmWbNgT5Yg
-KjOkQglKOa0CetfZupoHQzGdyO9jBaTeMtluAHVuaSFbAgqNZ40+HHdrGdnxKzOs
-nJX7wXnvGZ8Y4sCA
--END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cda1942704ad747b8c0e6fe0801e8a71f322f89
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Horizon: Add mitaka version of the puppetpanel.

2017-01-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333987 )

Change subject: Horizon:  Add mitaka version of the puppetpanel.
..

Horizon:  Add mitaka version of the puppetpanel.

No doubt this will require some future tweaking.

Change-Id: I916270346bf4eed9bea1ff0dfe430379bb66267e
---
A modules/openstack/files/mitaka/horizon/puppettab/__init__.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/prefixpanel.py
A modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/urls.py
A modules/openstack/files/mitaka/horizon/puppettab/projectpanel.py
A modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
A modules/openstack/files/mitaka/horizon/puppettab/puppet_roles.py
A modules/openstack/files/mitaka/horizon/puppettab/puppet_tables.py
A 
modules/openstack/files/mitaka/horizon/puppettab/static/dashboard/puppet/puppet.scss
A modules/openstack/files/mitaka/horizon/puppettab/tab.py
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_apply.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_detail_puppet.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_edithiera.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_editotherclasses.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_hiera.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_other_classes.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_remove.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/_removeprefix.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/apply.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/edithiera.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/editotherclasses.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/plus_tab.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/prefix_panel.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/project_panel.html
A modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/remove.html
A 
modules/openstack/files/mitaka/horizon/puppettab/templates/puppet/removeprefix.html
A modules/openstack/files/mitaka/horizon/puppettab/urls.py
A modules/openstack/files/mitaka/horizon/puppettab/views.py
29 files changed, 1,426 insertions(+), 0 deletions(-)


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

diff --git a/modules/openstack/files/mitaka/horizon/puppettab/__init__.py 
b/modules/openstack/files/mitaka/horizon/puppettab/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/puppettab/__init__.py
diff --git 
a/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py 
b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/__init__.py
diff --git 
a/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py 
b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py
new file mode 100644
index 000..73b1776
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/puppettab/prefixpanel/plustab.py
@@ -0,0 +1,64 @@
+# Copyright (c) 2016 Andrew Bogott for Wikimedia Foundation
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+import logging
+import re
+
+from django import template
+from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
+
+from wikimediapuppettab.puppet_config import puppet_config
+
+from horizon import exceptions
+from horizon import tabs
+
+logging.basicConfig()
+LOG = logging.getLogger(__name__)
+
+
+class PlusTab(tabs.Tab):
+name = _("+")
+slug = "puppetprefixplus"
+template_name = "project/puppet/plus_tab.html"
+prefix_name = False
+
+def __init__(self, *args, **kwargs):
+if 'tenant_id' in kwargs:
+self.tenant_id = kwargs['tenant_id']
+del

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

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333985 )

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


group0 wikis to 1.29.0-wmf.9

Change-Id: I5616491abb6a6967fee94b844c2f51d10d121333
---
M php
M wikiversions.json
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/php b/php
index 335052b..5e4c17d 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.8
\ No newline at end of file
+php-1.29.0-wmf.9
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 3cefeec..0de7b09 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -481,7 +481,7 @@
 "maiwiki": "php-1.29.0-wmf.8",
 "map_bmswiki": "php-1.29.0-wmf.8",
 "mdfwiki": "php-1.29.0-wmf.8",
-"mediawikiwiki": "php-1.29.0-wmf.8",
+"mediawikiwiki": "php-1.29.0-wmf.9",
 "metawiki": "php-1.29.0-wmf.8",
 "mgwiki": "php-1.29.0-wmf.8",
 "mgwikibooks": "php-1.29.0-wmf.8",
@@ -751,9 +751,9 @@
 "tawiktionary": "php-1.29.0-wmf.8",
 "tcywiki": "php-1.29.0-wmf.8",
 "tenwiki": "php-1.29.0-wmf.8",
-"test2wiki": "php-1.29.0-wmf.8",
-"testwiki": "php-1.29.0-wmf.8",
-"testwikidatawiki": "php-1.29.0-wmf.8",
+"test2wiki": "php-1.29.0-wmf.9",
+"testwiki": "php-1.29.0-wmf.9",
+"testwikidatawiki": "php-1.29.0-wmf.9",
 "tetwiki": "php-1.29.0-wmf.8",
 "tewiki": "php-1.29.0-wmf.8",
 "tewikibooks": "php-1.29.0-wmf.8",
@@ -883,7 +883,7 @@
 "zawikiquote": "php-1.29.0-wmf.8",
 "zawiktionary": "php-1.29.0-wmf.8",
 "zeawiki": "php-1.29.0-wmf.8",
-"zerowiki": "php-1.29.0-wmf.8",
+"zerowiki": "php-1.29.0-wmf.9",
 "zh_classicalwiki": "php-1.29.0-wmf.8",
 "zh_min_nanwiki": "php-1.29.0-wmf.8",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.8",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5616491abb6a6967fee94b844c2f51d10d121333
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Added clear error message when SocialProfile extension is no...

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333964 )

Change subject: Added clear error message when SocialProfile extension is not 
installed.
..


Added clear error message when SocialProfile extension is not installed.

Bug: T155405
Change-Id: I2a756bff6a6a131275bc568dc18aab703390a472
---
M SpecialAdminPoll.php
M SpecialCreatePoll.php
M SpecialUpdatePoll.php
M i18n/en.json
M i18n/qqq.json
5 files changed, 24 insertions(+), 2 deletions(-)

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



diff --git a/SpecialAdminPoll.php b/SpecialAdminPoll.php
index 2182aac..76cde69 100644
--- a/SpecialAdminPoll.php
+++ b/SpecialAdminPoll.php
@@ -30,6 +30,12 @@
$request = $this->getRequest();
$user = $this->getUser();
 
+   // https://phabricator.wikimedia.org/T155405
+   // Throws error message when SocialProfile extension is not 
installed
+   if( !class_exists( 'UserStats' ) ) {
+   throw new ErrorPageError( 
'poll-error-socialprofile-title', 'poll-error-socialprofile' );
+   }
+
// If the user doesn't have the required permission, display an 
error
if( !$user->isAllowed( 'polladmin' ) ) {
throw new PermissionsError( 'polladmin' );
@@ -306,4 +312,4 @@
protected function getGroupName() {
return 'poll';
}
-}
\ No newline at end of file
+}
diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php
index 0445126..32815f7 100644
--- a/SpecialCreatePoll.php
+++ b/SpecialCreatePoll.php
@@ -31,6 +31,12 @@
 
$wgSupressPageTitle = true;
 
+   // https://phabricator.wikimedia.org/T155405
+   // Throws error message when SocialProfile extension is not 
installed
+   if( !class_exists( 'UserStats' ) ) {
+   throw new ErrorPageError( 
'poll-error-socialprofile-title', 'poll-error-socialprofile' );
+   }
+
// Blocked users cannot create polls
if( $user->isBlocked() ) {
throw new UserBlockedError( $user->getBlock() );
diff --git a/SpecialUpdatePoll.php b/SpecialUpdatePoll.php
index f198937..5f7ee29 100644
--- a/SpecialUpdatePoll.php
+++ b/SpecialUpdatePoll.php
@@ -19,6 +19,12 @@
$request = $this->getRequest();
$user = $this->getUser();
 
+   // https://phabricator.wikimedia.org/T155405
+   // Throws error message when SocialProfile extension is not 
installed
+   if( !class_exists( 'UserStats' ) ) {
+   throw new ErrorPageError( 
'poll-error-socialprofile-title', 'poll-error-socialprofile' );
+   }
+
// Show a message if the database is in read-only mode
if ( wfReadOnly() ) {
$out->readOnlyPage();
@@ -202,4 +208,4 @@
";
return $form;
}
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index f50bfd1..cd22b6b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,6 +14,8 @@
"poll-admin-closed": "Closed",
"poll-admin-flagged": "Flagged",
"poll-admin-open": "Open",
+   "poll-error-socialprofile": 
"[https://www.mediawiki.org/wiki/Extension:SocialProfile SocialProfile 
extension] is not installed. Please install this extension and try again.",
+   "poll-error-socialprofile-title": "SocialProfile extension is not 
installed.",
"poll-admin-panel": "Admin",
"poll-admin-status-nav": "Filter by status",
"poll-admin-title-all": "Poll admin - View all polls",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6c37f56..25bc157 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,6 +18,8 @@
"poll-admin-closed": "Link title; clicking on this link shows all 
closed polls.\n{{Identical|Closed}}",
"poll-admin-flagged": "Link title; clicking on this link shows all 
flagged polls.\n{{Identical|Flagged}}",
"poll-admin-open": "Link title; clicking on this link shows all open 
polls.\n{{Identical|Open}}",
+   "poll-error-socialprofile": "Error message shown when SocialProfle 
extension is not installed.",
+   "poll-error-socialprofile-title": "Title for 
poll-error-socialprofile.",
"poll-admin-panel": "Title of the admin panel link; shown on all Poll: 
pages, below the box {{msg-mw|poll-submitted-by}}.\n{{Identical|Admin}}",
"poll-admin-status-nav": "Title of the right-hand navigation menu on 
[[Special:AdminPoll]].\n\nFollowed by the following link texts:\n* 
{{msg-mw|Poll-admin-viewall}}\n* {{msg-mw|Poll-admin-open}}\n* 
{{msg-mw|Poll-admin-closed}}\n* {{msg-mw|Poll-admin-flagged}}",
"poll-admin-title-all": "Default title of

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: change drbd link over to /30 192.168

2017-01-24 Thread Rush (Code Review)

Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333986 )

Change subject: labstore: change drbd link over to /30 192.168
..

labstore: change drbd link over to /30 192.168

Here I am changing the old mechanism to stop assuming
the address is to be resolved.  It seems more prudent to
protect the drbd.d configs from DNS issues, and also
I am changing this to match the reality of the setup now
post direct connection.

Change-Id: Ie3dc34ba61e189b688dba0dec8727f8fa7972ad4
---
M modules/labstore/templates/drbd/drbd_resource.res.erb
M modules/role/manifests/labs/nfs/secondary.pp
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/modules/labstore/templates/drbd/drbd_resource.res.erb 
b/modules/labstore/templates/drbd/drbd_resource.res.erb
index 8d25202..74c4bf2 100644
--- a/modules/labstore/templates/drbd/drbd_resource.res.erb
+++ b/modules/labstore/templates/drbd/drbd_resource.res.erb
@@ -2,14 +2,14 @@
 
   on <%= @drbd_hosts.first %> {
 device<%= @device %>;
-address   <%= scope.function_ipresolve([@drbd_cluster[@drbd_hosts.first], 
4]) %>:<%= @port %>;
+address   <%= @drbd_cluster[@drbd_hosts.first] %>:<%= @port %>;
 disk  <%= @disk %>;
 meta-disk internal;
   }
 
   on <%= @drbd_hosts.last %> {
 device<%= @device %>;
-address   <%= scope.function_ipresolve([@drbd_cluster[@drbd_hosts.last], 
4]) %>:<%= @port %>;
+address   <%= @drbd_cluster[@drbd_hosts.last] %>:<%= @port %>;
 disk  <%= @disk %>;
 meta-disk internal;
   }
diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index 79bb4bd..ecc5ee8 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -22,8 +22,8 @@
 
 interface::ip { 'drbd-replication':
 interface => 'eth1',
-address   => '10.64.37.26',
-prefixlen => '24',
+address   => '192.168.0.2',
+prefixlen => '30',
 require   => Interface::Manual['eth1'],
 }
 }
@@ -34,8 +34,8 @@
 
 interface::ip { 'drbd-replication':
 interface => 'eth1',
-address   => '10.64.37.25',
-prefixlen => '24',
+address   => '192.168.0.1',
+prefixlen => '30',
 require   => Interface::Manual['eth1'],
 }
 }
@@ -71,8 +71,8 @@
 
 $drbd_defaults = {
 'drbd_cluster' => {
-'labstore1004' => 'eth1.labstore1004.eqiad.wmnet',
-'labstore1005' => 'eth1.labstore1005.eqiad.wmnet',
+'labstore1004' => '192.168.0.1',
+'labstore1005' => '192.168.0.2',
 },
 }
 

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

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

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

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

2017-01-24 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333985 )

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

group0 wikis to 1.29.0-wmf.9

Change-Id: I5616491abb6a6967fee94b844c2f51d10d121333
---
M php
M wikiversions.json
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/php b/php
index 335052b..5e4c17d 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.8
\ No newline at end of file
+php-1.29.0-wmf.9
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 3cefeec..0de7b09 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -481,7 +481,7 @@
 "maiwiki": "php-1.29.0-wmf.8",
 "map_bmswiki": "php-1.29.0-wmf.8",
 "mdfwiki": "php-1.29.0-wmf.8",
-"mediawikiwiki": "php-1.29.0-wmf.8",
+"mediawikiwiki": "php-1.29.0-wmf.9",
 "metawiki": "php-1.29.0-wmf.8",
 "mgwiki": "php-1.29.0-wmf.8",
 "mgwikibooks": "php-1.29.0-wmf.8",
@@ -751,9 +751,9 @@
 "tawiktionary": "php-1.29.0-wmf.8",
 "tcywiki": "php-1.29.0-wmf.8",
 "tenwiki": "php-1.29.0-wmf.8",
-"test2wiki": "php-1.29.0-wmf.8",
-"testwiki": "php-1.29.0-wmf.8",
-"testwikidatawiki": "php-1.29.0-wmf.8",
+"test2wiki": "php-1.29.0-wmf.9",
+"testwiki": "php-1.29.0-wmf.9",
+"testwikidatawiki": "php-1.29.0-wmf.9",
 "tetwiki": "php-1.29.0-wmf.8",
 "tewiki": "php-1.29.0-wmf.8",
 "tewikibooks": "php-1.29.0-wmf.8",
@@ -883,7 +883,7 @@
 "zawikiquote": "php-1.29.0-wmf.8",
 "zawiktionary": "php-1.29.0-wmf.8",
 "zeawiki": "php-1.29.0-wmf.8",
-"zerowiki": "php-1.29.0-wmf.8",
+"zerowiki": "php-1.29.0-wmf.9",
 "zh_classicalwiki": "php-1.29.0-wmf.8",
 "zh_min_nanwiki": "php-1.29.0-wmf.8",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.8",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5616491abb6a6967fee94b844c2f51d10d121333
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add .bash_profile to my homedir so my .bashrc works

2017-01-24 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333984 )

Change subject: Add .bash_profile to my homedir so my .bashrc works
..

Add .bash_profile to my homedir so my .bashrc works

Change-Id: Id6af9ca88a432b44942988012d9994ef616bcaa4
---
A modules/admin/files/home/demon/.bash_profile
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/admin/files/home/demon/.bash_profile 
b/modules/admin/files/home/demon/.bash_profile
new file mode 100644
index 000..6b304f9
--- /dev/null
+++ b/modules/admin/files/home/demon/.bash_profile
@@ -0,0 +1,5 @@
+#
+
+if [ ~/.bashrc ]; then
+   . ~/.bashrc
+fi

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove labs docroot, unused

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333960 )

Change subject: Remove labs docroot, unused
..


Remove labs docroot, unused

Depends-On: Ib8a38fe292fac903a5d90125149aa697ed478471
Change-Id: Ia86e828ebc61982e546a1b63e78dd04f0bec10db
---
D docroot/labs
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/docroot/labs b/docroot/labs
deleted file mode 12
index 3c7bb5e..000
--- a/docroot/labs
+++ /dev/null
@@ -1 +0,0 @@
-wikimedia.org
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia86e828ebc61982e546a1b63e78dd04f0bec10db
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Horizon: Forward some custom files from liberty

2017-01-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333983 )

Change subject: Horizon:  Forward some custom files from liberty
..


Horizon:  Forward some custom files from liberty

Change-Id: I99b29bc0195f243c13dfd313c23bb0140c820604
---
A modules/openstack/files/mitaka/horizon/keystone_policy.json
A modules/openstack/files/mitaka/horizon/openstack_auth/backend.py
A modules/openstack/files/mitaka/horizon/puppet_group_add.py
A modules/openstack/files/mitaka/horizon/puppet_prefix_tab_enable.py
A modules/openstack/files/mitaka/horizon/puppet_tab_enable.py
5 files changed, 465 insertions(+), 0 deletions(-)

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



diff --git a/modules/openstack/files/mitaka/horizon/keystone_policy.json 
b/modules/openstack/files/mitaka/horizon/keystone_policy.json
new file mode 100644
index 000..0bd9546
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/keystone_policy.json
@@ -0,0 +1,183 @@
+{
+"admin_required": "role:admin or is_admin:1",
+"service_role": "role:service",
+"service_or_admin": "rule:admin_required or rule:service_role",
+"owner" : "user_id:%(user_id)s",
+"admin_or_owner": "rule:admin_required or rule:owner",
+"token_subject": "user_id:%(target.token.user_id)s",
+"admin_or_token_subject": "rule:admin_required or rule:token_subject",
+ 
+"default": "rule:admin_required",
+ 
+"identity:get_region": "",
+"identity:list_regions": "rule:admin_required",
+"identity:create_region": "rule:admin_required",
+"identity:update_region": "rule:admin_required",
+"identity:delete_region": "rule:admin_required",
+ 
+"identity:get_service": "",
+"identity:list_services": "",
+"identity:create_service": "rule:admin_required",
+"identity:update_service": "rule:admin_required",
+"identity:delete_service": "rule:admin_required",
+ 
+"identity:get_endpoint": "",
+"identity:list_endpoints": "",
+"identity:create_endpoint": "rule:admin_required",
+"identity:update_endpoint": "rule:admin_required",
+"identity:delete_endpoint": "rule:admin_required",
+ 
+"identity:get_domain": "rule:admin_required",
+"identity:list_domains": "rule:admin_required",
+"identity:create_domain": "rule:admin_required",
+"identity:update_domain": "rule:admin_required",
+"identity:delete_domain": "rule:admin_required",
+ 
+"identity:get_project": "rule:admin_required",
+"identity:list_projects": "role:admin_required",
+"identity:list_user_projects": "",
+"identity:create_project": "rule:admin_required",
+"identity:update_project": "rule:admin_required",
+"identity:delete_project": "rule:admin_required",
+ 
+"identity:get_user": "rule:admin_required",
+"identity:list_users": "rule:admin_required",
+"identity:create_user": "rule:admin_required",
+"identity:update_user": "rule:admin_required",
+"identity:delete_user": "rule:admin_required",
+"identity:change_password": "rule:admin_or_owner",
+ 
+"identity:get_group": "rule:admin_required",
+"identity:list_groups": "rule:admin_required",
+"identity:list_groups_for_user": "rule:admin_or_owner",
+"identity:create_group": "rule:admin_required",
+"identity:update_group": "rule:admin_required",
+"identity:delete_group": "rule:admin_required",
+"identity:list_users_in_group": "rule:admin_required",
+"identity:remove_user_from_group": "rule:admin_required",
+"identity:check_user_in_group": "rule:admin_required",
+"identity:add_user_to_group": "rule:admin_required",
+ 
+"identity:get_credential": "rule:admin_required",
+"identity:list_credentials": "rule:admin_required",
+"identity:create_credential": "rule:admin_required",
+"identity:update_credential": "rule:admin_required",
+"identity:delete_credential": "rule:admin_required",
+ 
+"identity:ec2_get_credential": "rule:admin_required or (rule:owner and 
user_id:%(target.credential.user_id)s)",
+"identity:ec2_list_credentials": "rule:admin_or_owner",
+"identity:ec2_create_credential": "rule:admin_or_owner",
+"identity:ec2_delete_credential": "rule:admin_required or (rule:owner and 
user_id:%(target.credential.user_id)s)",
+ 
+"identity:get_role": "",
+"identity:list_roles": "rule:admin_required",
+"identity:create_role": "rule:admin_required",
+"identity:update_role": "rule:admin_required",
+"identity:delete_role": "rule:admin_required",
+ 
+"identity:check_grant": "rule:admin_required",
+"identity:list_grants": "rule:admin_required",
+"identity:create_grant": "rule:admin_required",
+"identity:revoke_grant": "rule:admin_required",
+ 
+"identity:list_role_assignments": "rule:admin_required",
+ 
+"identity:get_policy": "rule:admin_required",
+"identity:list_policies": "rule:admin_required",
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Horizon: Forward some custom files from liberty

2017-01-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333983 )

Change subject: Horizon:  Forward some custom files from liberty
..

Horizon:  Forward some custom files from liberty

Change-Id: I99b29bc0195f243c13dfd313c23bb0140c820604
---
A modules/openstack/files/mitaka/horizon/keystone_policy.json
A modules/openstack/files/mitaka/horizon/openstack_auth/backend.py
A modules/openstack/files/mitaka/horizon/puppet_group_add.py
A modules/openstack/files/mitaka/horizon/puppet_prefix_tab_enable.py
A modules/openstack/files/mitaka/horizon/puppet_tab_enable.py
5 files changed, 465 insertions(+), 0 deletions(-)


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

diff --git a/modules/openstack/files/mitaka/horizon/keystone_policy.json 
b/modules/openstack/files/mitaka/horizon/keystone_policy.json
new file mode 100644
index 000..0bd9546
--- /dev/null
+++ b/modules/openstack/files/mitaka/horizon/keystone_policy.json
@@ -0,0 +1,183 @@
+{
+"admin_required": "role:admin or is_admin:1",
+"service_role": "role:service",
+"service_or_admin": "rule:admin_required or rule:service_role",
+"owner" : "user_id:%(user_id)s",
+"admin_or_owner": "rule:admin_required or rule:owner",
+"token_subject": "user_id:%(target.token.user_id)s",
+"admin_or_token_subject": "rule:admin_required or rule:token_subject",
+ 
+"default": "rule:admin_required",
+ 
+"identity:get_region": "",
+"identity:list_regions": "rule:admin_required",
+"identity:create_region": "rule:admin_required",
+"identity:update_region": "rule:admin_required",
+"identity:delete_region": "rule:admin_required",
+ 
+"identity:get_service": "",
+"identity:list_services": "",
+"identity:create_service": "rule:admin_required",
+"identity:update_service": "rule:admin_required",
+"identity:delete_service": "rule:admin_required",
+ 
+"identity:get_endpoint": "",
+"identity:list_endpoints": "",
+"identity:create_endpoint": "rule:admin_required",
+"identity:update_endpoint": "rule:admin_required",
+"identity:delete_endpoint": "rule:admin_required",
+ 
+"identity:get_domain": "rule:admin_required",
+"identity:list_domains": "rule:admin_required",
+"identity:create_domain": "rule:admin_required",
+"identity:update_domain": "rule:admin_required",
+"identity:delete_domain": "rule:admin_required",
+ 
+"identity:get_project": "rule:admin_required",
+"identity:list_projects": "role:admin_required",
+"identity:list_user_projects": "",
+"identity:create_project": "rule:admin_required",
+"identity:update_project": "rule:admin_required",
+"identity:delete_project": "rule:admin_required",
+ 
+"identity:get_user": "rule:admin_required",
+"identity:list_users": "rule:admin_required",
+"identity:create_user": "rule:admin_required",
+"identity:update_user": "rule:admin_required",
+"identity:delete_user": "rule:admin_required",
+"identity:change_password": "rule:admin_or_owner",
+ 
+"identity:get_group": "rule:admin_required",
+"identity:list_groups": "rule:admin_required",
+"identity:list_groups_for_user": "rule:admin_or_owner",
+"identity:create_group": "rule:admin_required",
+"identity:update_group": "rule:admin_required",
+"identity:delete_group": "rule:admin_required",
+"identity:list_users_in_group": "rule:admin_required",
+"identity:remove_user_from_group": "rule:admin_required",
+"identity:check_user_in_group": "rule:admin_required",
+"identity:add_user_to_group": "rule:admin_required",
+ 
+"identity:get_credential": "rule:admin_required",
+"identity:list_credentials": "rule:admin_required",
+"identity:create_credential": "rule:admin_required",
+"identity:update_credential": "rule:admin_required",
+"identity:delete_credential": "rule:admin_required",
+ 
+"identity:ec2_get_credential": "rule:admin_required or (rule:owner and 
user_id:%(target.credential.user_id)s)",
+"identity:ec2_list_credentials": "rule:admin_or_owner",
+"identity:ec2_create_credential": "rule:admin_or_owner",
+"identity:ec2_delete_credential": "rule:admin_required or (rule:owner and 
user_id:%(target.credential.user_id)s)",
+ 
+"identity:get_role": "",
+"identity:list_roles": "rule:admin_required",
+"identity:create_role": "rule:admin_required",
+"identity:update_role": "rule:admin_required",
+"identity:delete_role": "rule:admin_required",
+ 
+"identity:check_grant": "rule:admin_required",
+"identity:list_grants": "rule:admin_required",
+"identity:create_grant": "rule:admin_required",
+"identity:revoke_grant": "rule:admin_required",
+ 
+"identity:list_role_assignments": "rule:admin_required",
+ 
+"identity:get_policy": "rule:admin_required",
+"identity:list_policies": "rule:admin_required",
+

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Make kafka run on Jessie

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333836 )

Change subject: Make kafka run on Jessie
..


Make kafka run on Jessie

Bug: T156101
Change-Id: Ic1f8960ed8c792687e0a1c552639c3e10e65ad8e
---
D puppet/modules/kafka/files/upstart
M puppet/modules/kafka/manifests/init.pp
A puppet/modules/kafka/templates/systemd/kafka.erb
3 files changed, 25 insertions(+), 33 deletions(-)

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



diff --git a/puppet/modules/kafka/files/upstart 
b/puppet/modules/kafka/files/upstart
deleted file mode 100644
index ee57a33..000
--- a/puppet/modules/kafka/files/upstart
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-#
-
-description "Kafka Broker"
-
-start on mediawiki-ready
-respawn
-
-setuid kafka
-setgid kafka
-
-env KAFKA_HEAP_OPTS="-Xmx164m -Xmx164m"
-
-exec /usr/bin/kafka-server-start /etc/kafka/server.properties
diff --git a/puppet/modules/kafka/manifests/init.pp 
b/puppet/modules/kafka/manifests/init.pp
index 14f103c..8b25277 100644
--- a/puppet/modules/kafka/manifests/init.pp
+++ b/puppet/modules/kafka/manifests/init.pp
@@ -2,6 +2,7 @@
 #
 class kafka {
 require ::service
+require ::mediawiki::ready_service
 
 require_package('openjdk-7-jdk')
 require_package('zookeeper-server')
@@ -37,12 +38,6 @@
 source => 'puppet:///modules/kafka/kafka.profile.sh',
 }
 
-file { '/etc/init/kafka.conf':
-ensure => 'present',
-source => 'puppet:///modules/kafka/upstart',
-mode   => '0444',
-}
-
 file { '/etc/kafka/server.properties':
 ensure => 'present',
 source => 'puppet:///modules/kafka/server.properties',
@@ -57,7 +52,7 @@
 }
 
 exec { 'zookeeper-server-init':
-command => '/usr/bin/service zookeeper-server init',
+command => '/etc/init.d/zookeeper-server init',
 unless  => '/usr/bin/test -d /var/lib/zookeeper/version-2',
 require => Package['zookeeper-server']
 }
@@ -68,16 +63,14 @@
 require => Exec['zookeeper-server-init'],
 }
 
-service { 'kafka':
-ensure=> 'running',
-enable=> true,
-require   => [
-User['kafka'],
-Service['zookeeper-server'],
-],
-subscribe => [
-File['/etc/init/kafka.conf'],
-File['/etc/kafka/server.properties'],
-],
+systemd::service { 'kafka':
+ensure => 'present',
+service_params => {
+require   => [
+User['kafka'],
+Service['zookeeper-server'],
+],
+subscribe => File['/etc/kafka/server.properties'],
+},
 }
 }
diff --git a/puppet/modules/kafka/templates/systemd/kafka.erb 
b/puppet/modules/kafka/templates/systemd/kafka.erb
new file mode 100644
index 000..c4f1ec4
--- /dev/null
+++ b/puppet/modules/kafka/templates/systemd/kafka.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description=Kafka Broker
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+User=kafka
+Group=kafka
+Environment=KAFKA_HEAP_OPTS=-Xmx164m -Xmx164m
+ExecStart=/usr/bin/kafka-server-start /etc/kafka/server.properties
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1f8960ed8c792687e0a1c552639c3e10e65ad8e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Remove zotero

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333845 )

Change subject: Remove zotero
..


Remove zotero

Zotero requires XULRunner which is not packaged for Jessie. See T107302
and T93579 for more details.

Bug: T155972
Change-Id: I956b9d92e68fd43bec3f4017f15899bcd4752505
---
M puppet/hieradata/common.yaml
M puppet/modules/citoid/manifests/init.pp
M puppet/modules/role/manifests/citoid.pp
D puppet/modules/role/manifests/zotero.pp
D puppet/modules/zotero/manifests/init.pp
D puppet/modules/zotero/templates/defaults.js.erb
D puppet/modules/zotero/templates/systemd/zotero.erb
7 files changed, 2 insertions(+), 158 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 115ad42..07b01bc 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -485,6 +485,3 @@
 thumbor::sentry_dsn_file: "%{hiera('sentry::dsn_file')}"
 
 xhprofgui::dir: "%{hiera('mwv::vendor_dir')}/xhprof"
-
-zotero::base_path: "%{hiera('mwv::services_dir')}/zotero"
-zotero::log_file: /vagrant/logs/zotero.log
diff --git a/puppet/modules/citoid/manifests/init.pp 
b/puppet/modules/citoid/manifests/init.pp
index dcd9fe6..abf4525 100644
--- a/puppet/modules/citoid/manifests/init.pp
+++ b/puppet/modules/citoid/manifests/init.pp
@@ -19,10 +19,8 @@
 port  => $port,
 log_level => $log_level,
 config=> {
-userAgent   => undef,
-zoteroInterface => '127.0.0.1',
-zoteroPort  => '1969',
-zoteroUseProxy  => false,
+userAgent => undef,
+zotero=> false,
 },
 }
 }
diff --git a/puppet/modules/role/manifests/citoid.pp 
b/puppet/modules/role/manifests/citoid.pp
index de637f1..1045295 100644
--- a/puppet/modules/role/manifests/citoid.pp
+++ b/puppet/modules/role/manifests/citoid.pp
@@ -4,7 +4,6 @@
 class role::citoid(
 $url,
 ) {
-include ::role::zotero
 include ::citoid
 
 mediawiki::extension { 'Citoid':
diff --git a/puppet/modules/role/manifests/zotero.pp 
b/puppet/modules/role/manifests/zotero.pp
deleted file mode 100644
index 0bdc227..000
--- a/puppet/modules/role/manifests/zotero.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# == Class: role::zotero
-# Provisions Zotero, a dependency of Citoid.
-class role::zotero {
-include ::zotero
-}
diff --git a/puppet/modules/zotero/manifests/init.pp 
b/puppet/modules/zotero/manifests/init.pp
deleted file mode 100644
index 6cdecb3..000
--- a/puppet/modules/zotero/manifests/init.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# == Class: zotero
-#
-# Zotero is a service based on running the Zotero Firefox extension via 
xpcshell
-# and JavaScript wrappers. It is meant to scrape URLs provided to it and return
-# metadata.
-#
-# === Parameters
-#
-# [*base_path*]
-#   Path to the zotero code. (e.g. /vagrant/srv/zotero)
-#
-# [*log_file*]
-#   Place where zotero should log messages.
-#
-class zotero(
-$base_path,
-$log_file,
-) {
-
-package { 'xulrunner-dev':
-ensure => present,
-before => Service['zotero'],
-}
-
-file { $base_path:
-ensure => directory,
-before => Service['zotero'],
-owner  => $::share_owner,
-group  => $::share_group,
-}
-
-git::clone{ 'mediawiki/services/zotero/translation-server':
-directory => "${base_path}/translation-server",
-require   => File[$base_path],
-before=> Service['zotero'],
-}
-
-git::clone{ 'mediawiki/services/zotero/translators':
-directory => "${base_path}/translators",
-require   => File[$base_path],
-before=> Service['zotero'],
-}
-
-file { '/etc/zotero':
-ensure => directory,
-}
-file { '/etc/zotero/defaults.js':
-ensure  => present,
-content => template('zotero/defaults.js.erb'),
-require => Git::Clone['mediawiki/services/zotero/translation-server'],
-notify  => Service['zotero'],
-}
-
-file { $log_file:
-ensure => present,
-mode   => '0666',
-owner  => $::share_owner,
-group  => $::share_group,
-}
-
-service::gitupdate { 'zotero_translation_server':
-dir  => "${base_path}/translation-server",
-restart  => true,
-service_name => 'zotero',
-}
-
-service::gitupdate { 'zotero_translators':
-dir  => "${base_path}/translators",
-restart  => true,
-service_name => 'zotero',
-}
-
-systemd::service { 'zotero':
-ensure => 'present',
-}
-}
diff --git a/puppet/modules/zotero/templates/defaults.js.erb 
b/puppet/modules/zotero/templates/defaults.js.erb
deleted file mode 100644
index 9c70fb0..000
---

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Rename mobile.ajax module

2017-01-24 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333982 )

Change subject: Hygiene: Rename mobile.ajax module
..

Hygiene: Rename mobile.ajax module

It's a style module, not a script+style module
and should be consistently named with all our other
modules

Change-Id: I09749b8d4ff98f67e61ee802b65e8622e8c3e00a
---
M extension.json
M includes/MobileFrontend.hooks.php
R resources/mobile.ajax.styles/ajax-loader.gif
R resources/mobile.ajax.styles/refresh.png
R resources/mobile.ajax.styles/refresh.svg
R resources/mobile.ajax.styles/spinner.less
6 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index dced597..d57313e 100644
--- a/extension.json
+++ b/extension.json
@@ -403,13 +403,13 @@
"toc"
]
},
-   "mobile.ajax": {
+   "mobile.ajax.styles": {
"targets": [
"mobile",
"desktop"
],
"styles": [
-   "resources/mobile.ajax/spinner.less"
+   "resources/mobile.ajax.styles/spinner.less"
]
},
"mobile.backtotop": {
@@ -441,7 +441,7 @@
"mobile.pagesummary.styles",
"mediawiki.notify",
"mobile.overlay.images",
-   "mobile.ajax",
+   "mobile.ajax.styles",
"mediawiki.language",
"mediawiki.jqueryMsg",
"mediawiki.user",
@@ -959,7 +959,7 @@
],
"dependencies": [
"mobile.startup",
-   "mobile.ajax",
+   "mobile.ajax.styles",
"mobile.search.util"
],
"scripts": [
@@ -1026,7 +1026,7 @@
"desktop"
],
"dependencies": [
-   "mobile.ajax",
+   "mobile.ajax.styles",
"mobile.special.nearby.styles",
"mediawiki.language",
"mobile.pagelist.scripts",
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index ad14bc1..236616c 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -620,7 +620,7 @@
if ( $name === 'Search' ) {
$out->addModuleStyles( 
'skins.minerva.special.search.styles' );
} elseif ( $name === 'Userlogin' || $name === 
'CreateAccount' ) {
-   $out->addModuleStyles( [ 'mobile.ajax', 
'skins.minerva.special.userlogin.styles' ] );
+   $out->addModuleStyles( [ 'mobile.ajax.styles', 
'skins.minerva.special.userlogin.styles' ] );
$out->addModules( 
'mobile.special.userlogin.scripts' );
}
}
diff --git a/resources/mobile.ajax/ajax-loader.gif 
b/resources/mobile.ajax.styles/ajax-loader.gif
similarity index 100%
rename from resources/mobile.ajax/ajax-loader.gif
rename to resources/mobile.ajax.styles/ajax-loader.gif
Binary files differ
diff --git a/resources/mobile.ajax/refresh.png 
b/resources/mobile.ajax.styles/refresh.png
similarity index 100%
rename from resources/mobile.ajax/refresh.png
rename to resources/mobile.ajax.styles/refresh.png
Binary files differ
diff --git a/resources/mobile.ajax/refresh.svg 
b/resources/mobile.ajax.styles/refresh.svg
similarity index 100%
rename from resources/mobile.ajax/refresh.svg
rename to resources/mobile.ajax.styles/refresh.svg
diff --git a/resources/mobile.ajax/spinner.less 
b/resources/mobile.ajax.styles/spinner.less
similarity index 100%
rename from resources/mobile.ajax/spinner.less
rename to resources/mobile.ajax.styles/spinner.less

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Use systemd for eventlogging::devserver and eventlogging::se...

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333564 )

Change subject: Use systemd for eventlogging::devserver and 
eventlogging::service
..


Use systemd for eventlogging::devserver and eventlogging::service

Bug: T154265
Change-Id: Ica8f5c4aa2038092a3c517ea50c5b9cc8db84a05
---
M puppet/modules/eventlogging/manifests/devserver.pp
M puppet/modules/eventlogging/manifests/service.pp
D puppet/modules/eventlogging/templates/devserver.upstart.erb
D puppet/modules/eventlogging/templates/service.upstart.erb
A puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
A puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
6 files changed, 29 insertions(+), 47 deletions(-)

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



diff --git a/puppet/modules/eventlogging/manifests/devserver.pp 
b/puppet/modules/eventlogging/manifests/devserver.pp
index 42560ad..ecfd0dc 100644
--- a/puppet/modules/eventlogging/manifests/devserver.pp
+++ b/puppet/modules/eventlogging/manifests/devserver.pp
@@ -7,16 +7,8 @@
 
 # Local variable for ease of use in service.upstart.erb template.
 $eventlogging_path = $::eventlogging::path
-file { '/etc/init/eventlogging-devserver.conf':
-content => template('eventlogging/devserver.upstart.erb'),
-}
 
 service { 'eventlogging-devserver':
-ensure=> 'running',
-enable=> true,
-provider  => 'upstart',
-subscribe => [
-File['/etc/init/eventlogging-devserver.conf'],
-],
+ensure=> 'present',
 }
 }
diff --git a/puppet/modules/eventlogging/manifests/service.pp 
b/puppet/modules/eventlogging/manifests/service.pp
index 4b5941c..fb78b1f 100644
--- a/puppet/modules/eventlogging/manifests/service.pp
+++ b/puppet/modules/eventlogging/manifests/service.pp
@@ -47,17 +47,11 @@
 content => template('eventlogging/service.erb'),
 }
 
-file { "/etc/init/${service_name}.conf":
-content => template('eventlogging/service.upstart.erb'),
-}
-
-service { $service_name:
-ensure=> 'running',
-enable=> true,
-provider  => 'upstart',
-subscribe => [
-File[$config_file],
-File["/etc/init/${service_name}.conf"],
-],
+systemd::service { $service_name:
+ensure => 'present',
+template_name  => 'eventlogging-service',
+service_params => {
+subscribe => File[$config_file],
+},
 }
 }
diff --git a/puppet/modules/eventlogging/templates/devserver.upstart.erb 
b/puppet/modules/eventlogging/templates/devserver.upstart.erb
deleted file mode 100644
index 7b89c7f..000
--- a/puppet/modules/eventlogging/templates/devserver.upstart.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-#
-
-description "EventLogging Dev Server"
-
-start on web
-respawn
-
-setuid www-data
-setgid www-data
-
-exec <%= @eventlogging_path %>/virtualenv/bin/eventlogging-devserver 
--append-to <%= @output_file %>
diff --git a/puppet/modules/eventlogging/templates/service.upstart.erb 
b/puppet/modules/eventlogging/templates/service.upstart.erb
deleted file mode 100644
index baa0bcb..000
--- a/puppet/modules/eventlogging/templates/service.upstart.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-#
-
-description "EventLogging Produce HTTP Service"
-
-start on web
-respawn
-
-setuid www-data
-setgid www-data
-
-exec <%= @eventlogging_path %>/virtualenv/bin/eventlogging-service @<%= 
@config_file %>
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
new file mode 100644
index 000..eb7532d
--- /dev/null
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
@@ -0,0 +1,11 @@
+[Unit]
+Description=EventLogging Dev Server
+Requires=network.target
+
+[service]
+User=www-data
+Group=www-data
+ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-devserver 
--append-to <%= @output_file %>
+
+[Install]
+WantedBy=multi-user.target
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
new file mode 100644
index 000..0381fe0
--- /dev/null
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
@@ -0,0 +1,11 @@
+[Unit]
+Description=EventLogging Produce HTTP Service
+Requires=network.target
+
+[service]
+User=www-data
+Group=www-data
+ExecStart=<%=

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Add a define to make adding systemd units easier

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333085 )

Change subject: Add a define to make adding systemd units easier
..


Add a define to make adding systemd units easier

systemd::service is a dumbed down copy of operations/puppet.git's
base::service_unit that only knows how to setup a systemd unit and
associated service.

Existing systemd units are converted to use the new define.

Change-Id: I0700550313c5b25b3d73cd08aaacc6b7e0fba794
---
M puppet/modules/cgroup/manifests/init.pp
R puppet/modules/cgroup/templates/systemd/cgrulesengd.erb
M puppet/modules/hhvm/manifests/fcgi.pp
R puppet/modules/hhvm/templates/systemd/hhvm.erb
M puppet/modules/mediawiki/manifests/jobrunner.pp
M puppet/modules/mediawiki/manifests/ready_service.pp
R puppet/modules/mediawiki/templates/systemd/jobchron.erb
R puppet/modules/mediawiki/templates/systemd/jobrunner.erb
R puppet/modules/mediawiki/templates/systemd/mediawiki-ready.erb
M puppet/modules/sentry/manifests/init.pp
R puppet/modules/sentry/templates/systemd/sentry-server.erb
R puppet/modules/sentry/templates/systemd/sentry-worker.erb
M puppet/modules/service/manifests/node.pp
R puppet/modules/service/templates/systemd/node.erb
M puppet/modules/statsd/manifests/init.pp
R puppet/modules/statsd/templates/systemd/statsd.erb
A puppet/modules/systemd/manifests/service.pp
M puppet/modules/xvfb/manifests/init.pp
R puppet/modules/xvfb/templates/systemd/xvfb.erb
M puppet/modules/zotero/manifests/init.pp
R puppet/modules/zotero/templates/systemd/zotero.erb
21 files changed, 162 insertions(+), 237 deletions(-)

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



diff --git a/puppet/modules/cgroup/manifests/init.pp 
b/puppet/modules/cgroup/manifests/init.pp
index 157c8de..f009e0f 100644
--- a/puppet/modules/cgroup/manifests/init.pp
+++ b/puppet/modules/cgroup/manifests/init.pp
@@ -5,33 +5,16 @@
 class cgroup {
 require_package('cgroup-bin')
 
-file { '/lib/systemd/system/cgrulesengd.service':
-ensure => present,
-source => 'puppet:///modules/cgroup/cgrulesengd.systemd',
-owner  => 'root',
-group  => 'root',
-mode   => '0644',
-}
-exec { 'systemd reload for cgrulesengd':
-  refreshonly => true,
-  command => '/bin/systemctl daemon-reload',
-  subscribe   => File['/lib/systemd/system/cgrulesengd.service'],
-}
-
 # The reason we need the daemon is that upstart won't work with cgexec.
 # As a result, if we want to put a service started via upstart into a
 # cgroup, we need cgrulesengd to be running and set the service's process
 # to a cgroup by system user/group
-
-service { 'cgrulesengd':
-ensure=> running,
-enable=> true,
-provider  => 'systemd',
-require   => [
-Package['cgroup-bin'],
-Exec['systemd reload for cgrulesengd'],
-],
-subscribe => File['/etc/init/cgrulesengd.conf']
+systemd::service { 'cgrulesengd':
+ensure => 'present',
+require=> Package['cgroup-bin'],
+service_params => {
+subscribe => File['/etc/init/cgrulesengd.conf'],
+},
 }
 
 exec { 'cgconfigparser':
diff --git a/puppet/modules/cgroup/files/cgrulesengd.upstart 
b/puppet/modules/cgroup/templates/systemd/cgrulesengd.erb
similarity index 100%
rename from puppet/modules/cgroup/files/cgrulesengd.upstart
rename to puppet/modules/cgroup/templates/systemd/cgrulesengd.erb
diff --git a/puppet/modules/hhvm/manifests/fcgi.pp 
b/puppet/modules/hhvm/manifests/fcgi.pp
index 5ff477c..4e0d92d 100644
--- a/puppet/modules/hhvm/manifests/fcgi.pp
+++ b/puppet/modules/hhvm/manifests/fcgi.pp
@@ -6,40 +6,17 @@
 require ::hhvm
 require ::mediawiki::ready_service
 
-$systemd_dir = '/etc/systemd/system/hhvm.service.d'
-file { $systemd_dir:
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
-file { "${systemd_dir}/puppet-override.conf":
-ensure  => file,
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-content => template('hhvm/hhvm.systemd.erb'),
-notify  => Service['hhvm'],
-}
-
-exec { 'systemd reload for hhvm':
-refreshonly => true,
-command => '/bin/systemctl daemon-reload',
-subscribe   => File["${systemd_dir}/puppet-override.conf"],
-notify  => Service['hhvm'],
-}
-
-service { 'hhvm':
-ensure=> running,
-enable=> true,
-provider  => 'systemd',
-subscribe => [
-Package['hhvm'],
-Package[$::hhvm::ext_pkgs],
-File['/etc/hhvm/server.ini'],
-File['/etc/default/hhvm'],
-],
+systemd::service {

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Global event emitter passed in as option to Skin

2017-01-24 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333981 )

Change subject: Global event emitter passed in as option to Skin
..

Global event emitter passed in as option to Skin

Bug: T156186
Change-Id: If9e5cb796e0d0e1e866f797fd19911c89714998e
---
M resources/mobile.startup/Skin.js
M resources/skins.minerva.scripts/preInit.js
2 files changed, 10 insertions(+), 8 deletions(-)


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

diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 01e5072..15cd058 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -50,6 +50,7 @@
 
this.page = options.page;
this.name = options.name;
+   this.emitter = options.globalEventEmitter;
this.mainMenu = options.mainMenu;
View.call( this, options );
// Must be run after merging with defaults as must be defined.
@@ -73,7 +74,7 @@
}
}
}
-   M.on( 'resize', $.proxy( this, 'emit', '_resize' ) );
+   this.emitter.on( 'resize', $.proxy( this, 'emit', '_resize' ) );
this.on( '_resize', loadWideScreenModules );
this.emit( '_resize' );
 
@@ -87,7 +88,7 @@
}
 
if ( mw.config.get( 'wgMFLazyLoadReferences' ) ) {
-   M.on( 'before-section-toggled', $.proxy( 
this.lazyLoadReferences, this ) );
+   this.emitter.on( 'before-section-toggled', $.proxy( 
this.lazyLoadReferences, this ) );
}
}
 
@@ -199,17 +200,17 @@
} );
 
if ( !imagePlaceholders.length ) {
-   M.off( 'scroll:throttled', _loadImages 
);
-   M.off( 'resize:throttled', _loadImages 
);
-   M.off( 'section-toggled', _loadImages );
+   this.emitter.off( 'scroll:throttled', 
_loadImages );
+   this.emitter.off( 'resize:throttled', 
_loadImages );
+   this.emitter.off( 'section-toggled', 
_loadImages );
self.off( 'changed', _loadImages );
}
 
}
 
-   M.on( 'scroll:throttled', _loadImages );
-   M.on( 'resize:throttled', _loadImages );
-   M.on( 'section-toggled', _loadImages );
+   this.emitter.on( 'scroll:throttled', _loadImages );
+   this.emitter.on( 'resize:throttled', _loadImages );
+   this.emitter.on( 'section-toggled', _loadImages );
this.on( 'changed', _loadImages );
 
_loadImages();
diff --git a/resources/skins.minerva.scripts/preInit.js 
b/resources/skins.minerva.scripts/preInit.js
index 4736030..fa6f7ac 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -19,6 +19,7 @@
'mobile.references.gateway/ReferencesMobileViewGateway'
),
skinData = {
+   globalEventEmitter: M,
el: 'body',
tabletModules: mw.config.get( 'skin' ) === 'minerva' ? 
[ 'skins.minerva.tablet.scripts' ] : [],
page: getCurrentPage(),

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Adding support for task forces to the assessment processing ...

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330185 )

Change subject: Adding support for task forces to the assessment processing code
..


Adding support for task forces to the assessment processing code

Also modifying the maintenance script so it won't delete projects
that are parents of other projects.

Also modifying the APIs to allow inclusion of task force data.

Bug: T154216
Change-Id: I578a4f4d25b7cead1ebeb0ac66b631f6e89c55d4
---
M PageAssessmentsBody.php
M api/ApiQueryPageAssessments.php
M api/ApiQueryProjects.php
M i18n/en.json
M i18n/qqq.json
M maintenance/purgeUnusedProjects.php
6 files changed, 89 insertions(+), 11 deletions(-)

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



diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index 0c3dde3..1a8733a 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -49,14 +49,18 @@
foreach ( $assessmentData as $parserData ) {
// If the name of the project is set...
if ( isset( $parserData[0] ) && $parserData[0] !== '' ) 
{
+   $projectName = $parserData[0];
// ...get the corresponding ID from 
page_assessments_projects table.
-   $projectId = self::getProjectId( $parserData[0] 
);
+   $projectId = self::getProjectId( $projectName );
// If there is no existing project by that 
name, add it to the table.
if ( $projectId === false ) {
-   $projectId = self::insertProject( 
$parserData[0] );
+   // Extract possible parent from the 
project name.
+   $parentId = 
self::extractParentProjectId( $projectName );
+   // Insert project data into the 
database table.
+   $projectId = self::insertProject( 
$projectName, $parentId );
}
// Add the project's ID to the array.
-   $projects[$parserData[0]] = $projectId;
+   $projects[$projectName] = $projectId;
}
}
// Get a list of all the projects previously assigned to the 
page.
@@ -137,9 +141,24 @@
return false;
}
 
+   /**
+* Extract parent from a project name and return the ID. For example, 
if the
+* project name is "Novels/Crime task force", the parent will be 
"Novels",
+* i.e. WikiProject Novels.
+*
+* @param string $projectName Project title
+* @return int|false project ID or false if not found
+*/
+   protected static function extractParentProjectId( $projectName ) {
+   $projectNameParts = explode( '/', $projectName );
+   if ( count( $projectNameParts ) > 1 && $projectNameParts[0] !== 
'' ) {
+   return self::getProjectId( $projectNameParts[0] );
+   }
+   return false;
+   }
 
/**
-* Get project ID for a give wikiproject title
+* Get project ID for a given wikiproject title
 * @param string $project Project title
 * @return int|false project ID or false if not found
 */
@@ -156,14 +175,18 @@
/**
 * Insert a new wikiproject into the projects table
 * @param string $project Wikiproject title
+* @param int $parentId ID of the parent project (for subprojects) 
(optional)
 * @return int Insert Id for new project
 */
-   public static function insertProject( $project ) {
+   public static function insertProject( $project, $parentId = null ) {
$dbw = wfGetDB( DB_MASTER );
-   $values = array(
+   $values = [
'pap_project_title' => $project,
'pap_project_id' => $dbw->nextSequenceValue( 
'pap_project_id_seq' )
-   );
+   ];
+   if ( $parentId ) {
+   $values[ 'pap_parent_id' ] = (int)$parentId;
+   }
$dbw->insert( 'page_assessments_projects', $values, __METHOD__ 
);
$id = $dbw->insertId();
return $id;
diff --git a/api/ApiQueryPageAssessments.php b/api/ApiQueryPageAssessments.php
index 4544c8a..5297993 100644
--- a/api/ApiQueryPageAssessments.php
+++ b/api/ApiQueryPageAssessments.php
@@ -75,6 +75,9 @@
)
) );
$this->addWhereFld( 'pa_page_id', array_keys( $pages ) );
+   if ( !$params['subprojects'] ) {
+

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Add database support for subprojects

2017-01-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329386 )

Change subject: Add database support for subprojects
..


Add database support for subprojects

Add new field for parent project ID and increase the size of the
project title field.

Bug: T154216
Change-Id: I2bae8b3e0bf67087e304fde38df1438908b07067
---
M PageAssessments.hooks.php
M db/addProjectsTable.sql
A db/patch-subprojects.sql
3 files changed, 16 insertions(+), 2 deletions(-)

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



diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 5c86259..1831294 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -67,6 +67,7 @@
$dbDir = __DIR__ . '/db';
$updater->addExtensionUpdate( array( 'addTable', 
'page_assessments_projects', "$dbDir/addProjectsTable.sql", true ) );
$updater->addExtensionUpdate( array( 'addTable', 
'page_assessments', "$dbDir/addReviewsTable.sql", true ) );
+   $updater->addExtensionUpdate( array( 'addField', 
'page_assessments_projects', 'pap_parent_id', "$dbDir/patch-subprojects.sql", 
true ) );
}
 
/**
diff --git a/db/addProjectsTable.sql b/db/addProjectsTable.sql
index 576e010..46ae948 100644
--- a/db/addProjectsTable.sql
+++ b/db/addProjectsTable.sql
@@ -1,8 +1,17 @@
 -- Add wikiprojects table
 
 CREATE TABLE IF NOT EXISTS /*_*/page_assessments_projects (
-  pap_project_id  INT UNSIGNED NOT NULL AUTO_INCREMENT,  -- generated ID 
of the project
-  pap_project_title   VARCHAR(128) DEFAULT NULL, -- name of the 
project assessing the page
+  -- Generated ID of the project
+  pap_project_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- Name of the project assessing the page. In the case of a subproject or 
task
+  -- force, this will be a combination of the project and subproject name, e.g.
+  -- Films/Korean cinema task force.
+  pap_project_title VARCHAR(255) DEFAULT NULL,
+
+  -- ID of the parent project (for subprojects and task forces)
+  pap_parent_id INT UNSIGNED NULL DEFAULT NULL,
+
   PRIMARY KEY (pap_project_id)
 )/*$wgDBTableOptions*/;
 
diff --git a/db/patch-subprojects.sql b/db/patch-subprojects.sql
new file mode 100644
index 000..b19ccc5
--- /dev/null
+++ b/db/patch-subprojects.sql
@@ -0,0 +1,4 @@
+-- ID of the parent project (for subprojects and task forces)
+ALTER TABLE /*_*/page_assessments_projects ADD COLUMN pap_parent_id INT 
UNSIGNED NULL DEFAULT NULL;
+-- Increase size of pap_project_title column to accommodate subprojects
+ALTER TABLE /*_*/page_assessments_projects MODIFY pap_project_title 
VARCHAR(255) DEFAULT NULL;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bae8b3e0bf67087e304fde38df1438908b07067
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: use new kubectl location for maintain-kubeusers

2017-01-24 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333980 )

Change subject: tools: use new kubectl location for maintain-kubeusers
..


tools: use new kubectl location for maintain-kubeusers

This breaks new homedir creation for new tools!

Change-Id: I85439896566c2aa439759588e8584c789cdcc170
---
M modules/toollabs/files/maintain-kubeusers
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/toollabs/files/maintain-kubeusers 
b/modules/toollabs/files/maintain-kubeusers
index 521e89c..7fe17a0 100755
--- a/modules/toollabs/files/maintain-kubeusers
+++ b/modules/toollabs/files/maintain-kubeusers
@@ -286,7 +286,7 @@
 Creates a namespace for the given user if it doesn't exist
 """
 p = subprocess.Popen([
-'/usr/local/bin/kubectl',
+'/usr/bin/kubectl',
 'create',
 '--validate=false',
 '-f',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85439896566c2aa439759588e8584c789cdcc170
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move labtestweb openstack::version to mitaka

2017-01-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333979 )

Change subject: Move labtestweb openstack::version to mitaka
..


Move labtestweb openstack::version to mitaka

This is an experiment to see how horizon/mitaka copes with
the rest of our setup.  It ought to work...

Change-Id: I9321453d4a1c75bee9e43f999712334fcf159e9b
---
M hieradata/hosts/labtestweb2001.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labtestweb2001.yaml 
b/hieradata/hosts/labtestweb2001.yaml
index cefba97..255fc94 100644
--- a/hieradata/hosts/labtestweb2001.yaml
+++ b/hieradata/hosts/labtestweb2001.yaml
@@ -2,3 +2,5 @@
   - deployment
 
 apache::logrotate::rotate: 12
+
+openstack::version: mitaka

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9321453d4a1c75bee9e43f999712334fcf159e9b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: use new kubectl location for maintain-kubeusers

2017-01-24 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333980 )

Change subject: tools: use new kubectl location for maintain-kubeusers
..

tools: use new kubectl location for maintain-kubeusers

This breaks new homedir creation for new tools!

Change-Id: I85439896566c2aa439759588e8584c789cdcc170
---
M modules/toollabs/files/maintain-kubeusers
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/toollabs/files/maintain-kubeusers 
b/modules/toollabs/files/maintain-kubeusers
index 521e89c..7fe17a0 100755
--- a/modules/toollabs/files/maintain-kubeusers
+++ b/modules/toollabs/files/maintain-kubeusers
@@ -286,7 +286,7 @@
 Creates a namespace for the given user if it doesn't exist
 """
 p = subprocess.Popen([
-'/usr/local/bin/kubectl',
+'/usr/bin/kubectl',
 'create',
 '--validate=false',
 '-f',

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: standardize deployment.wikimedia.beta.wmflabs.org docroot

2017-01-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333958 )

Change subject: beta: standardize deployment.wikimedia.beta.wmflabs.org docroot
..


beta: standardize deployment.wikimedia.beta.wmflabs.org docroot

Use wikimedia.org as it's a wikimedia.org docroot (and there's nothing
special about it)

Change-Id: Ib8a38fe292fac903a5d90125149aa697ed478471
---
M modules/mediawiki/files/apache/beta/sites/beta_specific.conf
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Chad: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/mediawiki/files/apache/beta/sites/beta_specific.conf 
b/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
index 03f6c17..9d178f6 100644
--- a/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
+++ b/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
@@ -13,20 +13,20 @@
 
 
 ServerName deployment.wikimedia.beta.wmflabs.org
-DocumentRoot "/srv/mediawiki/docroot/labs"
+DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
 
 AllowEncodedSlashes On
 RewriteEngine On
 
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php retry=0
+ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
 ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/favicon.php  [P]
+ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
+RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
+RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
 
 # Primary wiki redirector
-Alias /wiki /srv/mediawiki/docroot/labs/w/index.php
+Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
 Include "sites-enabled/public-wiki-rewrites.incl"
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8a38fe292fac903a5d90125149aa697ed478471
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move labtestweb openstack::version to newton

2017-01-24 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333979 )

Change subject: Move labtestweb openstack::version to newton
..

Move labtestweb openstack::version to newton

This is an experiment to see how horizon/newton copes with
the rest of our setup.  It ought to work...

Change-Id: I9321453d4a1c75bee9e43f999712334fcf159e9b
---
M hieradata/hosts/labtestweb2001.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/labtestweb2001.yaml 
b/hieradata/hosts/labtestweb2001.yaml
index cefba97..2799fc6 100644
--- a/hieradata/hosts/labtestweb2001.yaml
+++ b/hieradata/hosts/labtestweb2001.yaml
@@ -2,3 +2,5 @@
   - deployment
 
 apache::logrotate::rotate: 12
+
+openstack::version: newton

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9321453d4a1c75bee9e43f999712334fcf159e9b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

1 2 3 4 >

1 - 100 of 360 matches

Mail list logo