[MediaWiki-commits] [Gerrit] Use a UNIX timestamp in the LoggedOut cookie - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use a UNIX timestamp in the LoggedOut cookie
..


Use a UNIX timestamp in the LoggedOut cookie

Since it is easier to interpret in VCL. The read side code strangely
does not need to be updated, and MW will continue to work with
cookies sent before this change, because wfTimestamp() automatically
detects the timestamp format.

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

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



diff --git a/includes/User.php b/includes/User.php
index 3ee32c3..2e22312 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3146,7 +3146,7 @@
$this-clearCookie( 'forceHTTPS' );
 
// Remember when user logged out, to prevent seeing cached pages
-   $this-setCookie( 'LoggedOut', wfTimestampNow(), time() + 86400 
);
+   $this-setCookie( 'LoggedOut', time(), time() + 86400 );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c661b735b1de8e295d5d713a5ca959ee99e274e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add more detail to settings documentation. - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Add more detail to settings documentation.
..


Add more detail to settings documentation.

Change-Id: I04e8b75977fcfa5476d8c59848ed5ebeca6d4c36
---
M README
M settings.d/README
2 files changed, 11 insertions(+), 3 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/README b/README
index f190937..0033ca7 100644
--- a/README
+++ b/README
@@ -65,6 +65,9 @@
 with the vagrant files run `git pull` and then `vagrant reload`.  The latter
 will restart the VM.
 
+## Settings
+
+For information about settings, see settings.d/README.
 
 ## Troubleshoot
 
diff --git a/settings.d/README b/settings.d/README
index dc02296..4b626ea 100644
--- a/settings.d/README
+++ b/settings.d/README
@@ -18,9 +18,14 @@
|   /|  \This directory is accessible as
| _/ T  /'/vagrant/settings.d' in the guest environment.
|  | |  |
-   |  | |__|_   Because the files load alphabeticallly, you can use a
-   |__| '-.__)  two-digit prefix to tweak the load order -- e.g.:
-  jgs  \__)
+   |  | |__|_   There are two separate groups of settings, 
Puppet-managed
+   |__| '-.__)  settings and custom settings.  All Puppet-managed 
settings
+  jgs  \__) are loaded after the custom settings have finished 
loading.
+
+Within each settings group, the settings are loaded
+alphabetically.  Thus, you can use a two-digit prefix 
to
+tweak the load order. E.g.:
+
 settings/
 ├── 10-RunFirst.php
 ├── 20-SomeExtension.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04e8b75977fcfa5476d8c59848ed5ebeca6d4c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add IPv6 range support, for Opera Turbo - change (mediawiki...TrustedXFF)

[jenkins-bot (Code Review)]

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

Change subject: Add IPv6 range support, for Opera Turbo
..


Add IPv6 range support, for Opera Turbo

Tested only in eval.php. Checked that TrustedXFF::isTrusted() gives
appropriate responses for IPv6 addresses in and out of the Opera Turbo
range.

Change-Id: I1fc717b709d6bc35023bc6fe1b51fc384c5a6d8e
---
M TrustedXFF.php
M trusted-hosts.txt
2 files changed, 22 insertions(+), 5 deletions(-)

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



diff --git a/TrustedXFF.php b/TrustedXFF.php
index 58d55d5..e4cd4c5 100644
--- a/TrustedXFF.php
+++ b/TrustedXFF.php
@@ -33,6 +33,15 @@
 
var $cdb;
 
+   // FIXME: IPv6 ranges need to be put here for now, there is no
+   // trusted-hosts.txt support. The ranges are too large to be expanded 
with
+   // the current CDB system.
+   static $ipv6Ranges = array(
+   // Opera Turbo
+   // Source: net-changes-mini
+   '2001:4c28::/32'
+   );
+
static function onIsTrustedProxy( $ip, $trusted ) {
// Don't want to override hosts that are already trusted
if ( !$trusted ) {
@@ -70,7 +79,17 @@
if ( $data ) {
return true;
}
-   // TODO: IPv6 prefixes which aren't feasible to expand
+
+   // Try IPv6 ranges
+   if ( substr( $hex, 0, 2 ) === 'v6' ) {
+   foreach ( self::$ipv6Ranges as $range ) {
+   list( $start, $end ) = IP::parseRange( $range );
+   if ( $hex = $start  $hex = $end ) {
+   return true;
+   }
+   }
+   }
+
return false;
}
 }
diff --git a/trusted-hosts.txt b/trusted-hosts.txt
index 5d7620e..b421d23 100644
--- a/trusted-hosts.txt
+++ b/trusted-hosts.txt
@@ -3,7 +3,8 @@
 #
 # http://meta.wikimedia.org/wiki/XFF_project
 #
-
+# Note: IPv6 ranges cannot currently be listed in this file. They are 
+# listed in TrustedXFF.php instead.
 
 
 # AOL
@@ -566,9 +567,6 @@
 209.170.68.0/24
 217.212.226.0/24
 217.212.230.0/23
-
-# Opera
-2001:4c28::/32
 
 # True Internet (Thailand)
 61.91.190.242

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fc717b709d6bc35023bc6fe1b51fc384c5a6d8e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TrustedXFF
Gerrit-Branch: master
Gerrit-Owner: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Set common rsync and dsh parameters in mw-deployment-vars - change (operations/puppet)

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged.

Change subject: Set common rsync and dsh parameters in mw-deployment-vars
..


Set common rsync and dsh parameters in mw-deployment-vars

scap-2 and sync-common-file each exclude a different set of file-patterns from
rsync. sync-common-file excludes '.svn' and '.git' in their entirety, whereas
scap-2 only excludes git objects and SVN lock files. dsh invocations are
consistent, but the same set of of command-line arguments is specified in five
different places. This patch centralizes common arguments to dsh and rsync in
mw-deployment-vars.

Because some of these scripts run on scap targets too, it's necessary for
mw-deployment-vars to be deployed to all scap targets. This is made somewhat
complicated by the fact that the 'misc::deployment::vars' class that generates
that file takes a parameter, '$system', which defaults to 'git-deploy'. Because
we need to invoke the class with a different value for $system (namely, 'scap')
we can't simply include misc::deployment::vars. We have to use the resource
definition idiom (class { 'foo': param = 'paramvalue' }). The problem there
is that while a class may be included any number of times (and the includes may
be cyclic), the resource-style class declaration can only be used once per
class.

To work around this, I changed the default value to 'scap', which allows both
misc::deployment::scap_scripts and mediawiki::sync to include the vars
class. I then changed misc::deployment::scripts (used by git-deploy) to use
the resource declaration idiom, so it can specify the (now-non-default)
git-deploy parameter.

Bug: 40025
Change-Id: I702777b4ada8706b65322af45fcc2f402aad54db
---
M files/scap/mwversionsinuse
M files/scap/scap-1
M files/scap/scap-1skins
M files/scap/scap-2
M files/scap/sync-common-file
M files/scap/sync-dblist
M files/scap/sync-docroot
M files/scap/sync-wikiversions
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
M templates/misc/mw-deployment-vars.erb
11 files changed, 30 insertions(+), 26 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/files/scap/mwversionsinuse b/files/scap/mwversionsinuse
index 1f7fafc..64827cb 100755
--- a/files/scap/mwversionsinuse
+++ b/files/scap/mwversionsinuse
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Shell wrapper for the local version of multiversion/activeMWVersions.
 # This script belongs in /usr/bin/ and should be in PATH.
-if ! /usr/local/apache/common-local/multiversion/activeMWVersions $@; then
+. /usr/local/lib/mw-deployment-vars.sh
+if ! ${MW_COMMON}/multiversion/activeMWVersions $@; then
exit 1
 fi
diff --git a/files/scap/scap-1 b/files/scap/scap-1
index 8ec196b..8bf326d 100755
--- a/files/scap/scap-1
+++ b/files/scap/scap-1
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-if [ ! -d /usr/local/apache/common-local ];then
-   if ! install -d -o mwdeploy -g mwdeploy /usr/local/apache/common-local; 
then
-   echo Unable to create common-local, please re-run this script 
as root.
+. /usr/local/lib/mw-deployment-vars.sh
+
+if [ ! -d ${MW_COMMON} ];then
+   if ! install -d -o mwdeploy -g mwdeploy ${MW_COMMON}; then
+   echo Unable to create ${MW_COMMON}, please re-run this script 
as root.
exit 1
fi
 fi
@@ -20,7 +22,7 @@
SERVER=$(sudo /usr/local/bin/find-nearest-rsync $RSYNC_SERVERS)
 fi
 if [ -z $SERVER ]; then
-   SERVER=tin.eqiad.wmnet
+   SERVER=${MW_RSYNC_HOST}
 fi
 
 sudo -u mwdeploy /usr/local/bin/scap-2 $SERVER
diff --git a/files/scap/scap-1skins b/files/scap/scap-1skins
index df542a8..b4ffe8f 100755
--- a/files/scap/scap-1skins
+++ b/files/scap/scap-1skins
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. /usr/local/lib/mw-deployment-vars.sh
+
 mwVersionNums=$(mwversionsinuse)
 if [ -z $mwVersionNums ]; then
echo Unable to read wikiversions.dat or it is empty
@@ -8,8 +10,8 @@
 
 for mwVerNum in ${mwVersionNums[@]}; do
sudo -u mwdeploy sh -c 
-   rsync -a --no-perms tin.eqiad.wmnet::common/php-$mwVerNum/skins/ \
-   /usr/local/apache/common-local/php-$mwVerNum/skins  \
+   echo rsync -a --no-perms 
${MW_RSYNC_HOST}::common/php-${mwVerNum}/skins/ \
+   ${MW_COMMON}/php-${mwVerNum}/skins  \
echo ok || \
echo failed

diff --git a/files/scap/scap-2 b/files/scap/scap-2
index 6a111e2..db89ad5 100755
--- a/files/scap/scap-2
+++ b/files/scap/scap-2
@@ -3,22 +3,18 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:
 TERM=dumb
 
+. /usr/local/lib/mw-deployment-vars.sh
+
 SERVER=$1
 if [ -z $SERVER ]; then
-   SERVER=tin.eqiad.wmnet
+   SERVER=${MW_RSYNC_HOST}
 fi
 
 echo -n Copying to `hostname -s` from $SERVER...
-if rsync -a --delete \
-   --exclude=**/.svn/lock \
-   --exclude=**/.git/objects \
-   --exclude=**/.git/**/objects \
-   --no-perms \
-   $SERVER::common/ /usr/local/apache/common-local
+if rsync ${MW_RSYNC_ARGS[@]} 

[MediaWiki-commits] [Gerrit] fix. pep8. - change (analytics/user-metrics)

[Rfaulk (Code Review)]

Rfaulk has submitted this change and it was merged.

Change subject: fix. pep8.
..


fix. pep8.

Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
---
M user_metrics/api/engine/request_meta.py
1 file changed, 20 insertions(+), 20 deletions(-)

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



diff --git a/user_metrics/api/engine/request_meta.py 
b/user_metrics/api/engine/request_meta.py
index 0c3af89..7e90356 100644
--- a/user_metrics/api/engine/request_meta.py
+++ b/user_metrics/api/engine/request_meta.py
@@ -61,6 +61,7 @@
 }
 }
 
+
 def RequestMetaFactory(cohort_expr, cohort_gen_timestamp, metric_expr):
 
 Dynamically builds a record type given a metric handle
@@ -86,9 +87,8 @@
 additional_params = additional_params[:-1]
 params = default_params + additional_params
 
-arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] +\
-   ['None'] * \
-   len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
+arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] + \
+['None'] * len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
 arg_str = ( + ,.join(arg_list) + )
 
 rt = recordtype(RequestMeta, params)
@@ -137,7 +137,8 @@
 if not request_meta.project:
 request_meta.project = DEFAULT_PROJECT
 
-if get_request_type(request_meta) != request_types.raw and not 
request_meta.group in REQUEST_VALUE_MAPPING:
+grp_in_req = request_meta.group in REQUEST_VALUE_MAPPING
+if get_request_type(request_meta) != request_types.raw and not grp_in_req:
 request_meta.group = DEFAULT_GROUP
 
 # set the aggregator if there is one
@@ -233,9 +234,9 @@
 
 class ParameterMapping(object):
 
-Using the **Mediator** model :: Defines the query parameters accepted 
by
-each metric request.  This is a dict keyed on metric that stores a list
-of tuples.  Each tuple defines:
+Using the **Mediator** model :: Defines the query parameters accepted
+by each metric request.  This is a dict keyed on metric that stores a
+list of tuples.  Each tuple defines:
 
(name of allowable query string var, name of corresponding
metric param)
@@ -326,8 +327,7 @@
 
 
 # Registered metrics types
-metric_dict =\
-{
+metric_dict = {
 'threshold': Threshold,
 'survival': Survival,
 'revert_rate': RevertRate,
@@ -338,12 +338,11 @@
 'namespace_edits': NamespaceEdits,
 'live_account': LiveAccount,
 'pages_created': PagesCreated,
-}
+}
 
 # @TODO: let metric types handle this mapping themselves and obsolete this
 #structure
-aggregator_dict =\
-{
+aggregator_dict = {
 'sum+bytes_added': ba_sum_agg,
 'mean+bytes_added': ba_mean_agg,
 'std+bytes_added': ba_std_agg,
@@ -363,7 +362,7 @@
 'proportion+blocks': block_prop_agg,
 'dist+time_to_threshold': ttt_stats_agg,
 'dist+pages_created': pages_created_stats_agg,
-}
+}
 
 
 def get_metric_type(metric):
@@ -409,19 +408,20 @@
 
 # Enumeration to store request types
 request_types = enum(time_series='time_series',
-aggregator='aggregator',
-raw='raw')
+ aggregator='aggregator',
+ raw='raw')
 
 
 def get_request_type(request_meta):
  Determines request type. 
-if request_meta.aggregator and request_meta.time_series \
-   and request_meta.group and request_meta.slice and request_meta.start \
-   and request_meta.end:
+
+cond = request_meta.aggregator and request_meta.time_series
+cond = cond and request_meta.group
+cond = cond and request_meta.slice and request_meta.start
+cond = cond and request_meta.end
+if cond:
 return request_types.time_series
 elif request_meta.aggregator:
 return request_types.aggregator
 else:
 return request_types.raw
-
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org
Gerrit-Reviewer: Rfaulk rfaulk...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] fix. pep8. - change (analytics/user-metrics)

[Rfaulk (Code Review)]

Rfaulk has uploaded a new change for review.

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


Change subject: fix. pep8.
..

fix. pep8.

Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
---
M user_metrics/api/engine/request_meta.py
1 file changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics 
refs/changes/63/71963/1

diff --git a/user_metrics/api/engine/request_meta.py 
b/user_metrics/api/engine/request_meta.py
index 0c3af89..7e90356 100644
--- a/user_metrics/api/engine/request_meta.py
+++ b/user_metrics/api/engine/request_meta.py
@@ -61,6 +61,7 @@
 }
 }
 
+
 def RequestMetaFactory(cohort_expr, cohort_gen_timestamp, metric_expr):
 
 Dynamically builds a record type given a metric handle
@@ -86,9 +87,8 @@
 additional_params = additional_params[:-1]
 params = default_params + additional_params
 
-arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] +\
-   ['None'] * \
-   len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
+arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] + \
+['None'] * len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
 arg_str = ( + ,.join(arg_list) + )
 
 rt = recordtype(RequestMeta, params)
@@ -137,7 +137,8 @@
 if not request_meta.project:
 request_meta.project = DEFAULT_PROJECT
 
-if get_request_type(request_meta) != request_types.raw and not 
request_meta.group in REQUEST_VALUE_MAPPING:
+grp_in_req = request_meta.group in REQUEST_VALUE_MAPPING
+if get_request_type(request_meta) != request_types.raw and not grp_in_req:
 request_meta.group = DEFAULT_GROUP
 
 # set the aggregator if there is one
@@ -233,9 +234,9 @@
 
 class ParameterMapping(object):
 
-Using the **Mediator** model :: Defines the query parameters accepted 
by
-each metric request.  This is a dict keyed on metric that stores a list
-of tuples.  Each tuple defines:
+Using the **Mediator** model :: Defines the query parameters accepted
+by each metric request.  This is a dict keyed on metric that stores a
+list of tuples.  Each tuple defines:
 
(name of allowable query string var, name of corresponding
metric param)
@@ -326,8 +327,7 @@
 
 
 # Registered metrics types
-metric_dict =\
-{
+metric_dict = {
 'threshold': Threshold,
 'survival': Survival,
 'revert_rate': RevertRate,
@@ -338,12 +338,11 @@
 'namespace_edits': NamespaceEdits,
 'live_account': LiveAccount,
 'pages_created': PagesCreated,
-}
+}
 
 # @TODO: let metric types handle this mapping themselves and obsolete this
 #structure
-aggregator_dict =\
-{
+aggregator_dict = {
 'sum+bytes_added': ba_sum_agg,
 'mean+bytes_added': ba_mean_agg,
 'std+bytes_added': ba_std_agg,
@@ -363,7 +362,7 @@
 'proportion+blocks': block_prop_agg,
 'dist+time_to_threshold': ttt_stats_agg,
 'dist+pages_created': pages_created_stats_agg,
-}
+}
 
 
 def get_metric_type(metric):
@@ -409,19 +408,20 @@
 
 # Enumeration to store request types
 request_types = enum(time_series='time_series',
-aggregator='aggregator',
-raw='raw')
+ aggregator='aggregator',
+ raw='raw')
 
 
 def get_request_type(request_meta):
  Determines request type. 
-if request_meta.aggregator and request_meta.time_series \
-   and request_meta.group and request_meta.slice and request_meta.start \
-   and request_meta.end:
+
+cond = request_meta.aggregator and request_meta.time_series
+cond = cond and request_meta.group
+cond = cond and request_meta.slice and request_meta.start
+cond = cond and request_meta.end
+if cond:
 return request_types.time_series
 elif request_meta.aggregator:
 return request_types.aggregator
 else:
 return request_types.raw
-
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] add script for rsyncs of public data between dataset hosts - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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


Change subject: add script for rsyncs of public data between dataset hosts
..

add script for rsyncs of public data between dataset hosts

Change-Id: I827bd6807c0b51d1d896ae337a4b9bf2f3a2fbc7
---
A files/misc/scripts/rsync-dumps.sh
1 file changed, 72 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/71964/1

diff --git a/files/misc/scripts/rsync-dumps.sh 
b/files/misc/scripts/rsync-dumps.sh
new file mode 100755
index 000..ae20c8f
--- /dev/null
+++ b/files/misc/scripts/rsync-dumps.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# NOTE: this file is maintained in puppet
+
+# rsync XML dumps and other public datasets between the various dataset 
servers,
+# allowing for the possibility that dumps may be produced on any or all of them
+# for different sets of wikis
+
+# this script takes one possible argument: dryrun in which case it prints 
what it would
+# do instead of actually doing the rsyncs
+
+if [ $1 == dryrun ]; then
+DRYRUN=1
+else
+DRYRUN=0
+fi
+
+RSYNCBW=4
+
+
+HOST=`/bin/hostname`
+
+RSYNCCMD='/usr/bin/rsync'
+RSYNCARGS=( '-q' --bwlimit=$RSYNCBW '-a' '--delete' )
+EXCLUDES=( '--exclude=wikidump_*' '--exclude=md5temp.*' )
+RSYNCSRC='/data/xmldatadumps/public/'
+
+MAILCMD='/usr/bin/mail'
+MAILARGS=( '-E' '-s' DUMPS RSYNC $HOST 'ops-du...@wikimedia.org' )
+
+SERVERS=( 'dataset2' 'dataset1001' 'localhost.localdomain' )
+# remove self from the list
+for ((i=0; i${#SERVERS[*]}; i++)); do
+if [ ${SERVERS[$i]} == $HOST ]; then
+   unset SERVERS[$i]
+fi
+done
+
+do_rsyncs () {
+for s in ${SERVERS[@]}; do
+   running=`pgrep -u root -f $s::data/xmldatadumps/public/`
+   if [ ! -z $running ]; then
+   exit 0
+   fi
+   RSYNCDEST=$s::data/xmldatadumps/public/
+   if [ $DRYRUN -eq 0 ]; then
+   $RSYNCCMD ${RSYNCARGS[@]} ${EXCLUDES[@]} ${EXTRAARGS[@]} 
${RSYNCSRC} ${RSYNCDEST} 21 | $MAILCMD ${MAILARGS[@]}
+   else
+   echo -n $RSYNCCMD ${RSYNCARGS[@]} ${EXCLUDES[@]} 
${EXTRAARGS[@]} ${RSYNCSRC} ${RSYNCDEST}
+   echo '|' $MAILCMD ${MAILARGS[@]}
+   fi
+done
+}
+
+case $HOST in
+'dataset1001' )
+   # all dumps are produced on this host except these
+   DIRS=( '/enwiki/' ) # must have leading/trailing slash
+   DIRARGS=${DIRS[@]/#/--include=}
+   EXTRAARGS=( ${DIRARGS[@]} ${DIRARGS[@]/%/**} '--exclude=*' )
+   do_rsyncs
+   ;;
+'localhost.localdomain'|'dataset2' )
+   # directories for which this host produces dumps
+   DIRS=( '/enwiki/' ) # must have leading/trailing slash
+   EXTRAARGS=( ${DIRS[@]/#/--exclude=} )
+   do_rsyncs
+   ;;
+* )
+echo No rsync stanza available for $HOST
+   ;;
+esac

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I827bd6807c0b51d1d896ae337a4b9bf2f3a2fbc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Separated the rendering and parsing part from ProofreadPage.... - change (mediawiki...ProofreadPage)

[Rtdwivedi (Code Review)]

Rtdwivedi has uploaded a new change for review.

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


Change subject: Separated the rendering and parsing part from 
ProofreadPage.body.php.
..

Separated the rendering and parsing part from ProofreadPage.body.php.

Change-Id: I9d51105c2948675794abe7cabce96e880fdf476b
---
M ProofreadPage.body.php
M ProofreadPage.php
A includes/ProofreadPageParser.php
A includes/ProofreadPageRenderer.php
M includes/page/EditProofreadPagePage.php
5 files changed, 516 insertions(+), 458 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/65/71965/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 23a0557..2105b7d 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -119,19 +119,6 @@
}
 
/**
-* Set up our custom parser hooks when initializing parser.
-*
-* @param Parser $parser
-* @return boolean hook return value
-*/
-   public static function onParserFirstCallInit( $parser ) {
-   $parser-setHook( 'pagelist', array( __CLASS__, 
'renderPageList' ) );
-   $parser-setHook( 'pages', array( __CLASS__, 'renderPages' ) );
-   $parser-setHook( 'pagequality', array( __CLASS__, 
'pageQuality' ) );
-   return true;
-   }
-
-   /**
 * Query the database to find if the current page is referred in an 
Index page.
 * @param $title Title
 */
@@ -477,410 +464,6 @@
}
 
/**
-* Parser hook for index pages
-* Display a list of coloured links to pages
-* @param $input
-* @param $args array
-* @param $parser Parser
-* @return string
-*/
-   public static function renderPageList( $input, $args, $parser ) {
-   global $wgContLang;
-
-   $title = $parser-getTitle();
-   if ( !$title-inNamespace( self::getIndexNamespaceId() ) ) {
-   return '';
-   }
-   $imageTitle = Title::makeTitleSafe( NS_IMAGE, $title-getText() 
);
-   if ( !$imageTitle ) {
-   return 'strong class=error' . wfMessage( 
'proofreadpage_nosuch_file' )-inContentLanguage()-escaped() . '/strong';
-   }
-
-   $image = wfFindFile( $imageTitle );
-   if ( !( $image  $image-isMultipage()  $image-pageCount() 
) ) {
-   return 'strong class=error' . wfMessage( 
'proofreadpage_nosuch_file' )-inContentLanguage()-escaped() . '/strong';
-   }
-
-   $return = '';
-
-   $name = $imageTitle-getDBkey();
-   $count = $image-pageCount();
-
-   $from = array_key_exists( 'from', $args ) ? $args['from'] : 1;
-   $to = array_key_exists( 'to', $args ) ? $args['to'] : $count;
-
-   if( !is_numeric( $from ) || !is_numeric( $to ) ) {
-   return 'strong class=error' . wfMessage( 
'proofreadpage_number_expected' )-inContentLanguage()-escaped() . '/strong';
-   }
-   if( ( $from  $to ) || ( $from  1 ) || ( $to  1 ) || ( $to  
$count ) ) {
-   return 'strong class=error' . wfMessage( 
'proofreadpage_invalid_interval' )-inContentLanguage()-escaped() . 
'/strong';
-   }
-
-   for ( $i = $from; $i  $to + 1; $i++ ) {
-   list( $view, $links, $mode ) = self::pageNumber( $i, 
$args );
-
-   if ( $mode == 'highroman' || $mode == 'roman' ) {
-   $view = '#160;' . $view;
-   }
-
-   $n = strlen( $count ) - mb_strlen( $view );
-   if ( $n  ( $mode == 'normal' || $mode == 'empty' ) ) {
-   $txt = 'span style=visibility:hidden;';
-   $pad = $wgContLang-formatNum( 0, true );
-   for ( $j = 0; $j  $n; $j++ ) {
-   $txt = $txt . $pad;
-   }
-   $view = $txt . '/span' . $view;
-   }
-   $title = self::getPageTitle( $name, $i );
-
-   if ( !$links || !$title ) {
-   $return .= $view . ' ';
-   } else {
-   $return .= '[[' . $title-getPrefixedText() . 
'|' . $view . ']] ';
-   }
-   }
-   $return = $parser-recursiveTagParse( $return );
-   return $return;
-   }
-
-   /**
-* Parser hook that includes a list of pages.
-*  parameters : index, from, to, header
-* @param $input
-* @param $args array
-* @param $parser Parser
-* @return string
-*/
-

[MediaWiki-commits] [Gerrit] Remove globals from special page execution - change (mediawiki...CommunityTwitter)

[FastLizard4 (Code Review)]

FastLizard4 has submitted this change and it was merged.

Change subject: Remove globals from special page execution
..


Remove globals from special page execution

Finally, all of the globals in the CommunityTwitter special page are
gone, replaced with variables retrieved from ContextSource. With that
done, we should be able to move on to improving the extension's
functionality instead of improving what's already there.

Change-Id: Id7d2984e66bdf998bdd11249abae5824c8a23591
---
M CommunityTwitter_body.php
1 file changed, 51 insertions(+), 56 deletions(-)

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



diff --git a/CommunityTwitter_body.php b/CommunityTwitter_body.php
index 257cbd5..8c12512 100755
--- a/CommunityTwitter_body.php
+++ b/CommunityTwitter_body.php
@@ -32,33 +32,31 @@
 
 class CommunityTwitter extends SpecialPage {
 
-   function CommunityTwitter() {
-   global $wgUser;
-   global $individualAccs;
+   // Variable to keep track of whether individual accounts are used by 
each user
+   private $individualAccs;
 
-   $individualAccs = true;
+   function __construct() {
+   $this-individualAccs = true;
 
// In case you want to change the name of the special page, you 
have to edit CommunityTwitter_body.php and CommunityTwitter.php
-   SpecialPage::SpecialPage('CommunityTwitter', 'twitter');
-   $this-skin = $wgUser-getSkin();
+   SpecialPage::__construct('CommunityTwitter', 'twitter');
}
 
function execute($query) {
-   global $wgOut;
-   global $wgUser;
-   global $wgScriptPath;
-   global $wgRequest;
-   global $wgDBserver;
-   global $wgDBuser;
-   global $wgDBpassword;
-   global $wgDBname;
+   // Get context variables
+   $output = $this-getOutput();
+   $user = $this-getUser();
+   $request = $this-getRequest();
+   $title = $this-getTitle();
+   $language = $this-getLanguage();
+
+   // Get extension configuration variables
global $ctTableName;
global $ctDefaultAccount;
global $ctDisplayCoordinates;
global $ctLat;
global $ctLong;
global $ctAllowedGroup;
-   global $individualAccs;
 
if (!isset($ctTableName) || !isset($ctDefaultAccount) || 
!isset($ctDisplayCoordinates)) die (Configure LocalSettings.php first.);
 
@@ -67,7 +65,7 @@
$this-setHeaders();
 
// Grant access to users with twitter right only. All others 
receive error pages.
-   if ( !$this-userCanExecute( $wgUser ) ) {
+   if ( !$this-userCanExecute( $user ) ) {
// User does not have rights or is not logged in
 
$tGroupRights = SpecialPage::getTitleFor( 
'ListGroupRights' );
@@ -77,10 +75,10 @@
array( 'User', 'makeGroupLinkWiki' ),
User::getGroupsWithPermission( 'twitter' )
);
-   $groupsList = $this-getLanguage()-commaList( $groups 
);
+   $groupsList = $language-commaList( $groups );
 
 
-   if ( !$wgUser-isAnon() )
+   if ( !$user-isAnon() )
{
// Logged in, but no rights
 
@@ -102,9 +100,9 @@
 
}
 
-   } else if ( $wgUser-isBlocked() ) {
+   } else if ( $user-isBlocked() ) {
// isBlocked is not checked in userCanExecute, make 
sure blocked users aren't tweeting.
-   throw new UserBlockedError( $wgUser-getBlock() );
+   throw new UserBlockedError( $user-getBlock() );
 
} else {
// Presumably the user is allowed
@@ -121,16 +119,16 @@
// Query for individual account(s)
$sql_individual = sprintf(SELECT app_name, 
consumer_key, consumer_secret, access_token, access_token_secret FROM %s 
NATURAL JOIN %s .

JOIN %s ON (user_id=ug_user) WHERE `ug_group` = '%s' AND `active` = 1 
AND (`user_id` = %d OR `user_id` = 0);,
-   
$dbr-tableName(user), $ctTableName, $dbr-tableName(user_groups), 
$ctAllowedGroup, $wgUser-getId());
+   
$dbr-tableName(user), $ctTableName, $dbr-tableName(user_groups), 
$ctAllowedGroup, $user-getId());
   

[MediaWiki-commits] [Gerrit] jobqueue: improved performance of JobQueueGroup::getQueuesWi... - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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


Change subject: jobqueue: improved performance of 
JobQueueGroup::getQueuesWithJobs()
..

jobqueue: improved performance of JobQueueGroup::getQueuesWithJobs()

* Also added a JobQueueGroup::getQueueSizes() function.
  This function is now used by the API to make is useful
  for when queues are not in the DB.

bug: 45072
bug: 50635
bug: 9518
Change-Id: I75c16ffa14c963e7f8fb7cb390e6cc4cde0a5804
---
M includes/SiteStats.php
M includes/job/JobQueue.php
M includes/job/JobQueueDB.php
M includes/job/JobQueueFederated.php
M includes/job/JobQueueGroup.php
M includes/job/JobQueueRedis.php
6 files changed, 216 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/71966/1

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 199c64f..78bb6cc 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -189,7 +189,7 @@
static function jobs() {
if ( !isset( self::$jobs ) ) {
$dbr = wfGetDB( DB_SLAVE );
-   self::$jobs = $dbr-estimateRowCount( 'job' );
+   self::$jobs = array_sum( 
JobQueueGroup::singleton()-getQueueSizes() );
/* Zero rows still do single row read for row that 
doesn't exist, but people are annoyed by that */
if ( self::$jobs == 1 ) {
self::$jobs = 0;
diff --git a/includes/job/JobQueue.php b/includes/job/JobQueue.php
index 3295c24..2fd26fc 100644
--- a/includes/job/JobQueue.php
+++ b/includes/job/JobQueue.php
@@ -617,6 +617,63 @@
}
 
/**
+* Do not use this function outside of JobQueue/JobQueueGroup
+*
+* @return string
+* @since 1.22
+*/
+   public function getCoalesceLocationInternal() {
+   return null;
+   }
+
+   /**
+* Check whether each of the given queues are empty.
+* This is used for batching checks for queues stored at the same place.
+*
+* @param array $types List of queues types
+* @return array|null (list of non-empty queue types) or null if 
unsupported
+* @throws MWException
+* @since 1.22
+*/
+   final public function getSiblingQueuesNonEmpty( array $types ) {
+   $section = new ProfileSection( __METHOD__ );
+   return $this-doGetSiblingQueuesNonEmpty( $types );
+   }
+
+   /**
+* @see JobQueue::getSiblingQueuesNonEmpty()
+* @param array $types List of queues types
+* @return array|null (list of queue types) or null if unsupported
+*/
+   protected function doGetSiblingQueuesNonEmpty( array $types ) {
+   return null; // not supported
+   }
+
+   /**
+* Check the size of each of the given queues.
+* For queues not served by the same store as this one, 0 is returned.
+* This is used for batching checks for queues stored at the same place.
+*
+* @param array $types List of queues types
+* @return array|null (job type = whether queue is empty) or null if 
unsupported
+* @throws MWException
+* @since 1.22
+*/
+   final public function getSiblingQueueSizes( array $types ) {
+   $section = new ProfileSection( __METHOD__ );
+   return $this-doGetSiblingQueueSizes( $types );
+   }
+
+   /**
+* @see JobQueue::getSiblingQueuesSize()
+* @param array $types List of queues types
+* @return array|null (list of queue types) or null if unsupported
+*/
+   protected function doGetSiblingQueueSizes( array $types ) {
+   return null; // not supported
+   }
+
+   /**
 * Call wfIncrStats() for the queue overall and for the queue type
 *
 * @param string $key Event type
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index 56da4f3..77011ad 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -571,6 +571,34 @@
);
}
 
+   public function getCoalesceLocationInternal() {
+   return $this-cluster ? DBCluster:{$this-cluster} : 
LBFactory:{$this-wiki};
+   }
+
+   protected function doGetSiblingQueuesNonEmpty( array $types ) {
+   list( $dbr, $scope ) = $this-getSlaveDB();
+   $res = $dbr-select( 'job', 'DISTINCT job_cmd',
+   array( 'job_cmd' = $types ), __METHOD__ );
+
+   $types = array();
+   foreach ( $res as $row ) {
+   $types[] = $row-job_cmd;
+   }
+   return $types;
+   }
+
+   protected function doGetSiblingQueueSizes( array $types ) {
+   list( $dbr, $scope ) = 

[MediaWiki-commits] [Gerrit] Don't assume a language in RepoItemLinkGeneratorTest::testGe... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Don't assume a language in 
RepoItemLinkGeneratorTest::testGetLinks
..


Don't assume a language in RepoItemLinkGeneratorTest::testGetLinks

Change-Id: I2b0ec32cfcc239b207b29ad0e2b12910be154c8c
---
M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php 
b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
index c2d9610..0d8f88f 100644
--- a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
+++ b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
@@ -50,6 +50,13 @@
 */
protected $namespaceChecker;
 
+   protected function setUp() {
+   parent::setUp();
+   $this-setMwGlobals( array(
+   'wgLang' = \Language::factory( 'en' )
+   ) );
+   }
+
protected function getRepoLinker() {
$baseUrl = 'http://www.example.com';
$articlePath = '/wiki/$1';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b0ec32cfcc239b207b29ad0e2b12910be154c8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Revert Set common rsync and dsh parameters in mw-deployment... - change (operations/puppet)

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged.

Change subject: Revert Set common rsync and dsh parameters in 
mw-deployment-vars
..


Revert Set common rsync and dsh parameters in mw-deployment-vars

/usr/local/bin/mwversionsinuse: 7: /usr/local/lib/mw-deployment-vars.sh: Syntax 
error: ( unexpected
Unable to read wikiversions.dat or it is empty.

This reverts commit 7eba91549ad226a4f939ed7144ecf88f1900ffb1.

Change-Id: I4e6675efe28d89e52453b0e2d494881e82cef005
---
M files/scap/mwversionsinuse
M files/scap/scap-1
M files/scap/scap-1skins
M files/scap/scap-2
M files/scap/sync-common-file
M files/scap/sync-dblist
M files/scap/sync-docroot
M files/scap/sync-wikiversions
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
M templates/misc/mw-deployment-vars.erb
11 files changed, 26 insertions(+), 30 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/files/scap/mwversionsinuse b/files/scap/mwversionsinuse
index 64827cb..1f7fafc 100755
--- a/files/scap/mwversionsinuse
+++ b/files/scap/mwversionsinuse
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Shell wrapper for the local version of multiversion/activeMWVersions.
 # This script belongs in /usr/bin/ and should be in PATH.
-. /usr/local/lib/mw-deployment-vars.sh
-if ! ${MW_COMMON}/multiversion/activeMWVersions $@; then
+if ! /usr/local/apache/common-local/multiversion/activeMWVersions $@; then
exit 1
 fi
diff --git a/files/scap/scap-1 b/files/scap/scap-1
index 8bf326d..8ec196b 100755
--- a/files/scap/scap-1
+++ b/files/scap/scap-1
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-. /usr/local/lib/mw-deployment-vars.sh
-
-if [ ! -d ${MW_COMMON} ];then
-   if ! install -d -o mwdeploy -g mwdeploy ${MW_COMMON}; then
-   echo Unable to create ${MW_COMMON}, please re-run this script 
as root.
+if [ ! -d /usr/local/apache/common-local ];then
+   if ! install -d -o mwdeploy -g mwdeploy /usr/local/apache/common-local; 
then
+   echo Unable to create common-local, please re-run this script 
as root.
exit 1
fi
 fi
@@ -22,7 +20,7 @@
SERVER=$(sudo /usr/local/bin/find-nearest-rsync $RSYNC_SERVERS)
 fi
 if [ -z $SERVER ]; then
-   SERVER=${MW_RSYNC_HOST}
+   SERVER=tin.eqiad.wmnet
 fi
 
 sudo -u mwdeploy /usr/local/bin/scap-2 $SERVER
diff --git a/files/scap/scap-1skins b/files/scap/scap-1skins
index b4ffe8f..df542a8 100755
--- a/files/scap/scap-1skins
+++ b/files/scap/scap-1skins
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. /usr/local/lib/mw-deployment-vars.sh
-
 mwVersionNums=$(mwversionsinuse)
 if [ -z $mwVersionNums ]; then
echo Unable to read wikiversions.dat or it is empty
@@ -10,8 +8,8 @@
 
 for mwVerNum in ${mwVersionNums[@]}; do
sudo -u mwdeploy sh -c 
-   echo rsync -a --no-perms 
${MW_RSYNC_HOST}::common/php-${mwVerNum}/skins/ \
-   ${MW_COMMON}/php-${mwVerNum}/skins  \
+   rsync -a --no-perms tin.eqiad.wmnet::common/php-$mwVerNum/skins/ \
+   /usr/local/apache/common-local/php-$mwVerNum/skins  \
echo ok || \
echo failed

diff --git a/files/scap/scap-2 b/files/scap/scap-2
index db89ad5..6a111e2 100755
--- a/files/scap/scap-2
+++ b/files/scap/scap-2
@@ -3,18 +3,22 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:
 TERM=dumb
 
-. /usr/local/lib/mw-deployment-vars.sh
-
 SERVER=$1
 if [ -z $SERVER ]; then
-   SERVER=${MW_RSYNC_HOST}
+   SERVER=tin.eqiad.wmnet
 fi
 
 echo -n Copying to `hostname -s` from $SERVER...
-if rsync ${MW_RSYNC_ARGS[@]} $SERVER::common/ ${MW_COMMON}
+if rsync -a --delete \
+   --exclude=**/.svn/lock \
+   --exclude=**/.git/objects \
+   --exclude=**/.git/**/objects \
+   --no-perms \
+   $SERVER::common/ /usr/local/apache/common-local
 then
echo ok
 else
echo failed
exit 1
 fi
+
diff --git a/files/scap/sync-common-file b/files/scap/sync-common-file
index cd95b16..7fd4787 100755
--- a/files/scap/sync-common-file
+++ b/files/scap/sync-common-file
@@ -39,12 +39,12 @@
 
 if [ -d $MW_COMMON_SOURCE/$DIR ]; then
DESTDIR=$MW_COMMON/$DIR
-   dsh ${MW_DSH_ARGS[@]} -- 
-   sudo -u mwdeploy rsync ${MW_RSYNC_ARGS[*]} --exclude=cache/l10n 
$MW_RSYNC_HOST::common/$DIR/ $DESTDIR
+   dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 -- 
+   sudo -u mwdeploy rsync -a --delete --exclude=.svn 
--exclude=.git --exclude=cache/l10n --no-perms $MW_RSYNC_HOST::common/$DIR/ 
$DESTDIR

 else
DESTDIR=$(dirname $MW_COMMON/$DIR)
-   dsh ${MW_DSH_ARGS[@]} -- 
+   dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 -- 
sudo -u mwdeploy rsync -l $MW_RSYNC_HOST::common/$DIR $DESTDIR

 fi
diff --git a/files/scap/sync-dblist b/files/scap/sync-dblist
index a9e847f..9d24029 100755
--- a/files/scap/sync-dblist
+++ b/files/scap/sync-dblist
@@ -5,7 +5,7 @@
 echo Synchronizing $MW_COMMON_SOURCE/*.dblist to 

[MediaWiki-commits] [Gerrit] contint: publish Zuul git repositories - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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


Change subject: contint: publish Zuul git repositories
..

contint: publish Zuul git repositories

When running jobs on slaves, we need the Zuul reference it crafts.  This
can be done by publishing them with git-http-backend bound to the URL
http://integration.wikimedia.org/zuul/git/

This is limited to the internal network for now, I do not think there is
any public needs for them.  Also it is done over HTTP instead of HTTPS
to save up a bit of SSL processing.

Change-Id: I0248003dc3564d4d2fce63f962517a0220b36300
---
M modules/contint/manifests/website.pp
R modules/contint/templates/apache/integration.wikimedia.org.erb
2 files changed, 31 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/71968/1

diff --git a/modules/contint/manifests/website.pp 
b/modules/contint/manifests/website.pp
index 8c830fa..4c103fb 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -34,10 +34,10 @@
 
   # Apache configuration for integration.wikimedia.org
   file { '/etc/apache2/sites-available/integration.wikimedia.org':
-mode   = '0444',
-owner  = 'root',
-group  = 'root',
-source = 'puppet:///modules/contint/apache/integration.wikimedia.org',
+mode= '0444',
+owner   = 'root',
+group   = 'root',
+content = 'contint/apache/integration.wikimedia.org.erb',
   }
   apache_site { 'integration.wikimedia.org':
 name = 'integration.wikimedia.org',
diff --git a/modules/contint/files/apache/integration.wikimedia.org 
b/modules/contint/templates/apache/integration.wikimedia.org.erb
similarity index 67%
rename from modules/contint/files/apache/integration.wikimedia.org
rename to modules/contint/templates/apache/integration.wikimedia.org.erb
index 27e7fa1..c1509c1 100644
--- a/modules/contint/files/apache/integration.wikimedia.org
+++ b/modules/contint/templates/apache/integration.wikimedia.org.erb
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/contint/apache/integration.wikimedia.org
+### contint module templates/apache/integration.wikimedia.org.erb
 #
 # vim: filetype=apache
 
@@ -12,8 +12,31 @@
ErrorLog /var/log/apache2/integration_error.log
CustomLog /var/log/apache2/integration_access.log vhost_combined
 
-   # Force Jenkins request through HTTPS
-   Redirect permanent / https://integration.wikimedia.org/
+   # Force any request to HTTPS except the Zuul git repository
+   RedirectMatch permanent ^/((?!(zuul\/git).*) 
https://integration.wikimedia.org/$1
+
+   # Publish Zuul git repositories
+   #
+   # This let Jenkins slaves the possibility to fetch git references 
crafted
+   # by Zuul.
+
+   SetEnv GIT_PROJECT_ROOT %= scope.lookupvar(zuul::git_dir) %
+   # Allow access to any repository:
+   SetEnv GIT_HTTP_EXPORT_ALL
+
+   # Rewrites borrowed from OpenStack Zuul configuration
+   AliasMatch ^/zuul/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ %= 
scope.lookupvar(zuul::git_dir) %/$1
+   AliasMatch ^/zuul/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ 
%= scope.lookupvar(zuul::git_dir) %/$1
+   ScriptAlias /zuul/git/ /usr/lib/git-core/git-http-backend
+
+   # Restrict access to internal network
+   Directory %= scope.lookupvar(zuul::git_dir) %
+   Order Deny,Allow
+   Deny from all
+   Allow from 10.0.0.0/8
+   Allow from 127.0.0.1
+   /Directory
+
 /VirtualHost
 
 VirtualHost *:443
@@ -81,4 +104,5 @@
Directory /srv/org/wikimedia/integration/nightly/mediawiki/core
IndexOrderDefault Descending Date
/Directory
+
 /VirtualHost

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

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

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

[MediaWiki-commits] [Gerrit] added support for synonyms in Semantic Glossary, added .idea... - change (mediawiki...SemanticGlossary)

[Euvl (Code Review)]

Euvl has uploaded a new change for review.

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


Change subject: added support for synonyms in Semantic Glossary, added .idea to 
gitignore
..

added support for synonyms in Semantic Glossary, added .idea to gitignore

Change-Id: I5073db166165cc2a5aa2ba66113fc176313efd2d
---
M .gitignore
M SemanticGlossaryBackend.php
M SemanticGlossaryCacheHandling.php
3 files changed, 27 insertions(+), 19 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..da5d6dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 .svn
 *~
 *.kate-swp
diff --git a/SemanticGlossaryBackend.php b/SemanticGlossaryBackend.php
index df29c08..bf92648 100644
--- a/SemanticGlossaryBackend.php
+++ b/SemanticGlossaryBackend.php
@@ -89,12 +89,12 @@
public function next() {
 
wfProfileIn( __METHOD__ );
-   $ret = null;
+   static $ret = array();
 
// find next line
$page = current( $this-mQueryResults );
 
-   if ( $page ) {
+   if ( $page  count( $ret ) == 0 ) {
 
next( $this-mQueryResults );
 
@@ -117,13 +117,6 @@
$definitions = 
$this-mStore-getPropertyValues( $page, $this-mDiDefinition );
$links = $this-mStore-getPropertyValues( 
$page, $this-mDiLink );
 
-   if ( empty( $terms ) ) {
-   $term = null;
-   } else {
-   $this-mDvTerm-setDataItem( $terms[0] 
);
-   $term = 
$this-mDvTerm-getShortWikiText();
-   }
-
if ( empty( $definitions ) ) {
$definition = null;
} else {
@@ -138,18 +131,32 @@
$link = 
$this-mDvLink-getShortWikiText();
}
 
-   $ret = array(
-   LingoElement::ELEMENT_TERM = $term,
-   LingoElement::ELEMENT_DEFINITION = 
$definition,
-   LingoElement::ELEMENT_LINK = $link,
-   LingoElement::ELEMENT_SOURCE = $page
-   );
-   $cache-set( $cachekey, $ret );
-   wfDebug( Cached glossary entry $cachekey.\n );
+   $tmp_terms = array();
+
+   if ( !empty( $terms ) ) {
+   foreach ( $terms as $term ) {
+   $this-mDvTerm-setDataItem( 
$term );
+   $tmp_terms[] = 
$this-mDvTerm-getShortWikiText();
+   }
+   }
+
+   foreach ( $tmp_terms as $tmp_term ) {
+   $tmp_ret = array(
+   
LingoElement::ELEMENT_TERM = $tmp_term,
+   
LingoElement::ELEMENT_DEFINITION = $definition,
+   
LingoElement::ELEMENT_LINK = $link,
+   
LingoElement::ELEMENT_SOURCE = $page
+   );
+
+   $cache-set( $cachekey, 
$tmp_ret );
+   wfDebug( Cached glossary entry 
$cachekey.\n );
+   $ret[] = $tmp_ret;
+   }
}
}
+
wfProfileOut( __METHOD__ );
-   return $ret;
+   return array_pop($ret);
}
 
/**
diff --git a/SemanticGlossaryCacheHandling.php 
b/SemanticGlossaryCacheHandling.php
index 7e14b2f..96b16df 100644
--- a/SemanticGlossaryCacheHandling.php
+++ b/SemanticGlossaryCacheHandling.php
@@ -36,7 +36,7 @@
// first handle subobjects recursively
if ( array_key_exists( '_SOBJ', $properties ) ) {
foreach ( $data-getPropertyValues( 
$properties['_SOBJ'] ) as $so ) {
-   self::purgeCacheForData( $store, 
$so-getSemanticData(), false );
+   self::purgeCacheForData( $store, 
$store-getSemanticData($so), false );
}
}
 

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

[MediaWiki-commits] [Gerrit] Improve comments throughout - change (mediawiki...erudite)

[Njw (Code Review)]

Njw has uploaded a new change for review.

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


Change subject: Improve comments throughout
..

Improve comments throughout

Change-Id: I2c9f2c3d5a59511ba43e4dd75d46da18b185110b
---
M Erudite.skin.php
M assets/erudite.css
M assets/print.css
M erudite.php
4 files changed, 32 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/70/71970/1

diff --git a/Erudite.skin.php b/Erudite.skin.php
index 7486a63..e536e3d 100644
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -1,7 +1,6 @@
 ?php
 /**
  * Erudite skin
- * Based off The Erudite skin for Wordpress.
  *
  * @file
  * @ingroup Skins
@@ -15,6 +14,9 @@
public function initPage( OutputPage $out ) {
parent::initPage( $out );
 
+   /* Assures mobile devices that the site doesn't assume 
traditional
+* desktop dimensions, so they won't downscale and will instead 
respect
+* things like CSS's @media rules */
$out-addHeadItem( 'viewport',
'meta name=viewport content=width=device-width'
);
@@ -32,6 +34,10 @@
 class EruditeTemplate extends BaseTemplate {
/**
 * Like msgWiki() but it ensures edit section links are never shown.
+*
+* Needed for Mediawiki 1.19  1.20 due to bug 36975:
+* https://bugzilla.wikimedia.org/show_bug.cgi?id=36975
+*
 * @param $message Name of wikitext message to return
 */
function msgWikiNoEdit( $message ) {
diff --git a/assets/erudite.css b/assets/erudite.css
index 61b36fe..9e19a18 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -16,16 +16,16 @@
 
 
 /* Use dark stripes around edge to focus on content */
-div#container {
-   background: white;
-}
-
 div#wrapper {
/* @embed */
background: #fafafa url(images/stripes-dark.png);
 }
 
-/* Typography Base */
+div#container {
+   background: white;
+}
+
+/* Typography base */
 body {
font-family: constantia, 'hoefler text', 'palatino linotype', serif;
line-height: 1.5;
@@ -33,7 +33,7 @@
color: #33;
 }
 
-/* use sans-serif font for headings and navigation */
+/* Use sans-serif font for headings and navigation */
 h1,
 h2,
 h3,
@@ -48,6 +48,13 @@
text-rendering: optimizeLegibility;
 }
 
+/* Set attractive monospace fonts */
+pre,
+code {
+   font-family: consolas, 'deja vu sans mono', 'lucida sans typewriter', 
monaco, monospace;
+}
+
+/* Headings */
 h1 {
font-size: 1.5em;
text-transform: uppercase;
@@ -100,11 +107,6 @@
 td  h5:first-child,
 td  h6:first-child {
margin-top: 0;
-}
-
-pre,
-code {
-   font-family: consolas, 'deja vu sans mono', 'lucida sans typewriter', 
monaco, monospace;
 }
 
 /* Links */
@@ -557,7 +559,7 @@
padding-bottom: 1.5em;
 }
 
-/* ensure edit form doesn't clear the right floated meta
+/* Ensure edit form doesn't clear the right floated meta
  * (.action-edit is selected so that preview content is cleared) */
 body.action-edit #editform,
 body.action-edit #toolbar,
@@ -565,9 +567,9 @@
clear: none;
 }
 
-/* adjustments for smaller browser viewports */
+/* Adjustments for smaller browser viewports */
 @media (max-width: 66em) {
-   /* top menu is likely to start wrapping, so reduce padding
+   /* The top menu is likely to start wrapping, so reduce padding
 * and add a separator */
#menu {
padding: 0.7em 1em 0.45em;
@@ -591,7 +593,7 @@
 }
 
 @media (max-width: 60em) {
-   /* some of the padding is best dispatched with */
+   /* Some of the padding is best dispatched with */
#container,
#header,
#footer-wrap-inner,
@@ -609,12 +611,12 @@
 }
 
 @media (max-width: 40em) {
-   /* shave padding back a bit further */
+   /* Reduce padding a bit further */
#content {
padding: 1em 1em 0em;
}
 
-   /* stack footer columns */
+   /* Stack footer columns */
.footer {
display: block;
float: none;
@@ -631,14 +633,14 @@
margin-top: 0.5em;
}
 
-   /* stack top menu items */
+   /* Stack top menu items */
#menu li {
float: none !important;
border: none;
padding: 0em;
}
 
-   /* disable text justification (user preference) */
+   /* Disable text justification (user preference) */
#article, #bodyContent, #mw_content {
text-align: left !important;
}
diff --git a/assets/print.css b/assets/print.css
index cc1e7a6..e116de9 100644
--- a/assets/print.css
+++ b/assets/print.css
@@ -1,3 +1,4 @@
+/* Hide navigation elements */
 #header-wrap,
 #mw-js-message,
 .entry-meta,
@@ -5,6 +6,7 @@
display:none;
 }
 
+/* Ensure footer text with 

[MediaWiki-commits] [Gerrit] Improve comments throughout - change (mediawiki...erudite)

[jenkins-bot (Code Review)]

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

Change subject: Improve comments throughout
..


Improve comments throughout

Change-Id: I2c9f2c3d5a59511ba43e4dd75d46da18b185110b
---
M Erudite.skin.php
M assets/erudite.css
M assets/print.css
M erudite.php
4 files changed, 32 insertions(+), 22 deletions(-)

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



diff --git a/Erudite.skin.php b/Erudite.skin.php
index 7486a63..e536e3d 100644
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -1,7 +1,6 @@
 ?php
 /**
  * Erudite skin
- * Based off The Erudite skin for Wordpress.
  *
  * @file
  * @ingroup Skins
@@ -15,6 +14,9 @@
public function initPage( OutputPage $out ) {
parent::initPage( $out );
 
+   /* Assures mobile devices that the site doesn't assume 
traditional
+* desktop dimensions, so they won't downscale and will instead 
respect
+* things like CSS's @media rules */
$out-addHeadItem( 'viewport',
'meta name=viewport content=width=device-width'
);
@@ -32,6 +34,10 @@
 class EruditeTemplate extends BaseTemplate {
/**
 * Like msgWiki() but it ensures edit section links are never shown.
+*
+* Needed for Mediawiki 1.19  1.20 due to bug 36975:
+* https://bugzilla.wikimedia.org/show_bug.cgi?id=36975
+*
 * @param $message Name of wikitext message to return
 */
function msgWikiNoEdit( $message ) {
diff --git a/assets/erudite.css b/assets/erudite.css
index 61b36fe..9e19a18 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -16,16 +16,16 @@
 
 
 /* Use dark stripes around edge to focus on content */
-div#container {
-   background: white;
-}
-
 div#wrapper {
/* @embed */
background: #fafafa url(images/stripes-dark.png);
 }
 
-/* Typography Base */
+div#container {
+   background: white;
+}
+
+/* Typography base */
 body {
font-family: constantia, 'hoefler text', 'palatino linotype', serif;
line-height: 1.5;
@@ -33,7 +33,7 @@
color: #33;
 }
 
-/* use sans-serif font for headings and navigation */
+/* Use sans-serif font for headings and navigation */
 h1,
 h2,
 h3,
@@ -48,6 +48,13 @@
text-rendering: optimizeLegibility;
 }
 
+/* Set attractive monospace fonts */
+pre,
+code {
+   font-family: consolas, 'deja vu sans mono', 'lucida sans typewriter', 
monaco, monospace;
+}
+
+/* Headings */
 h1 {
font-size: 1.5em;
text-transform: uppercase;
@@ -100,11 +107,6 @@
 td  h5:first-child,
 td  h6:first-child {
margin-top: 0;
-}
-
-pre,
-code {
-   font-family: consolas, 'deja vu sans mono', 'lucida sans typewriter', 
monaco, monospace;
 }
 
 /* Links */
@@ -557,7 +559,7 @@
padding-bottom: 1.5em;
 }
 
-/* ensure edit form doesn't clear the right floated meta
+/* Ensure edit form doesn't clear the right floated meta
  * (.action-edit is selected so that preview content is cleared) */
 body.action-edit #editform,
 body.action-edit #toolbar,
@@ -565,9 +567,9 @@
clear: none;
 }
 
-/* adjustments for smaller browser viewports */
+/* Adjustments for smaller browser viewports */
 @media (max-width: 66em) {
-   /* top menu is likely to start wrapping, so reduce padding
+   /* The top menu is likely to start wrapping, so reduce padding
 * and add a separator */
#menu {
padding: 0.7em 1em 0.45em;
@@ -591,7 +593,7 @@
 }
 
 @media (max-width: 60em) {
-   /* some of the padding is best dispatched with */
+   /* Some of the padding is best dispatched with */
#container,
#header,
#footer-wrap-inner,
@@ -609,12 +611,12 @@
 }
 
 @media (max-width: 40em) {
-   /* shave padding back a bit further */
+   /* Reduce padding a bit further */
#content {
padding: 1em 1em 0em;
}
 
-   /* stack footer columns */
+   /* Stack footer columns */
.footer {
display: block;
float: none;
@@ -631,14 +633,14 @@
margin-top: 0.5em;
}
 
-   /* stack top menu items */
+   /* Stack top menu items */
#menu li {
float: none !important;
border: none;
padding: 0em;
}
 
-   /* disable text justification (user preference) */
+   /* Disable text justification (user preference) */
#article, #bodyContent, #mw_content {
text-align: left !important;
}
diff --git a/assets/print.css b/assets/print.css
index cc1e7a6..e116de9 100644
--- a/assets/print.css
+++ b/assets/print.css
@@ -1,3 +1,4 @@
+/* Hide navigation elements */
 #header-wrap,
 #mw-js-message,
 .entry-meta,
@@ -5,6 +6,7 @@
display:none;
 }
 
+/* Ensure footer text with URL isn't justified */
 .printfooter {

[MediaWiki-commits] [Gerrit] (bug 49742) Introducing PropertyInfoDataTypeLookup - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: (bug 49742) Introducing PropertyInfoDataTypeLookup
..


(bug 49742) Introducing PropertyInfoDataTypeLookup

Adding an implementation of DataTypeLookup that is based on a
PropertyInfoStore.

Change-Id: Ibb8f50230be53575bee69b4fb64f6bd27e02ccbf
---
M lib/WikibaseLib.classes.php
M lib/includes/EntityRetrievingDataTypeLookup.php
A lib/includes/PropertyInfoDataTypeLookup.php
M lib/tests/phpunit/EntityRetrievingDataTypeLookupTest.php
A lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
5 files changed, 252 insertions(+), 2 deletions(-)

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



diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index 0bac36d..b226735 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -44,6 +44,7 @@
'Wikibase\Lib\GuidGenerator' = 'includes/GuidGenerator.php',
'Wikibase\Lib\V4GuidGenerator' = 'includes/GuidGenerator.php',
'Wikibase\Lib\EntityRetrievingDataTypeLookup' = 
'includes/EntityRetrievingDataTypeLookup.php',
+   'Wikibase\Lib\PropertyInfoDataTypeLookup' = 
'includes/PropertyInfoDataTypeLookup.php',
'Wikibase\Lib\ClaimGuidGenerator' = 
'includes/GuidGenerator.php',
'Wikibase\Lib\ClaimGuidValidator' = 
'includes/ClaimGuidValidator.php',
'Wikibase\Lib\InMemoryDataTypeLookup' = 
'includes/InMemoryDataTypeLookup.php',
diff --git a/lib/includes/EntityRetrievingDataTypeLookup.php 
b/lib/includes/EntityRetrievingDataTypeLookup.php
index d273084..add731d 100644
--- a/lib/includes/EntityRetrievingDataTypeLookup.php
+++ b/lib/includes/EntityRetrievingDataTypeLookup.php
@@ -8,7 +8,8 @@
 use Wikibase\Property;
 
 /**
- * PropertyDataTypeLookup that uses an EntityLookup to find the
+ * PropertyDataTypeLookup that uses an EntityLookup to find
+ * a property's data type ID.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +53,6 @@
 * @return string
 */
public function getDataTypeIdForProperty( EntityId $propertyId ) {
-   //TODO: use memcached here, or wrap this object!
$this-verifyIdIsOfAProperty( $propertyId );
return $this-getProperty( $propertyId )-getDataTypeId();
}
diff --git a/lib/includes/PropertyInfoDataTypeLookup.php 
b/lib/includes/PropertyInfoDataTypeLookup.php
new file mode 100644
index 000..8f8ab24
--- /dev/null
+++ b/lib/includes/PropertyInfoDataTypeLookup.php
@@ -0,0 +1,93 @@
+?php
+
+namespace Wikibase\Lib;
+
+use InvalidArgumentException;
+use Wikibase\EntityId;
+use Wikibase\EntityLookup;
+use Wikibase\Property;
+use Wikibase\PropertyInfoStore;
+
+/**
+ * PropertyDataTypeLookup that uses an PropertyInfoStore to find
+ * a property's data type ID.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.4
+ *
+ * @file
+ * @ingroup WikibaseLib
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class PropertyInfoDataTypeLookup implements PropertyDataTypeLookup {
+
+   /**
+* @var PropertyDataTypeLookup
+*/
+   private $fallbackLookup;
+
+   /**
+* @var PropertyInfoStore
+*/
+   private $infoStore;
+
+   /**
+* @param PropertyInfoStore  $infoStore
+* @param PropertyDataTypeLookup $fallbackLookup
+*/
+   public function __construct( PropertyInfoStore $infoStore, 
PropertyDataTypeLookup $fallbackLookup = null ) {
+   $this-infoStore = $infoStore;
+   $this-fallbackLookup = $fallbackLookup;
+   }
+
+   /**
+* @since 0.4
+*
+* @param EntityId $propertyId
+*
+* @return string
+*/
+   public function getDataTypeIdForProperty( EntityId $propertyId ) {
+   $dataTypeId = null;
+   $info = $this-infoStore-getPropertyInfo( $propertyId );
+
+   if ( $info !== null  isset( 
$info[PropertyInfoStore::KEY_DATA_TYPE] ) ) {
+   $dataTypeId = 

[MediaWiki-commits] [Gerrit] Ignore now empty message for translation - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Ignore now empty message for translation
..


Ignore now empty message for translation

Followup to I2622b35e712120dc171ea44a887d6b42286f2a06

Change-Id: I235fe77381e2ef2c763de33b59373649b3b8a50b
---
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Matmarex: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 8629a4f..0e8e75a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4599,7 +4599,7 @@
 'semicolon-separator' = ';#32;', # only translate this message to other 
languages if you have to change it
 'comma-separator' = ',#32;', # only translate this message to other 
languages if you have to change it
 'colon-separator' = ':#32;', # only translate this message to other 
languages if you have to change it
-'autocomment-prefix'  = '', # only translate this message to other languages 
if you have to change it
+'autocomment-prefix'  = '', # do not translate or duplicate this message to 
other languages
 'pipe-separator'  = '#32;|#32;', # only translate this message to other 
languages if you have to change it
 'word-separator'  = '#32;', # only translate this message to other 
languages if you have to change it
 'ellipsis'= '...', # only translate this message to other 
languages if you have to change it
diff --git a/maintenance/language/messageTypes.inc 
b/maintenance/language/messageTypes.inc
index 0ec22e0..8c6b3a4 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -258,6 +258,7 @@
'today-at',
'redirect-text',
'edithelppage',
+   'autocomment-prefix',
 );
 
 /** Optional messages, which may be translated only if changed in the target 
language. */
@@ -454,7 +455,6 @@
'percent',
'parentheses',
'brackets',
-   'autocomment-prefix',
'listgrouprights-right-display',
'listgrouprights-right-revoked',
'timezone-utc',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I235fe77381e2ef2c763de33b59373649b3b8a50b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Matmarex matma@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add snak validation to wbcreateclaim module. - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Add snak validation to wbcreateclaim module.
..


Add snak validation to wbcreateclaim module.

Prevent invalid snaks to be created via the CreateClaim module.

Change-Id: I49216858fa1b077285a71e6fe206a773aa7c9de7
---
M repo/includes/api/CreateClaim.php
M repo/tests/phpunit/includes/api/CreateClaimTest.php
2 files changed, 35 insertions(+), 12 deletions(-)

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



diff --git a/repo/includes/api/CreateClaim.php 
b/repo/includes/api/CreateClaim.php
index 0beb963..9267bda 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -4,9 +4,9 @@
 
 use ApiBase, MWException;
 
+use ApiMain;
 use DataValues\IllegalValueException;
 use InvalidArgumentException;
-use UsageException;
 use ValueParsers\ParseException;
 use Wikibase\EntityId;
 use Wikibase\Entity;
@@ -14,13 +14,12 @@
 use Wikibase\EntityContentFactory;
 use Wikibase\Property;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\SnakFactory;
 use Wikibase\LibRegistry;
 use Wikibase\Claim;
 use Wikibase\Autocomment;
-use Wikibase\Settings;
 use Wikibase\Summary;
 use Wikibase\Snak;
+use Wikibase\Validators\ValidatorErrorLocalizer;
 
 /**
  * API module for creating claims.
@@ -51,7 +50,29 @@
  */
 class CreateClaim extends ModifyClaim {
 
-   // TODO: rights
+
+   /**
+* @var SnakValidationHelper
+*/
+   protected $snakValidation;
+
+   /**
+* see ApiBase::__construct()
+*
+* @param ApiMain $mainModule
+* @param string  $moduleName
+* @param string  $modulePrefix
+*/
+   public function __construct( ApiMain $mainModule, $moduleName, 
$modulePrefix = '' ) {
+   parent::__construct( $mainModule, $moduleName, $modulePrefix );
+
+   $this-snakValidation = new SnakValidationHelper(
+   $this,
+   
WikibaseRepo::getDefaultInstance()-getPropertyDataTypeLookup(),
+   
WikibaseRepo::getDefaultInstance()-getDataTypeFactory(),
+   new ValidatorErrorLocalizer()
+   );
+   }
 
/**
 * @see \ApiBase::execute
@@ -85,6 +106,8 @@
$this-dieUsage( $parseException-getMessage(), 
'claim-invalid-guid' );
}
 
+   $this-snakValidation-validateSnak( $snak );
+
$claim = $this-addClaim( $entityContent-getEntity(), $snak );
$summary = $this-createSummary( $snak, 'create' );
 
diff --git a/repo/tests/phpunit/includes/api/CreateClaimTest.php 
b/repo/tests/phpunit/includes/api/CreateClaimTest.php
index f19fe58..ba4efcc 100644
--- a/repo/tests/phpunit/includes/api/CreateClaimTest.php
+++ b/repo/tests/phpunit/includes/api/CreateClaimTest.php
@@ -76,7 +76,7 @@
'entity' = $this-getFormattedIdForEntity( $entity ),
'snaktype' = 'value',
'property' = $this-getFormattedIdForEntity( $property 
),
-   'value' = 'foo',
+   'value' = 'Foo.png',
'token' = $GLOBALS['wgUser']-getEditToken()
);
 
@@ -111,7 +111,7 @@
'entity' = 'q0',
'snaktype' = 'value',
'property' = '-',
-   'value' = 'foo',
+   'value' = 'Foo.png',
);
 
$argLists[] = array( 'cant-load-entity-content', $params );
@@ -121,7 +121,7 @@
'entity' = '-',
'snaktype' = 'value',
'property' = 'q0',
-   'value' = 'foo',
+   'value' = 'Foo.png',
);
 
$argLists[] = array( 'claim-invalid-snak', $params );
@@ -131,7 +131,7 @@
'entity' = '-',
'snaktype' = 'hax',
'property' = '-',
-   'value' = 'foo',
+   'value' = 'Foo.png',
);
 
$argLists[] = array( 'unknown_snaktype', $params );
@@ -142,7 +142,7 @@
'entity' = '-',
'snaktype' = 'value',
'property' = '-',
-   'value' = 'foo',
+   'value' = 'Foo.png',
);
 
unset( $params[$requiredParam] );
@@ -154,7 +154,7 @@
'action' = 'wbcreateclaim',
'entity' = '-',
'snaktype' = 'value',
-   'value' = 'foo',
+   'value' = 'Foo.png',
);
 
$argLists[] = array( 

[MediaWiki-commits] [Gerrit] ULS deployment phase 5 - change (operations/mediawiki-config)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: ULS deployment phase 5
..

ULS deployment phase 5

https://www.mediawiki.org/wiki/UniversalLanguageSelector/Deployment/Planning#Phase_5:_The_rest

Change-Id: Ifa5c99e3a5bed9fe2bbf2c8b40e9a0295b98b56d
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 98 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4c39bd1..925842b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12102,104 +12102,7 @@
 ),
 
 'wmgUseUniversalLanguageSelector' = array(
-   'default' = false,
-   'special' = true,
-   'wikimedia' = true,
-   'amwiki' = true,
-   'amwikiquote' = true,
-   'amwiktionary' = true,
-   'arwiki' = true,
-   'arwikibooks' = true,
-   'arwikinews' = true,
-   'arwikiquote' = true,
-   'arwikisource' = true,
-   'arwikiversity' = true,
-   'arwiktionary' = true,
-   'aswiki' = true,
-   'aswikibooks' = true,
-   'aswikisource' = true,
-   'aswiktionary' = true,
-   'betawikiversity' = true,
-   'bhwiki' = true,
-   'bnwiki' = true,
-   'bnwikibooks' = true,
-   'bnwikisource' = true,
-   'bnwiktionary' = true,
-   'bpywiki' = true,
-   'bugwiki' = true,
-   'cawiki' = true,
-   'cebwiki' = true,
-   'dvwiki' = true,
-   'dvwiktionary' = true,
-   'enwiki' = true,
-   'enwikisource' = true,
-   'enwiktionary' = true,
-   'fawiki' = true,
-   'fiwiki' = true,
-   'frwikisource' = true,
-   'guwiki' = true,
-   'guwikibooks' = true,
-   'guwikiquote' = true,
-   'guwikisource' = true,
-   'guwiktionary' = true,
-   'hiwiki' = true,
-   'hiwikibooks' = true,
-   'hiwikiquote' = true,
-   'hiwiktionary' = true,
-   'jvwiki' = true,
-   'jvwiktionary' = true,
-   'kawiki' = true,
-   'knwiki' = true,
-   'knwikibooks' = true,
-   'knwikiquote' = true,
-   'knwikisource' = true,
-   'knwiktionary' = true,
-   'map_bmswiki' = true,
-   'mlwiki' = true,
-   'mlwikibooks' = true,
-   'mlwikiquote' = true,
-   'mlwikisource' = true,
-   'mlwiktionary' = true,
-   'mrwiki' = true,
-   'mrwikibooks' = true,
-   'mrwikiquote' = true,
-   'mrwikisource' = true,
-   'mrwiktionary' = true,
-   'mywiki' = true,
-   'mywiktionary' = true,
-   'newiki' = true,
-   'newikibooks' = true,
-   'newiktionary' = true,
-   'nowiki' = true,
-   'orwiki' = true,
-   'orwiktionary' = true,
-   'pawiki' = true,
-   'pawikibooks' = true,
-   'pawiktionary' = true,
-   'ptwiki' = true,
-   'sawiki' = true,
-   'sawikibooks' = true,
-   'sawikiquote' = true,
-   'sawikisource' = true,
-   'sawiktionary' = true,
-   'siwiki' = true,
-   'siwikibooks' = true,
-   'siwiktionary' = true,
-   'tawiki' = true,
-   'tawikibooks' = true,
-   'tawikinews' = true,
-   'tawikiquote' = true,
-   'tawikisource' = true,
-   'tawiktionary' = true,
-   'tewiki' = true,
-   'tewikibooks' = true,
-   'tewikiquote' = true,
-   'tewikisource' = true,
-   'tewiktionary' = true,
-   'ukwiki' = true,
-   'viwiki' = true,
-   'warwiki' = true,
-   'zhwiki' = true,
+   'default' = true,
 ),
 
 'wmgULSPosition' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa5c99e3a5bed9fe2bbf2c8b40e9a0295b98b56d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] (bug 45167) use SetupAfterCache to register templates. - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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


Change subject: (bug 45167) use SetupAfterCache to register templates.
..

(bug 45167) use SetupAfterCache to register templates.

Avoid using $wgExtensionFunctions in general, and especially
with closures, since they look odd on Special:Version.

Change-Id: I924c856232af8e81ac9e55c10a4a22e2f4f6200a
---
M lib/WikibaseLib.php
1 file changed, 11 insertions(+), 6 deletions(-)


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

diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 3ce122c..5a9fc13 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -104,12 +104,6 @@
// i18n
$wgExtensionMessagesFiles['WikibaseLib'] = __DIR__ . 
'/WikibaseLib.i18n.php';
 
-   // TODO: this is not nice, figure out a better design
-   $wgExtensionFunctions[] = function() {
-   \Wikibase\TemplateRegistry::singleton()-addTemplates( include( 
__DIR__ . /resources/templates.php ) );
-   return true;
-   };
-
$wgValueParsers['wikibase-entityid'] = 'Wikibase\Lib\EntityIdParser';
$wgDataValues['wikibase-entityid'] = 'Wikibase\EntityId';
$wgJobClasses['ChangeNotification'] = 'Wikibase\ChangeNotificationJob';
@@ -138,6 +132,17 @@
};
 
/**
+* Called when setup is done. This is somewhat ugly, find a better time 
to register templates.
+* @see https://www.mediawiki.org/wiki/Manual:Hooks/SetupAfterCache
+*
+* @return bool
+*/
+   $wgHooks['SetupAfterCache'][] = function() {
+   \Wikibase\TemplateRegistry::singleton()-addTemplates( include( 
__DIR__ . /resources/templates.php ) );
+   return true;
+   };
+
+   /**
 * Shorthand function to retrieve a template filled with the specified 
parameters.
 *
 * @since 0.2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I924c856232af8e81ac9e55c10a4a22e2f4f6200a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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


Change subject: Update jquery.uls from upstream
..

Update jquery.uls from upstream

Performance improvements by matmarex

Change-Id: Ie89bd56702dec231a8c27f9cf8eeb7bbffe9b251
---
M lib/jquery.uls/i18n/ka.json
M lib/jquery.uls/src/jquery.uls.core.js
M lib/jquery.uls/src/jquery.uls.lcd.js
M lib/jquery.uls/src/jquery.uls.regionfilter.js
4 files changed, 27 insertions(+), 48 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/73/71973/1

diff --git a/lib/jquery.uls/i18n/ka.json b/lib/jquery.uls/i18n/ka.json
index 530b5e5..b42f526 100644
--- a/lib/jquery.uls/i18n/ka.json
+++ b/lib/jquery.uls/i18n/ka.json
@@ -4,13 +4,18 @@
 David1010
 ]
 },
+uls-select-language: \u10d0\u10d8\u10e0\u10e9\u10d8\u10d4\u10d7 
\u10d4\u10dc\u10d0,
 uls-region-WW: \u10db\u10e1\u10dd\u10e4\u10da\u10d8\u10dd,
+uls-region-SP: 
\u10e1\u10de\u10d4\u10ea\u10d8\u10d0\u10da\u10e3\u10e0\u10d8,
 uls-region-AM: \u10d0\u10db\u10d4\u10e0\u10d8\u10d9\u10d0,
 uls-region-AF: \u10d0\u10e4\u10e0\u10d8\u10d9\u10d0,
 uls-region-EU: \u10d4\u10d5\u10e0\u10dd\u10de\u10d0,
 uls-region-AS: \u10d0\u10d6\u10d8\u10d0,
 uls-region-ME: \u10d0\u10ee\u10da\u10dd 
\u10d0\u10e6\u10db\u10dd\u10e1\u10d0\u10d5\u10da\u10d4\u10d7\u10d8,
 uls-region-PA: \u10dd\u10d9\u10d4\u10d0\u10dc\u10d4\u10d7\u10d8,
+uls-no-results-found: \u10e8\u10d4\u10d3\u10d4\u10d2\u10d8 
\u10d5\u10d4\u10e0 \u10db\u10dd\u10d8\u10eb\u10d4\u10d1\u10dc\u10d0,
 uls-common-languages: \u10e1\u10d0\u10d4\u10e0\u10d7\u10dd 
\u10d4\u10dc\u10d4\u10d1\u10d8,
+uls-no-results-suggestion-title: \u10d8\u10e5\u10dc\u10d4\u10d1 
\u10d7\u10e5\u10d5\u10d4\u10dc \u10d0\u10db 
\u10d4\u10dc\u10d4\u10d1\u10db\u10d0 
\u10d3\u10d0\u10d2\u10d0\u10d8\u10dc\u10e2\u10d4\u10e0\u10d4\u10e1\u10dd\u10d7:,
+uls-search-help: \u10eb\u10d8\u10d4\u10d1\u10d0 
\u10e8\u10d4\u10e1\u10d0\u10eb\u10da\u10d4\u10d1\u10d4\u10da\u10d8\u10d0 
\u10d4\u10dc\u10d8\u10e1 \u10e1\u10d0\u10ee\u10d4\u10da\u10d8\u10d7 
\u10d0\u10dc 
\u10d3\u10d0\u10db\u10ec\u10d4\u10e0\u10da\u10dd\u10d1\u10d8\u10d7, 
\u10d4\u10dc\u10d8\u10e1 ISO-\u10d9\u10dd\u10d3\u10d8\u10d7 \u10d0\u10dc 
\u10e0\u10d4\u10d2\u10d8\u10dd\u10dc\u10d8\u10e1 
\u10db\u10d8\u10ee\u10d4\u10d3\u10d5\u10d8\u10d7:,
 uls-search-placeholder: \u10d4\u10dc\u10d8\u10e1 
\u10db\u10dd\u10eb\u10d4\u10d1\u10dc\u10d0
 }
\ No newline at end of file
diff --git a/lib/jquery.uls/src/jquery.uls.core.js 
b/lib/jquery.uls/src/jquery.uls.core.js
index 0d3cfd0..cac2b8d 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -201,11 +201,7 @@
defaultSearch: function () {
this.$resultsView.lcd( 'empty' );
 
-   if ( this.options.lazyload ) {
-   this.$regionFilters.first().regionselector( 
'show' );
-   } else {
-   this.$regionFilters.regionselector( 'show' );
-   }
+   this.$regionFilters.regionselector( 'show' );
},
 
/**
@@ -269,7 +265,6 @@
languages: uls.languages,
quickList: uls.options.quickList,
clickhandler: $.proxy( uls.select, uls ),
-   lazyload: uls.options.lazyload,
source: uls.$languageFilter,
showRegions: uls.options.showRegions
} ).data( 'lcd' );
@@ -412,7 +407,6 @@
searchAPI: null, // Language search API
languages: $.uls.data.getAutonyms(), // Languages to be used 
for ULS, default is all languages
quickList: null, // Array of language codes or function that 
returns such
-   lazyload: true, // Lazy load the language list when scrolled.
compact: false, // Show ULS in compact mode
showRegions: ['WW', 'AM', 'EU', 'ME', 'AF', 'AS', 'PA']
};
diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js 
b/lib/jquery.uls/src/jquery.uls.lcd.js
index 927f419..87f79c2 100644
--- a/lib/jquery.uls/src/jquery.uls.lcd.js
+++ b/lib/jquery.uls/src/jquery.uls.lcd.js
@@ -287,11 +287,6 @@
scrollTop = 
$ulsLanguageList.position().top,
scrollBottom = 
$ulsLanguageList.height();
 
-   if ( lcd.options.lazyload  
lcd.options.source.val() === '' ) {
-   if ( this.offsetHeight + this.scrollTop 
= this.scrollHeight / 2 ) {
-   lcd.$element.trigger( 
'scrollend' );
-  

[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Update jquery.uls from upstream
..


Update jquery.uls from upstream

Performance improvements by matmarex

Change-Id: Ie89bd56702dec231a8c27f9cf8eeb7bbffe9b251
---
M lib/jquery.uls/i18n/ka.json
M lib/jquery.uls/src/jquery.uls.core.js
M lib/jquery.uls/src/jquery.uls.lcd.js
M lib/jquery.uls/src/jquery.uls.regionfilter.js
4 files changed, 27 insertions(+), 48 deletions(-)

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



diff --git a/lib/jquery.uls/i18n/ka.json b/lib/jquery.uls/i18n/ka.json
index 530b5e5..b42f526 100644
--- a/lib/jquery.uls/i18n/ka.json
+++ b/lib/jquery.uls/i18n/ka.json
@@ -4,13 +4,18 @@
 David1010
 ]
 },
+uls-select-language: \u10d0\u10d8\u10e0\u10e9\u10d8\u10d4\u10d7 
\u10d4\u10dc\u10d0,
 uls-region-WW: \u10db\u10e1\u10dd\u10e4\u10da\u10d8\u10dd,
+uls-region-SP: 
\u10e1\u10de\u10d4\u10ea\u10d8\u10d0\u10da\u10e3\u10e0\u10d8,
 uls-region-AM: \u10d0\u10db\u10d4\u10e0\u10d8\u10d9\u10d0,
 uls-region-AF: \u10d0\u10e4\u10e0\u10d8\u10d9\u10d0,
 uls-region-EU: \u10d4\u10d5\u10e0\u10dd\u10de\u10d0,
 uls-region-AS: \u10d0\u10d6\u10d8\u10d0,
 uls-region-ME: \u10d0\u10ee\u10da\u10dd 
\u10d0\u10e6\u10db\u10dd\u10e1\u10d0\u10d5\u10da\u10d4\u10d7\u10d8,
 uls-region-PA: \u10dd\u10d9\u10d4\u10d0\u10dc\u10d4\u10d7\u10d8,
+uls-no-results-found: \u10e8\u10d4\u10d3\u10d4\u10d2\u10d8 
\u10d5\u10d4\u10e0 \u10db\u10dd\u10d8\u10eb\u10d4\u10d1\u10dc\u10d0,
 uls-common-languages: \u10e1\u10d0\u10d4\u10e0\u10d7\u10dd 
\u10d4\u10dc\u10d4\u10d1\u10d8,
+uls-no-results-suggestion-title: \u10d8\u10e5\u10dc\u10d4\u10d1 
\u10d7\u10e5\u10d5\u10d4\u10dc \u10d0\u10db 
\u10d4\u10dc\u10d4\u10d1\u10db\u10d0 
\u10d3\u10d0\u10d2\u10d0\u10d8\u10dc\u10e2\u10d4\u10e0\u10d4\u10e1\u10dd\u10d7:,
+uls-search-help: \u10eb\u10d8\u10d4\u10d1\u10d0 
\u10e8\u10d4\u10e1\u10d0\u10eb\u10da\u10d4\u10d1\u10d4\u10da\u10d8\u10d0 
\u10d4\u10dc\u10d8\u10e1 \u10e1\u10d0\u10ee\u10d4\u10da\u10d8\u10d7 
\u10d0\u10dc 
\u10d3\u10d0\u10db\u10ec\u10d4\u10e0\u10da\u10dd\u10d1\u10d8\u10d7, 
\u10d4\u10dc\u10d8\u10e1 ISO-\u10d9\u10dd\u10d3\u10d8\u10d7 \u10d0\u10dc 
\u10e0\u10d4\u10d2\u10d8\u10dd\u10dc\u10d8\u10e1 
\u10db\u10d8\u10ee\u10d4\u10d3\u10d5\u10d8\u10d7:,
 uls-search-placeholder: \u10d4\u10dc\u10d8\u10e1 
\u10db\u10dd\u10eb\u10d4\u10d1\u10dc\u10d0
 }
\ No newline at end of file
diff --git a/lib/jquery.uls/src/jquery.uls.core.js 
b/lib/jquery.uls/src/jquery.uls.core.js
index 0d3cfd0..cac2b8d 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -201,11 +201,7 @@
defaultSearch: function () {
this.$resultsView.lcd( 'empty' );
 
-   if ( this.options.lazyload ) {
-   this.$regionFilters.first().regionselector( 
'show' );
-   } else {
-   this.$regionFilters.regionselector( 'show' );
-   }
+   this.$regionFilters.regionselector( 'show' );
},
 
/**
@@ -269,7 +265,6 @@
languages: uls.languages,
quickList: uls.options.quickList,
clickhandler: $.proxy( uls.select, uls ),
-   lazyload: uls.options.lazyload,
source: uls.$languageFilter,
showRegions: uls.options.showRegions
} ).data( 'lcd' );
@@ -412,7 +407,6 @@
searchAPI: null, // Language search API
languages: $.uls.data.getAutonyms(), // Languages to be used 
for ULS, default is all languages
quickList: null, // Array of language codes or function that 
returns such
-   lazyload: true, // Lazy load the language list when scrolled.
compact: false, // Show ULS in compact mode
showRegions: ['WW', 'AM', 'EU', 'ME', 'AF', 'AS', 'PA']
};
diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js 
b/lib/jquery.uls/src/jquery.uls.lcd.js
index 927f419..87f79c2 100644
--- a/lib/jquery.uls/src/jquery.uls.lcd.js
+++ b/lib/jquery.uls/src/jquery.uls.lcd.js
@@ -287,11 +287,6 @@
scrollTop = 
$ulsLanguageList.position().top,
scrollBottom = 
$ulsLanguageList.height();
 
-   if ( lcd.options.lazyload  
lcd.options.source.val() === '' ) {
-   if ( this.offsetHeight + this.scrollTop 
= this.scrollHeight / 2 ) {
-   lcd.$element.trigger( 
'scrollend' );
-   }
-   }
// 

[MediaWiki-commits] [Gerrit] Drop mw:ExtLink/URL support - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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


Change subject: Drop mw:ExtLink/URL support
..

Drop mw:ExtLink/URL support

Because Parsoid has.

Bug: 50734
Change-Id: Id2c893467c5063cc29cd9a91203406b86a3abfbe
---
M modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
M modules/ve-mw/test/dm/ve.dm.mwExample.js
2 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js 
b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
index 85bf863..44654e6 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
@@ -11,7 +11,6 @@
  * Example HTML sources:
  * a rel=mw:ExtLink
  * a rel=mw:ExtLink/Numbered
- * a rel=mw:ExtLink/URL
  *
  * Each example is semantically slightly different, but they don't need 
special treatment (yet).
  *
@@ -34,7 +33,8 @@
 ve.dm.MWExternalLinkAnnotation.static.name = 'link/mwExternal';
 
 ve.dm.MWExternalLinkAnnotation.static.matchRdfaTypes = [
-   'mw:ExtLink', 'mw:ExtLink/Numbered', 'mw:ExtLink/URL'
+   'mw:ExtLink',
+   'mw:ExtLink/Numbered'
 ];
 
 ve.dm.MWExternalLinkAnnotation.static.toDataElement = function ( domElements ) 
{
diff --git a/modules/ve-mw/test/dm/ve.dm.mwExample.js 
b/modules/ve-mw/test/dm/ve.dm.mwExample.js
index ec6bd20..68c09e6 100644
--- a/modules/ve-mw/test/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/test/dm/ve.dm.mwExample.js
@@ -1187,7 +1187,7 @@
]
},
'URL link': {
-   'html': 'bodypa rel=mw:ExtLink/URL 
href=http://www.mediawiki.org/;mw/a/p/body',
+   'html': 'bodypa rel=mw:ExtLink 
href=http://www.mediawiki.org/;mw/a/p/body',
'data': [
{ 'type': 'paragraph' },
[
@@ -1196,10 +1196,10 @@
'type': 'link/mwExternal',
'attributes': {
'href': 
'http://www.mediawiki.org/',
-   'rel': 'mw:ExtLink/URL'
+   'rel': 'mw:ExtLink'
},
'htmlAttributes': [ { 'values': {
-   'rel': 'mw:ExtLink/URL',
+   'rel': 'mw:ExtLink',
'href': 
'http://www.mediawiki.org/'
} } ]
} ]
@@ -1210,10 +1210,10 @@
'type': 'link/mwExternal',
'attributes': {
'href': 
'http://www.mediawiki.org/',
-   'rel': 'mw:ExtLink/URL'
+   'rel': 'mw:ExtLink'
},
'htmlAttributes': [ { 'values': {
-   'rel': 'mw:ExtLink/URL',
+   'rel': 'mw:ExtLink',
'href': 
'http://www.mediawiki.org/'
} } ]
} ]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2c893467c5063cc29cd9a91203406b86a3abfbe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Simplify CSS a tiny bit - change (mediawiki...erudite)

[Njw (Code Review)]

Njw has uploaded a new change for review.

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


Change subject: Simplify CSS a tiny bit
..

Simplify CSS a tiny bit

Change-Id: I61cf0e6c0409985f0af4ddbbf53a76615246332d
---
M assets/print.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/75/71975/1

diff --git a/assets/print.css b/assets/print.css
index e116de9..697ef0f 100644
--- a/assets/print.css
+++ b/assets/print.css
@@ -8,5 +8,5 @@
 
 /* Ensure footer text with URL isn't justified */
 .printfooter {
-   text-align: left !important;
+   text-align: left;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61cf0e6c0409985f0af4ddbbf53a76615246332d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk

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

[MediaWiki-commits] [Gerrit] add script for rsyncs of public data between dataset hosts - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: add script for rsyncs of public data between dataset hosts
..


add script for rsyncs of public data between dataset hosts

Change-Id: I827bd6807c0b51d1d896ae337a4b9bf2f3a2fbc7
---
A files/misc/scripts/rsync-dumps.sh
1 file changed, 72 insertions(+), 0 deletions(-)

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



diff --git a/files/misc/scripts/rsync-dumps.sh 
b/files/misc/scripts/rsync-dumps.sh
new file mode 100755
index 000..ae20c8f
--- /dev/null
+++ b/files/misc/scripts/rsync-dumps.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# NOTE: this file is maintained in puppet
+
+# rsync XML dumps and other public datasets between the various dataset 
servers,
+# allowing for the possibility that dumps may be produced on any or all of them
+# for different sets of wikis
+
+# this script takes one possible argument: dryrun in which case it prints 
what it would
+# do instead of actually doing the rsyncs
+
+if [ $1 == dryrun ]; then
+DRYRUN=1
+else
+DRYRUN=0
+fi
+
+RSYNCBW=4
+
+
+HOST=`/bin/hostname`
+
+RSYNCCMD='/usr/bin/rsync'
+RSYNCARGS=( '-q' --bwlimit=$RSYNCBW '-a' '--delete' )
+EXCLUDES=( '--exclude=wikidump_*' '--exclude=md5temp.*' )
+RSYNCSRC='/data/xmldatadumps/public/'
+
+MAILCMD='/usr/bin/mail'
+MAILARGS=( '-E' '-s' DUMPS RSYNC $HOST 'ops-du...@wikimedia.org' )
+
+SERVERS=( 'dataset2' 'dataset1001' 'localhost.localdomain' )
+# remove self from the list
+for ((i=0; i${#SERVERS[*]}; i++)); do
+if [ ${SERVERS[$i]} == $HOST ]; then
+   unset SERVERS[$i]
+fi
+done
+
+do_rsyncs () {
+for s in ${SERVERS[@]}; do
+   running=`pgrep -u root -f $s::data/xmldatadumps/public/`
+   if [ ! -z $running ]; then
+   exit 0
+   fi
+   RSYNCDEST=$s::data/xmldatadumps/public/
+   if [ $DRYRUN -eq 0 ]; then
+   $RSYNCCMD ${RSYNCARGS[@]} ${EXCLUDES[@]} ${EXTRAARGS[@]} 
${RSYNCSRC} ${RSYNCDEST} 21 | $MAILCMD ${MAILARGS[@]}
+   else
+   echo -n $RSYNCCMD ${RSYNCARGS[@]} ${EXCLUDES[@]} 
${EXTRAARGS[@]} ${RSYNCSRC} ${RSYNCDEST}
+   echo '|' $MAILCMD ${MAILARGS[@]}
+   fi
+done
+}
+
+case $HOST in
+'dataset1001' )
+   # all dumps are produced on this host except these
+   DIRS=( '/enwiki/' ) # must have leading/trailing slash
+   DIRARGS=${DIRS[@]/#/--include=}
+   EXTRAARGS=( ${DIRARGS[@]} ${DIRARGS[@]/%/**} '--exclude=*' )
+   do_rsyncs
+   ;;
+'localhost.localdomain'|'dataset2' )
+   # directories for which this host produces dumps
+   DIRS=( '/enwiki/' ) # must have leading/trailing slash
+   EXTRAARGS=( ${DIRS[@]/#/--exclude=} )
+   do_rsyncs
+   ;;
+* )
+echo No rsync stanza available for $HOST
+   ;;
+esac

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I827bd6807c0b51d1d896ae337a4b9bf2f3a2fbc7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Simplify CSS a tiny bit - change (mediawiki...erudite)

[jenkins-bot (Code Review)]

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

Change subject: Simplify CSS a tiny bit
..


Simplify CSS a tiny bit

Change-Id: I61cf0e6c0409985f0af4ddbbf53a76615246332d
---
M assets/print.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/assets/print.css b/assets/print.css
index e116de9..697ef0f 100644
--- a/assets/print.css
+++ b/assets/print.css
@@ -8,5 +8,5 @@
 
 /* Ensure footer text with URL isn't justified */
 .printfooter {
-   text-align: left !important;
+   text-align: left;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61cf0e6c0409985f0af4ddbbf53a76615246332d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] some more extensions - change (mediawiki/extensions)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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


Change subject: some more extensions
..

some more extensions

Using update-extensions.sh, adds in:

BookManagerv2
CloseWikis
FlashPlayer
HaloTripleStoreConnector
InlineCategorizer
PageLanguage
PronunciationRecording
SMWHalo
SlippyMap
WikiTwidget
WikidataEntitySuggester

Change-Id: Id90396daf369584bc0d05306562b69cffee02c12
---
M .gitmodules
A BookManagerv2
A CloseWikis
A FlashPlayer
A HaloTripleStoreConnector
A InlineCategorizer
A PageLanguage
A PronunciationRecording
A SMWHalo
A SlippyMap
A WikiTwidget
A WikidataEntitySuggester
12 files changed, 56 insertions(+), 0 deletions(-)


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

diff --git a/.gitmodules b/.gitmodules
index d310663..3d9e78e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2240,3 +2240,59 @@
path = WikibaseQueryEngine
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseQueryEngine.git
branch = .
+[submodule BookManagerv2]
+   path = BookManagerv2
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BookManagerv2.git
+   branch = .
+[submodule CloseWikis]
+   path = CloseWikis
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CloseWikis.git
+   branch = .
+   branch = .
+[submodule FlashPlayer]
+   path = FlashPlayer
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/FlashPlayer.git
+   branch = .
+   branch = .
+   branch = .
+[submodule HaloTripleStoreConnector]
+   path = HaloTripleStoreConnector
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HaloTripleStoreConnector.git
+   branch = .
+[submodule InlineCategorizer]
+   path = InlineCategorizer
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/InlineCategorizer.git
+   branch = .
+   branch = .
+[submodule PageLanguage]
+   path = PageLanguage
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PageLanguage.git
+   branch = .
+   branch = .
+   branch = .
+   branch = .
+[submodule PronunciationRecording]
+   path = PronunciationRecording
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PronunciationRecording.git
+   branch = .
+[submodule SMWHalo]
+   path = SMWHalo
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SMWHalo.git
+   branch = .
+[submodule SlippyMap]
+   path = SlippyMap
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SlippyMap.git
+   branch = .
+   branch = .
+   branch = .
+   branch = .
+   branch = .
+[submodule WikiTwidget]
+   path = WikiTwidget
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikiTwidget.git
+   branch = .
+   branch = .
+[submodule WikidataEntitySuggester]
+   path = WikidataEntitySuggester
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikidataEntitySuggester.git
+   branch = .
diff --git a/BookManagerv2 b/BookManagerv2
new file mode 16
index 000..f226441
--- /dev/null
+++ b/BookManagerv2
+Subproject commit f22644142212800adb9ad14dc967a0eac516daa2
diff --git a/CloseWikis b/CloseWikis
new file mode 16
index 000..a5f0327
--- /dev/null
+++ b/CloseWikis
+Subproject commit a5f0327439bf2e507d08f91639b66b5322d9150c
diff --git a/FlashPlayer b/FlashPlayer
new file mode 16
index 000..a466069
--- /dev/null
+++ b/FlashPlayer
+Subproject commit a46606967cf1575a94f18bfdb1839931d16aa087
diff --git a/HaloTripleStoreConnector b/HaloTripleStoreConnector
new file mode 16
index 000..8b4b5a2
--- /dev/null
+++ b/HaloTripleStoreConnector
+Subproject commit 8b4b5a2591834ba6b6b15796564c388d6f083151
diff --git a/InlineCategorizer b/InlineCategorizer
new file mode 16
index 000..9b3e826
--- /dev/null
+++ b/InlineCategorizer
+Subproject commit 9b3e8263b597874c226588a14ec1e16eb6e36b97
diff --git a/PageLanguage b/PageLanguage
new file mode 16
index 000..6cdd751
--- /dev/null
+++ b/PageLanguage
+Subproject commit 6cdd751adea7dc75c15d53788aaafb94c746fb87
diff --git a/PronunciationRecording b/PronunciationRecording
new file mode 16
index 000..14c3983
--- /dev/null
+++ b/PronunciationRecording
+Subproject commit 14c39832dd05384339e481b20a3c30603490ac8a
diff --git a/SMWHalo b/SMWHalo
new file mode 16
index 000..e0b1fbe
--- /dev/null
+++ b/SMWHalo
+Subproject commit e0b1fbe602c795a0ba66379bc95877851aeba589
diff --git a/SlippyMap b/SlippyMap
new file mode 16
index 000..4d7dcb7
--- /dev/null
+++ b/SlippyMap
+Subproject commit 4d7dcb7ada060419106385a2fa545aa5ff7fcec9
diff --git a/WikiTwidget b/WikiTwidget
new file mode 16
index 000..97952b4
--- /dev/null
+++ b/WikiTwidget
+Subproject commit 97952b46f680f64ba5333b994fc64e3029d1d3fb
diff 

[MediaWiki-commits] [Gerrit] Calculate the position of the menu near the cog properly - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Calculate the position of the menu near the cog properly
..


Calculate the position of the menu near the cog properly

Instead of magic numbers, use a proper calculation according
to the elements' positions.

Bug: 49471
Change-Id: I9093b2c684f557e9e562762b7ef25ced37b8848b
---
M resources/js/ext.uls.interface.js
1 file changed, 14 insertions(+), 9 deletions(-)

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



diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index e243b24..ed60f97 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -286,23 +286,28 @@
$ulsSettingsTrigger.languagesettings( {
defaultModule: 'display',
onVisible: function () {
-   var left,
+   var topRowHeight, caretHeight, 
caretWidth,
+   $caretBefore = $( 'span' 
).addClass( 'caret-before' ),
+   $caretAfter = $( 'span' 
).addClass( 'caret-after' ),
+   ulsTriggerWidth = 
$ulsSettingsTrigger.width(),
ulsTriggerOffset = 
$ulsSettingsTrigger.offset();
 
this.$window.addClass( 'callout' );
+   this.$window.prepend( $caretBefore, 
$caretAfter );
+
if ( rtlPage ) {
-   left = ulsTriggerOffset.left - 
this.$window.width() - 30;
+   caretWidth = parseInt( 
$caretBefore.css( 'border-left-width' ), '10' );
+   this.left = 
ulsTriggerOffset.left - this.$window.width() - caretWidth;
} else {
-   left = ulsTriggerOffset.left + 
30;
+   caretWidth = parseInt( 
$caretBefore.css( 'border-right-width' ), '10' );
+   this.left = 
ulsTriggerOffset.left + ulsTriggerWidth + caretWidth;
}
 
-   this.left = left;
-   this.top = ulsTriggerOffset.top - 50;
+   topRowHeight = this.$window.find( 
'.row' ).height();
+   caretHeight = parseInt( 
$caretBefore.css( 'top' ), '10' );
+   this.top = ulsTriggerOffset.top - 
topRowHeight - caretHeight / 2;
+
this.position();
-   this.$window.prepend(
-   $( 'span' ).addClass( 
'caret-before' ),
-   $( 'span' ).addClass( 
'caret-after' )
-   );
}
} );
} else if ( anonMode ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9093b2c684f557e9e562762b7ef25ced37b8848b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] enable rsync dumps cronjob for primary dataset host - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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


Change subject: enable rsync dumps cronjob for primary dataset host
..

enable rsync dumps cronjob for primary dataset host

Change-Id: I769535b307f08e149f062a33f76bb0ed466c72b3
---
M manifests/misc/download.pp
M manifests/site.pp
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/71977/1

diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index 99db53e..e26ce96 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -1,5 +1,24 @@
 # misc::download
 
+class misc::download::cron-rsync-dumps {
+file { '/usr/local/bin/rsync-dumps.sh':
+   mode   = 0755,
+   owner  = root,
+   group  = root,
+   path   = '/usr/local/bin/rsync-dumps.sh',
+   source = 'puppet:///files/misc/scripts/rsync-dumps.sh';
+}
+
+   cron { 'rsync-dumps':
+   ensure  = present,
+   command = '/usr/local/bin/rsync-dumps.sh',
+   user= root,
+   minute  = '0',
+hour= '*/2',
+   require = File['/usr/local/bin/rsync-dumps.sh'];
+   }
+}
+
 class misc::download-wikimedia {
system_role { misc::download-wikimedia: description = 
download.wikimedia.org }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 0797e9b..3cbdf86 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -435,6 +435,7 @@
accounts::catrope,
misc::download-wikimedia,
misc::download-primary,
+misc::download::cron-rsync-dumps,
misc::kiwix-mirror
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I769535b307f08e149f062a33f76bb0ed466c72b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] some more extensions - change (mediawiki/extensions)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: some more extensions
..


some more extensions

Using update-extensions.sh, adds in:

BookManagerv2
CloseWikis
FlashPlayer
HaloTripleStoreConnector
InlineCategorizer
PageLanguage
PronunciationRecording
SMWHalo
SlippyMap
WikiTwidget
WikidataEntitySuggester

Change-Id: Id90396daf369584bc0d05306562b69cffee02c12
---
M .gitmodules
A BookManagerv2
A CloseWikis
A FlashPlayer
A HaloTripleStoreConnector
A InlineCategorizer
A PageLanguage
A PronunciationRecording
A SMWHalo
A SlippyMap
A WikiTwidget
A WikidataEntitySuggester
12 files changed, 44 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index d310663..b38002f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2240,3 +2240,47 @@
path = WikibaseQueryEngine
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseQueryEngine.git
branch = .
+[submodule BookManagerv2]
+   path = BookManagerv2
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BookManagerv2.git
+   branch = .
+[submodule CloseWikis]
+   path = CloseWikis
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CloseWikis.git
+   branch = .
+[submodule FlashPlayer]
+   path = FlashPlayer
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/FlashPlayer.git
+   branch = .
+[submodule HaloTripleStoreConnector]
+   path = HaloTripleStoreConnector
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HaloTripleStoreConnector.git
+   branch = .
+[submodule InlineCategorizer]
+   path = InlineCategorizer
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/InlineCategorizer.git
+   branch = .
+[submodule PageLanguage]
+   path = PageLanguage
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PageLanguage.git
+   branch = .
+[submodule PronunciationRecording]
+   path = PronunciationRecording
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PronunciationRecording.git
+   branch = .
+[submodule SMWHalo]
+   path = SMWHalo
+   url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SMWHalo.git
+   branch = .
+[submodule SlippyMap]
+   path = SlippyMap
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SlippyMap.git
+   branch = .
+[submodule WikiTwidget]
+   path = WikiTwidget
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikiTwidget.git
+   branch = .
+[submodule WikidataEntitySuggester]
+   path = WikidataEntitySuggester
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikidataEntitySuggester.git
+   branch = .
diff --git a/BookManagerv2 b/BookManagerv2
new file mode 16
index 000..f226441
--- /dev/null
+++ b/BookManagerv2
+Subproject commit f22644142212800adb9ad14dc967a0eac516daa2
diff --git a/CloseWikis b/CloseWikis
new file mode 16
index 000..a5f0327
--- /dev/null
+++ b/CloseWikis
+Subproject commit a5f0327439bf2e507d08f91639b66b5322d9150c
diff --git a/FlashPlayer b/FlashPlayer
new file mode 16
index 000..a466069
--- /dev/null
+++ b/FlashPlayer
+Subproject commit a46606967cf1575a94f18bfdb1839931d16aa087
diff --git a/HaloTripleStoreConnector b/HaloTripleStoreConnector
new file mode 16
index 000..8b4b5a2
--- /dev/null
+++ b/HaloTripleStoreConnector
+Subproject commit 8b4b5a2591834ba6b6b15796564c388d6f083151
diff --git a/InlineCategorizer b/InlineCategorizer
new file mode 16
index 000..9b3e826
--- /dev/null
+++ b/InlineCategorizer
+Subproject commit 9b3e8263b597874c226588a14ec1e16eb6e36b97
diff --git a/PageLanguage b/PageLanguage
new file mode 16
index 000..6cdd751
--- /dev/null
+++ b/PageLanguage
+Subproject commit 6cdd751adea7dc75c15d53788aaafb94c746fb87
diff --git a/PronunciationRecording b/PronunciationRecording
new file mode 16
index 000..14c3983
--- /dev/null
+++ b/PronunciationRecording
+Subproject commit 14c39832dd05384339e481b20a3c30603490ac8a
diff --git a/SMWHalo b/SMWHalo
new file mode 16
index 000..e0b1fbe
--- /dev/null
+++ b/SMWHalo
+Subproject commit e0b1fbe602c795a0ba66379bc95877851aeba589
diff --git a/SlippyMap b/SlippyMap
new file mode 16
index 000..4d7dcb7
--- /dev/null
+++ b/SlippyMap
+Subproject commit 4d7dcb7ada060419106385a2fa545aa5ff7fcec9
diff --git a/WikiTwidget b/WikiTwidget
new file mode 16
index 000..97952b4
--- /dev/null
+++ b/WikiTwidget
+Subproject commit 97952b46f680f64ba5333b994fc64e3029d1d3fb
diff --git a/WikidataEntitySuggester b/WikidataEntitySuggester
new file mode 16
index 000..585e236
--- /dev/null
+++ b/WikidataEntitySuggester
+Subproject commit 585e236624e2aa42b6fe38e42390fdb8c02b5b70

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

[MediaWiki-commits] [Gerrit] enable rsync dumps cronjob for primary dataset host - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: enable rsync dumps cronjob for primary dataset host
..


enable rsync dumps cronjob for primary dataset host

Change-Id: I769535b307f08e149f062a33f76bb0ed466c72b3
---
M manifests/misc/download.pp
M manifests/site.pp
2 files changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index 99db53e..e26ce96 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -1,5 +1,24 @@
 # misc::download
 
+class misc::download::cron-rsync-dumps {
+file { '/usr/local/bin/rsync-dumps.sh':
+   mode   = 0755,
+   owner  = root,
+   group  = root,
+   path   = '/usr/local/bin/rsync-dumps.sh',
+   source = 'puppet:///files/misc/scripts/rsync-dumps.sh';
+}
+
+   cron { 'rsync-dumps':
+   ensure  = present,
+   command = '/usr/local/bin/rsync-dumps.sh',
+   user= root,
+   minute  = '0',
+hour= '*/2',
+   require = File['/usr/local/bin/rsync-dumps.sh'];
+   }
+}
+
 class misc::download-wikimedia {
system_role { misc::download-wikimedia: description = 
download.wikimedia.org }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 0797e9b..3cbdf86 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -435,6 +435,7 @@
accounts::catrope,
misc::download-wikimedia,
misc::download-primary,
+misc::download::cron-rsync-dumps,
misc::kiwix-mirror
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I769535b307f08e149f062a33f76bb0ed466c72b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Allow loading redirects in Common languages - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Allow loading redirects in Common languages
..


Allow loading redirects in Common languages

Bug: 49847
Change-Id: Ia2380a77ebad789a2f70a7a88a1bb9970199b1c5
---
M resources/js/ext.uls.init.js
M tests/qunit/ext.uls.tests.js
2 files changed, 55 insertions(+), 5 deletions(-)

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



diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 083711f..3c5f389 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -75,9 +75,20 @@
return mw.config.get( 'wgULSAcceptLanguageList' );
};
 
-   mw.uls.getFrequentLanguageList = function () {
-   var countryCode,
-   unique = [],
+   /**
+* Get a list of codes for languages to show in
+* the Common languages section of the ULS.
+* The list consists of the user's current selected language,
+* the wiki's content language, the browser' UI language
+* and Accept-Language, user's previous selected languages
+* and finally, the languages of countryCode taken from the CLDR,
+* taken by default from the user's geolocation.
+*
+* @param {String} [countryCode] Uppercase country code.
+* @return {Array} List of language codes without duplicates.
+*/
+   mw.uls.getFrequentLanguageList = function ( countryCode ) {
+   var unique = [],
list = [
mw.config.get( 'wgUserLanguage' ),
mw.config.get( 'wgContentLanguage' ),
@@ -86,7 +97,7 @@
.concat( mw.uls.getPreviousLanguages() )
.concat( mw.uls.getAcceptLanguageList() );
 
-   countryCode = mw.uls.getCountryCode();
+   countryCode = countryCode || mw.uls.getCountryCode();
 
if ( countryCode ) {
list = list.concat( $.uls.data.getLanguagesInTerritory( 
countryCode ) );
@@ -100,7 +111,24 @@
 
// Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode ) {
-   return $.fn.uls.defaults.languages[langCode];
+   var target;
+
+   // If the language is already known and defined, just 
use it
+   if ( $.fn.uls.defaults.languages[langCode] !== 
undefined ) {
+   return true;
+   }
+
+   // If the language is not immediately known,
+   // try to check is as a redirect
+   target = $.uls.data.isRedirect( langCode );
+
+   if ( target ) {
+   // Check that the redirect's target is known
+   // to this instance of ULS
+   return $.fn.uls.defaults.languages[target] !== 
undefined;
+   }
+
+   return false;
} );
 
return unique;
diff --git a/tests/qunit/ext.uls.tests.js b/tests/qunit/ext.uls.tests.js
index ffb6974..4d9d211 100644
--- a/tests/qunit/ext.uls.tests.js
+++ b/tests/qunit/ext.uls.tests.js
@@ -63,4 +63,26 @@
prefs.set( prefName, undefined );
prefs.save();
} );
+
+   QUnit.test( '-- Common languages', 1, function ( assert ) {
+   var i, foundTagalog, languagesInPH;
+
+   // Bug 49847
+   foundTagalog = false;
+   languagesInPH = mw.uls.getFrequentLanguageList( 'PH' );
+
+   for ( i = 0; i  languagesInPH.length; i++ ) {
+   if ( $.uls.data.isRedirect( languagesInPH[i] ) === 'tl' 
||
+   languagesInPH[i] === 'tl'
+   ) {
+   foundTagalog = true;
+
+   break;
+   }
+   }
+   assert.ok(
+   foundTagalog,
+   'Tagalog is one of the languages presented to users in 
the Philippines.'
+   );
+   } );
 }( jQuery, mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2380a77ebad789a2f70a7a88a1bb9970199b1c5
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot

___

[MediaWiki-commits] [Gerrit] Remove redundant caret elements - change (mediawiki...UniversalLanguageSelector)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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


Change subject: Remove redundant caret elements
..

Remove redundant caret elements

They are already added when languagesettings are
initialized in ext.uls.interface.js.

Change-Id: I7ee201a7dc9ad7a3fd080c770d1a3afd51feffdd
---
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.inputsettings.js
2 files changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/resources/js/ext.uls.displaysettings.js 
b/resources/js/ext.uls.displaysettings.js
index 7de1345..67d9cb3 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -264,10 +264,6 @@
uls.$menu.find( 'h1.uls-title' )
.data( 'i18n', 
'ext-uls-display-settings-ui-language' )
.i18n();
-   uls.$menu.prepend(
-   $( 'span' ).addClass( 
'caret-before' ),
-   $( 'span' ).addClass( 
'caret-after' )
-   );
},
onVisible: function () {
if ( 
!displaySettings.$parent.$window.hasClass( 'callout' ) ) {
diff --git a/resources/js/ext.uls.inputsettings.js 
b/resources/js/ext.uls.inputsettings.js
index 4d39214..028693c 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -342,10 +342,6 @@
uls.$menu.find( 'h1.uls-title' )
.data( 'i18n', 
'ext-uls-input-settings-ui-language' )
.i18n();
-   uls.$menu.prepend(
-   $( 'span' ).addClass( 
'caret-before' ),
-   $( 'span' ).addClass( 
'caret-after' )
-   );
},
onVisible: function () {
if ( 
!inputSettings.$parent.$window.hasClass( 'callout' ) ) {

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

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

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

[MediaWiki-commits] [Gerrit] Add esams mobile LVS service IPs for HTTPS - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Add esams mobile LVS service IPs for HTTPS
..

Add esams mobile LVS service IPs for HTTPS

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/71979/1

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ab94e23..30307f4 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -227,6 +227,7 @@
'wikipedialbsecure' = 91.198.174.225,
'bitslbsecure' = 91.198.174.233,
'uploadlbsecure' = 91.198.174.234,
+   'mobilelbsecure' = '91.198.174.236',
'wiktionarylbsecure' = 
91.198.174.226,
'wikiquotelbsecure' = 91.198.174.227,
'wikibookslbsecure' = 91.198.174.228,
@@ -248,6 +249,7 @@
'foundationlbsecure6' = 
2620:0:862:ed1a::9,
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = 
2620:0:862:ed1a::b,
+   'uploadlbsecure6' = 
'2620:0:862:ed1a::c',
},
},
'ipv6' = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I509caca0917dc9ea02c55d8acb022ace6f696a8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add esams mobile LVS service IPs for HTTPS - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Add esams mobile LVS service IPs for HTTPS
..


Add esams mobile LVS service IPs for HTTPS

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

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ab94e23..30307f4 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -227,6 +227,7 @@
'wikipedialbsecure' = 91.198.174.225,
'bitslbsecure' = 91.198.174.233,
'uploadlbsecure' = 91.198.174.234,
+   'mobilelbsecure' = '91.198.174.236',
'wiktionarylbsecure' = 
91.198.174.226,
'wikiquotelbsecure' = 91.198.174.227,
'wikibookslbsecure' = 91.198.174.228,
@@ -248,6 +249,7 @@
'foundationlbsecure6' = 
2620:0:862:ed1a::9,
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = 
2620:0:862:ed1a::b,
+   'uploadlbsecure6' = 
'2620:0:862:ed1a::c',
},
},
'ipv6' = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I509caca0917dc9ea02c55d8acb022ace6f696a8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] hosts that mount /data will do so from dataset host in same ... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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


Change subject: hosts that mount /data will do so from dataset host in same 
datacenter
..

hosts that mount /data will do so from dataset host in same datacenter

Change-Id: I981910efd53c8776882e66d31f699188b752f8b4
---
M manifests/nfs.pp
1 file changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/71980/1

diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 3434682..15ee8e6 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -233,19 +233,25 @@
 class nfs::data {
include nfs::common
 
-   file { [ /mnt/data ]:
+   file { [ '/mnt/data' ]:
ensure = directory;
}
 
+$datasetserver = $site ? {
+'eqiad' = 'dataset1001.wikimedia.org',
+'pmtpa' = 'dataset2.wikimedia.org',
+default = 'dataset2.wikimedia.org',
+}
+
mount {
-   /mnt/data:
-   device = dataset2.wikimedia.org:/data,
-   fstype = nfs,
-   name = /mnt/data,
-   options = 
bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3,
-   require = File[/mnt/data],
+   '/mnt/data':
+   device   = ${datasetserver}:/data,
+   fstype   = 'nfs',
+   name = '/mnt/data',
+   options  = 
'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+   require  = File['/mnt/data'],
remounts = false,
-   ensure = mounted;
+   ensure   = mounted;
}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I981910efd53c8776882e66d31f699188b752f8b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add esams mobile HTTPS service IPs - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Add esams mobile HTTPS service IPs
..

Add esams mobile HTTPS service IPs

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/71981/1

diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index d4283f3..e5ef103 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -64,7 +64,7 @@
 realserver_ips = $::site ? {
 'pmtpa' = [ '208.80.152.200', '208.80.152.201', 
'208.80.152.202', '208.80.152.203', '208.80.152.204', '208.80.152.205', 
'208.80.152.206', '208.80.152.207', '208.80.152.208', '208.80.152.209', 
'208.80.152.210', '208.80.152.211', '208.80.152.3', '208.80.152.118', 
'208.80.152.218', '208.80.152.219', '2620:0:860:ed1a::', '2620:0:860:ed1a::1', 
'2620:0:860:ed1a::2', '2620:0:860:ed1a::3', '2620:0:860:ed1a::4', 
'2620:0:860:ed1a::5', '2620:0:860:ed1a::6', '2620:0:860:ed1a::7', 
'2620:0:860:ed1a::8', '2620:0:860:ed1a::9', '2620:0:860:ed1a::a', 
'2620:0:860:ed1a::b', '2620:0:860:ed1a::c', '2620:0:860:ed1a::12', 
'2620:0:860:ed1a::13' ],
 'eqiad' = [ '208.80.154.224', '208.80.154.225', 
'208.80.154.226', '208.80.154.227', '208.80.154.228', '208.80.154.229', 
'208.80.154.230', '208.80.154.231', '208.80.154.232', '208.80.154.233', 
'208.80.154.234', '208.80.154.235', '208.80.154.236', '208.80.154.242', 
'208.80.154.243', '2620:0:861:ed1a::', '2620:0:861:ed1a::1', 
'2620:0:861:ed1a::2', '2620:0:861:ed1a::3', '2620:0:861:ed1a::4', 
'2620:0:861:ed1a::5', '2620:0:861:ed1a::6', '2620:0:861:ed1a::7', 
'2620:0:861:ed1a::8', '2620:0:861:ed1a::9', '2620:0:861:ed1a::a', 
'2620:0:861:ed1a::b', '2620:0:861:ed1a::c', '2620:0:861:ed1a::12', 
'2620:0:861:ed1a::13' ],
-'esams' = [ '91.198.174.224', '91.198.174.225', 
'91.198.174.233', '91.198.174.234', '91.198.174.226', '91.198.174.227', 
'91.198.174.228', '91.198.174.229', '91.198.174.230', '91.198.174.231', 
'91.198.174.232', '91.198.174.235', '2620:0:862:ed1a::', '2620:0:862:ed1a::1', 
'2620:0:862:ed1a::2', '2620:0:862:ed1a::3', '2620:0:862:ed1a::4', 
'2620:0:862:ed1a::5', '2620:0:862:ed1a::6', '2620:0:862:ed1a::7', 
'2620:0:862:ed1a::8', '2620:0:862:ed1a::9', '2620:0:862:ed1a::a', 
'2620:0:862:ed1a::b', '2620:0:862:ed1a::c' ],
+'esams' = [ '91.198.174.224', '91.198.174.225', 
'91.198.174.233', '91.198.174.234', '91.198.174.226', '91.198.174.227', 
'91.198.174.228', '91.198.174.229', '91.198.174.230', '91.198.174.231', 
'91.198.174.232', '91.198.174.235', '91.198.174.236', '2620:0:862:ed1a::', 
'2620:0:862:ed1a::1', '2620:0:862:ed1a::2', '2620:0:862:ed1a::3', 
'2620:0:862:ed1a::4', '2620:0:862:ed1a::5', '2620:0:862:ed1a::6', 
'2620:0:862:ed1a::7', '2620:0:862:ed1a::8', '2620:0:862:ed1a::9', 
'2620:0:862:ed1a::a', '2620:0:862:ed1a::b', '2620:0:862:ed1a::c' ],
 }
 }
 
@@ -279,7 +279,7 @@
 proxy_addresses = {
 'pmtpa' = [ '127.0.0.1', '[2620:0:860:ed1a::c]' ],
 'eqiad' = [ '208.80.154.236', '[2620:0:861:ed1a::c]' ],
-'esams' = [ '127.0.0.1', '[2620:0:862:ed1a::c]' ],
+'esams' = [ '91.198.174.236', '[2620:0:862:ed1a::c]' ],
 },
 proxy_server_name = '*.m.wikipedia.org',
 proxy_server_cert_name = 'unified.wikimedia.org',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83b72cc7d5f8e587656526ae959958f57312e139
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add esams mobile HTTPS service IPs - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Add esams mobile HTTPS service IPs
..


Add esams mobile HTTPS service IPs

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

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



diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index d4283f3..e5ef103 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -64,7 +64,7 @@
 realserver_ips = $::site ? {
 'pmtpa' = [ '208.80.152.200', '208.80.152.201', 
'208.80.152.202', '208.80.152.203', '208.80.152.204', '208.80.152.205', 
'208.80.152.206', '208.80.152.207', '208.80.152.208', '208.80.152.209', 
'208.80.152.210', '208.80.152.211', '208.80.152.3', '208.80.152.118', 
'208.80.152.218', '208.80.152.219', '2620:0:860:ed1a::', '2620:0:860:ed1a::1', 
'2620:0:860:ed1a::2', '2620:0:860:ed1a::3', '2620:0:860:ed1a::4', 
'2620:0:860:ed1a::5', '2620:0:860:ed1a::6', '2620:0:860:ed1a::7', 
'2620:0:860:ed1a::8', '2620:0:860:ed1a::9', '2620:0:860:ed1a::a', 
'2620:0:860:ed1a::b', '2620:0:860:ed1a::c', '2620:0:860:ed1a::12', 
'2620:0:860:ed1a::13' ],
 'eqiad' = [ '208.80.154.224', '208.80.154.225', 
'208.80.154.226', '208.80.154.227', '208.80.154.228', '208.80.154.229', 
'208.80.154.230', '208.80.154.231', '208.80.154.232', '208.80.154.233', 
'208.80.154.234', '208.80.154.235', '208.80.154.236', '208.80.154.242', 
'208.80.154.243', '2620:0:861:ed1a::', '2620:0:861:ed1a::1', 
'2620:0:861:ed1a::2', '2620:0:861:ed1a::3', '2620:0:861:ed1a::4', 
'2620:0:861:ed1a::5', '2620:0:861:ed1a::6', '2620:0:861:ed1a::7', 
'2620:0:861:ed1a::8', '2620:0:861:ed1a::9', '2620:0:861:ed1a::a', 
'2620:0:861:ed1a::b', '2620:0:861:ed1a::c', '2620:0:861:ed1a::12', 
'2620:0:861:ed1a::13' ],
-'esams' = [ '91.198.174.224', '91.198.174.225', 
'91.198.174.233', '91.198.174.234', '91.198.174.226', '91.198.174.227', 
'91.198.174.228', '91.198.174.229', '91.198.174.230', '91.198.174.231', 
'91.198.174.232', '91.198.174.235', '2620:0:862:ed1a::', '2620:0:862:ed1a::1', 
'2620:0:862:ed1a::2', '2620:0:862:ed1a::3', '2620:0:862:ed1a::4', 
'2620:0:862:ed1a::5', '2620:0:862:ed1a::6', '2620:0:862:ed1a::7', 
'2620:0:862:ed1a::8', '2620:0:862:ed1a::9', '2620:0:862:ed1a::a', 
'2620:0:862:ed1a::b', '2620:0:862:ed1a::c' ],
+'esams' = [ '91.198.174.224', '91.198.174.225', 
'91.198.174.233', '91.198.174.234', '91.198.174.226', '91.198.174.227', 
'91.198.174.228', '91.198.174.229', '91.198.174.230', '91.198.174.231', 
'91.198.174.232', '91.198.174.235', '91.198.174.236', '2620:0:862:ed1a::', 
'2620:0:862:ed1a::1', '2620:0:862:ed1a::2', '2620:0:862:ed1a::3', 
'2620:0:862:ed1a::4', '2620:0:862:ed1a::5', '2620:0:862:ed1a::6', 
'2620:0:862:ed1a::7', '2620:0:862:ed1a::8', '2620:0:862:ed1a::9', 
'2620:0:862:ed1a::a', '2620:0:862:ed1a::b', '2620:0:862:ed1a::c' ],
 }
 }
 
@@ -279,7 +279,7 @@
 proxy_addresses = {
 'pmtpa' = [ '127.0.0.1', '[2620:0:860:ed1a::c]' ],
 'eqiad' = [ '208.80.154.236', '[2620:0:861:ed1a::c]' ],
-'esams' = [ '127.0.0.1', '[2620:0:862:ed1a::c]' ],
+'esams' = [ '91.198.174.236', '[2620:0:862:ed1a::c]' ],
 },
 proxy_server_name = '*.m.wikipedia.org',
 proxy_server_cert_name = 'unified.wikimedia.org',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83b72cc7d5f8e587656526ae959958f57312e139
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] hosts that mount /data will do so from dataset host in same ... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: hosts that mount /data will do so from dataset host in same 
datacenter
..


hosts that mount /data will do so from dataset host in same datacenter

Change-Id: I981910efd53c8776882e66d31f699188b752f8b4
---
M manifests/nfs.pp
1 file changed, 14 insertions(+), 8 deletions(-)

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



diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 3434682..74138ae 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -233,19 +233,25 @@
 class nfs::data {
include nfs::common
 
-   file { [ /mnt/data ]:
+   file { [ '/mnt/data' ]:
ensure = directory;
}
 
+$datasetserver = $::site ? {
+'eqiad' = 'dataset1001.wikimedia.org',
+'pmtpa' = 'dataset2.wikimedia.org',
+default = 'dataset2.wikimedia.org',
+}
+
mount {
-   /mnt/data:
-   device = dataset2.wikimedia.org:/data,
-   fstype = nfs,
-   name = /mnt/data,
-   options = 
bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3,
-   require = File[/mnt/data],
+   '/mnt/data':
+   device   = ${datasetserver}:/data,
+   fstype   = 'nfs',
+   name = '/mnt/data',
+   options  = 
'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+   require  = File['/mnt/data'],
remounts = false,
-   ensure = mounted;
+   ensure   = mounted;
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I981910efd53c8776882e66d31f699188b752f8b4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add wikidata/wikivoyage LVS IPs - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Add wikidata/wikivoyage LVS IPs
..

Add wikidata/wikivoyage LVS IPs

Change-Id: I9f415acea98def412004792ff9fd5183fdd55412
---
M manifests/lvs.pp
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 30307f4..5e78ea8 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -154,7 +154,9 @@
'wikinewslb' = 91.198.174.230,
'wikiversitylb' = 91.198.174.231,
'mediawikilb' = 91.198.174.232,
-   'foundationlb' = 91.198.174.235
+   'foundationlb' = 91.198.174.235,
+   'wikidatalb' = '91.198.174.237',
+   'wikivoyagelb' = '91.198.174.238',
},
},
'https' = {
@@ -236,6 +238,8 @@
'wikiversitylbsecure' = 
91.198.174.231,
'mediawikilbsecure' = '91.198.174.232',
'foundationlbsecure' = 
91.198.174.235,
+   'wikidatalbsecure' = '91.198.174.237',
+   'wikivoyagelbsecure' = 
'91.198.174.238',
 
'wikimedialbsecure6' = 
2620:0:862:ed1a::0,
'wikipedialbsecure6' = 
2620:0:862:ed1a::1,
@@ -250,6 +254,8 @@
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = 
2620:0:862:ed1a::b,
'uploadlbsecure6' = 
'2620:0:862:ed1a::c',
+   'wikidatalbsecure6' = 
2620:0:862:ed1a::12,
+   'wikivoyagelbsecure6' = 
2620:0:862:ed1a::13
},
},
'ipv6' = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f415acea98def412004792ff9fd5183fdd55412
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Enable IPv6 for amslvs1 and amslvs2 - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Enable IPv6 for amslvs1 and amslvs2
..

Enable IPv6 for amslvs1 and amslvs2

Change-Id: I7bba485abcf021b077c06e3aba05fe43be83d4ca
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 5e78ea8..d2a1006 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -70,7 +70,7 @@
 
# This needs to stay in place until the esams MX80 is in production
# amslvs1 and amslvs2 currently can't have ipv6 enabled
-   $ipv6_hosts = [lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, 
lvs1001, lvs1002, lvs1003, lvs1004, lvs1005, lvs1006, amslvs3, 
amslvs4]
+   $ipv6_hosts = [lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, 
lvs1001, lvs1002, lvs1003, lvs1004, lvs1005, lvs1006, amslvs1, 
amslvs2, amslvs3, amslvs4]
 
if $::ipaddress6_eth0 {
$v6_ip = $::ipaddress6_eth0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bba485abcf021b077c06e3aba05fe43be83d4ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add wikidata/wikivoyage LVS IPs - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Add wikidata/wikivoyage LVS IPs
..


Add wikidata/wikivoyage LVS IPs

Change-Id: I9f415acea98def412004792ff9fd5183fdd55412
---
M manifests/lvs.pp
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 30307f4..5e78ea8 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -154,7 +154,9 @@
'wikinewslb' = 91.198.174.230,
'wikiversitylb' = 91.198.174.231,
'mediawikilb' = 91.198.174.232,
-   'foundationlb' = 91.198.174.235
+   'foundationlb' = 91.198.174.235,
+   'wikidatalb' = '91.198.174.237',
+   'wikivoyagelb' = '91.198.174.238',
},
},
'https' = {
@@ -236,6 +238,8 @@
'wikiversitylbsecure' = 
91.198.174.231,
'mediawikilbsecure' = '91.198.174.232',
'foundationlbsecure' = 
91.198.174.235,
+   'wikidatalbsecure' = '91.198.174.237',
+   'wikivoyagelbsecure' = 
'91.198.174.238',
 
'wikimedialbsecure6' = 
2620:0:862:ed1a::0,
'wikipedialbsecure6' = 
2620:0:862:ed1a::1,
@@ -250,6 +254,8 @@
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = 
2620:0:862:ed1a::b,
'uploadlbsecure6' = 
'2620:0:862:ed1a::c',
+   'wikidatalbsecure6' = 
2620:0:862:ed1a::12,
+   'wikivoyagelbsecure6' = 
2620:0:862:ed1a::13
},
},
'ipv6' = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f415acea98def412004792ff9fd5183fdd55412
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Enable IPv6 for amslvs1 and amslvs2 - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Enable IPv6 for amslvs1 and amslvs2
..


Enable IPv6 for amslvs1 and amslvs2

Change-Id: I7bba485abcf021b077c06e3aba05fe43be83d4ca
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 5e78ea8..d2a1006 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -70,7 +70,7 @@
 
# This needs to stay in place until the esams MX80 is in production
# amslvs1 and amslvs2 currently can't have ipv6 enabled
-   $ipv6_hosts = [lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, 
lvs1001, lvs1002, lvs1003, lvs1004, lvs1005, lvs1006, amslvs3, 
amslvs4]
+   $ipv6_hosts = [lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, 
lvs1001, lvs1002, lvs1003, lvs1004, lvs1005, lvs1006, amslvs1, 
amslvs2, amslvs3, amslvs4]
 
if $::ipaddress6_eth0 {
$v6_ip = $::ipaddress6_eth0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bba485abcf021b077c06e3aba05fe43be83d4ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Several CSS improvements - change (mediawiki...erudite)

[Njw (Code Review)]

Njw has uploaded a new change for review.

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


Change subject: Several CSS improvements
..

Several CSS improvements

- Use thin instead of 1px for border-width
- Ensure site name isn't underlined if hovered
- Use em rather than px even around images
- Hide colon in categories section at the bottom of pages
- Remove unneeded !important entries

Change-Id: Iad9ebed78525e75d4d61bdef0884efdb2c338bcd
---
M assets/erudite.css
1 file changed, 22 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/84/71984/1

diff --git a/assets/erudite.css b/assets/erudite.css
index 9e19a18..aedff6d 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -146,6 +146,7 @@
 
 #header a {
color: #ff;
+   text-decoration: none;
 }
 
 #siteSubtitle {
@@ -158,7 +159,7 @@
margin: 1.5em 0 -0.625em;
overflow: hidden;
padding: 0.75em 2em 0.75em 3.75em;
-   border-top: 1px solid #66;
+   border-top: thin solid #66;
background: #33;
background: rgba(50, 50, 50, 0.7);
 }
@@ -206,7 +207,7 @@
 }
 
 .footer h3 {
-   border-bottom: 1px solid #66;
+   border-bottom: thin solid #66;
margin-bottom: 0.2em;
font-size: 1.25em;
text-transform: uppercase;
@@ -217,7 +218,7 @@
 .footer a.new {
color: #ff;
text-decoration: none;
-   border-bottom: 1px solid #99;
+   border-bottom: thin solid #99;
 }
 
 .footer a:hover,
@@ -253,11 +254,9 @@
 hr {
/* @embed */
background: url(images/hr.png) center no-repeat;
-   height: 24px;
-   margin: 0 0 10px;
+   height: 1.5em;
display: block;
-   border-width: 0px;
-   border-style: none !important;
+   border: none;
 }
 
 .entry-title {
@@ -309,7 +308,7 @@
 
 /* Main Links */
 .entry-content a {
-   border-bottom: 1px solid #aa;
+   border-bottom: thin solid #aa;
 }
 
 .entry-content a:hover {
@@ -323,7 +322,7 @@
padding-left: 1em;
margin-left: 1em;
margin-bottom: 0.625em;
-   border-left: 1px solid #aa;
+   border-left: thin solid #aa;
 }
 
 .entry-meta span {
@@ -368,8 +367,8 @@
 
 /* Images */
 .entry-content img {
-   padding: 4px;
-   margin-bottom: 6px;
+   padding: 0.25em;
+   margin-bottom: 0.5em;
 }
 
 .entry-content .gallery a {
@@ -408,8 +407,8 @@
 }
 
 div.thumbinner {
-   border: 1px solid #cc;
-   padding: 3px !important;
+   border: thin solid #cc;
+   padding: 0.2em;
background-color: #f9f9f9;
font-size: 0.875em;
text-align: center;
@@ -418,8 +417,8 @@
 
 img.thumbimage {
border: none;
-   padding: 0px;
-   margin: 0px;
+   padding: 0;
+   margin: 0;
 }
 
 .thumbinner  a {
@@ -429,20 +428,17 @@
 .thumbcaption {
border: none;
text-align: left;
-   padding: 0.1875em !important;
+   padding: 0.2em;
 }
 
 div.magnify {
float: right;
-   border: none !important;
-   background: none !important;
 }
 
 div.magnify a,
 div.magnify img {
display: block;
-   border: none !important;
-   background: none !important;
+   border: none;
 }
 
 div.tright {
@@ -458,7 +454,7 @@
 }
 
 img.thumbborder {
-   border: 1px solid #aa;
+   border: thin solid #aa;
 }
 
 .hiddenStructure {
@@ -471,7 +467,7 @@
 
 table.gallery td {
background-color: #fafafa;
-   border: 2px solid #fafafa;
+   border: thin solid #fafafa;
 }
 
 /* Category and Special Page lists */
@@ -487,6 +483,8 @@
background: #66;
height: 100%;
overflow: hidden;
+   /* Hide the colon after Category */
+   color: #66;
 }
 
 #catlinks a {
@@ -498,7 +496,7 @@
 }
 
 .catlinks li:first-child {
-   border-left: 1px solid #aa;
+   border-left: thin solid #aa;
 }
 
 .catlinks li {
@@ -577,7 +575,7 @@
}
 
#menu li {
-   border-right: 1px solid #66;
+   border-right: thin solid #66;
padding: 0em 1em;
margin-bottom: 0.3em;
margin-right: 0em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9ebed78525e75d4d61bdef0884efdb2c338bcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk

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

[MediaWiki-commits] [Gerrit] Several CSS improvements - change (mediawiki...erudite)

[jenkins-bot (Code Review)]

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

Change subject: Several CSS improvements
..


Several CSS improvements

- Use thin instead of 1px for border-width
- Ensure site name isn't underlined if hovered
- Use em rather than px even around images
- Hide colon in categories section at the bottom of pages
- Remove unneeded !important entries

Change-Id: Iad9ebed78525e75d4d61bdef0884efdb2c338bcd
---
M assets/erudite.css
1 file changed, 22 insertions(+), 24 deletions(-)

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



diff --git a/assets/erudite.css b/assets/erudite.css
index 9e19a18..aedff6d 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -146,6 +146,7 @@
 
 #header a {
color: #ff;
+   text-decoration: none;
 }
 
 #siteSubtitle {
@@ -158,7 +159,7 @@
margin: 1.5em 0 -0.625em;
overflow: hidden;
padding: 0.75em 2em 0.75em 3.75em;
-   border-top: 1px solid #66;
+   border-top: thin solid #66;
background: #33;
background: rgba(50, 50, 50, 0.7);
 }
@@ -206,7 +207,7 @@
 }
 
 .footer h3 {
-   border-bottom: 1px solid #66;
+   border-bottom: thin solid #66;
margin-bottom: 0.2em;
font-size: 1.25em;
text-transform: uppercase;
@@ -217,7 +218,7 @@
 .footer a.new {
color: #ff;
text-decoration: none;
-   border-bottom: 1px solid #99;
+   border-bottom: thin solid #99;
 }
 
 .footer a:hover,
@@ -253,11 +254,9 @@
 hr {
/* @embed */
background: url(images/hr.png) center no-repeat;
-   height: 24px;
-   margin: 0 0 10px;
+   height: 1.5em;
display: block;
-   border-width: 0px;
-   border-style: none !important;
+   border: none;
 }
 
 .entry-title {
@@ -309,7 +308,7 @@
 
 /* Main Links */
 .entry-content a {
-   border-bottom: 1px solid #aa;
+   border-bottom: thin solid #aa;
 }
 
 .entry-content a:hover {
@@ -323,7 +322,7 @@
padding-left: 1em;
margin-left: 1em;
margin-bottom: 0.625em;
-   border-left: 1px solid #aa;
+   border-left: thin solid #aa;
 }
 
 .entry-meta span {
@@ -368,8 +367,8 @@
 
 /* Images */
 .entry-content img {
-   padding: 4px;
-   margin-bottom: 6px;
+   padding: 0.25em;
+   margin-bottom: 0.5em;
 }
 
 .entry-content .gallery a {
@@ -408,8 +407,8 @@
 }
 
 div.thumbinner {
-   border: 1px solid #cc;
-   padding: 3px !important;
+   border: thin solid #cc;
+   padding: 0.2em;
background-color: #f9f9f9;
font-size: 0.875em;
text-align: center;
@@ -418,8 +417,8 @@
 
 img.thumbimage {
border: none;
-   padding: 0px;
-   margin: 0px;
+   padding: 0;
+   margin: 0;
 }
 
 .thumbinner  a {
@@ -429,20 +428,17 @@
 .thumbcaption {
border: none;
text-align: left;
-   padding: 0.1875em !important;
+   padding: 0.2em;
 }
 
 div.magnify {
float: right;
-   border: none !important;
-   background: none !important;
 }
 
 div.magnify a,
 div.magnify img {
display: block;
-   border: none !important;
-   background: none !important;
+   border: none;
 }
 
 div.tright {
@@ -458,7 +454,7 @@
 }
 
 img.thumbborder {
-   border: 1px solid #aa;
+   border: thin solid #aa;
 }
 
 .hiddenStructure {
@@ -471,7 +467,7 @@
 
 table.gallery td {
background-color: #fafafa;
-   border: 2px solid #fafafa;
+   border: thin solid #fafafa;
 }
 
 /* Category and Special Page lists */
@@ -487,6 +483,8 @@
background: #66;
height: 100%;
overflow: hidden;
+   /* Hide the colon after Category */
+   color: #66;
 }
 
 #catlinks a {
@@ -498,7 +496,7 @@
 }
 
 .catlinks li:first-child {
-   border-left: 1px solid #aa;
+   border-left: thin solid #aa;
 }
 
 .catlinks li {
@@ -577,7 +575,7 @@
}
 
#menu li {
-   border-right: 1px solid #66;
+   border-right: thin solid #66;
padding: 0em 1em;
margin-bottom: 0.3em;
margin-right: 0em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad9ebed78525e75d4d61bdef0884efdb2c338bcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove obsolete $ipv6_hosts construct - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Remove obsolete $ipv6_hosts construct
..

Remove obsolete $ipv6_hosts construct

Change-Id: Iff47601ff00fdc89715a128d922f7543efd6295b
---
M manifests/lvs.pp
M templates/pybal/pybal.conf.erb
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/71985/1

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index d2a1006..8ea52fc 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -68,10 +68,6 @@
},
}
 
-   # This needs to stay in place until the esams MX80 is in production
-   # amslvs1 and amslvs2 currently can't have ipv6 enabled
-   $ipv6_hosts = [lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, 
lvs1001, lvs1002, lvs1003, lvs1004, lvs1005, lvs1006, amslvs1, 
amslvs2, amslvs3, amslvs4]
-
if $::ipaddress6_eth0 {
$v6_ip = $::ipaddress6_eth0
}
@@ -795,7 +791,6 @@
include generic::sysfs::enable-rps
 
$lvs_class_hosts = $lvs::configuration::lvs_class_hosts
-   $ipv6_hosts = $lvs::configuration::ipv6_hosts
$pybal = $lvs::configuration::pybal
$lvs_services = $lvs::configuration::lvs_services
 
diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb
index a8b8fd5..85e003f 100644
--- a/templates/pybal/pybal.conf.erb
+++ b/templates/pybal/pybal.conf.erb
@@ -29,7 +29,7 @@
 port = %= service.fetch('port', 80) %
 scheduler = %= service.fetch('scheduler', wrr) %
 config = http://noc.wikimedia.org/pybal/%= site %/%= servicename %
-bgp = %= subserviceip.include?(:) ? ( 
ipv6_hosts.include?(scope.lookupvar(::hostname)) ? service.fetch('bgp', no) 
: no ) : service.fetch('bgp', no) %
+bgp = %= service.fetch('bgp', no) %
 depool-threshold = %= service.fetch('depool-threshold', .5) %
 monitors = %= service['monitors'].keys.sort.inspect %
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff47601ff00fdc89715a128d922f7543efd6295b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Remove obsolete $ipv6_hosts construct - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Remove obsolete $ipv6_hosts construct
..


Remove obsolete $ipv6_hosts construct

Change-Id: Iff47601ff00fdc89715a128d922f7543efd6295b
---
M manifests/lvs.pp
M templates/pybal/pybal.conf.erb
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index d2a1006..8ea52fc 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -68,10 +68,6 @@
},
}
 
-   # This needs to stay in place until the esams MX80 is in production
-   # amslvs1 and amslvs2 currently can't have ipv6 enabled
-   $ipv6_hosts = [lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, 
lvs1001, lvs1002, lvs1003, lvs1004, lvs1005, lvs1006, amslvs1, 
amslvs2, amslvs3, amslvs4]
-
if $::ipaddress6_eth0 {
$v6_ip = $::ipaddress6_eth0
}
@@ -795,7 +791,6 @@
include generic::sysfs::enable-rps
 
$lvs_class_hosts = $lvs::configuration::lvs_class_hosts
-   $ipv6_hosts = $lvs::configuration::ipv6_hosts
$pybal = $lvs::configuration::pybal
$lvs_services = $lvs::configuration::lvs_services
 
diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb
index a8b8fd5..85e003f 100644
--- a/templates/pybal/pybal.conf.erb
+++ b/templates/pybal/pybal.conf.erb
@@ -29,7 +29,7 @@
 port = %= service.fetch('port', 80) %
 scheduler = %= service.fetch('scheduler', wrr) %
 config = http://noc.wikimedia.org/pybal/%= site %/%= servicename %
-bgp = %= subserviceip.include?(:) ? ( 
ipv6_hosts.include?(scope.lookupvar(::hostname)) ? service.fetch('bgp', no) 
: no ) : service.fetch('bgp', no) %
+bgp = %= service.fetch('bgp', no) %
 depool-threshold = %= service.fetch('depool-threshold', .5) %
 monitors = %= service['monitors'].keys.sort.inspect %
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff47601ff00fdc89715a128d922f7543efd6295b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix mobile IPv6 service IP name - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Fix mobile IPv6 service IP name
..

Fix mobile IPv6 service IP name

Change-Id: Iae7220eff0b5220173e1174a4636e53828c94383
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 8ea52fc..73a1a03 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -249,7 +249,7 @@
'foundationlbsecure6' = 
2620:0:862:ed1a::9,
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = 
2620:0:862:ed1a::b,
-   'uploadlbsecure6' = 
'2620:0:862:ed1a::c',
+   'mobilelbsecure6' = 
'2620:0:862:ed1a::c',
'wikidatalbsecure6' = 
2620:0:862:ed1a::12,
'wikivoyagelbsecure6' = 
2620:0:862:ed1a::13
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae7220eff0b5220173e1174a4636e53828c94383
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Release v1.1 - change (mediawiki...erudite)

[Njw (Code Review)]

Njw has submitted this change and it was merged.

Change subject: Release v1.1
..


Release v1.1

Change-Id: I4a2900bd3847335ed22f58a7e8d149e4aec8b4f1
---
M erudite.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/erudite.php b/erudite.php
index 1b36bc3..25b6ab2 100644
--- a/erudite.php
+++ b/erudite.php
@@ -17,7 +17,7 @@
'name' = 'Erudite',
'url' = 'https://www.mediawiki.org/wiki/Skin:Erudite',
'author' = array( 'Nick White', 'Matt Wiebe', 'Colin Andrew Ferm' ),
-   'version' = '1.0',
+   'version' = '1.1',
'descriptionmsg' = 'erudite-desc',
 );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2900bd3847335ed22f58a7e8d149e4aec8b4f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Release v1.1 - change (mediawiki...erudite)

[Njw (Code Review)]

Njw has uploaded a new change for review.

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


Change subject: Release v1.1
..

Release v1.1

Change-Id: I4a2900bd3847335ed22f58a7e8d149e4aec8b4f1
---
M erudite.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/87/71987/1

diff --git a/erudite.php b/erudite.php
index 1b36bc3..25b6ab2 100644
--- a/erudite.php
+++ b/erudite.php
@@ -17,7 +17,7 @@
'name' = 'Erudite',
'url' = 'https://www.mediawiki.org/wiki/Skin:Erudite',
'author' = array( 'Nick White', 'Matt Wiebe', 'Colin Andrew Ferm' ),
-   'version' = '1.0',
+   'version' = '1.1',
'descriptionmsg' = 'erudite-desc',
 );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a2900bd3847335ed22f58a7e8d149e4aec8b4f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk

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

[MediaWiki-commits] [Gerrit] Fix mobile IPv6 service IP name - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Fix mobile IPv6 service IP name
..


Fix mobile IPv6 service IP name

Change-Id: Iae7220eff0b5220173e1174a4636e53828c94383
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 8ea52fc..73a1a03 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -249,7 +249,7 @@
'foundationlbsecure6' = 
2620:0:862:ed1a::9,
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' = 
2620:0:862:ed1a::b,
-   'uploadlbsecure6' = 
'2620:0:862:ed1a::c',
+   'mobilelbsecure6' = 
'2620:0:862:ed1a::c',
'wikidatalbsecure6' = 
2620:0:862:ed1a::12,
'wikivoyagelbsecure6' = 
2620:0:862:ed1a::13
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae7220eff0b5220173e1174a4636e53828c94383
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add writeuptopageid to mwbzutils - change (operations/dumps)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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


Change subject: add writeuptopageid to mwbzutils
..

add writeuptopageid to mwbzutils

Change-Id: Ib02eabc6eba4b2a5f56897b2aef330bad0bcd981
---
M xmldumps-backup/mwbzutils/Makefile
R xmldumps-backup/mwbzutils/writeuptopageid.c
2 files changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps 
refs/changes/88/71988/1

diff --git a/xmldumps-backup/mwbzutils/Makefile 
b/xmldumps-backup/mwbzutils/Makefile
index 31fbd40..5fcd560 100644
--- a/xmldumps-backup/mwbzutils/Makefile
+++ b/xmldumps-backup/mwbzutils/Makefile
@@ -30,7 +30,8 @@
dumpbz2filefromoffset \
dumplastbz2block \
findpageidinbz2xml \
-   recompressxml
+   recompressxml \
+   writeuptopageid
 
 dumplastbz2block: $(OBJSBZ) mwbzlib.o dumplastbz2block.o
$(CC) $(CFLAGS) $(LDFLAGS) -o dumplastbz2block dumplastbz2block.o 
mwbzlib.o  $(OBJSBZ) -lbz2
@@ -47,23 +48,28 @@
 recompressxml: $(OBJSBZ) recompressxml.o
$(CC) $(CFLAGS) $(LDFLAGS) -o recompressxml recompressxml.o -lbz2
 
-install: dumplastbz2block findpageidinbz2xml checkforbz2footer 
dumpbz2filefromoffset recompressxml
+writeuptopage: $(OBJSBZ) writeuptopageid.o
+   $(CC) $(CFLAGS) $(LDFLAGS) -o writeuptopageid writeuptopageid.o -lbz2
+
+install: dumplastbz2block findpageidinbz2xml checkforbz2footer 
dumpbz2filefromoffset recompressxml writeuptopageid
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
cp -f dumplastbz2block $(PREFIX)/bin/dumplastbz2block
cp -f findpageidinbz2xml $(PREFIX)/bin/findpageidinbz2xml
cp -f checkforbz2footer $(PREFIX)/bin/checkforbz2footer
cp -f dumpbz2filefromoffset $(PREFIX)/bin/dumpbz2filefromoffset
cp -f recompressxml $(PREFIX)/bin/recompressxml
+   cp -f writeuptopageid $(PREFIX)/bin/writeuptopageid
chmod a+x $(PREFIX)/bin/dumplastbz2block
chmod a+x $(PREFIX)/bin/findpageidinbz2xml
chmod a+x $(PREFIX)/bin/checkforbz2footer
chmod a+x $(PREFIX)/bin/dumpbz2filefromoffset
chmod a+x $(PREFIX)/bin/recompressxml
+   chmod a+x $(PREFIX)/bin/writeuptopageid
 
 clean: 
rm -f *.o *.a dumplastbz2block findpageidinbz2xml \
checkforbz2footer dumpbz2filefromoffset \
-   recompressxml
+   recompressxml writeuptopageid
 
 bzlibfuncs.o: bzlibfuncs.c bzlib.h bzlib_private.h
$(CC) $(CFLAGS) -c bzlibfuncs.c
@@ -81,6 +87,8 @@
$(CC) $(CFLAGS) -c dumpbz2filefromoffset.c
 recompressxml.o: recompressxml.c
$(CC) $(CFLAGS) -c recompressxml.c
+writeuptopageid.o: writeuptopageid.c
+   $(CC) $(CFLAGS) -c writeuptopageid.c
 
 distclean: clean
 
@@ -89,6 +97,7 @@
rm -f $(DISTNAME)
ln -s -f . $(DISTNAME)
tar cvf $(DISTNAME).tar \
+  $(DISTNAME)/writeuptopageid.c \
   $(DISTNAME)/recompressxml.c \
   $(DISTNAME)/dumplastbz2block.c \
   $(DISTNAME)/findpageidinbz2xml.c \
diff --git a/xmldumps-backup/writeuptopageid.c 
b/xmldumps-backup/mwbzutils/writeuptopageid.c
similarity index 100%
rename from xmldumps-backup/writeuptopageid.c
rename to xmldumps-backup/mwbzutils/writeuptopageid.c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib02eabc6eba4b2a5f56897b2aef330bad0bcd981
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use single entry point mw.uls.init for all ULS ui initializa... - change (mediawiki...UniversalLanguageSelector)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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


Change subject: Use single entry point mw.uls.init for all ULS ui initialization
..

Use single entry point mw.uls.init for all ULS ui initialization

Change-Id: I485ea27deebb530eb89e4b0935eda01a5276f884
---
M resources/js/ext.uls.ime.js
M resources/js/ext.uls.init.js
M resources/js/ext.uls.interface.js
M resources/js/ext.uls.webfonts.js
4 files changed, 36 insertions(+), 29 deletions(-)


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

diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index 1d26010..d3da527 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -203,17 +203,14 @@
};
 
$( document ).ready( function () {
-   if ( !mw.uls.isBrowserSupported() ) {
-   return;
-   }
+   mw.uls.init( function () {
+   // Load the ime preferences
+   $.ime.preferences.load();
 
-   // Load the ime preferences
-   $.ime.preferences.load();
-
-   if ( $.ime.preferences.isEnabled() ) {
-   mw.ime.setup();
-   }
-
+   if ( $.ime.preferences.isEnabled() ) {
+   mw.ime.setup();
+   }
+   } );
} );
 
function imeNotification () {
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index f35dfee..dee92b8 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -31,7 +31,8 @@
this.$languageFilter.addClass( 'noime' );
};
 
-   var currentLang = mw.config.get( 'wgUserLanguage' );
+   var initialized = false,
+   currentLang = mw.config.get( 'wgUserLanguage' );
mw.uls = mw.uls || {};
mw.uls.previousLanguagesCookie = 'uls-previous-languages';
/**
@@ -111,7 +112,7 @@
 * Browse support policy: 
http://www.mediawiki.org/wiki/Browser_support#Grade_A
 * @return boolean
 */
-   mw.uls.isBrowserSupported = function () {
+   function isBrowserSupported() {
// Blacklist Grade B browsers IE 6, 7 and IE60-IE79
return !/MSIE [67]/i.test( navigator.userAgent );
};
@@ -159,8 +160,14 @@
.load( jsonLoader + currentLang, currentLang );
}
 
-   $( document ).ready( function () {
-   if ( !mw.uls.isBrowserSupported() ) {
+   mw.uls.init = function( callback ) {
+   callback = callback || $.noop;
+
+   if ( initialized ) {
+   callback.call( this, false );
+   return;
+   }
+   if ( !isBrowserSupported() ) {
$( '#pt-uls' ).hide();
return;
}
@@ -177,5 +184,11 @@
 
// JavaScript side i18n initialization
i18nInit();
+   initialized = true;
+   callback.call( this, true );
+   }
+
+   $( document ).ready( function () {
+   mw.uls.init();
} );
 }( jQuery, mediaWiki ) );
diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index e243b24..3212d69 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -223,6 +223,7 @@
}
 
$( document ).ready( function () {
+   mw.uls.init( function () {
var $ulsTrigger = $( '.uls-trigger' ),
$ulsSettingsTrigger,
$pLang,
@@ -231,10 +232,6 @@
anonMode = ( mw.user.isAnon() 
!mw.config.get( 'wgULSAnonCanChangeLanguage' ) 
),
ulsPosition = mw.config.get( 'wgULSPosition' );
-
-   if ( !mw.uls.isBrowserSupported() ) {
-   return;
-   }
 
if ( ulsPosition === 'interlanguage' ) {
// The interlanguage links section
@@ -325,4 +322,5 @@
 
showULSTooltip();
} );
+   } );
 }( jQuery, mediaWiki ) );
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index 4b11ae8..804f0fa 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -81,17 +81,16 @@
};
 
$( document ).ready( function () {
-   if ( !mw.uls.isBrowserSupported() ) {
-   return;
-   }
-   // MediaWiki specific overrides for jquery.webfonts
-   $.extend( $.fn.webfonts.defaults, {
-   repository: mediawikiFontRepository,
-   fontStack: new Array( $( 

[MediaWiki-commits] [Gerrit] jquery.i18n messagestore for ULS - change (mediawiki...UniversalLanguageSelector)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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


Change subject: jquery.i18n messagestore for ULS
..

jquery.i18n messagestore for ULS

Change-Id: Iddef0805abbf9b4ff0e606fc311c57e9dfa7107d
---
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.init.js
2 files changed, 58 insertions(+), 18 deletions(-)


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

diff --git a/resources/js/ext.uls.displaysettings.js 
b/resources/js/ext.uls.displaysettings.js
index 7de1345..a639288 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -196,6 +196,8 @@
 
function buttonHandler( button ) {
return function () {
+   var i18n;
+
displaySettings.enableApplyButton();
displaySettings.uiLanguage = 
button.data( 'language' ) || displaySettings.uiLanguage;
$( 'div.uls-ui-languages button.button' 
).removeClass( 'down' );
@@ -204,8 +206,11 @@
// set the language for the settings 
panel so that webfonts
// are correctly applied.
displaySettings.$template.attr( 'lang', 
displaySettings.uiLanguage );
-   $.i18n().locale = 
displaySettings.uiLanguage;
-   displaySettings.i18n();
+   i18n = $.i18n();
+   i18n.locale = 
displaySettings.uiLanguage;
+   i18n.messageStore.load( i18n.locale, 
function() {
+   displaySettings.i18n();
+   } ) ;
};
}
 
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index dee92b8..2a1a010 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -32,6 +32,7 @@
};
 
var initialized = false,
+   MWMessageStore,
currentLang = mw.config.get( 'wgUserLanguage' );
mw.uls = mw.uls || {};
mw.uls.previousLanguagesCookie = 'uls-previous-languages';
@@ -115,7 +116,7 @@
function isBrowserSupported() {
// Blacklist Grade B browsers IE 6, 7 and IE60-IE79
return !/MSIE [67]/i.test( navigator.userAgent );
-   };
+   }
 
/**
 * Local wrapper for 'mw.eventLog.logEvent' which handles default params
@@ -145,28 +146,57 @@
}
 
/**
-* i18n initialization
+* jquery.i18n message store for MediaWiki
+*
 */
-   function i18nInit() {
-   var jsonLoader = mw.util.wikiScript( 'api' ) + 
'?action=ulslocalizationlanguage=';
+   MWMessageStore = function () {
+   this.messages = {};
+   };
 
-   $.i18n( {
-   locale: currentLang,
-   messageLocationResolver: function ( locale ) {
-   return jsonLoader + locale;
+   MWMessageStore.prototype = {
+   init: function () {},
+   get: function ( locale, messageKey ) {
+   return (  this.isLoaded( locale )
+this.messages[locale][messageKey] )
+   || '' + messageKey + '';
+   },
+   set: function( locale, messages ) {
+   this.messages[locale] = messages;
+   },
+   isLoaded:function ( locale ) {
+   if ( this.messages[locale] ) {
+   return true;
}
-   } )
-   // Preload i18n for current language.
-   .load( jsonLoader + currentLang, currentLang );
-   }
+   return false;
+   },
+   load: function( locale, callback ) {
+   var store = this,
+   url = mw.util.wikiScript( 'api' ) + 
'?action=ulslocalizationlanguage=';
 
-   mw.uls.init = function( callback ) {
+   callback = callback || $.noop;
+   if ( store.isLoaded( locale ) ) {
+   callback.call( this );
+   return;
+   }
+   $.getJSON( url + locale ).done( function ( data ) {
+   store.set( locale, data);
+   callback.call( store );
+   } ).fail( 

[MediaWiki-commits] [Gerrit] Add support for x3d files - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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


Change subject: Add support for x3d files
..

Add support for x3d files

Add X3D MIME types detection and fix the block of the upload because of the
filtering of the head tag.

Change-Id: I39712097b505ec1192eb5ab578d23c73b62a7160
---
M includes/DefaultSettings.php
M includes/mime.types
M includes/upload/UploadBase.php
3 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/71991/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 10f2885..162608b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1087,6 +1087,7 @@
'http://www.lysator.liu.se/~alla/dia/:diagram' = 
'application/x-dia-diagram',
'http://www.w3.org/1999/xhtml:html' = 'text/html', // 
application/xhtml+xml?
'html' = 'text/html', // application/xhtml+xml?
+   'X3D' = 'model/x3d+xml',
 );
 
 /**
diff --git a/includes/mime.types b/includes/mime.types
index a89d229..2ae51bc 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -104,6 +104,9 @@
 model/iges igs iges
 model/mesh msh mesh silo
 model/vrml wrl vrml
+model/x3d+xml x3d
+model/x3d+vrml x3dv
+model/x3d+binary x3db
 text/calendar ics ifb
 text/css css
 text/html html htm
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 36e4252..6e1e7e5 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1038,7 +1038,6 @@
$tags = array(
'a href',
'body',
-   'head',
'html',   #also in safari
'img',
'pre',
@@ -1050,6 +1049,10 @@
$tags[] = 'title';
}
 
+   if ( $extension !== 'x3d'  $mime !== 'model/x3d+xml' ) {
+   $tags[] = 'head';
+   }
+
foreach ( $tags as $tag ) {
if ( false !== strpos( $chunk, $tag ) ) {
wfDebug( __METHOD__ . : found something that 
may make it be mistaken for html: $tag\n );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39712097b505ec1192eb5ab578d23c73b62a7160
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr

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

[MediaWiki-commits] [Gerrit] (bug 45167) use SetupAfterCache to register templates. - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: (bug 45167) use SetupAfterCache to register templates.
..


(bug 45167) use SetupAfterCache to register templates.

Avoid using $wgExtensionFunctions in general, and especially
with closures, since they look odd on Special:Version.

Change-Id: I924c856232af8e81ac9e55c10a4a22e2f4f6200a
---
M lib/WikibaseLib.php
1 file changed, 11 insertions(+), 6 deletions(-)

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



diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 3ce122c..5a9fc13 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -104,12 +104,6 @@
// i18n
$wgExtensionMessagesFiles['WikibaseLib'] = __DIR__ . 
'/WikibaseLib.i18n.php';
 
-   // TODO: this is not nice, figure out a better design
-   $wgExtensionFunctions[] = function() {
-   \Wikibase\TemplateRegistry::singleton()-addTemplates( include( 
__DIR__ . /resources/templates.php ) );
-   return true;
-   };
-
$wgValueParsers['wikibase-entityid'] = 'Wikibase\Lib\EntityIdParser';
$wgDataValues['wikibase-entityid'] = 'Wikibase\EntityId';
$wgJobClasses['ChangeNotification'] = 'Wikibase\ChangeNotificationJob';
@@ -138,6 +132,17 @@
};
 
/**
+* Called when setup is done. This is somewhat ugly, find a better time 
to register templates.
+* @see https://www.mediawiki.org/wiki/Manual:Hooks/SetupAfterCache
+*
+* @return bool
+*/
+   $wgHooks['SetupAfterCache'][] = function() {
+   \Wikibase\TemplateRegistry::singleton()-addTemplates( include( 
__DIR__ . /resources/templates.php ) );
+   return true;
+   };
+
+   /**
 * Shorthand function to retrieve a template filled with the specified 
parameters.
 *
 * @since 0.2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I924c856232af8e81ac9e55c10a4a22e2f4f6200a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Create simple PyBal module - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Create simple PyBal module
..

Create simple PyBal module

Change-Id: I80968f26b48883f8e3dd5b83cdf4d6ac359c8ce8
---
A modules/pybal/manifests/configuration.pp
A modules/pybal/manifests/init.pp
A modules/pybal/templates/pybal.conf.erb
3 files changed, 62 insertions(+), 0 deletions(-)


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

diff --git a/modules/pybal/manifests/configuration.pp 
b/modules/pybal/manifests/configuration.pp
new file mode 100644
index 000..d5bdabf
--- /dev/null
+++ b/modules/pybal/manifests/configuration.pp
@@ -0,0 +1,11 @@
+class pybal::configuration(
+$global_options={},
+$lvs_services,
+$lvs_class_hosts) {
+
+# Generate PyBal config file
+file { /etc/pybal/pybal.conf:
+require = Package['pybal'],
+content = template(${module_name}/pybal.conf.erb);
+}
+}
diff --git a/modules/pybal/manifests/init.pp b/modules/pybal/manifests/init.pp
new file mode 100644
index 000..bc0581a
--- /dev/null
+++ b/modules/pybal/manifests/init.pp
@@ -0,0 +1,5 @@
+class pybal {
+package { [ 'ipvsadm', 'pybal' ]:
+ensure = installed;
+}
+}
diff --git a/modules/pybal/templates/pybal.conf.erb 
b/modules/pybal/templates/pybal.conf.erb
new file mode 100644
index 000..97ab172
--- /dev/null
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -0,0 +1,46 @@
+# PyBal configuration file
+# This file is managed by Puppet!
+
+[global]
+bgp = %= global_options.fetch('bgp', no) %
+bgp-local-asn = 64600
+bgp-peer-address = %= global_options['bgp-peer-address'] %
+#bgp-as-path = 64600 64601
+bgp-nexthop-ipv4 = %= global_options['bgp-nexthop-ipv4'] %
+bgp-nexthop-ipv6 = %= global_options['bgp-nexthop-ipv6'] %
+
+#
+# LVS service definitions
+#
+
+% lvs_services.sort.each do |servicename, service| -%
+% if 
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) and 
service['sites'].include?(scope.lookupvar(::site)) then -%
+% if service['ip'].class.eql?(String) then
+service['ip'] = { servicename = service['ip'] }
+end -%
+% service['ip'].sort.each do |subservicename, subserviceip| -%
+# SERVICE %= subservicename %
+# Class: %= service['class'] %
+# Description: %= service['description'] %
+# LVS balancers: %= lvs_class_hosts[service['class']].join( ) %
+[%= subservicename %]
+protocol = %= service.fetch('protocol', tcp) %
+ip = %= subserviceip %
+port = %= service.fetch('port', 80) %
+scheduler = %= service.fetch('scheduler', wrr) %
+config = http://noc.wikimedia.org/pybal/%= site %/%= servicename %
+bgp = %= service.fetch('bgp', no) %
+depool-threshold = %= service.fetch('depool-threshold', .5) %
+monitors = %= service['monitors'].keys.sort.inspect %
+
+% service['monitors'].sort.each do |monitorname, monitor| -%
+# %= monitorname % monitor configuration
+% monitor.each_pair do |param, value| -%
+%= monitorname.downcase %.%= param % = %= value.class == Array ? 
value.inspect : value %
+% end -%
+% end -%
+
+% end -%
+
+% end -%
+% end -%

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80968f26b48883f8e3dd5b83cdf4d6ac359c8ce8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] add writeuptopageid to mwbzutils - change (operations/dumps)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: add writeuptopageid to mwbzutils
..


add writeuptopageid to mwbzutils

Change-Id: Ib02eabc6eba4b2a5f56897b2aef330bad0bcd981
---
M xmldumps-backup/mwbzutils/Makefile
R xmldumps-backup/mwbzutils/writeuptopageid.c
2 files changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/xmldumps-backup/mwbzutils/Makefile 
b/xmldumps-backup/mwbzutils/Makefile
index 31fbd40..5fcd560 100644
--- a/xmldumps-backup/mwbzutils/Makefile
+++ b/xmldumps-backup/mwbzutils/Makefile
@@ -30,7 +30,8 @@
dumpbz2filefromoffset \
dumplastbz2block \
findpageidinbz2xml \
-   recompressxml
+   recompressxml \
+   writeuptopageid
 
 dumplastbz2block: $(OBJSBZ) mwbzlib.o dumplastbz2block.o
$(CC) $(CFLAGS) $(LDFLAGS) -o dumplastbz2block dumplastbz2block.o 
mwbzlib.o  $(OBJSBZ) -lbz2
@@ -47,23 +48,28 @@
 recompressxml: $(OBJSBZ) recompressxml.o
$(CC) $(CFLAGS) $(LDFLAGS) -o recompressxml recompressxml.o -lbz2
 
-install: dumplastbz2block findpageidinbz2xml checkforbz2footer 
dumpbz2filefromoffset recompressxml
+writeuptopage: $(OBJSBZ) writeuptopageid.o
+   $(CC) $(CFLAGS) $(LDFLAGS) -o writeuptopageid writeuptopageid.o -lbz2
+
+install: dumplastbz2block findpageidinbz2xml checkforbz2footer 
dumpbz2filefromoffset recompressxml writeuptopageid
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
cp -f dumplastbz2block $(PREFIX)/bin/dumplastbz2block
cp -f findpageidinbz2xml $(PREFIX)/bin/findpageidinbz2xml
cp -f checkforbz2footer $(PREFIX)/bin/checkforbz2footer
cp -f dumpbz2filefromoffset $(PREFIX)/bin/dumpbz2filefromoffset
cp -f recompressxml $(PREFIX)/bin/recompressxml
+   cp -f writeuptopageid $(PREFIX)/bin/writeuptopageid
chmod a+x $(PREFIX)/bin/dumplastbz2block
chmod a+x $(PREFIX)/bin/findpageidinbz2xml
chmod a+x $(PREFIX)/bin/checkforbz2footer
chmod a+x $(PREFIX)/bin/dumpbz2filefromoffset
chmod a+x $(PREFIX)/bin/recompressxml
+   chmod a+x $(PREFIX)/bin/writeuptopageid
 
 clean: 
rm -f *.o *.a dumplastbz2block findpageidinbz2xml \
checkforbz2footer dumpbz2filefromoffset \
-   recompressxml
+   recompressxml writeuptopageid
 
 bzlibfuncs.o: bzlibfuncs.c bzlib.h bzlib_private.h
$(CC) $(CFLAGS) -c bzlibfuncs.c
@@ -81,6 +87,8 @@
$(CC) $(CFLAGS) -c dumpbz2filefromoffset.c
 recompressxml.o: recompressxml.c
$(CC) $(CFLAGS) -c recompressxml.c
+writeuptopageid.o: writeuptopageid.c
+   $(CC) $(CFLAGS) -c writeuptopageid.c
 
 distclean: clean
 
@@ -89,6 +97,7 @@
rm -f $(DISTNAME)
ln -s -f . $(DISTNAME)
tar cvf $(DISTNAME).tar \
+  $(DISTNAME)/writeuptopageid.c \
   $(DISTNAME)/recompressxml.c \
   $(DISTNAME)/dumplastbz2block.c \
   $(DISTNAME)/findpageidinbz2xml.c \
diff --git a/xmldumps-backup/writeuptopageid.c 
b/xmldumps-backup/mwbzutils/writeuptopageid.c
similarity index 100%
rename from xmldumps-backup/writeuptopageid.c
rename to xmldumps-backup/mwbzutils/writeuptopageid.c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib02eabc6eba4b2a5f56897b2aef330bad0bcd981
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Create simple PyBal module - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Create simple PyBal module
..


Create simple PyBal module

Change-Id: I80968f26b48883f8e3dd5b83cdf4d6ac359c8ce8
---
A modules/pybal/manifests/configuration.pp
A modules/pybal/manifests/init.pp
A modules/pybal/templates/pybal.conf.erb
3 files changed, 63 insertions(+), 0 deletions(-)

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



diff --git a/modules/pybal/manifests/configuration.pp 
b/modules/pybal/manifests/configuration.pp
new file mode 100644
index 000..b3b9cb3
--- /dev/null
+++ b/modules/pybal/manifests/configuration.pp
@@ -0,0 +1,12 @@
+class pybal::configuration(
+$global_options={},
+$lvs_services,
+$lvs_class_hosts,
+$site) {
+
+# Generate PyBal config file
+file { '/etc/pybal/pybal.conf':
+require = Package['pybal'],
+content = template(${module_name}/pybal.conf.erb);
+}
+}
diff --git a/modules/pybal/manifests/init.pp b/modules/pybal/manifests/init.pp
new file mode 100644
index 000..bc0581a
--- /dev/null
+++ b/modules/pybal/manifests/init.pp
@@ -0,0 +1,5 @@
+class pybal {
+package { [ 'ipvsadm', 'pybal' ]:
+ensure = installed;
+}
+}
diff --git a/modules/pybal/templates/pybal.conf.erb 
b/modules/pybal/templates/pybal.conf.erb
new file mode 100644
index 000..69ef43c
--- /dev/null
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -0,0 +1,46 @@
+# PyBal configuration file
+# This file is managed by Puppet!
+
+[global]
+bgp = %= global_options.fetch('bgp', no) %
+bgp-local-asn = 64600
+bgp-peer-address = %= global_options['bgp-peer-address'] %
+#bgp-as-path = 64600 64601
+bgp-nexthop-ipv4 = %= global_options['bgp-nexthop-ipv4'] %
+bgp-nexthop-ipv6 = %= global_options['bgp-nexthop-ipv6'] %
+
+#
+# LVS service definitions
+#
+
+% lvs_services.sort.each do |servicename, service| -%
+% if 
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) and 
service['sites'].include?(site) then -%
+% if service['ip'].class.eql?(String) then
+service['ip'] = { servicename = service['ip'] }
+end -%
+% service['ip'].sort.each do |subservicename, subserviceip| -%
+# SERVICE %= subservicename %
+# Class: %= service['class'] %
+# Description: %= service['description'] %
+# LVS balancers: %= lvs_class_hosts[service['class']].join( ) %
+[%= subservicename %]
+protocol = %= service.fetch('protocol', tcp) %
+ip = %= subserviceip %
+port = %= service.fetch('port', 80) %
+scheduler = %= service.fetch('scheduler', wrr) %
+config = http://noc.wikimedia.org/pybal/%= site %/%= servicename %
+bgp = %= service.fetch('bgp', no) %
+depool-threshold = %= service.fetch('depool-threshold', .5) %
+monitors = %= service['monitors'].keys.sort.inspect %
+
+% service['monitors'].sort.each do |monitorname, monitor| -%
+# %= monitorname % monitor configuration
+% monitor.each_pair do |param, value| -%
+%= monitorname.downcase %.%= param % = %= value.class == Array ? 
value.inspect : value %
+% end -%
+% end -%
+
+% end -%
+
+% end -%
+% end -%

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80968f26b48883f8e3dd5b83cdf4d6ac359c8ce8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Migrate class lvs::balancer to the new PyBal module - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Migrate class lvs::balancer to the new PyBal module
..

Migrate class lvs::balancer to the new PyBal module

Change-Id: I192fbf000dc36e2304d2dbfc3bdeab01a5afcbec
---
M manifests/lvs.pp
D templates/pybal/pybal.conf.erb
2 files changed, 6 insertions(+), 55 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/71993/1

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 73a1a03..ac3ce4b 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -789,21 +789,18 @@
 
require lvs::configuration
include generic::sysfs::enable-rps
-
-   $lvs_class_hosts = $lvs::configuration::lvs_class_hosts
-   $pybal = $lvs::configuration::pybal
-   $lvs_services = $lvs::configuration::lvs_services
+   include pybal
 
system_role { lvs::balancer: description = LVS balancer }
 
-   package { [ ipvsadm, pybal, ethtool ]:
+   package { ethtool:
ensure = installed;
}
 
-   # Generate PyBal config file
-   file { /etc/pybal/pybal.conf:
-   require = Package[pybal],
-   content = template(pybal/pybal.conf.erb);
+   class { 'pybal::configuration':
+   global_options = $lvs::configuration::pybal,
+   lvs_services = $lvs::configuration::lvs_services,
+   lvs_class_hosts = $lvs::configuration::lvs_class_hosts
}
 
# Tune the ip_vs conn_tab_bits parameter
diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb
deleted file mode 100644
index 85e003f..000
--- a/templates/pybal/pybal.conf.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-# PyBal configuration file
-# This file is managed by Puppet!
-
-[global]
-bgp = %= pybal.fetch('bgp', no) %
-bgp-local-asn = 64600
-bgp-peer-address = %= pybal['bgp-peer-address'] %
-#bgp-as-path = 64600 64601
-bgp-nexthop-ipv4 = %= pybal['bgp-nexthop-ipv4'] %
-bgp-nexthop-ipv6 = %= pybal['bgp-nexthop-ipv6'] %
-
-#
-# LVS service definitions
-#
-
-% lvs_services.sort.each do |servicename, service| -%
-% if 
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) and 
service['sites'].include?(scope.lookupvar(::site)) then -%
-% if service['ip'].class.eql?(String) then
-service['ip'] = { servicename = service['ip'] }
-end -%
-% service['ip'].sort.each do |subservicename, subserviceip| -%
-# SERVICE %= subservicename %
-# Class: %= service['class'] %
-# Description: %= service['description'] %
-# LVS balancers: %= lvs_class_hosts[service['class']].join( ) %
-[%= subservicename %]
-protocol = %= service.fetch('protocol', tcp) %
-ip = %= subserviceip %
-port = %= service.fetch('port', 80) %
-scheduler = %= service.fetch('scheduler', wrr) %
-config = http://noc.wikimedia.org/pybal/%= site %/%= servicename %
-bgp = %= service.fetch('bgp', no) %
-depool-threshold = %= service.fetch('depool-threshold', .5) %
-monitors = %= service['monitors'].keys.sort.inspect %
-
-% service['monitors'].sort.each do |monitorname, monitor| -%
-# %= monitorname % monitor configuration
-% monitor.each_pair do |param, value| -%
-%= monitorname.downcase %.%= param % = %= value.class == Array ? 
value.inspect : value %
-% end -%
-% end -%
-
-% end -%
-
-% end -%
-% end -%

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I192fbf000dc36e2304d2dbfc3bdeab01a5afcbec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Migrate class lvs::balancer to the new PyBal module - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Migrate class lvs::balancer to the new PyBal module
..


Migrate class lvs::balancer to the new PyBal module

Change-Id: I192fbf000dc36e2304d2dbfc3bdeab01a5afcbec
---
M manifests/lvs.pp
D templates/pybal/pybal.conf.erb
2 files changed, 6 insertions(+), 55 deletions(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 73a1a03..ac3ce4b 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -789,21 +789,18 @@
 
require lvs::configuration
include generic::sysfs::enable-rps
-
-   $lvs_class_hosts = $lvs::configuration::lvs_class_hosts
-   $pybal = $lvs::configuration::pybal
-   $lvs_services = $lvs::configuration::lvs_services
+   include pybal
 
system_role { lvs::balancer: description = LVS balancer }
 
-   package { [ ipvsadm, pybal, ethtool ]:
+   package { ethtool:
ensure = installed;
}
 
-   # Generate PyBal config file
-   file { /etc/pybal/pybal.conf:
-   require = Package[pybal],
-   content = template(pybal/pybal.conf.erb);
+   class { 'pybal::configuration':
+   global_options = $lvs::configuration::pybal,
+   lvs_services = $lvs::configuration::lvs_services,
+   lvs_class_hosts = $lvs::configuration::lvs_class_hosts
}
 
# Tune the ip_vs conn_tab_bits parameter
diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb
deleted file mode 100644
index 85e003f..000
--- a/templates/pybal/pybal.conf.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-# PyBal configuration file
-# This file is managed by Puppet!
-
-[global]
-bgp = %= pybal.fetch('bgp', no) %
-bgp-local-asn = 64600
-bgp-peer-address = %= pybal['bgp-peer-address'] %
-#bgp-as-path = 64600 64601
-bgp-nexthop-ipv4 = %= pybal['bgp-nexthop-ipv4'] %
-bgp-nexthop-ipv6 = %= pybal['bgp-nexthop-ipv6'] %
-
-#
-# LVS service definitions
-#
-
-% lvs_services.sort.each do |servicename, service| -%
-% if 
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) and 
service['sites'].include?(scope.lookupvar(::site)) then -%
-% if service['ip'].class.eql?(String) then
-service['ip'] = { servicename = service['ip'] }
-end -%
-% service['ip'].sort.each do |subservicename, subserviceip| -%
-# SERVICE %= subservicename %
-# Class: %= service['class'] %
-# Description: %= service['description'] %
-# LVS balancers: %= lvs_class_hosts[service['class']].join( ) %
-[%= subservicename %]
-protocol = %= service.fetch('protocol', tcp) %
-ip = %= subserviceip %
-port = %= service.fetch('port', 80) %
-scheduler = %= service.fetch('scheduler', wrr) %
-config = http://noc.wikimedia.org/pybal/%= site %/%= servicename %
-bgp = %= service.fetch('bgp', no) %
-depool-threshold = %= service.fetch('depool-threshold', .5) %
-monitors = %= service['monitors'].keys.sort.inspect %
-
-% service['monitors'].sort.each do |monitorname, monitor| -%
-# %= monitorname % monitor configuration
-% monitor.each_pair do |param, value| -%
-%= monitorname.downcase %.%= param % = %= value.class == Array ? 
value.inspect : value %
-% end -%
-% end -%
-
-% end -%
-
-% end -%
-% end -%

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I192fbf000dc36e2304d2dbfc3bdeab01a5afcbec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Pass variable $site - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Pass variable $site
..

Pass variable $site

Change-Id: I4ecae962e548518a862159259fb69c69e462d19e
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ac3ce4b..a609cff 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -800,7 +800,8 @@
class { 'pybal::configuration':
global_options = $lvs::configuration::pybal,
lvs_services = $lvs::configuration::lvs_services,
-   lvs_class_hosts = $lvs::configuration::lvs_class_hosts
+   lvs_class_hosts = $lvs::configuration::lvs_class_hosts,
+   site = $::site
}
 
# Tune the ip_vs conn_tab_bits parameter

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ecae962e548518a862159259fb69c69e462d19e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Pass variable $site - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Pass variable $site
..


Pass variable $site

Change-Id: I4ecae962e548518a862159259fb69c69e462d19e
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ac3ce4b..a609cff 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -800,7 +800,8 @@
class { 'pybal::configuration':
global_options = $lvs::configuration::pybal,
lvs_services = $lvs::configuration::lvs_services,
-   lvs_class_hosts = $lvs::configuration::lvs_class_hosts
+   lvs_class_hosts = $lvs::configuration::lvs_class_hosts,
+   site = $::site
}
 
# Tune the ip_vs conn_tab_bits parameter

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ecae962e548518a862159259fb69c69e462d19e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Installer: Remove wgResourceLoaderMaxQueryLength in LocalSet... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Installer: Remove wgResourceLoaderMaxQueryLength in 
LocalSettings
..


Installer: Remove wgResourceLoaderMaxQueryLength in LocalSettings

This can change from one web server to another. Hardcoding it
in LocalSettings is unnececary (and could even cause problems
when a MediaWiki install is moved to a server with a lower
limit than the original server, as ResourceLoader would still
be acting on the old limit).

Similar to how wgUsePathInfo is currently dynamically set.

The less cruft in LocalSettings by default the better imho.
Except for stuff that makes sense to be sticky, explicit and
cached. Or stuff that is every commonly enabled and is therefor
convinient (such as wgEnableUploads/wgUseInstantCommons).

Change-Id: I58cb185f8dc1650a76c60c7fd04767fb74b32be2
---
M includes/DefaultSettings.php
M includes/Setup.php
M includes/installer/Installer.php
M includes/installer/LocalSettingsGenerator.php
4 files changed, 15 insertions(+), 18 deletions(-)

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  Demon: Looks good to me, approved
  Parent5446: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 58eb3d7..528eb9e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3036,8 +3036,10 @@
  *
  * If set to a negative number, ResourceLoader will assume there is no query
  * string length limit.
+ *
+ * Defaults to a value based on php configuration.
  */
-$wgResourceLoaderMaxQueryLength = -1;
+$wgResourceLoaderMaxQueryLength = false;
 
 /**
  * If set to true, JavaScript modules loaded from wiki pages will be parsed
diff --git a/includes/Setup.php b/includes/Setup.php
index d8c9180..028758f 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -293,6 +293,13 @@
$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 }
 
+
+// Default value is either the suhosin limit or -1 for unlimited
+if ( $wgResourceLoaderMaxQueryLength === false ) {
+   $maxValueLength = ini_get( 'suhosin.get.max_value_length' );
+   $wgResourceLoaderMaxQueryLength = $maxValueLength  0 ? $maxValueLength 
: -1;
+}
+
 /**
  * Definitions of the NS_ constants are in Defines.php
  * @private
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index b1517e4..8362772 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1075,22 +1075,16 @@
}
 
/**
-* Checks if suhosin.get.max_value_length is set, and if so, sets
-* $wgResourceLoaderMaxQueryLength to that value in the generated
-* LocalSettings file
+* Checks if suhosin.get.max_value_length is set, and if so generate
+* a warning because it decreases ResourceLoader performance.
 * @return bool
 */
protected function envCheckSuhosinMaxValueLength() {
$maxValueLength = ini_get( 'suhosin.get.max_value_length' );
-   if ( $maxValueLength  0 ) {
-   if ( $maxValueLength  1024 ) {
-   # Only warn if the value is below the sane 1024
-   $this-showMessage( 
'config-suhosin-max-value-length', $maxValueLength );
-   }
-   } else {
-   $maxValueLength = -1;
+   if ( $maxValueLength  0   $maxValueLength  1024 ) {
+   // Only warn if the value is below the sane 1024
+   $this-showMessage( 'config-suhosin-max-value-length', 
$maxValueLength );
}
-   $this-setVar( 'wgResourceLoaderMaxQueryLength', 
$maxValueLength );
return true;
}
 
diff --git a/includes/installer/LocalSettingsGenerator.php 
b/includes/installer/LocalSettingsGenerator.php
index 3a9bfe8..cca8a4a 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -349,12 +349,6 @@
 # Path to the GNU diff3 utility. Used for conflict resolution.
 \$wgDiff3 = \{$this-values['wgDiff3']}\;
 
-# Query string length limit for ResourceLoader. You should only set this if
-# your web server has a query string length limit (then set it to that limit),
-# or if you have suhosin.get.max_value_length set in php.ini (then set it to
-# that value)
-\$wgResourceLoaderMaxQueryLength = 
{$this-values['wgResourceLoaderMaxQueryLength']};
-
 {$groupRights};
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58cb185f8dc1650a76c60c7fd04767fb74b32be2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Catrope 

[MediaWiki-commits] [Gerrit] starting with dump format: file header - change (operations...incremental)

[Petr Onderka (Code Review)]

Petr Onderka has uploaded a new change for review.

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


Change subject: starting with dump format: file header
..

starting with dump format: file header

Change-Id: I29350dbe9de280efa1248a6c87d174fa6494d32e
---
A Dump.cpp
A Dump.h
A DumpObject.cpp
A DumpObject.h
A FileHeader.cpp
A FileHeader.h
M Incremental dumps.vcxproj
A Offset.cpp
A Offset.h
M main.cpp
10 files changed, 246 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/incremental 
refs/changes/95/71995/1

diff --git a/Dump.cpp b/Dump.cpp
new file mode 100644
index 000..5a0d77f
--- /dev/null
+++ b/Dump.cpp
@@ -0,0 +1,49 @@
+#include cstdint
+#include memory
+#include string
+#include fstream
+#include Dump.h
+
+using std::unique_ptr;
+using std::move;
+using std::string;
+using std::fstream;
+using std::ios;
+
+ReadableDump::ReadableDump(unique_ptriostream stream)
+: stream(move(stream))
+{}
+
+ReadableDump::ReadableDump(string fileName)
+: stream(unique_ptrfstream(new fstream(fileName, ios::in | ios::binary)))
+{}
+
+unique_ptriostream WritableDump::openStream(string fileName)
+{
+fstream *stream = new fstream(fileName, ios::in | ios::out | ios::binary);
+
+if (!stream-is_open())
+{
+// this feels dangerous, isn't there a better way?
+stream = new fstream(fileName, ios::in | ios::out | ios::binary | 
ios::trunc);
+}
+
+stream-exceptions(ios::failbit | ios::badbit);
+
+return unique_ptriostream(stream);
+}
+
+WritableDump::WritableDump(string fileName)
+: ReadableDump(openStream(fileName))
+{
+if (stream-peek() == EOF)
+{
+stream-clear();
+fileHeader = FileHeader();
+fileHeader.Write(stream, 0);
+}
+else
+{
+fileHeader = FileHeader::Read(stream);
+}
+}
\ No newline at end of file
diff --git a/Dump.h b/Dump.h
new file mode 100644
index 000..e995d1b
--- /dev/null
+++ b/Dump.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include cstdint
+#include memory
+#include string
+#include iostream
+#include FileHeader.h
+
+using std::int64_t;
+using std::unique_ptr;
+using std::string;
+using std::iostream;
+
+class DumpException : std::exception
+{
+};
+
+class ReadableDump
+{
+protected:
+unique_ptriostream stream;
+ReadableDump(unique_ptriostream stream);
+public:
+ReadableDump(string fileName);
+};
+
+class WritableDump : public ReadableDump
+{
+private:
+FileHeader fileHeader;
+
+static unique_ptriostream openStream(string fileName);
+public:
+WritableDump(string fileName);
+};
\ No newline at end of file
diff --git a/DumpObject.cpp b/DumpObject.cpp
new file mode 100644
index 000..ce6715f
--- /dev/null
+++ b/DumpObject.cpp
@@ -0,0 +1,7 @@
+#include DumpObject.h
+
+void DumpObject::Write(unique_ptriostream const stream, int64_t offset)
+{
+stream-seekp(offset);
+WriteInternal(stream);
+}
\ No newline at end of file
diff --git a/DumpObject.h b/DumpObject.h
new file mode 100644
index 000..f7b5c2f
--- /dev/null
+++ b/DumpObject.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include cstdint
+#include memory
+#include iostream
+
+using std::int64_t;
+using std::unique_ptr;
+using std::iostream;
+
+class DumpObject
+{
+protected:
+virtual void WriteInternal(unique_ptriostream const stream) = 0;
+public:
+void Write(unique_ptriostream const stream, int64_t offset);
+};
\ No newline at end of file
diff --git a/FileHeader.cpp b/FileHeader.cpp
new file mode 100644
index 000..ddee2dc
--- /dev/null
+++ b/FileHeader.cpp
@@ -0,0 +1,37 @@
+#include FileHeader.h
+#include Dump.h
+
+FileHeader::FileHeader(Offset fileEnd, Offset pageIdIndexRoot, Offset 
freeSpaceIndexRoot)
+: FileEnd(fileEnd), PageIdIndexRoot(pageIdIndexRoot), 
FreeSpaceIndexRoot(freeSpaceIndexRoot)
+{
+}
+
+void FileHeader::WriteInternal(unique_ptriostream const stream)
+{
+stream-write(WMID, 4);
+stream-write(FileFormatVersion, 1);
+stream-write(FileDataVersion, 1);
+
+FileEnd.Write(stream);
+PageIdIndexRoot.Write(stream);
+FreeSpaceIndexRoot.Write(stream);
+}
+
+FileHeader FileHeader::Read(unique_ptriostream const stream)
+{
+char bytes[6];
+stream-read(bytes, 6);
+if (stream-fail() || strncmp(bytes, WMID, 4) != 0 || bytes[4] != 
FileFormatVersion || bytes[5] != FileDataVersion)
+throw new DumpException();
+
+Offset fileEnd = Offset::Read(stream);
+Offset pageIdIndexRoot = Offset::Read(stream);
+Offset freeSpaceIndexRoot = Offset::Read(stream);
+
+return FileHeader(fileEnd, pageIdIndexRoot, freeSpaceIndexRoot);
+}
+
+FileHeader::FileHeader()
+: FileEnd(0), PageIdIndexRoot(0), FreeSpaceIndexRoot(0)
+{
+}
\ No newline at end of file
diff --git a/FileHeader.h b/FileHeader.h
new file mode 100644
index 000..20e1bb1
--- /dev/null
+++ b/FileHeader.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include iostream
+#include DumpObject.h
+#include Offset.h
+

[MediaWiki-commits] [Gerrit] starting with dump format: file header - change (operations...incremental)

[Petr Onderka (Code Review)]

Petr Onderka has submitted this change and it was merged.

Change subject: starting with dump format: file header
..


starting with dump format: file header

Change-Id: I29350dbe9de280efa1248a6c87d174fa6494d32e
---
A Dump.cpp
A Dump.h
A DumpObject.cpp
A DumpObject.h
A FileHeader.cpp
A FileHeader.h
M Incremental dumps.vcxproj
A Offset.cpp
A Offset.h
M main.cpp
10 files changed, 246 insertions(+), 2 deletions(-)

Approvals:
  Petr Onderka: Verified; Looks good to me, approved



diff --git a/Dump.cpp b/Dump.cpp
new file mode 100644
index 000..5a0d77f
--- /dev/null
+++ b/Dump.cpp
@@ -0,0 +1,49 @@
+#include cstdint
+#include memory
+#include string
+#include fstream
+#include Dump.h
+
+using std::unique_ptr;
+using std::move;
+using std::string;
+using std::fstream;
+using std::ios;
+
+ReadableDump::ReadableDump(unique_ptriostream stream)
+: stream(move(stream))
+{}
+
+ReadableDump::ReadableDump(string fileName)
+: stream(unique_ptrfstream(new fstream(fileName, ios::in | ios::binary)))
+{}
+
+unique_ptriostream WritableDump::openStream(string fileName)
+{
+fstream *stream = new fstream(fileName, ios::in | ios::out | ios::binary);
+
+if (!stream-is_open())
+{
+// this feels dangerous, isn't there a better way?
+stream = new fstream(fileName, ios::in | ios::out | ios::binary | 
ios::trunc);
+}
+
+stream-exceptions(ios::failbit | ios::badbit);
+
+return unique_ptriostream(stream);
+}
+
+WritableDump::WritableDump(string fileName)
+: ReadableDump(openStream(fileName))
+{
+if (stream-peek() == EOF)
+{
+stream-clear();
+fileHeader = FileHeader();
+fileHeader.Write(stream, 0);
+}
+else
+{
+fileHeader = FileHeader::Read(stream);
+}
+}
\ No newline at end of file
diff --git a/Dump.h b/Dump.h
new file mode 100644
index 000..e995d1b
--- /dev/null
+++ b/Dump.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include cstdint
+#include memory
+#include string
+#include iostream
+#include FileHeader.h
+
+using std::int64_t;
+using std::unique_ptr;
+using std::string;
+using std::iostream;
+
+class DumpException : std::exception
+{
+};
+
+class ReadableDump
+{
+protected:
+unique_ptriostream stream;
+ReadableDump(unique_ptriostream stream);
+public:
+ReadableDump(string fileName);
+};
+
+class WritableDump : public ReadableDump
+{
+private:
+FileHeader fileHeader;
+
+static unique_ptriostream openStream(string fileName);
+public:
+WritableDump(string fileName);
+};
\ No newline at end of file
diff --git a/DumpObject.cpp b/DumpObject.cpp
new file mode 100644
index 000..ce6715f
--- /dev/null
+++ b/DumpObject.cpp
@@ -0,0 +1,7 @@
+#include DumpObject.h
+
+void DumpObject::Write(unique_ptriostream const stream, int64_t offset)
+{
+stream-seekp(offset);
+WriteInternal(stream);
+}
\ No newline at end of file
diff --git a/DumpObject.h b/DumpObject.h
new file mode 100644
index 000..f7b5c2f
--- /dev/null
+++ b/DumpObject.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include cstdint
+#include memory
+#include iostream
+
+using std::int64_t;
+using std::unique_ptr;
+using std::iostream;
+
+class DumpObject
+{
+protected:
+virtual void WriteInternal(unique_ptriostream const stream) = 0;
+public:
+void Write(unique_ptriostream const stream, int64_t offset);
+};
\ No newline at end of file
diff --git a/FileHeader.cpp b/FileHeader.cpp
new file mode 100644
index 000..ddee2dc
--- /dev/null
+++ b/FileHeader.cpp
@@ -0,0 +1,37 @@
+#include FileHeader.h
+#include Dump.h
+
+FileHeader::FileHeader(Offset fileEnd, Offset pageIdIndexRoot, Offset 
freeSpaceIndexRoot)
+: FileEnd(fileEnd), PageIdIndexRoot(pageIdIndexRoot), 
FreeSpaceIndexRoot(freeSpaceIndexRoot)
+{
+}
+
+void FileHeader::WriteInternal(unique_ptriostream const stream)
+{
+stream-write(WMID, 4);
+stream-write(FileFormatVersion, 1);
+stream-write(FileDataVersion, 1);
+
+FileEnd.Write(stream);
+PageIdIndexRoot.Write(stream);
+FreeSpaceIndexRoot.Write(stream);
+}
+
+FileHeader FileHeader::Read(unique_ptriostream const stream)
+{
+char bytes[6];
+stream-read(bytes, 6);
+if (stream-fail() || strncmp(bytes, WMID, 4) != 0 || bytes[4] != 
FileFormatVersion || bytes[5] != FileDataVersion)
+throw new DumpException();
+
+Offset fileEnd = Offset::Read(stream);
+Offset pageIdIndexRoot = Offset::Read(stream);
+Offset freeSpaceIndexRoot = Offset::Read(stream);
+
+return FileHeader(fileEnd, pageIdIndexRoot, freeSpaceIndexRoot);
+}
+
+FileHeader::FileHeader()
+: FileEnd(0), PageIdIndexRoot(0), FreeSpaceIndexRoot(0)
+{
+}
\ No newline at end of file
diff --git a/FileHeader.h b/FileHeader.h
new file mode 100644
index 000..20e1bb1
--- /dev/null
+++ b/FileHeader.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include iostream
+#include DumpObject.h
+#include Offset.h
+
+using std::istream;
+
+class FileHeader : public DumpObject
+{

[MediaWiki-commits] [Gerrit] Use requested variant language instead of target language to... - change (mediawiki...Wikibase)

[Liangent (Code Review)]

Liangent has uploaded a new change for review.

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


Change subject: Use requested variant language instead of target language to 
fetch labels
..

Use requested variant language instead of target language to fetch labels

Change-Id: I5a461251c5c4b0ff6c5abd701707c5c04910fadf
---
M client/includes/parserhooks/PropertyParserFunction.php
1 file changed, 25 insertions(+), 2 deletions(-)


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

diff --git a/client/includes/parserhooks/PropertyParserFunction.php 
b/client/includes/parserhooks/PropertyParserFunction.php
index 4d09ab9..3a15074 100644
--- a/client/includes/parserhooks/PropertyParserFunction.php
+++ b/client/includes/parserhooks/PropertyParserFunction.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase;
 
+use Language;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\SimpleSiteLink;
 use Wikibase\Lib\SnakFormatter;
@@ -188,7 +189,18 @@
$propertyLabelResolver = 
$wikibaseClient-getStore()-getPropertyLabelResolver();
$formatter = $wikibaseClient-newSnakFormatter();
 
-   $instance = new self( $targetLanguage,
+   // Use variant language instead of content language itself when 
the output will
+   // be converted, in case some labels can't be converted 
correctly afterwards.
+   $parserOptions = $parser-getOptions();
+   $handleVariants = $parser-ot['html']  
!$parserOptions-getInterfaceMessage()
+!$parserOptions-getDisableContentConversion();
+   if ( $handleVariants ) {
+   $labelLanguage = Language::factory( 
$targetLanguage-getPreferredVariant() );
+   } else {
+   $labelLanguage = $targetLanguage;
+   }
+
+   $instance = new self( $labelLanguage,
$entityLookup, $propertyLabelResolver,
$errorFormatter, $formatter );
 
@@ -210,10 +222,21 @@
 
$text = $status-isOK() ? $status-getValue() : '';
 
+   // This condition is less strict than handleVariants.
+   if ( $parser-ot['html'] || $parser-ot['pre'] ) {
+   $text = wfEscapeWikitext( $text );
+
+   // Since we've already fetched labels in requested 
variant languages,
+   // prevent them from being converted again in further 
parsing process.
+   // Some tests may be added to ensure this behavior.
+   if ( $handleVariants ) {
+   $text = 
$targetLanguage-getConverter()-markNoConversion( $text );
+   }
+   }
+
$result = array(
$text,
'noparse' = false,
-   'nowiki' = true,
);
 
wfProfileOut( __METHOD__ );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a461251c5c4b0ff6c5abd701707c5c04910fadf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add Special:RandomInCategory. - change (mediawiki/core)

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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


Change subject: Add Special:RandomInCategory.
..

Add Special:RandomInCategory.

This is meant mostly to spur discussion. The method used is quite
biased, but I believe its the best possible without a schema change
and still being efficient.

The question at hand - is this method acceptable. The method used
is to chose a random timestamp and look at cl_timestamp. This method
will give good results if the timestamps are uniformly distributed
(which probably is not usually true). I think it may give acceptable
results in general, especially given most people are not interested
in true randomness, but more in give me a result I haven't seen before.
(For example, to pick a random entry in a maintenance category to clean
up).

It also fudges the result a little bit using offset to stop really
biased results from happening.

Bug: 25931
Change-Id: I0c48e4a236b50fb627af94f0df47fef8372ea14d
---
M RELEASE-NOTES-1.22
M includes/AutoLoader.php
M includes/SpecialPageFactory.php
A includes/specials/SpecialRandomInCategory.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
7 files changed, 291 insertions(+), 0 deletions(-)


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

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 45a6f01..0d06ff2 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -137,6 +137,7 @@
   also granting the ability to protect and unprotect.
 * (bug 48256) Make brackets in section edit links accessible to CSS.
   They are now wrapped in span class=mw-editsection-bracket /.
+* (bug 25931) Add Special:RandomInCategory.
 
 === Bug fixes in 1.22 ===
 * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 6f8cd4b..09d5f90 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -932,6 +932,7 @@
'ProtectedPagesPager' = 'includes/specials/SpecialProtectedpages.php',
'ProtectedTitlesPager' = 
'includes/specials/SpecialProtectedtitles.php',
'RandomPage' = 'includes/specials/SpecialRandompage.php',
+   'RandomInCategory' = 'includes/specials/SpecialRandomInCategory.php',
'ShortPagesPage' = 'includes/specials/SpecialShortpages.php',
'SpecialActiveUsers' = 'includes/specials/SpecialActiveusers.php',
'SpecialAllmessages' = 'includes/specials/SpecialAllmessages.php',
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 4d63553..c4b3dd0 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -130,6 +130,7 @@
// Redirecting special pages
'LinkSearch'= 'LinkSearchPage',
'Randompage'= 'Randompage',
+   'RandomInCategory'  = 'RandomInCategory',
'Randomredirect'= 'SpecialRandomredirect',
 
// High use pages
diff --git a/includes/specials/SpecialRandomInCategory.php 
b/includes/specials/SpecialRandomInCategory.php
new file mode 100644
index 000..3b2f964
--- /dev/null
+++ b/includes/specials/SpecialRandomInCategory.php
@@ -0,0 +1,264 @@
+?php
+/**
+ * Implements Special:RandomInCategory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ * @author Brian Wolff
+ */
+
+/**
+ * Special page to direct the user to a random page
+ *
+ * @note The method used here is rather biased. It is assumed that
+ * the use of this page will be people wanting to get a random page
+ * out of a maintenance category, to fix it up. The method used by
+ * this page should return different pages in an unpredictable fashion
+ * which is hoped to be sufficient, even if some pages are selected
+ * more often than others.
+ *
+ * A more unbiased method could be achieved by adding a cl_random field
+ * to the categorylinks table.
+ *
+ * The method used here is as follows:
+ *  * Find the smallest and largest timestamp in the category
+ *  * Pick a random timestamp in 

[MediaWiki-commits] [Gerrit] (bug 50425) Add the flood flag on bs.wikipedia - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: (bug 50425) Add the flood flag on bs.wikipedia
..


(bug 50425) Add the flood flag on bs.wikipedia

Adding the flood flag on bs.wikipedia per community request;
administrators will be able to add and remove users from this
group (including themselves).

[Note: The request asked for bureaucrats to be able to assign
this group to users, too, but since there are no bureaucrats
who are not simultaneously administrators on bs.wikipedia, I'm
adding this right only to the 'sysop' group.]

Bug: 50426
Change-Id: Idb753d1b28826ea492d7d8f3854e76dac9a6e25a
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4c39bd1..7e40475 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6654,6 +6654,7 @@
'patroller' = array( 'patrol' = true ),
'autopatrolled' = array( 'autopatrol' = true ),
'rollbacker' = array( 'rollback' = true ),
+   'flood' = array( 'bot' = true ), // bug 50425
),
'cawiki' = array(
'user' = array( 'patrol' = false ),
@@ -7629,7 +7630,8 @@
'bureaucrat' = array( 'import' ),
),
'+bswiki' = array(
-   'bureaucrat' = array( 'patroller', 'autopatrolled', 
'rollbacker' )
+   'sysop' = array( 'flood' ), // bug 50425
+   'bureaucrat' = array( 'patroller', 'autopatrolled', 
'rollbacker' ),
),
'+cawiki' = array(
'sysop' = array( 'rollbacker', 'autopatrolled', 'abusefilter', 
),
@@ -8040,7 +8042,8 @@
'bureaucrat' = array( 'import' ),
),
'+bswiki' = array(
-   'bureaucrat' = array( 'patroller', 'autopatrolled', 
'rollbacker' )
+   'sysop' = array( 'flood' ), // bug 50425
+   'bureaucrat' = array( 'patroller', 'autopatrolled', 
'rollbacker' ),
),
'+cawiki' = array(
'sysop' = array( 'rollbacker', 'autopatrolled', 'abusefilter', 
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb753d1b28826ea492d7d8f3854e76dac9a6e25a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder tom...@twkozlowski.net
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] (bug 50287) Restrict local uploads on Meta-Wiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: (bug 50287) Restrict local uploads on Meta-Wiki
..


(bug 50287) Restrict local uploads on Meta-Wiki

Per community request, I'm restricting local uploads on Meta
to the 'sysop' and the newly created 'uploader' user groups.

To do that, I'm taking away all upload-related user rights
from all users: 'reupload-own' which is assigned by default
to the 'user' group, and 'upload' and 'reupload' which are
assigned to the 'autoconfirmed' user group.

As requested, I'm also removing the same rights from users in
the 'confirmed' user group and creating a new 'uploader' group
with 'upload', 'reupload' and 'reupload-own' user rights. Since
no upload rights are assigned to the 'sysop' group by default,
I'm adding the said rights to that group as well (because they
wouldn't be able to upload anything otherwise).

[Unrelated: I'm removing the 'move' definition since this right
is already taken away from the 'user' group in wgGroupOverrides2.]

As requested, bureaucrats will be able to add and remove users
from the new 'uploader' group.

Bug: 50287
Change-Id: I78737791fccde75e0c90af7e6a45539d0dfdce6e
---
M wmf-config/InitialiseSettings.php
1 file changed, 21 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7e40475..010774f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7111,11 +7111,29 @@
),
 
'metawiki' = array(
-   'user' = array( 'move' = false ), // sigh. tired of this 
shit. brion -2007-01-10
+   /* 'user' = array( 'reupload-own' = false ), // bug 50287 */
+   'autoconfirmed' = array( // bug 50287
+   'upload' = false,
+   'reupload' = false,
+   ),
+   'confirmed' = array( // bug 50287
+   'upload' = false,
+   'reupload' = false,
+   ),
'steward' = array( 'userrights-interwiki' = true ), // new 
steward stuff, yay 2007-12-27
'flood' = array( 'bot' = true ),
'autopatrolled' = array( 'autopatrol' = true ),
'centralnoticeadmin' = array( 'centralnotice-admin' = true, 
'editinterface' = true ), //adding to allow CN access without local sysop JRA 
2013-02-21
+   'uploader' = array( // bug 50287
+   'upload' = true,
+   'reupload' = true,
+   'reupload-own' = true,
+   ),
+   'sysop' = array( // bug 50287
+   'upload' = true,
+   'reupload' = true,
+   'reupload-own' = true,
+   ),
),
'mkwiki' = array(
'autopatrolled' = array( 'autopatrol' = true ),
@@ -7805,7 +7823,7 @@
'coder' = array( 'coder' ),
),
'+metawiki' = array(
-   'bureaucrat' = array( 'ipblock-exempt', 'centralnoticeadmin', 
'flood' ), // Bug 46639
+   'bureaucrat' = array( 'ipblock-exempt', 'centralnoticeadmin', 
'flood', 'uploader' ), // Bug 46639
'checkuser'  = array( 'ipblock-exempt' ),
'sysop'  = array( 'autopatrolled' ),
),
@@ -8228,7 +8246,7 @@
'bureaucrat' = array( 'transwiki', 'import', 'coder', 
'svnadmins' ),
),
'+metawiki' = array(
-   'bureaucrat' = array( 'sysop', 'bureaucrat', 'ipblock-exempt', 
'flood', 'translationadmin', 'centralnoticeadmin' ), // 
https://bugzilla.wikimedia.org/show_bug.cgi?id=37198
+   'bureaucrat' = array( 'sysop', 'bureaucrat', 'ipblock-exempt', 
'flood', 'translationadmin', 'centralnoticeadmin', 'uploader' ), // bug 37198, 
50287
'checkuser'  = array( 'ipblock-exempt' ),
'sysop'  = array( 'autopatrolled' ),
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78737791fccde75e0c90af7e6a45539d0dfdce6e
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder tom...@twkozlowski.net
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] (bug 50377) Enable 'autopatrolled' group on hewikivoyage - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: (bug 50377) Enable 'autopatrolled' group on hewikivoyage
..


(bug 50377) Enable 'autopatrolled' group on hewikivoyage

Administrators can add and remove users from that group.

Bug: 50377
Change-Id: If1b5abdbc03cc7d4b72aa5b10759069aecdee234
---
M wmf-config/InitialiseSettings.php
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 010774f..3e3b111 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6948,6 +6948,9 @@
'hewikiquote' = array(
'autopatrolled' = array( 'autopatrol' = true ),
),
+   'hewikivoyage' = array(
+   'autopatrolled' = array( 'autopatrol' = true ), // bug 50377
+   ),
'hiwiki' = array(
'reviewer' = array ( 'patrol' = true, 'autopatrol' = true ),
'autopatrolled' = array( 'autopatrol' = true ),
@@ -7775,6 +7778,9 @@
'+hewikiquote' = array(
'sysop' = array( 'autopatrolled' ),
),
+   '+hewikivoyage' = array(
+   'sysop' = array( 'autopatrolled' ), // bug 50377
+   ),
'+hiwiki' = array(
'sysop' = array( 'abusefilter', 'autopatrolled', 'reviewer' ),
),
@@ -8190,6 +8196,9 @@
'+hewikiquote' = array(
'sysop' = array( 'autopatrolled' ),
),
+   '+hewikivoyage' = array(
+   'sysop' = array( 'autopatrolled' ), // bug 50377
+   ),
'+hiwiki' = array(
'sysop' = array( 'abusefilter', 'autopatrolled', 'reviewer' ),
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1b5abdbc03cc7d4b72aa5b10759069aecdee234
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder tom...@twkozlowski.net
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] (bug 50007) Add 'Translation' namespace to English Wikisource - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: (bug 50007) Add 'Translation' namespace to English Wikisource
..


(bug 50007) Add 'Translation' namespace to English Wikisource

Adding this new namespace under no. 114 (115 for the corresponding
talk page namespace), enabling subpages for both and adding the
former to $wgContentNamespace. I'm also setting this new namespace
to be searched by default, all as requested in the bug.

Bug: 50007
Change-Id: Ib17903d6b85012f2297e117cdcfe5d82c61e4369
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3e3b111..0a8dc0d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3451,6 +3451,7 @@
// Wikisource @{
'+wikisource' = array( 0 = 1, 6 = 0, 8 = 0 ),
'+cswikisource' = array( 14 = 1 ),
+   '+enwikisource' = array( 114 = 1, 115 = 1 ), // bug 50007
'+huwikisource' = array( 10 = 0 ),
'+nowikisource' = array( 10 = 0 ),
'+ruwikisource' = array( 10 = 0 ),
@@ -4998,6 +4999,8 @@
// @} end of Wikipedia
 
// Wikisource wikis @{
+   // Please reserve NS 114 for 'Translation', thanks!
+
'sourceswiki' = array(
104 = 'Page',
105 = 'Page_talk',
@@ -5015,6 +5018,8 @@
105 = 'Page_talk',
106 = 'Index',
107 = 'Index_talk',
+   114 = 'Translation', // bug 50007
+   115 = 'Translation_talk', // bug 50007
),
'arwikisource' = array(
100 = 'بوابة',
@@ -6375,7 +6380,7 @@
'+elwikisource' = array( 102 = 1 ),
'+enwikibooks' = array( 4 = 1, 112 = 1 ),
'+enwikinews' = array( 100 = 1, 101 = 0 ),
-   '+enwikisource' = array( 102 = 1, 106 = 1 ),
+   '+enwikisource' = array( 102 = 1, 106 = 1, 114 = 1 ), // bug 50007
'+eswiki' = array( 100 = 1, 104 = 1 ),
'+eswikisource' = array( 104 = 1 ),
'+etwikisource' = array( 104 = 1, 106 = 1 ),
@@ -9073,7 +9078,7 @@
'+dewikisource' = array( 102, 104 ),
'+elwikisource' = array( 100, 102 ),
'+enwikibooks' = array( 102, 110 ),
-   '+enwikisource' = array( 102, 104, 106 ),
+   '+enwikisource' = array( 102, 104, 106, 114 ), // bug 50007
'+eswiki' = array( 104 ), // Bug 39866
'+eswikisource' = array( 102, 104 ),
'+etwikisource' = array( 102, 104, 106 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib17903d6b85012f2297e117cdcfe5d82c61e4369
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder tom...@twkozlowski.net
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fixed import source for testwikidatawiki - change (operations/mediawiki-config)

[Vogone (Code Review)]

Vogone has uploaded a new change for review.

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


Change subject: Fixed import source for testwikidatawiki
..

Fixed import source for testwikidatawiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 0a8dc0d..5cbd33c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8727,7 +8727,7 @@
'viwikiquote'  = array( 'w', 'wikt', 'b', 's' ),
 
'wikidata' = array( 'meta', 'commons', 'en', 'de', 'fr', 'es' ),
-   '+testwikidatawiki' = array( 'wikidata' ),
+   '+testwikidatawiki' = array( 'd' ),
'wikimania2012wiki' = array( 'en', 'meta', 'wm2011' ),
'wikimania2013wiki' = array( 'en', 'meta', 'wm2011', 'wm2012' ),
'wikimania2014wiki' = array( 'en', 'meta', 'wm2011', 'wm2012', 
'wm2013' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1c543531584316d6d3b5623cbf7b89bd170d529
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Vogone leon.liese...@wikipedia.de

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

[MediaWiki-commits] [Gerrit] Use single entry point mw.uls.init for all ULS ui initializa... - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Use single entry point mw.uls.init for all ULS ui initialization
..


Use single entry point mw.uls.init for all ULS ui initialization

Change-Id: I485ea27deebb530eb89e4b0935eda01a5276f884
---
M resources/js/ext.uls.ime.js
M resources/js/ext.uls.init.js
M resources/js/ext.uls.interface.js
M resources/js/ext.uls.webfonts.js
4 files changed, 37 insertions(+), 30 deletions(-)

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



diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index 1d26010..d3da527 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -203,17 +203,14 @@
};
 
$( document ).ready( function () {
-   if ( !mw.uls.isBrowserSupported() ) {
-   return;
-   }
+   mw.uls.init( function () {
+   // Load the ime preferences
+   $.ime.preferences.load();
 
-   // Load the ime preferences
-   $.ime.preferences.load();
-
-   if ( $.ime.preferences.isEnabled() ) {
-   mw.ime.setup();
-   }
-
+   if ( $.ime.preferences.isEnabled() ) {
+   mw.ime.setup();
+   }
+   } );
} );
 
function imeNotification () {
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 5733c28..4531923 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -31,7 +31,8 @@
this.$languageFilter.addClass( 'noime' );
};
 
-   var currentLang = mw.config.get( 'wgUserLanguage' );
+   var initialized = false,
+   currentLang = mw.config.get( 'wgUserLanguage' );
mw.uls = mw.uls || {};
mw.uls.previousLanguagesCookie = 'uls-previous-languages';
/**
@@ -139,10 +140,10 @@
 * Browse support policy: 
http://www.mediawiki.org/wiki/Browser_support#Grade_A
 * @return boolean
 */
-   mw.uls.isBrowserSupported = function () {
+   function isBrowserSupported() {
// Blacklist Grade B browsers IE 6, 7 and IE60-IE79
return !/MSIE [67]/i.test( navigator.userAgent );
-   };
+   }
 
/**
 * Local wrapper for 'mw.eventLog.logEvent' which handles default params
@@ -187,8 +188,14 @@
.load( jsonLoader + currentLang, currentLang );
}
 
-   $( document ).ready( function () {
-   if ( !mw.uls.isBrowserSupported() ) {
+   mw.uls.init = function( callback ) {
+   callback = callback || $.noop;
+
+   if ( initialized ) {
+   callback.call( this, false );
+   return;
+   }
+   if ( !isBrowserSupported() ) {
$( '#pt-uls' ).hide();
return;
}
@@ -205,5 +212,11 @@
 
// JavaScript side i18n initialization
i18nInit();
+   initialized = true;
+   callback.call( this, true );
+   };
+
+   $( document ).ready( function () {
+   mw.uls.init();
} );
 }( jQuery, mediaWiki ) );
diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index ed60f97..4d69347 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -223,6 +223,7 @@
}
 
$( document ).ready( function () {
+   mw.uls.init( function () {
var $ulsTrigger = $( '.uls-trigger' ),
$ulsSettingsTrigger,
$pLang,
@@ -231,10 +232,6 @@
anonMode = ( mw.user.isAnon() 
!mw.config.get( 'wgULSAnonCanChangeLanguage' ) 
),
ulsPosition = mw.config.get( 'wgULSPosition' );
-
-   if ( !mw.uls.isBrowserSupported() ) {
-   return;
-   }
 
if ( ulsPosition === 'interlanguage' ) {
// The interlanguage links section
@@ -330,4 +327,5 @@
 
showULSTooltip();
} );
+   } );
 }( jQuery, mediaWiki ) );
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index 4b11ae8..804f0fa 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -81,17 +81,16 @@
};
 
$( document ).ready( function () {
-   if ( !mw.uls.isBrowserSupported() ) {
-   return;
-   }
-   // MediaWiki specific overrides for jquery.webfonts
-   $.extend( $.fn.webfonts.defaults, {
-   repository: mediawikiFontRepository,
- 

[MediaWiki-commits] [Gerrit] Generate data for Echo preferences - change (analytics/limn-ee-data)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: Generate data for Echo preferences
..

Generate data for Echo preferences

Bug: 46669
Bug: 46672
Bug: 46673
Change-Id: I132522ed4624c9d4598448159ebe146f8c252171
---
A .gitreview
A README.md
A cron.sh
A echo_clicks.sh
A echo_preferences_all.sh
A echo_preferences_diff.sh
A echo_views.sh
A newbie_user_ids.sh
A wiki_env.sh
9 files changed, 415 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-ee-data 
refs/changes/99/71999/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..1f2f0b1
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=analytics/limn-ee-data.git
+defaultbranch=master
diff --git a/README.md b/README.md
new file mode 100644
index 000..03f46d6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,18 @@
+# ee-metrics
+
+Scripts generating data CSVs for certain graphs for WMF ee-dashboard features, 
on http://ee-dashboard.wmflabs.org/dashboards/enwiki-features/
+
+# Usage
+
+cron.sh will be run on a daily basis. In there are the calls to the scripts 
that will generate the data.
+
+The real scripts can be called like this (from cron.sh):
+
+script.sh -hdbhost -wwiki
+
+wiki is the name of the wiki
+dbhost is db slave the wiki's data lives (see 
https://office.wikimedia.org/wiki/Data_access)
+
+Scripts will write CSVs to /a/limn-public-data/ee/datasets/wiki
+
+The database queries in the scripts have no credentials and will be performed 
as the user executing the script.
diff --git a/cron.sh b/cron.sh
new file mode 100755
index 000..d9eadb4
--- /dev/null
+++ b/cron.sh
@@ -0,0 +1,10 @@
+DIR=`dirname $0`
+
+# this will be called via cron, on a daily basis, and will execute these 
scripts
+
+enwiki='-hdb1047.eqiad.wmnet -wenwiki'
+
+sh $DIR/echo_clicks.sh $enwiki
+sh $DIR/echo_views.sh $enwiki
+sh $DIR/echo_preferences_all.sh $enwiki
+sh $DIR/echo_preferences_diff.sh $enwiki
diff --git a/echo_clicks.sh b/echo_clicks.sh
new file mode 100755
index 000..10c3f4f
--- /dev/null
+++ b/echo_clicks.sh
@@ -0,0 +1,69 @@
+#!/bin/bash -e
+
+# http://www.mediawiki.org/wiki/Echo/Metrics#Clicks_Dashboards
+# Based on EventLogging data
+
+
+DIR=`dirname $0`
+
+# get $db  $wiki from args
+. $DIR/wiki_env.sh -s`basename $0` $@
+
+# config
+dt=/a/limn-public-data/ee/datasets/$wiki
+mkdir -p $dt
+
+
+# clicks by category
+category=
+SELECT
+   DATE(timestamp) AS 'date',
+   SUM(event_notificationType = 'edit-user-talk') AS 'edit-user-talk',
+   SUM(event_notificationType = 'edit-thank') AS 'edit-thank',
+   SUM(event_notificationType = 'mention') AS 'mention',
+   SUM(event_notificationType = 'page-linked') AS 'page-linked',
+   SUM(event_notificationType = 'pagetriage-mark-as-reviewed') AS 
'pagetriage-mark-as-reviewed',
+   SUM(event_notificationType = 'reverted') AS 'reverted',
+   SUM(event_notificationType = 'welcome') AS 'welcome',
+   SUM(event_notificationType = 'gettingstarted-start-editing') AS 
'gettingstarted-start-editing',
+   SUM(event_notificationType = 'user-rights') AS 'user-rights'
+FROM EchoInteraction_5539940
+WHERE wiki = '$wiki' AND event_action = 'notification-link-click'
+GROUP BY DATE(timestamp);
+
+# clicks by source
+src=
+SELECT
+   DATE(timestamp) AS 'date',
+   SUM(event_context = 'flyout') AS 'flyout',
+   SUM(event_context = 'archive') AS 'archive'
+FROM EchoInteraction_5539940
+WHERE wiki = '$wiki' AND event_action = 'notification-link-click'
+GROUP BY DATE(timestamp);
+
+# clicks by user status (newbie|existing)
+newbieids=`$DIR/newbie_user_ids.sh -h$db -w$wiki`
+usertype=
+SELECT
+   DATE(timestamp) AS 'date',
+   SUM(event_userId IN ($newbieids)) AS 'newbie',
+   SUM(event_userId NOT IN ($newbieids)) AS 'existing'
+FROM EchoInteraction_5539940
+WHERE wiki = '$wiki' AND event_action = 'notification-link-click'
+GROUP BY DATE(timestamp);
+
+
+echo Generating dumps
+
+# CSV headers
+echo 
date,edit-user-talk,edit-thank,mention,page-linked,pagetriage-mark-as-reviewed,reverted,welcome,gettingstarted-start-editing,user-rights
  $dt/echo_clicks_by_category.csv
+echo date,flyout,archive  $dt/echo_clicks_by_source.csv
+echo date,newbie,existing  $dt/echo_clicks_by_user_type.csv
+
+# append daily data
+echo $category | mysql -hdb1047.eqiad.wmnet -Dlog -B | sed '1d;$d;s/\t/,/g'  
$dt/echo_clicks_by_category.csv
+echo $src | mysql -hdb1047.eqiad.wmnet -Dlog -B | sed '1d;$d;s/\t/,/g'  
$dt/echo_clicks_by_source.csv
+echo $usertype | mysql -hdb1047.eqiad.wmnet -Dlog -B | sed '1d;$d;s/\t/,/g'  
$dt/echo_clicks_by_user_type.csv
+
+
+echo Done
diff --git a/echo_preferences_all.sh b/echo_preferences_all.sh
new file mode 100755
index 000..3b3bde6
--- /dev/null
+++ b/echo_preferences_all.sh
@@ -0,0 +1,93 @@
+#!/bin/bash -e
+
+# 

[MediaWiki-commits] [Gerrit] Fix case of first letter of group-centralnoticeadmin-member ... - change (mediawiki...WikimediaMessages)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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


Change subject: Fix case of first letter of group-centralnoticeadmin-member 
message
..

Fix case of first letter of group-centralnoticeadmin-member message

Bug: 47613
Change-Id: I13f7641f605b82058fa9b77cc35bdaaabe482a6c
---
M WikimediaMessages.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/WikimediaMessages.i18n.php b/WikimediaMessages.i18n.php
index 64f0f51..4968c76 100644
--- a/WikimediaMessages.i18n.php
+++ b/WikimediaMessages.i18n.php
@@ -201,7 +201,7 @@
 
# Bug 45270 due to https://gerrit.wikimedia.org/r/#/c/50196/
'group-centralnoticeadmin'= 'Central notice administrators',
-   'group-centralnoticeadmin-member' = '{{GENDER:$1|Central notice 
administrator}}',
+   'group-centralnoticeadmin-member' = '{{GENDER:$1|central notice 
administrator}}',
'grouppage-centralnoticeadmin'= '{{ns:project}}:Central notice 
administrators',
 
# mediawiki.org specific user group

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13f7641f605b82058fa9b77cc35bdaaabe482a6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com

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

[MediaWiki-commits] [Gerrit] Setup gitreview - change (operations...jmxtrans)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Setup gitreview
..


Setup gitreview

Change-Id: Ia563c0afcd6633ffbf48808d13d0e51e0c38e9de
---
A .gitreview
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..be14e5f
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/puppet/jmxtrans.git
+defaultbranch=master
+

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

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

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

[MediaWiki-commits] [Gerrit] Fix case of first letter of group-centralnoticeadmin-member ... - change (mediawiki...WikimediaMessages)

[jenkins-bot (Code Review)]

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

Change subject: Fix case of first letter of group-centralnoticeadmin-member 
message
..


Fix case of first letter of group-centralnoticeadmin-member message

Bug: 47613
Change-Id: I13f7641f605b82058fa9b77cc35bdaaabe482a6c
---
M WikimediaMessages.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/WikimediaMessages.i18n.php b/WikimediaMessages.i18n.php
index 64f0f51..4968c76 100644
--- a/WikimediaMessages.i18n.php
+++ b/WikimediaMessages.i18n.php
@@ -201,7 +201,7 @@
 
# Bug 45270 due to https://gerrit.wikimedia.org/r/#/c/50196/
'group-centralnoticeadmin'= 'Central notice administrators',
-   'group-centralnoticeadmin-member' = '{{GENDER:$1|Central notice 
administrator}}',
+   'group-centralnoticeadmin-member' = '{{GENDER:$1|central notice 
administrator}}',
'grouppage-centralnoticeadmin'= '{{ns:project}}:Central notice 
administrators',
 
# mediawiki.org specific user group

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13f7641f605b82058fa9b77cc35bdaaabe482a6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Parse duplicate-defaultsort error message - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Parse duplicate-defaultsort error message
..


Parse duplicate-defaultsort error message

Bug: 49611
Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
---
M includes/parser/CoreParserFunctions.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index a7820d4..41cbd08 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -862,7 +862,10 @@
return '';
} else {
return 'span class=error' .
-   wfMessage( 'duplicate-defaultsort', $old, $text 
)-inContentLanguage()-escaped() .
+   wfMessage( 'duplicate-defaultsort',
+   wfEscapeWikiText( $old ), // Message 
should be parsed, but these params should only be escaped.
+   wfEscapeWikiText( $text )
+   )-inContentLanguage()-text() .
'/span';
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Liangent liang...@gmail.com
Gerrit-Reviewer: Matmarex matma@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Organized the packages for exec_environ - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Organized the packages for exec_environ
..

Organized the packages for exec_environ

Change-Id: I4f7d2dd4ece8853d5714835a036a8db6deba5608
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 51 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/72001/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index ac873fd..10ec83e 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -20,20 +20,19 @@
   include identd
 
   package { [
+  # Language Runtimes
+  'openjdk-7-jre-headless',
+  'python3',
+  'nodejs',
+  'mono-runtime',
+  'tcl',
+  'ruby1.9.3',
+  'r-base',
+
+  # Perl libraries
   'libdata-compare-perl',# For Checkwiki.
   'libtest-exception-perl',  # For Checkwiki.
   'libxml-xpathengine-perl', # For Checkwiki.
-  'mariadb-client',  # For /usr/bin/mysql.
-  'mdbtools',# Bug #48805.
-  'python-genshi',   # Bug #48863.
-  'python-genshi-doc',   # Bug #48863.
-  'tree',# Bug #48862.
-  'nodejs',
-  'php5-curl',
-  'mono-runtime',
-  'php5-cli',
-  'php5-mysql',
-  'php5-redis',
   'libcache-memcached-fast-perl',
   'libhtml-parser-perl',
   'libwww-perl',
@@ -42,8 +41,6 @@
   'libjson-xs-perl',
   'libdbd-sqlite3-perl',
   'libpoe-perl',
-  'python-twisted',
-  'python-virtualenv',
   'libclass-data-inheritable-perl',
   'libcommon-sense-perl',
   'libcrypt-openssl-bignum-perl',
@@ -51,24 +48,21 @@
   'libdigest-hmac-perl',
   'libmediawiki-bot-perl',
   'libmediawiki-api-perl',
-  'libpng3',
-  'libfreetype6',
-  'libmpc2',
-  'libmpfr4',
-  'libneon27-gnutls',
-  'libnet-oauth-perl',
-  'libnfnetlink0',
-  'libnspr4',
-  'libnss3',
-  'libnss3-1d',
-  'libotf0',
-  'libpcsclite1',
-  'libquadmath0',
   'libstring-diff-perl',
   'libstring-shellquote-perl',   # For jsub.
-  'libsvn1',
-  'mariadb-common',
-  'openjdk-7-jre-headless',
+  'libpod-simple-wiki-perl',
+  'libxml-libxml-perl',
+  'libdbd-mysql-perl',
+  'libnetaddr-ip-perl',
+  'libthreads-shared-perl',
+  'libthreads-perl',
+  'libnet-oauth-perl',
+
+  # Python libraries
+  'python-genshi',   # Bug #48863.
+  'python-genshi-doc',   # Bug #48863.
+  'python-twisted',
+  'python-virtualenv',
   'python-apport',
   'python-flask',
   'python-flup',
@@ -92,25 +86,41 @@
   'python-flask-oauth',
   'python-nose',
   'python-sqlalchemy',
-  'python3',
-  'mono-complete',
   'python-irclib',
+
+  # PHP libraries
+  'php5-curl',
+  'php5-cli',
+  'php5-mysql',
+  'php5-redis',
+
+  # Other packages
+  'mariadb-client',  # For /usr/bin/mysql.
+  'mariadb-common',
+  'mdbtools',# Bug #48805.
+  'tree',# Bug #48862.
+  'libpng3',
+  'libfreetype6',
+  'libmpc2',
+  'libmpfr4',
+  'libneon27-gnutls',
+  'libnfnetlink0',
+  'libnspr4',
+  'libnss3',
+  'libnss3-1d',
+  'libotf0',
+  'libpcsclite1',
+  'libquadmath0',
+  'libsvn1',
+  'mono-complete',
   'adminbot',
   'gnuplot-nox',
-  'libpod-simple-wiki-perl',
-  'libxml-libxml-perl',
-  'libdbd-mysql-perl',
-  'libnetaddr-ip-perl',
-  'tcl',
   'tclcurl',
   'tcllib',
-  'ruby1.9.3',
-  'libthreads-shared-perl',
-  'libthreads-perl',
   'dc',
   'p7zip',
-  'phpunit',
-  'r-base' ]:
+  'phpunit'
+  ]:
 ensure = present
   }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f7d2dd4ece8853d5714835a036a8db6deba5608
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add php5-xsl (XSLT processor) on request from Tpt - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Add php5-xsl (XSLT processor) on request from Tpt
..

Add php5-xsl (XSLT processor) on request from Tpt

Change-Id: I5f51c3aafe8fc389534edbd28540a73d1ad7c013
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/72002/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 10ec83e..da78f1c 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -93,6 +93,7 @@
   'php5-cli',
   'php5-mysql',
   'php5-redis',
+  'php5-xsl',
 
   # Other packages
   'mariadb-client',  # For /usr/bin/mysql.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f51c3aafe8fc389534edbd28540a73d1ad7c013
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Disable language conversion for echoed sortkeys in defaultso... - change (mediawiki/core)

[Liangent (Code Review)]

Liangent has uploaded a new change for review.

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


Change subject: Disable language conversion for echoed sortkeys in defaultsort 
errors.
..

Disable language conversion for echoed sortkeys in defaultsort errors.

Change-Id: I24ac06687df126b59a3eddeb4ed00b2ca0ee22e9
---
M includes/parser/CoreParserFunctions.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/72003/1

diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 2b84358..511460d 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -864,8 +864,9 @@
} else {
return 'span class=error' .
wfMessage( 'duplicate-defaultsort',
-   wfEscapeWikiText( $old ), // Message 
should be parsed, but these params should only be escaped.
-   wfEscapeWikiText( $text )
+   // Message should be parsed, but these 
params should only be escaped.
+   
$parser-getConverterLanguage()-getConverter()-markNoConversion( 
wfEscapeWikiText( $old ) ),
+   
$parser-getConverterLanguage()-getConverter()-markNoConversion( 
wfEscapeWikiText( $text ) )
)-inContentLanguage()-text() .
'/span';
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24ac06687df126b59a3eddeb4ed00b2ca0ee22e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com

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

[MediaWiki-commits] [Gerrit] Organized the packages for exec_environ - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Organized the packages for exec_environ
..


Organized the packages for exec_environ

Change-Id: I4f7d2dd4ece8853d5714835a036a8db6deba5608
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 51 insertions(+), 41 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index ac873fd..10ec83e 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -20,20 +20,19 @@
   include identd
 
   package { [
+  # Language Runtimes
+  'openjdk-7-jre-headless',
+  'python3',
+  'nodejs',
+  'mono-runtime',
+  'tcl',
+  'ruby1.9.3',
+  'r-base',
+
+  # Perl libraries
   'libdata-compare-perl',# For Checkwiki.
   'libtest-exception-perl',  # For Checkwiki.
   'libxml-xpathengine-perl', # For Checkwiki.
-  'mariadb-client',  # For /usr/bin/mysql.
-  'mdbtools',# Bug #48805.
-  'python-genshi',   # Bug #48863.
-  'python-genshi-doc',   # Bug #48863.
-  'tree',# Bug #48862.
-  'nodejs',
-  'php5-curl',
-  'mono-runtime',
-  'php5-cli',
-  'php5-mysql',
-  'php5-redis',
   'libcache-memcached-fast-perl',
   'libhtml-parser-perl',
   'libwww-perl',
@@ -42,8 +41,6 @@
   'libjson-xs-perl',
   'libdbd-sqlite3-perl',
   'libpoe-perl',
-  'python-twisted',
-  'python-virtualenv',
   'libclass-data-inheritable-perl',
   'libcommon-sense-perl',
   'libcrypt-openssl-bignum-perl',
@@ -51,24 +48,21 @@
   'libdigest-hmac-perl',
   'libmediawiki-bot-perl',
   'libmediawiki-api-perl',
-  'libpng3',
-  'libfreetype6',
-  'libmpc2',
-  'libmpfr4',
-  'libneon27-gnutls',
-  'libnet-oauth-perl',
-  'libnfnetlink0',
-  'libnspr4',
-  'libnss3',
-  'libnss3-1d',
-  'libotf0',
-  'libpcsclite1',
-  'libquadmath0',
   'libstring-diff-perl',
   'libstring-shellquote-perl',   # For jsub.
-  'libsvn1',
-  'mariadb-common',
-  'openjdk-7-jre-headless',
+  'libpod-simple-wiki-perl',
+  'libxml-libxml-perl',
+  'libdbd-mysql-perl',
+  'libnetaddr-ip-perl',
+  'libthreads-shared-perl',
+  'libthreads-perl',
+  'libnet-oauth-perl',
+
+  # Python libraries
+  'python-genshi',   # Bug #48863.
+  'python-genshi-doc',   # Bug #48863.
+  'python-twisted',
+  'python-virtualenv',
   'python-apport',
   'python-flask',
   'python-flup',
@@ -92,25 +86,41 @@
   'python-flask-oauth',
   'python-nose',
   'python-sqlalchemy',
-  'python3',
-  'mono-complete',
   'python-irclib',
+
+  # PHP libraries
+  'php5-curl',
+  'php5-cli',
+  'php5-mysql',
+  'php5-redis',
+
+  # Other packages
+  'mariadb-client',  # For /usr/bin/mysql.
+  'mariadb-common',
+  'mdbtools',# Bug #48805.
+  'tree',# Bug #48862.
+  'libpng3',
+  'libfreetype6',
+  'libmpc2',
+  'libmpfr4',
+  'libneon27-gnutls',
+  'libnfnetlink0',
+  'libnspr4',
+  'libnss3',
+  'libnss3-1d',
+  'libotf0',
+  'libpcsclite1',
+  'libquadmath0',
+  'libsvn1',
+  'mono-complete',
   'adminbot',
   'gnuplot-nox',
-  'libpod-simple-wiki-perl',
-  'libxml-libxml-perl',
-  'libdbd-mysql-perl',
-  'libnetaddr-ip-perl',
-  'tcl',
   'tclcurl',
   'tcllib',
-  'ruby1.9.3',
-  'libthreads-shared-perl',
-  'libthreads-perl',
   'dc',
   'p7zip',
-  'phpunit',
-  'r-base' ]:
+  'phpunit'
+  ]:
 ensure = present
   }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f7d2dd4ece8853d5714835a036a8db6deba5608
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add php5-xsl (XSLT processor) on request from Tpt - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Add php5-xsl (XSLT processor) on request from Tpt
..


Add php5-xsl (XSLT processor) on request from Tpt

Change-Id: I5f51c3aafe8fc389534edbd28540a73d1ad7c013
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 10ec83e..da78f1c 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -93,6 +93,7 @@
   'php5-cli',
   'php5-mysql',
   'php5-redis',
+  'php5-xsl',
 
   # Other packages
   'mariadb-client',  # For /usr/bin/mysql.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f51c3aafe8fc389534edbd28540a73d1ad7c013
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Removing baserevid param from getclaim on api - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Removing baserevid param from getclaim on api
..


Removing baserevid param from getclaim on api

Bug: 50062
Change-Id: Ifa2292a110d322040d1fb29bfbaa0635e2aa26a0
---
M repo/includes/api/GetClaims.php
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index eebc0e5..1c71a93 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -44,7 +44,6 @@
  */
 class GetClaims extends ApiWikibase {
 
-   // TODO: automcomment
// TODO: example
// TODO: rights
// TODO: conflict detection
@@ -223,9 +222,6 @@
),
ApiBase::PARAM_DFLT = 'references',
),
-   'baserevid' = array(
-   ApiBase::PARAM_TYPE = 'integer',
-   ),
);
}
 
@@ -243,9 +239,6 @@
'claim' = 'A GUID identifying the claim. Required 
unless entity is provided.',
'rank' = 'Optional filter to return only the claims 
that have the specified rank',
'props' = 'Some parts of the claim are returned 
optionally. This parameter controls which ones are returned.',
-   'baserevid' = array( 'The numeric identifier for the 
revision to base the modification on.',
-   This is used for detecting conflicts during 
save.
-   ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa2292a110d322040d1fb29bfbaa0635e2aa26a0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding icinga check to make sure kafka brokers aren't gettin... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Adding icinga check to make sure kafka brokers aren't getting 
too many produce requests
..


Adding icinga check to make sure kafka brokers aren't getting too many produce 
requests

Change-Id: If8bf706692331d1e2963e5dda289b5be819d309a
---
M manifests/misc/analytics.pp
M templates/icinga/checkcommands.cfg.erb
2 files changed, 18 insertions(+), 6 deletions(-)

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



diff --git a/manifests/misc/analytics.pp b/manifests/misc/analytics.pp
index cf598fa..c190eea 100644
--- a/manifests/misc/analytics.pp
+++ b/manifests/misc/analytics.pp
@@ -29,10 +29,16 @@
 class misc::analytics::monitoring::kafka::server {
# Set up icinga monitoring of Kafka broker server produce requests per 
second.
# If this drops too low, trigger an alert
-   # for this udp2log instance.
-   monitor_service { kakfa-broker-ProduceRequestsPerSecond:
-   description   = 
kafka_network_SocketServerStats.ProduceRequestsPerSecond,
-   check_command = 
check_kafka_broker_produce_requests!2!1,
-   contact_group = analytics,
+   monitor_service { 'kafka_broker-ProduceRequestsPerSecond':
+   description   = 
'kafka_network_SocketServerStats.ProduceRequestsPerSecond',
+   check_command = 'check_kafka_broker_produce_requests_min!2!1',
+   contact_group = 'analytics',
+   }
+   # Set up icinga monitoring of Kafka broker server produce requests per 
second.
+   # If this drops too high, trigger an alert
+   monitor_service { 'kafka_broker-ProduceRequestsPerSecond':
+   description   = 
'kafka_network_SocketServerStats.ProduceRequestsPerSecond',
+   check_command = 
'check_kafka_broker_produce_requests_max!15!20',
+   contact_group = 'analytics',
}
 }
diff --git a/templates/icinga/checkcommands.cfg.erb 
b/templates/icinga/checkcommands.cfg.erb
index b156f7e..b40ea35 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -617,10 +617,16 @@
 # Analytics Kraken checks
 # Check that Kafka Brokers are getting ProduceRequests.
 define command{
-   command_namecheck_kafka_broker_produce_requests
+   command_namecheck_kafka_broker_produce_requests_min
command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m kafka_network_SocketServerStats.ProduceRequestsPerSecond -w $ARG1$ -c $ARG2$ 
-o lt
 }
 
+# Check that Kafka Brokers aren't getting TOO many ProduceRequests
+define command{
+   command_namecheck_kafka_producer_produce_requests_max
+   command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m kafka_network_SocketServerStats.ProduceRequestsPerSecond -w $ARG1$ -c $ARG2$ 
-o gt
+}
+
 # Alerts for data loss in Kraken HDFS.
 define command{
command_namecheck_kraken_webrequest_loss_positive

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

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

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

[MediaWiki-commits] [Gerrit] Adding icinga check to make sure kafka brokers aren't gettin... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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


Change subject: Adding icinga check to make sure kafka brokers aren't getting 
too many produce requests
..

Adding icinga check to make sure kafka brokers aren't getting too many produce 
requests

Change-Id: If8bf706692331d1e2963e5dda289b5be819d309a
---
M manifests/misc/analytics.pp
M templates/icinga/checkcommands.cfg.erb
2 files changed, 18 insertions(+), 6 deletions(-)


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

diff --git a/manifests/misc/analytics.pp b/manifests/misc/analytics.pp
index cf598fa..c190eea 100644
--- a/manifests/misc/analytics.pp
+++ b/manifests/misc/analytics.pp
@@ -29,10 +29,16 @@
 class misc::analytics::monitoring::kafka::server {
# Set up icinga monitoring of Kafka broker server produce requests per 
second.
# If this drops too low, trigger an alert
-   # for this udp2log instance.
-   monitor_service { kakfa-broker-ProduceRequestsPerSecond:
-   description   = 
kafka_network_SocketServerStats.ProduceRequestsPerSecond,
-   check_command = 
check_kafka_broker_produce_requests!2!1,
-   contact_group = analytics,
+   monitor_service { 'kafka_broker-ProduceRequestsPerSecond':
+   description   = 
'kafka_network_SocketServerStats.ProduceRequestsPerSecond',
+   check_command = 'check_kafka_broker_produce_requests_min!2!1',
+   contact_group = 'analytics',
+   }
+   # Set up icinga monitoring of Kafka broker server produce requests per 
second.
+   # If this drops too high, trigger an alert
+   monitor_service { 'kafka_broker-ProduceRequestsPerSecond':
+   description   = 
'kafka_network_SocketServerStats.ProduceRequestsPerSecond',
+   check_command = 
'check_kafka_broker_produce_requests_max!15!20',
+   contact_group = 'analytics',
}
 }
diff --git a/templates/icinga/checkcommands.cfg.erb 
b/templates/icinga/checkcommands.cfg.erb
index b156f7e..b40ea35 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -617,10 +617,16 @@
 # Analytics Kraken checks
 # Check that Kafka Brokers are getting ProduceRequests.
 define command{
-   command_namecheck_kafka_broker_produce_requests
+   command_namecheck_kafka_broker_produce_requests_min
command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m kafka_network_SocketServerStats.ProduceRequestsPerSecond -w $ARG1$ -c $ARG2$ 
-o lt
 }
 
+# Check that Kafka Brokers aren't getting TOO many ProduceRequests
+define command{
+   command_namecheck_kafka_producer_produce_requests_max
+   command_line$USER1$/check_ganglios_generic_value -H $HOSTADDRESS$ 
-m kafka_network_SocketServerStats.ProduceRequestsPerSecond -w $ARG1$ -c $ARG2$ 
-o gt
+}
+
 # Alerts for data loss in Kraken HDFS.
 define command{
command_namecheck_kraken_webrequest_loss_positive

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

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

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

[MediaWiki-commits] [Gerrit] Fix documentation of PropertyParserFunction::render() - change (mediawiki...Wikibase)

[Liangent (Code Review)]

Liangent has uploaded a new change for review.

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


Change subject: Fix documentation of PropertyParserFunction::render()
..

Fix documentation of PropertyParserFunction::render()

Change-Id: Ib888cd9dc23cfb50e01f4bab301b11fa1cfc7a42
---
M client/includes/parserhooks/PropertyParserFunction.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/client/includes/parserhooks/PropertyParserFunction.php 
b/client/includes/parserhooks/PropertyParserFunction.php
index 4d09ab9..ff669f5 100644
--- a/client/includes/parserhooks/PropertyParserFunction.php
+++ b/client/includes/parserhooks/PropertyParserFunction.php
@@ -161,8 +161,9 @@
 * @since 0.4
 *
 * @param \Parser $parser
+* @param string $propertyLabel property label or ID (pXXX)
 *
-* @return string
+* @return array
 */
public static function render( \Parser $parser, $propertyLabel ) {
wfProfileIn( __METHOD__ );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib888cd9dc23cfb50e01f4bab301b11fa1cfc7a42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com

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

[MediaWiki-commits] [Gerrit] mwbzutils: clean up makefile and source in prep for debian p... - change (operations/dumps)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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


Change subject: mwbzutils: clean up makefile and source in prep for debian 
packaging
..

mwbzutils: clean up makefile and source in prep for debian packaging

* cleanup install, add deinstall targets
* make distclean actually do that
* generate man pages with help2man
* add or redo all usage messages to conform with help2man
* add version and copyright info to all programs

Change-Id: Id7ddd9edb5b2e22f896166a23cf49d28a010007b
---
M xmldumps-backup/mwbzutils/Makefile
M xmldumps-backup/mwbzutils/checkforbz2footer.c
M xmldumps-backup/mwbzutils/dumpbz2filefromoffset.c
M xmldumps-backup/mwbzutils/dumplastbz2block.c
M xmldumps-backup/mwbzutils/findpageidinbz2xml.c
M xmldumps-backup/mwbzutils/recompressxml.c
M xmldumps-backup/mwbzutils/writeuptopageid.c
7 files changed, 411 insertions(+), 155 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps 
refs/changes/05/72005/1

diff --git a/xmldumps-backup/mwbzutils/Makefile 
b/xmldumps-backup/mwbzutils/Makefile
index 5fcd560..f3a3c44 100644
--- a/xmldumps-backup/mwbzutils/Makefile
+++ b/xmldumps-backup/mwbzutils/Makefile
@@ -16,22 +16,38 @@
 # 2010-2010: see the file COPYING for details.
 # --
 
-CC=gcc
-LDFLAGS=
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-PREFIX=/usr/local
+VERSION= 0.0.3
+CC = gcc
+LDFLAGS=
+BIGFILES   = -D_FILE_OFFSET_BITS=64
+CFLAGS = -Wall -Winline -O2 -g $(BIGFILES) -DVERSION=\$(VERSION)\
 
-SHELL=/bin/sh
+build: checkforbz2footer dumpbz2filefromoffset \
+   dumplastbz2block findpageidinbz2xml \
+   recompressxml writeuptopageid \
 
-OBJSBZ= bzlibfuncs.o
+NAME_CHECKFORBZ2FOOTER   = Check if bzip2 file ends with bz2 magic footer
+NAME_DUMPBZ2FILEFROMOFFSET   = Write MediaWiki XML pages from bzip2 file 
starting from offset
+NAME_DUMPLASTBZ2BLOCK= Find last bz2 block in bzip2 file and dump 
contents
+NAME_FINDPAGEIDINBZ2XML  = Display offset of bz2 block for given page id 
in bzip2 MediaWiki XML file
+NAME_RECOMPRESSXML   = Bz2 compress MediaWiki XML input in batches of 
pages
+NAME_WRITEUPTOPAGEID = Write range of page content from MediaWiki XML 
input
 
-all: checkforbz2footer \
-   dumpbz2filefromoffset \
-   dumplastbz2block \
-   findpageidinbz2xml \
-   recompressxml \
-   writeuptopageid
+BINDIR = $(DESTDIR)$(PREFIX)/usr/local/bin/
+MANDIR = $(DESTDIR)$(PREFIX)/usr/local/share/man/man1/
+
+GZIP   = /bin/gzip
+HELP2MAN   = /usr/bin/help2man
+SHELL  = /bin/sh
+
+DISTNAME   = mwbzutils-$(VERSION)
+
+OBJSBZ = bzlibfuncs.o
+
+build: checkforbz2footer dumpbz2filefromoffset \
+   dumplastbz2block findpageidinbz2xml \
+   recompressxml writeuptopageid \
+   manpages
 
 dumplastbz2block: $(OBJSBZ) mwbzlib.o dumplastbz2block.o
$(CC) $(CFLAGS) $(LDFLAGS) -o dumplastbz2block dumplastbz2block.o 
mwbzlib.o  $(OBJSBZ) -lbz2
@@ -51,25 +67,61 @@
 writeuptopage: $(OBJSBZ) writeuptopageid.o
$(CC) $(CFLAGS) $(LDFLAGS) -o writeuptopageid writeuptopageid.o -lbz2
 
+manpages: dumplastbz2block.1.gz findpageidinbz2xml.1.gz \
+   checkforbz2footer.1.gz dumpbz2filefromoffset.1.gz \
+   recompressxml.1.gz writeuptopageid.1.gz
+
+dumplastbz2block.1.gz : dumplastbz2block
+   $(HELP2MAN) --section 1 --no-info --name $(NAME_DUMPLASTBZ2BLOCK) \
+   --no-discard-stderr ./dumplastbz2block | $(GZIP)  
dumplastbz2block.1.gz
+findpageidinbz2xml.1.gz : findpageidinbz2xml
+   $(HELP2MAN) --section 1 --no-info --name $(NAME_FINDPAGEIDINBZ2XML) \
+   --no-discard-stderr ./findpageidinbz2xml | $(GZIP)  
findpageidinbz2xml.1.gz
+checkforbz2footer.1.gz : checkforbz2footer
+   $(HELP2MAN) --section 1 --no-info --name $(NAME_CHECKFORBZ2FOOTER) \
+   --no-discard-stderr ./checkforbz2footer | $(GZIP)  
checkforbz2footer.1.gz
+dumpbz2filefromoffset.1.gz : dumpbz2filefromoffset
+   $(HELP2MAN) --section 1 --no-info --name $(NAME_DUMPBZ2FILEFROMOFFSET) \
+   --no-discard-stderr ./dumpbz2filefromoffset | $(GZIP)  
dumpbz2filefromoffset.1.gz
+recompressxml.1.gz : recompressxml
+   $(HELP2MAN) --section 1 --no-info --name $(NAME_RECOMPRESSXML) \
+   --no-discard-stderr ./recompressxml | $(GZIP)  
recompressxml.1.gz
+writeuptopageid.1.gz : writeuptopageid
+   $(HELP2MAN) --section 1 --no-info --name $(NAME_WRITEUPTOPAGEID) \
+   --no-discard-stderr ./writeuptopageid | $(GZIP)  
writeuptopageid.1.gz
+
+
 install: dumplastbz2block findpageidinbz2xml checkforbz2footer 
dumpbz2filefromoffset recompressxml writeuptopageid
-   if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-   cp -f dumplastbz2block 

[MediaWiki-commits] [Gerrit] Fix documentation of PropertyParserFunction::render() - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix documentation of PropertyParserFunction::render()
..


Fix documentation of PropertyParserFunction::render()

Change-Id: Ib888cd9dc23cfb50e01f4bab301b11fa1cfc7a42
---
M client/includes/parserhooks/PropertyParserFunction.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/client/includes/parserhooks/PropertyParserFunction.php 
b/client/includes/parserhooks/PropertyParserFunction.php
index 4d09ab9..ff669f5 100644
--- a/client/includes/parserhooks/PropertyParserFunction.php
+++ b/client/includes/parserhooks/PropertyParserFunction.php
@@ -161,8 +161,9 @@
 * @since 0.4
 *
 * @param \Parser $parser
+* @param string $propertyLabel property label or ID (pXXX)
 *
-* @return string
+* @return array
 */
public static function render( \Parser $parser, $propertyLabel ) {
wfProfileIn( __METHOD__ );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib888cd9dc23cfb50e01f4bab301b11fa1cfc7a42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Arrange tool lab packages list in alphabetical order - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Arrange tool lab packages list in alphabetical order
..

Arrange tool lab packages list in alphabetical order

Change-Id: Ief6092b8d9d8263e2c15d7806e7ac27effdd0c0c
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 49 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/72046/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index da78f1c..0fbf22b 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -20,87 +20,87 @@
   include identd
 
   package { [
+  # Please keep all packages in each group sorted in alphabetical order
+
   # Language Runtimes
+  'mono-runtime',
+  'nodejs',
   'openjdk-7-jre-headless',
   'python3',
-  'nodejs',
-  'mono-runtime',
-  'tcl',
-  'ruby1.9.3',
   'r-base',
+  'ruby1.9.3',
+  'tcl',
 
   # Perl libraries
-  'libdata-compare-perl',# For Checkwiki.
-  'libtest-exception-perl',  # For Checkwiki.
-  'libxml-xpathengine-perl', # For Checkwiki.
   'libcache-memcached-fast-perl',
-  'libhtml-parser-perl',
-  'libwww-perl',
-  'liburi-perl',
-  'libjson-perl',
-  'libjson-xs-perl',
-  'libdbd-sqlite3-perl',
-  'libpoe-perl',
   'libclass-data-inheritable-perl',
   'libcommon-sense-perl',
   'libcrypt-openssl-bignum-perl',
   'libcrypt-openssl-rsa-perl',
+  'libdata-compare-perl',# For Checkwiki.
+  'libdbd-mysql-perl',
+  'libdbd-sqlite3-perl',
   'libdigest-hmac-perl',
-  'libmediawiki-bot-perl',
+  'libhtml-parser-perl',
+  'libjson-perl',
+  'libjson-xs-perl',
   'libmediawiki-api-perl',
+  'libmediawiki-bot-perl',
+  'libnet-oauth-perl',
+  'libnetaddr-ip-perl',
+  'libpod-simple-wiki-perl',
+  'libpoe-perl',
   'libstring-diff-perl',
   'libstring-shellquote-perl',   # For jsub.
-  'libpod-simple-wiki-perl',
-  'libxml-libxml-perl',
-  'libdbd-mysql-perl',
-  'libnetaddr-ip-perl',
-  'libthreads-shared-perl',
+  'libtest-exception-perl',  # For Checkwiki.
   'libthreads-perl',
-  'libnet-oauth-perl',
+  'libthreads-shared-perl',
+  'liburi-perl',
+  'libwww-perl',
+  'libxml-libxml-perl',
+  'libxml-xpathengine-perl', # For Checkwiki.
 
   # Python libraries
-  'python-genshi',   # Bug #48863.
-  'python-genshi-doc',   # Bug #48863.
-  'python-twisted',
-  'python-virtualenv',
   'python-apport',
+  'python-celery',
+  'python-celery-with-redis',
   'python-flask',
+  'python-flask-login',
+  'python-flask-oauth',
   'python-flup',
   'python-gdbm',
+  'python-genshi',   # Bug #48863.
+  'python-genshi-doc',   # Bug #48863.
   'python-gi',
   'python-httplib2',
+  'python-irclib',
   'python-keyring',
   'python-launchpadlib',
   'python-mysql.connector',
-  'python-problem-report',
+  'python-mysqldb',
   'python-newt',
+  'python-nose',
+  'python-problem-report',
+  'python-redis',
+  'python-requests',
+  'python-sqlalchemy',
+  'python-twisted',
+  'python-virtualenv',
   'python-wadllib',
   'python-webpy',
   'python-werkzeug',
-  'python-mysqldb',
-  'python-requests',
-  'python-redis',
-  'python-celery',
-  'python-celery-with-redis',
-  'python-flask-login',
-  'python-flask-oauth',
-  'python-nose',
-  'python-sqlalchemy',
-  'python-irclib',
 
   # PHP libraries
-  'php5-curl',
   'php5-cli',
+  'php5-curl',
   'php5-mysql',
   'php5-redis',
   'php5-xsl',
 
   # Other packages
-  'mariadb-client',  # For /usr/bin/mysql.
-  'mariadb-common',
-  'mdbtools',# Bug #48805.
-  'tree',# Bug #48862.
-  'libpng3',
+  'adminbot',
+  'dc',
+  'gnuplot-nox',
   'libfreetype6',
   'libmpc2',
   'libmpfr4',
@@ -111,16 +111,18 @@
   'libnss3-1d',
   'libotf0',
   'libpcsclite1',
+  'libpng3',
   'libquadmath0',
   'libsvn1',
+  'mariadb-client',  # For /usr/bin/mysql.
+  'mariadb-common',
+  'mdbtools',# Bug #48805.
   'mono-complete',
-  'adminbot',
-  'gnuplot-nox',
+  'p7zip',
+  'phpunit',
   'tclcurl',
   'tcllib',
-  'dc',
-  'p7zip',
-  'phpunit'
+  'tree' # Bug #48862.
   ]:
 ensure = present
   }

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

[MediaWiki-commits] [Gerrit] Add perl modules installed via user request (from SAL) - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Add perl modules installed via user request (from SAL)
..

Add perl modules installed via user request (from SAL)

Change-Id: I1d0c652882bf0a7fd2452a41131248e92abf8f22
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/72047/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 0fbf22b..7676d48 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -32,32 +32,47 @@
   'tcl',
 
   # Perl libraries
+  'libbot-basicbot-perl',
   'libcache-memcached-fast-perl',
   'libclass-data-inheritable-perl',
   'libcommon-sense-perl',
+  'libcrypt-gcrypt-perl',
   'libcrypt-openssl-bignum-perl',
   'libcrypt-openssl-rsa-perl',
   'libdata-compare-perl',# For Checkwiki.
+  'libdata-dumper-simple-perl',
+  'libdatetime-format-duration-perl',
+  'libdatetime-format-strptime-perl',
   'libdbd-mysql-perl',
   'libdbd-sqlite3-perl',
+  'libdigest-crc-perl',
   'libdigest-hmac-perl',
+  'libhtml-html5-entities-perl',
   'libhtml-parser-perl',
+  'libirc-utils-perl',
   'libjson-perl',
   'libjson-xs-perl',
   'libmediawiki-api-perl',
   'libmediawiki-bot-perl',
   'libnet-oauth-perl',
   'libnetaddr-ip-perl',
+  'libobject-pluggable-perl',
   'libpod-simple-wiki-perl',
+  'libpoe-component-irc-perl',
+  'libpoe-component-syndicator-perl',
+  'libpoe-filter-ircd-perl',
   'libpoe-perl',
+  'libsocket-getaddrinfo-perl',
   'libstring-diff-perl',
   'libstring-shellquote-perl',   # For jsub.
+  'libtask-weaken-perl',
   'libtest-exception-perl',  # For Checkwiki.
   'libthreads-perl',
   'libthreads-shared-perl',
   'liburi-perl',
   'libwww-perl',
   'libxml-libxml-perl',
+  'libxml-simple-perl',
   'libxml-xpathengine-perl', # For Checkwiki.
 
   # Python libraries

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d0c652882bf0a7fd2452a41131248e92abf8f22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Arrange tool lab packages list in alphabetical order - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Arrange tool lab packages list in alphabetical order
..


Arrange tool lab packages list in alphabetical order

Change-Id: Ief6092b8d9d8263e2c15d7806e7ac27effdd0c0c
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 49 insertions(+), 47 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index da78f1c..0fbf22b 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -20,87 +20,87 @@
   include identd
 
   package { [
+  # Please keep all packages in each group sorted in alphabetical order
+
   # Language Runtimes
+  'mono-runtime',
+  'nodejs',
   'openjdk-7-jre-headless',
   'python3',
-  'nodejs',
-  'mono-runtime',
-  'tcl',
-  'ruby1.9.3',
   'r-base',
+  'ruby1.9.3',
+  'tcl',
 
   # Perl libraries
-  'libdata-compare-perl',# For Checkwiki.
-  'libtest-exception-perl',  # For Checkwiki.
-  'libxml-xpathengine-perl', # For Checkwiki.
   'libcache-memcached-fast-perl',
-  'libhtml-parser-perl',
-  'libwww-perl',
-  'liburi-perl',
-  'libjson-perl',
-  'libjson-xs-perl',
-  'libdbd-sqlite3-perl',
-  'libpoe-perl',
   'libclass-data-inheritable-perl',
   'libcommon-sense-perl',
   'libcrypt-openssl-bignum-perl',
   'libcrypt-openssl-rsa-perl',
+  'libdata-compare-perl',# For Checkwiki.
+  'libdbd-mysql-perl',
+  'libdbd-sqlite3-perl',
   'libdigest-hmac-perl',
-  'libmediawiki-bot-perl',
+  'libhtml-parser-perl',
+  'libjson-perl',
+  'libjson-xs-perl',
   'libmediawiki-api-perl',
+  'libmediawiki-bot-perl',
+  'libnet-oauth-perl',
+  'libnetaddr-ip-perl',
+  'libpod-simple-wiki-perl',
+  'libpoe-perl',
   'libstring-diff-perl',
   'libstring-shellquote-perl',   # For jsub.
-  'libpod-simple-wiki-perl',
-  'libxml-libxml-perl',
-  'libdbd-mysql-perl',
-  'libnetaddr-ip-perl',
-  'libthreads-shared-perl',
+  'libtest-exception-perl',  # For Checkwiki.
   'libthreads-perl',
-  'libnet-oauth-perl',
+  'libthreads-shared-perl',
+  'liburi-perl',
+  'libwww-perl',
+  'libxml-libxml-perl',
+  'libxml-xpathengine-perl', # For Checkwiki.
 
   # Python libraries
-  'python-genshi',   # Bug #48863.
-  'python-genshi-doc',   # Bug #48863.
-  'python-twisted',
-  'python-virtualenv',
   'python-apport',
+  'python-celery',
+  'python-celery-with-redis',
   'python-flask',
+  'python-flask-login',
+  'python-flask-oauth',
   'python-flup',
   'python-gdbm',
+  'python-genshi',   # Bug #48863.
+  'python-genshi-doc',   # Bug #48863.
   'python-gi',
   'python-httplib2',
+  'python-irclib',
   'python-keyring',
   'python-launchpadlib',
   'python-mysql.connector',
-  'python-problem-report',
+  'python-mysqldb',
   'python-newt',
+  'python-nose',
+  'python-problem-report',
+  'python-redis',
+  'python-requests',
+  'python-sqlalchemy',
+  'python-twisted',
+  'python-virtualenv',
   'python-wadllib',
   'python-webpy',
   'python-werkzeug',
-  'python-mysqldb',
-  'python-requests',
-  'python-redis',
-  'python-celery',
-  'python-celery-with-redis',
-  'python-flask-login',
-  'python-flask-oauth',
-  'python-nose',
-  'python-sqlalchemy',
-  'python-irclib',
 
   # PHP libraries
-  'php5-curl',
   'php5-cli',
+  'php5-curl',
   'php5-mysql',
   'php5-redis',
   'php5-xsl',
 
   # Other packages
-  'mariadb-client',  # For /usr/bin/mysql.
-  'mariadb-common',
-  'mdbtools',# Bug #48805.
-  'tree',# Bug #48862.
-  'libpng3',
+  'adminbot',
+  'dc',
+  'gnuplot-nox',
   'libfreetype6',
   'libmpc2',
   'libmpfr4',
@@ -111,16 +111,18 @@
   'libnss3-1d',
   'libotf0',
   'libpcsclite1',
+  'libpng3',
   'libquadmath0',
   'libsvn1',
+  'mariadb-client',  # For /usr/bin/mysql.
+  'mariadb-common',
+  'mdbtools',# Bug #48805.
   'mono-complete',
-  'adminbot',
-  'gnuplot-nox',
+  'p7zip',
+  'phpunit',
   'tclcurl',
   'tcllib',
-  'dc',
-  'p7zip',
-  'phpunit'
+  'tree' # Bug #48862.
   ]:
 ensure = present
   }

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

[MediaWiki-commits] [Gerrit] Add python modules installed via user request (from SAL) - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Add python modules installed via user request (from SAL)
..

Add python modules installed via user request (from SAL)

Change-Id: I39eaead3af58cb94f04b883bb452cfedd3994e5b
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 7676d48..b28b225 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -79,6 +79,8 @@
   'python-apport',
   'python-celery',
   'python-celery-with-redis',
+  'python-egenix-mxdatetime',
+  'python-egenix-mxtools',
   'python-flask',
   'python-flask-login',
   'python-flask-oauth',
@@ -86,8 +88,11 @@
   'python-gdbm',
   'python-genshi',   # Bug #48863.
   'python-genshi-doc',   # Bug #48863.
+  'python-gevent',
   'python-gi',
+  'python-greenlet',
   'python-httplib2',
+  'python-imaging',
   'python-irclib',
   'python-keyring',
   'python-launchpadlib',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39eaead3af58cb94f04b883bb452cfedd3994e5b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add perl modules installed via user request (from SAL) - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Add perl modules installed via user request (from SAL)
..


Add perl modules installed via user request (from SAL)

Change-Id: I1d0c652882bf0a7fd2452a41131248e92abf8f22
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 0fbf22b..7676d48 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -32,32 +32,47 @@
   'tcl',
 
   # Perl libraries
+  'libbot-basicbot-perl',
   'libcache-memcached-fast-perl',
   'libclass-data-inheritable-perl',
   'libcommon-sense-perl',
+  'libcrypt-gcrypt-perl',
   'libcrypt-openssl-bignum-perl',
   'libcrypt-openssl-rsa-perl',
   'libdata-compare-perl',# For Checkwiki.
+  'libdata-dumper-simple-perl',
+  'libdatetime-format-duration-perl',
+  'libdatetime-format-strptime-perl',
   'libdbd-mysql-perl',
   'libdbd-sqlite3-perl',
+  'libdigest-crc-perl',
   'libdigest-hmac-perl',
+  'libhtml-html5-entities-perl',
   'libhtml-parser-perl',
+  'libirc-utils-perl',
   'libjson-perl',
   'libjson-xs-perl',
   'libmediawiki-api-perl',
   'libmediawiki-bot-perl',
   'libnet-oauth-perl',
   'libnetaddr-ip-perl',
+  'libobject-pluggable-perl',
   'libpod-simple-wiki-perl',
+  'libpoe-component-irc-perl',
+  'libpoe-component-syndicator-perl',
+  'libpoe-filter-ircd-perl',
   'libpoe-perl',
+  'libsocket-getaddrinfo-perl',
   'libstring-diff-perl',
   'libstring-shellquote-perl',   # For jsub.
+  'libtask-weaken-perl',
   'libtest-exception-perl',  # For Checkwiki.
   'libthreads-perl',
   'libthreads-shared-perl',
   'liburi-perl',
   'libwww-perl',
   'libxml-libxml-perl',
+  'libxml-simple-perl',
   'libxml-xpathengine-perl', # For Checkwiki.
 
   # Python libraries

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d0c652882bf0a7fd2452a41131248e92abf8f22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add python modules installed via user request (from SAL) - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Add python modules installed via user request (from SAL)
..


Add python modules installed via user request (from SAL)

Change-Id: I39eaead3af58cb94f04b883bb452cfedd3994e5b
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 7676d48..b28b225 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -79,6 +79,8 @@
   'python-apport',
   'python-celery',
   'python-celery-with-redis',
+  'python-egenix-mxdatetime',
+  'python-egenix-mxtools',
   'python-flask',
   'python-flask-login',
   'python-flask-oauth',
@@ -86,8 +88,11 @@
   'python-gdbm',
   'python-genshi',   # Bug #48863.
   'python-genshi-doc',   # Bug #48863.
+  'python-gevent',
   'python-gi',
+  'python-greenlet',
   'python-httplib2',
+  'python-imaging',
   'python-irclib',
   'python-keyring',
   'python-launchpadlib',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39eaead3af58cb94f04b883bb452cfedd3994e5b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add php modules installed via user request (from SAL) - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Add php modules installed via user request (from SAL)
..

Add php modules installed via user request (from SAL)

Change-Id: Id5b753c7fd7d01e7038310c031dd87fe4ca72ebe
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index b28b225..e58021e 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -113,6 +113,8 @@
   # PHP libraries
   'php5-cli',
   'php5-curl',
+  'php5-gd',
+  'php5-mcrypt',
   'php5-mysql',
   'php5-redis',
   'php5-xsl',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b753c7fd7d01e7038310c031dd87fe4ca72ebe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add testrunner classes - change (operations...buck)

[AzaToth (Code Review)]

AzaToth has uploaded a new change for review.

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


Change subject: Add testrunner classes
..

Add testrunner classes

Change-Id: I19b3ab3eee8a98790e629e872499c4502229
---
M debian/bin/buck
M debian/install
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/buck 
refs/changes/50/72050/1

diff --git a/debian/bin/buck b/debian/bin/buck
index 19b5625..b4a4bfd 100755
--- a/debian/bin/buck
+++ b/debian/bin/buck
@@ -14,6 +14,7 @@
 -Dlog4j.configuration=$ETC_DIR/log4j.properties
 -Dbuck.version_uid=0.0
 -Dbuck.daemon=false
+-Dbuck.testrunner_classes=${SHARE_DIR}/testrunner/classes
 )
 
 $JAVA_CMD ${BUCK_JAVA_ARGS[@]} -jar /usr/share/buck/buck.jar $@
diff --git a/debian/install b/debian/install
index 539dc99..5b1436a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
 build/buck.jar /usr/share/buck
+build/testrunner /usr/share/buck
 
 lib/guava-14.0.1.jar /usr/share/buck/jars
 lib/jyson-1.0.2.jar /usr/share/buck/jars

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19b3ab3eee8a98790e629e872499c4502229
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/buck
Gerrit-Branch: master
Gerrit-Owner: AzaToth azat...@gmail.com

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

[MediaWiki-commits] [Gerrit] Added implementation of {{{section}}} tag to the form defini... - change (mediawiki...SemanticForms)

[Himeshi (Code Review)]

Himeshi has uploaded a new change for review.

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


Change subject: Added implementation of {{{section}}} tag to the form 
definition syntax.
..

Added implementation of {{{section}}} tag to the form definition syntax.

Change-Id: I265f8ca9b9cf936447fe2a9ee827912239f3ff37
---
M includes/SF_FormPrinter.php
M includes/SF_FormUtils.php
2 files changed, 73 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/51/72051/1

diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index a6e17e2..7c3eb95 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1361,6 +1361,62 @@
}
$section = substr_replace( $section, 
$new_text, $brackets_loc, $brackets_end_loc + 3 - $brackets_loc );
// 
=
+   // for section processing
+   // 
=
+   } elseif ( $tag_title == 'section') {
+   //set defaults for section name and 
level
+   $section_name = '';
+   $header_level = 2; 
+   
+   $default_value = '';
+   $section_text;
+   
+   //get section name and level
+   if ( count($tag_components)  1 ){
+   $section_name = 
$tag_components[1];
+   
+   if ( count($tag_components)  2 
)
+   $header_level = trim( 
$tag_components[2] );
+   }
+   
+   //display the sections in wikitext on 
the created page
+   $header_string = ;
+   for ( $level_count = 0; $level_count  
$header_level; $level_count++ ) {
+   $header_string .= '='; 
+   }
+   $header_text = 
$header_string.$section_name.$header_string.\n;
+   $data_text .= $header_text;
+   
+   //split the existing page contents into 
the textareas in the form
+   if ( $source_is_page  
$existing_page_content !== null ) {
+   $section_start_loc = strpos( 
$existing_page_content, $header_text );
+   $existing_page_content = 
str_replace( $header_text, '', $existing_page_content );
+   $section_end_loc = strpos( 
$existing_page_content, '=', $section_start_loc );
+   
+   if ( $section_end_loc === FALSE 
) {
+   $default_value = 
$existing_page_content;
+   $existing_page_content 
= '';
+   } else {
+   $default_value = 
substr( $existing_page_content, $section_start_loc, $section_end_loc - 
$section_start_loc );
+   $existing_page_content 
= substr( $existing_page_content, $section_end_loc);
+   }
+   } 
+   
+   //if input is from the form
+   if ( ( ! $source_is_page )  
$wgRequest ) {
+   $section_text = 
$wgRequest-getArray( '_section' );
+   $default_value = 
$section_text[trim( $section_name )];
+   $data_text .= 
\n.$section_text[trim( $section_name )].\n;
+   }
+   
+   //set input name for query string
+   $input_name = '_section' . '[' . trim( 
$section_name ) . ']';
+   
+