date:20170802

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Restore db2051 original values

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Restore db2051 original values
..


db-eqiad.php: Restore db2051 original values

db2051 was out for maintenance, restoring its original values

Bug: T170351
Change-Id: I35c0517c17b56d02c1236c6472123d7a25cd7a45
---
M wmf-config/db-codfw.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index d4c549f..ec2d3cd 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -124,9 +124,9 @@
'db2019' => 0,   # B6 2.9TB  96GB, master
'db2037' => 50,  # C6 2.9TB 160GB, rc, log
'db2044' => 50,  # C6 2.9TB 160GB, rc, log
-   # 'db2051' => 200, # B8 2.9TB 160GB, api # T170351
+   'db2051' => 200, # B8 2.9TB 160GB, api
'db2058' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
-   'db2065' => 400, # D6 3.3TB 160GB # temporary API T170351
+   'db2065' => 400, # D6 3.3TB 160GB
# 'db2073' => 400, # C6 3.3TB 512GB # Compressing InnoDB
],
's5' => [
@@ -341,7 +341,7 @@
'db2058' => 1,
],
'api' => [
-   'db2065' => 1,
+   'db2051' => 1,
],
],
's5' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Restore db2051 original values

2017-08-02 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Restore db2051 original values
..

db-eqiad.php: Restore db2051 original values

db2051 was out for maintenance, restoring its original values

Bug: T170351
Change-Id: I35c0517c17b56d02c1236c6472123d7a25cd7a45
---
M wmf-config/db-codfw.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index d4c549f..ec2d3cd 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -124,9 +124,9 @@
'db2019' => 0,   # B6 2.9TB  96GB, master
'db2037' => 50,  # C6 2.9TB 160GB, rc, log
'db2044' => 50,  # C6 2.9TB 160GB, rc, log
-   # 'db2051' => 200, # B8 2.9TB 160GB, api # T170351
+   'db2051' => 200, # B8 2.9TB 160GB, api
'db2058' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
-   'db2065' => 400, # D6 3.3TB 160GB # temporary API T170351
+   'db2065' => 400, # D6 3.3TB 160GB
# 'db2073' => 400, # C6 3.3TB 512GB # Compressing InnoDB
],
's5' => [
@@ -341,7 +341,7 @@
'db2058' => 1,
],
'api' => [
-   'db2065' => 1,
+   'db2051' => 1,
],
],
's5' => [

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

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

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

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

2017-08-02 Thread Marostegui (Code Review)

Hello Florianschmidtwelzow, jenkins-bot, Jcrespo,

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

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

to review the following change.


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

Revert "db-codfw.php: Depool db2051"

This reverts commit 320df4a4d850a3d1d2e13322f43749a015119687.

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 431a720..67ae1c5 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -124,9 +124,9 @@
'db2019' => 0,   # B6 2.9TB  96GB, master
'db2037' => 50,  # C6 2.9TB 160GB, rc, log
'db2044' => 50,  # C6 2.9TB 160GB, rc, log
-   # 'db2051' => 200, # C6 2.9TB 160GB, api # T170351
+   'db2051' => 200, # C6 2.9TB 160GB, api
'db2058' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
-   'db2065' => 400, # D6 3.3TB 160GB # temporary API T170351
+   'db2065' => 400, # D6 3.3TB 160GB
# 'db2073' => 400, # C6 3.3TB 512GB # Compressing InnoDB
],
's5' => [
@@ -341,7 +341,7 @@
'db2058' => 1,
],
'api' => [
-   'db2065' => 1,
+   'db2051' => 1,
],
],
's5' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Update gjg's ssh key

2017-08-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369840 )

Change subject: admin: Update gjg's ssh key
..


admin: Update gjg's ssh key

I had to replace my x230 this week. New laptop, new key.

Also upgrading to an ed_25519 key.

Change-Id: I751f78cca5676c9023e1e9d2ee351c8b2ef5a890
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ef25b2a..155ea40 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -927,7 +927,7 @@
 realname: Greg Grossmeier
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDcwwxwZqCRMBQsMIutloeVS5Nx+nljUr914Yradb8YLeo2PbqLEjVKgC6+yKHe7binFNk3rlgiXhXOm2issytl7sWUZz8YpFqxp7fDqnfVVOTGTwMtAjBoZHugz9RaR1SVlz2dRk0N5qrovffz/Av3QQIS12jX3C/GCdqCMixgwi+ecYo2xA7WJyEGFnp+0Ah8hBIn2xabZAfHhZ8dF6VifEHsgp08Ot52sOZwb99+H0SjEWRwc9decwuPGNWX94BPvWcP6dQ2bzjqR3iRkwEIvKcgMvanYUXAvPb32382QCsW0r22HtvsUvA340ISlvcauRS1GGpyYmZYGSSfgHVH
 greg@x200s
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC16FrhA5M9oVeFTpJMZrjMSnmNXv4sW+Ku1PUpv14qOEw9zpW8JhWLzhD4+C66sE3vvDm/xwrfYeyn9lLFlxCM8ZbUOh9YCuZv3ABam5UHODg+YS3tdMHbZ/U4ZPSg1B6t79f2/CLCrpj0Tk+G2DQe9/d75fdmZBBC6ICKrY8glNWZOL2kxi22P2dUamTDzBu1j9UHmpSNYpMh169AeNFV5njNYlEpOueg4iDkLvXqvMyDyvXvYbSNSRAfGTZYdzlNmasBEWuS7zuSIQ1Fy0VJs5JEG5TtsRKOzEkfRsBwTumaaqJy5XCC1vK3qVDtNecmkrxezf4Yw0EmCIwSF6l7
 greg@x230
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5INwe64Pom7KuAcxlt8DJphg4aHX0jOg6V45IXEeYWcvx greg@x1
 uid: 2890
 email: ggrossme...@wikimedia.org
   halfak:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I751f78cca5676c9023e1e9d2ee351c8b2ef5a890
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Greg Grossmeier 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Update gjg's ssh key

2017-08-02 Thread Greg Grossmeier (Code Review)

Greg Grossmeier has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369840 )

Change subject: admin: Update gjg's ssh key
..

admin: Update gjg's ssh key

I had to replace my x230 this week. New laptop, new key.

Also upgrading to an ed_25519 key.

Change-Id: I751f78cca5676c9023e1e9d2ee351c8b2ef5a890
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/369840/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ef25b2a..155ea40 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -927,7 +927,7 @@
 realname: Greg Grossmeier
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDcwwxwZqCRMBQsMIutloeVS5Nx+nljUr914Yradb8YLeo2PbqLEjVKgC6+yKHe7binFNk3rlgiXhXOm2issytl7sWUZz8YpFqxp7fDqnfVVOTGTwMtAjBoZHugz9RaR1SVlz2dRk0N5qrovffz/Av3QQIS12jX3C/GCdqCMixgwi+ecYo2xA7WJyEGFnp+0Ah8hBIn2xabZAfHhZ8dF6VifEHsgp08Ot52sOZwb99+H0SjEWRwc9decwuPGNWX94BPvWcP6dQ2bzjqR3iRkwEIvKcgMvanYUXAvPb32382QCsW0r22HtvsUvA340ISlvcauRS1GGpyYmZYGSSfgHVH
 greg@x200s
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC16FrhA5M9oVeFTpJMZrjMSnmNXv4sW+Ku1PUpv14qOEw9zpW8JhWLzhD4+C66sE3vvDm/xwrfYeyn9lLFlxCM8ZbUOh9YCuZv3ABam5UHODg+YS3tdMHbZ/U4ZPSg1B6t79f2/CLCrpj0Tk+G2DQe9/d75fdmZBBC6ICKrY8glNWZOL2kxi22P2dUamTDzBu1j9UHmpSNYpMh169AeNFV5njNYlEpOueg4iDkLvXqvMyDyvXvYbSNSRAfGTZYdzlNmasBEWuS7zuSIQ1Fy0VJs5JEG5TtsRKOzEkfRsBwTumaaqJy5XCC1vK3qVDtNecmkrxezf4Yw0EmCIwSF6l7
 greg@x230
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5INwe64Pom7KuAcxlt8DJphg4aHX0jOg6V45IXEeYWcvx greg@x1
 uid: 2890
 email: ggrossme...@wikimedia.org
   halfak:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I751f78cca5676c9023e1e9d2ee351c8b2ef5a890
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Greg Grossmeier 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: remove /etc/ssh/userkeys/*

2017-08-02 Thread Andrew Bogott (Code Review)

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

Change subject: vmbuilder: remove /etc/ssh/userkeys/*
..


vmbuilder: remove /etc/ssh/userkeys/*

We want a fresh start, no keys on a new build.
This should prevent keys from accidentally leaking
from the build machine onto the base image.

Change-Id: I0d31bfb41eb54af20e2115a280aa04c65b805185
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index e06ac66..ff4b5ed 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -31,6 +31,7 @@
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*
+  rm -rf /etc/ssh/userkeys/*
   sed -i 's/\/dev\/sda/\/dev\/vda/' /etc/fstab
   sed -i '/^kernel/s/$/ console=ttyS0/' /boot/grub/menu.lst
   sed -i 's/console=hvc0/xencons=hvc0 console=hvc0/' /boot/grub/menu.lst

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d31bfb41eb54af20e2115a280aa04c65b805185
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: remove /etc/ssh/userkeys/*

2017-08-02 Thread Andrew Bogott (Code Review)

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

Change subject: vmbuilder: remove /etc/ssh/userkeys/*
..

vmbuilder: remove /etc/ssh/userkeys/*

We want a fresh start, no keys on a new build.
This should prevent keys from accidentally leaking
from the build machine onto the base image.

Change-Id: I0d31bfb41eb54af20e2115a280aa04c65b805185
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/369839/1

diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index e06ac66..ff4b5ed 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -31,6 +31,7 @@
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*
+  rm -rf /etc/ssh/userkeys/*
   sed -i 's/\/dev\/sda/\/dev\/vda/' /etc/fstab
   sed -i '/^kernel/s/$/ console=ttyS0/' /boot/grub/menu.lst
   sed -i 's/console=hvc0/xencons=hvc0 console=hvc0/' /boot/grub/menu.lst

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d31bfb41eb54af20e2115a280aa04c65b805185
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] operations...toollabs-images[master]: Install composer for PHP imaages

2017-08-02 Thread BryanDavis (Code Review)

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

Change subject: Install composer for PHP imaages
..

Install composer for PHP imaages

Use the same git clone method that is used by the ::toollabs::composer
Puppet module to provision composer in the PHP base image. It's not
pretty, but it is consistent.

Bug: T172358
Change-Id: I9a5d485bac1d65777437f407b8bc9923de7679fa
---
M php/base/Dockerfile.template
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images 
refs/changes/38/369838/1

diff --git a/php/base/Dockerfile.template b/php/base/Dockerfile.template
index 16a0c79..c4e2f3a 100644
--- a/php/base/Dockerfile.template
+++ b/php/base/Dockerfile.template
@@ -19,3 +19,9 @@
 php5-xsl \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*
+
+# T172358 - install composer simlarly to ::toollabs::composer
+RUN git clone \
+https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer \
+&& rm -rf /srv/composer/.git \
+&& ln -s /srv/composer/vendor/bin/composer /usr/local/bin/composer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a5d485bac1d65777437f407b8bc9923de7679fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: update-rc.d -f puppet remove

2017-08-02 Thread Andrew Bogott (Code Review)

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

Change subject: vmbuilder: update-rc.d -f puppet remove
..


vmbuilder: update-rc.d -f puppet remove

Removing init.d/puppet was overkill, and also
upsetting a puppet stage that explicitly turns
it off.  Surely this will prevent it from
trying to do anything at boot time.

Bug: T172064
Change-Id: Iad42f912f7c1677b26d7c238cf46042246b5827e
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index 7f90aaa..e06ac66 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -27,7 +27,7 @@
   puppet agent --disable
   /etc/init.d/puppet stop
   /usr/bin/killall puppet
-  rm /etc/init.d/puppet
+  update-rc.d -f puppet remove
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad42f912f7c1677b26d7c238cf46042246b5827e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: update-rc.d -f puppet remove

2017-08-02 Thread Andrew Bogott (Code Review)

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

Change subject: vmbuilder: update-rc.d -f puppet remove
..

vmbuilder: update-rc.d -f puppet remove

Removing init.d/puppet was overkill, and also
upsetting a puppet stage that explicitly turns
it off.  Surely this will prevent it from
trying to do anything at boot time.

Change-Id: Iad42f912f7c1677b26d7c238cf46042246b5827e
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/369837/1

diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index 7f90aaa..e06ac66 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -27,7 +27,7 @@
   puppet agent --disable
   /etc/init.d/puppet stop
   /usr/bin/killall puppet
-  rm /etc/init.d/puppet
+  update-rc.d -f puppet remove
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad42f912f7c1677b26d7c238cf46042246b5827e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: set phab1001 to active phab server

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: phabricator: set phab1001 to active phab server
..

phabricator: set phab1001 to active phab server

Bug: T163938
Change-Id: If391b524c8ff19ae2d16d3a1d8010a50e7add953
---
M hieradata/role/common/phabricator_server.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/369836/1

diff --git a/hieradata/role/common/phabricator_server.yaml 
b/hieradata/role/common/phabricator_server.yaml
index 869e978..4b1a438 100644
--- a/hieradata/role/common/phabricator_server.yaml
+++ b/hieradata/role/common/phabricator_server.yaml
@@ -8,8 +8,8 @@
   debdeploy-phabricator:
 value: standard
 
-phabricator_active_server: 'iridium'
-phabricator_active_server_fqdn: 'iridium.eqiad.wmnet'
+phabricator_active_server: 'phab1001'
+phabricator_active_server_fqdn: 'phab1001.eqiad.wmnet'
 
 phabricator_servers:
   - iridium.eqiad.wmnet
@@ -40,4 +40,4 @@
 version: 5
 roles:
   read: true
-  write: true
\ No newline at end of file
+  write: true

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Move statsv monitoring from 'webperf' to 'webperf::...

2017-08-02 Thread Krinkle (Code Review)

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

Change subject: webperf: Move statsv monitoring from 'webperf' to 
'webperf::statsv'
..

webperf: Move statsv monitoring from 'webperf' to 'webperf::statsv'

The base class is just for the user/group/directory, it doesn't
make sense for a specific service's monitoring to be ensured for
any class (e.g. webperf::navtiming) that wants to run a webperf
process.

It all works out now because the three webperf services run on
the same node, but this may be changing.

Bug: T158837
Change-Id: Icf006f551ac6ae398fb543dd9f50e25d495dec45
---
M modules/webperf/manifests/init.pp
M modules/webperf/manifests/statsv.pp
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/369835/1

diff --git a/modules/webperf/manifests/init.pp 
b/modules/webperf/manifests/init.pp
index dfc5262..a6deb91 100644
--- a/modules/webperf/manifests/init.pp
+++ b/modules/webperf/manifests/init.pp
@@ -1,7 +1,7 @@
 # == Class: webperf
 #
-# This Puppet module provisions a set of client-side performance
-# monitoring scripts for Wikimedia sites.
+# This base class provides a user, group, and working directory for
+# webperf processes.
 #
 class webperf {
 group { 'webperf':
@@ -19,10 +19,5 @@
 
 file { '/srv/webperf':
 ensure => directory,
-}
-
-nrpe::monitor_service { 'statsv':
-description  => 'statsv process',
-nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C python 
-a statsv',
 }
 }
diff --git a/modules/webperf/manifests/statsv.pp 
b/modules/webperf/manifests/statsv.pp
index 2ff2763..320c045 100644
--- a/modules/webperf/manifests/statsv.pp
+++ b/modules/webperf/manifests/statsv.pp
@@ -28,4 +28,9 @@
 provider  => 'systemd',
 subscribe => File['/lib/systemd/system/statsv.service'],
 }
+
+nrpe::monitor_service { 'statsv':
+description  => 'statsv process',
+nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C python 
-a statsv',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: exim/phabricator: send mail to phab1001, not iridium

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: exim/phabricator: send mail to phab1001, not iridium
..

exim/phabricator: send mail to phab1001, not iridium

Bug: T163938
Change-Id: I5038d510016b9aad8972b8a2892ed18a040909c5
---
M modules/role/templates/exim/exim4.conf.mx.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/369834/1

diff --git a/modules/role/templates/exim/exim4.conf.mx.erb 
b/modules/role/templates/exim/exim4.conf.mx.erb
index d645889..c0957e5 100644
--- a/modules/role/templates/exim/exim4.conf.mx.erb
+++ b/modules/role/templates/exim/exim4.conf.mx.erb
@@ -305,7 +305,7 @@
 phabricator:
driver = manualroute
domains = +phab_domains
-   route_list = * iridium.eqiad.wmnet byname
+   route_list = * phab1001.eqiad.wmnet byname
transport = remote_smtp
 
 # Send RT mails to the RT server

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: rm /etc/init.d/puppet in image

2017-08-02 Thread Andrew Bogott (Code Review)

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

Change subject: vmbuilder: rm /etc/init.d/puppet in image
..


vmbuilder: rm /etc/init.d/puppet in image

Because even though we...
- run puppet agent --disable...
- and set daemonize=false in puppet conf...
- and I tried setting RUN=no in the defaults...

puppet STILL tries to start up on first boot, hangs,
and ruins everything.

We start puppet in the firstboot script, when we're ready.  After
that, it's managed by a cron.  We never use this init script.

Bug: T172064
Change-Id: I895f3970db8bea3705f968f4681fd36fc0126f2c
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index 58a2c38..7f90aaa 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -27,6 +27,7 @@
   puppet agent --disable
   /etc/init.d/puppet stop
   /usr/bin/killall puppet
+  rm /etc/init.d/puppet
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I895f3970db8bea3705f968f4681fd36fc0126f2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: rm /etc/init.d/puppet in image

2017-08-02 Thread Andrew Bogott (Code Review)

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

Change subject: vmbuilder: rm /etc/init.d/puppet in image
..

vmbuilder: rm /etc/init.d/puppet in image

Because even though we...
- run puppet agent --disable...
- and set daemonize=false in puppet conf...
- and I tried setting RUN=no in the defaults...

puppet STILL tries to start up on first boot, hangs,
and ruins everything.

We start puppet in the firstboot script, when we're ready.  After
that, it's managed by a cron.  We never use this init script.

Bug: T172064
Change-Id: I895f3970db8bea3705f968f4681fd36fc0126f2c
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index 58a2c38..7f90aaa 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -27,6 +27,7 @@
   puppet agent --disable
   /etc/init.d/puppet stop
   /usr/bin/killall puppet
+  rm /etc/init.d/puppet
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I895f3970db8bea3705f968f4681fd36fc0126f2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb/phabricator: update GRANTS from iridium to phab1001

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: mariadb/phabricator: update GRANTS from iridium to phab1001
..

mariadb/phabricator: update GRANTS from iridium to phab1001

Bug: T163938
Change-Id: I821146a5d01382b934b928da251e3529b064666a
---
M modules/role/templates/mariadb/grants/production-m3.sql.erb
1 file changed, 13 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/369832/1

diff --git a/modules/role/templates/mariadb/grants/production-m3.sql.erb 
b/modules/role/templates/mariadb/grants/production-m3.sql.erb
index 1b02471..4aea973 100644
--- a/modules/role/templates/mariadb/grants/production-m3.sql.erb
+++ b/modules/role/templates/mariadb/grants/production-m3.sql.erb
@@ -11,11 +11,11 @@
 -- phadmin@iridium
 
 GRANT USAGE
-ON *.* TO 'phadmin'@'10.64.32.150'
+ON *.* TO 'phadmin'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
 
 GRANT ALL PRIVILEGES
-ON `phabricator%`.* TO 'phadmin'@'10.64.32.150';
+ON `phabricator%`.* TO 'phadmin'@'10.64.16.18';
 
 -- phadmin@dbproxy1003
 GRANT USAGE
@@ -36,14 +36,14 @@
 -- phuser@iridium
 
 GRANT REPLICATION CLIENT
-ON *.* TO 'phuser'@'10.64.32.150'
+ON *.* TO 'phuser'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
 
 GRANT CREATE, DROP
-ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.32.150';
+ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.6416.150';
 
 GRANT DELETE, EXECUTE, INSERT, SELECT, SHOW VIEW, UPDATE
-ON `phabricator%`.* TO 'phuser'@'10.64.32.150';
+ON `phabricator%`.* TO 'phuser'@'10.64.16.8';
 
 -- phuser@dbproxy1003
 
@@ -52,7 +52,7 @@
 IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
 
 GRANT CREATE, DROP
-ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.0.198';
+ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
 
 GRANT DELETE, EXECUTE, INSERT, SELECT, SHOW VIEW, UPDATE
 ON `phabricator%`.* TO 'phuser'@'10.64.0.198';
@@ -72,12 +72,12 @@
 -- phstats@iridium
 
 GRANT USAGE
-ON *.* TO 'phstats'@'10.64.32.150'
+ON *.* TO 'phstats'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
-GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.32.150';
-GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.32.150';
-GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.32.150';
-GRANT SELECT ON `phabricator_differential`.* TO 'phstats'@'10.64.32.150';
+GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.16.8';
+GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.16.8';
+GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.16.8';
+GRANT SELECT ON `phabricator_differential`.* TO 'phstats'@'10.64.16.8';
 
 -- phstats@dbproxy1003
 
@@ -102,11 +102,11 @@
 -- phmanifest@iridium
 
 GRANT USAGE
-ON *.* TO 'phmanifest'@'10.64.32.150'
+ON *.* TO 'phmanifest'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*57879C423C685FDF9F3F4E3DB71207E76A8384C4';
 
 GRANT SELECT
-ON `phabricator_maniphest`.* TO 'phmanifest'@'10.64.32.150';
+ON `phabricator_maniphest`.* TO 'phmanifest'@'10.64.16.8';
 
 -- phmanifest@dbproxy1003
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: datasets/phabricator: allow phab1001 as rsync host for dumps

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: datasets/phabricator: allow phab1001 as rsync host for dumps
..


datasets/phabricator: allow phab1001 as rsync host for dumps

Bug: T163938
Change-Id: Iac1a920beac591ec0365c79a092eda95b5284593
---
M modules/dataset/files/rsync/rsyncd.conf.phab_dump
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/dataset/files/rsync/rsyncd.conf.phab_dump 
b/modules/dataset/files/rsync/rsyncd.conf.phab_dump
index 19aa51e..9a02dac 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.phab_dump
+++ b/modules/dataset/files/rsync/rsyncd.conf.phab_dump
@@ -8,4 +8,4 @@
 gid = root
 read only = false
 path = /data/xmldatadumps/public/other/misc
-hosts allow = iridium.eqiad.wmnet
+hosts allow = iridium.eqiad.wmnet, phab1001.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac1a920beac591ec0365c79a092eda95b5284593
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: datasets/phabricator: allow phab1001 as rsync host for dumps

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: datasets/phabricator: allow phab1001 as rsync host for dumps
..

datasets/phabricator: allow phab1001 as rsync host for dumps

Bug: T163938
Change-Id: Iac1a920beac591ec0365c79a092eda95b5284593
---
M modules/dataset/files/rsync/rsyncd.conf.phab_dump
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/dataset/files/rsync/rsyncd.conf.phab_dump 
b/modules/dataset/files/rsync/rsyncd.conf.phab_dump
index 19aa51e..9a02dac 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.phab_dump
+++ b/modules/dataset/files/rsync/rsyncd.conf.phab_dump
@@ -8,4 +8,4 @@
 gid = root
 read only = false
 path = /data/xmldatadumps/public/other/misc
-hosts allow = iridium.eqiad.wmnet
+hosts allow = iridium.eqiad.wmnet, phab1001.eqiad.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: set phab_domain to phabricator-new for phab1001

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: phabricator: set phab_domain to phabricator-new for phab1001
..


phabricator: set phab_domain to phabricator-new for phab1001

Bug: T163938
Change-Id: Ic761144e7dda4ad86d7577397242aab70f2035ee
---
A hieradata/hosts/phab1001.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/phab1001.yaml b/hieradata/hosts/phab1001.yaml
new file mode 100644
index 000..8cb6a45
--- /dev/null
+++ b/hieradata/hosts/phab1001.yaml
@@ -0,0 +1,3 @@
+phabricator_domain: "phabricator-new.wikimedia.org"
+phabricator_altdomain: "phabricator-new.wikimedia.org"
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic761144e7dda4ad86d7577397242aab70f2035ee
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Omnimail::omnigroupmember.get job: add slow download handling.

2017-08-02 Thread Eileen (Code Review)

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

Change subject: Omnimail::omnigroupmember.get job: add slow download handling.
..

Omnimail::omnigroupmember.get job: add slow download handling.

This adds handling to for when the download takes a while, same as the 
recipient job.

Bug T160949

Change-Id: Id65ab87235de86000393e66b0f7e7679692115bf
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
4 files changed, 152 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/30/369830/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index fd9a6b7..b5007ab 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -66,7 +66,7 @@
 $params['mail_provider'] => array('last_timestamp' => 
$endTimestamp),
   ),
 ));
-return $data;
+return $this->formatResult($params, $data);
   }
   else {
 sleep($settings['omnimail_job_retry_interval']);
@@ -80,4 +80,34 @@
 
   }
 
+  /**
+   * @param $params
+   * @param $result
+   * @return array
+   */
+  public function formatResult($params, $result) {
+$options = _civicrm_api3_get_options_from_params($params);
+$values = array();
+foreach ($result as $groupMember) {
+  $value = array(
+'email' => (string) $groupMember->getEmail(),
+'is_opt_out' => (string) $groupMember->isOptOut(),
+'opt_in_date' => (string) $groupMember->getOptInIsoDateTime(),
+'opt_in_source' => (string) $groupMember->getOptInSource(),
+'opt_out_source' => (string) $groupMember->getOptOutSource(),
+'opt_out_date' => (string) $groupMember->getOptOutIsoDateTime(),
+'contact_id' => (string) $groupMember->getContactReference(),
+  );
+  foreach ($params['custom_data_map'] as $fieldName => $dataKey) {
+$value[$fieldName] = (string) $groupMember->getCustomData($dataKey);
+  }
+  $values[] = $value;
+  if ($options['limit'] > 0 && count($values) === (int) $options['limit']) 
{
+break;
+  }
+}
+return $values;
+  }
+
+
 }
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
index 0281f62..8e114d8 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
@@ -15,27 +15,7 @@
  */
 function civicrm_api3_omnigroupmember_get($params) {
   $job = new CRM_Omnimail_Omnigroupmembers();
-  $result = $job->getResult($params);
-  $options = _civicrm_api3_get_options_from_params($params);
-  $values = array();
-  foreach ($result as $groupMember) {
-$value = array(
-  'email' => (string) $groupMember->getEmail(),
-  'is_opt_out' => (string) $groupMember->isOptOut(),
-  'opt_in_date' => (string) $groupMember->getOptInIsoDateTime(),
-  'opt_in_source' => (string) $groupMember->getOptInSource(),
-  'opt_out_source' => (string) $groupMember->getOptOutSource(),
-  'opt_out_date' => (string) $groupMember->getOptOutIsoDateTime(),
-  'contact_id' => (string) $groupMember->getContactReference(),
-);
-foreach ($params['custom_data_map'] as $fieldName => $dataKey) {
-  $value[$fieldName] = (string) $groupMember->getCustomData($dataKey);
-}
-$values[] = $value;
-if ($options['limit'] > 0 && count($values) === (int) $options['limit']) {
-  break;
-}
-  }
+  $values = $job->getResult($params);
   return civicrm_api3_create_success($values);
 }
 
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
index 5fcc26f..59e0cd7 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
@@ -14,11 +14,32 @@
  * @return array
  */
 function civicrm_api3_omnigroupmember_load($params) {
-  $contacts = civicrm_api3('Omnigroupmember', 'get', $params);
+  $omnimail = new

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/phabricator: add director for phab-new

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: cache::misc/phabricator: add director for phab-new
..


cache::misc/phabricator: add director for phab-new

Bug: T163938
Change-Id: I898fe242936d6b9e2291a6c068dc2b3f0c58f422
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index f89330f..cfdd87e 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -97,6 +97,9 @@
   phabricator:
 backends:
   eqiad: 'iridium.eqiad.wmnet'
+  phabricator_new:
+backends:
+  eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:
   eqiad: 'planet1001.eqiad.wmnet'
@@ -220,6 +223,8 @@
 director: 'graphite1001'
   phabricator.wikimedia.org:
 director: 'phabricator'
+  phabricator-new.wikimedia.org:
+director: 'phabricator_new'
   phab.wmfusercontent.org:
 director: 'phabricator'
   pivot.wikimedia.org:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I898fe242936d6b9e2291a6c068dc2b3f0c58f422
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/phabricator: add director for phab-new

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: cache::misc/phabricator: add director for phab-new
..

cache::misc/phabricator: add director for phab-new

Bug: T163938
Change-Id: I898fe242936d6b9e2291a6c068dc2b3f0c58f422
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index f89330f..f97de3e 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -97,6 +97,9 @@
   phabricator:
 backends:
   eqiad: 'iridium.eqiad.wmnet'
+  phabricator_new:
+backends:
+  eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:
   eqiad: 'planet1001.eqiad.wmnet'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Prevent live update fetch if model is in conflict

2017-08-02 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Prevent live update fetch if model is in conflict
..

RCFilters: Prevent live update fetch if model is in conflict

Change-Id: I52df598036a33fe203d6411fa9cfb6a485a8504d
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/369828/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 16822d8..f3ea248 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -540,6 +540,7 @@
new mw.Uri().query.liveupdate;
 
return !document.hidden &&
+   !this.filtersModel.hasConflict() &&
!this.changesListModel.getNewChangesExist() &&
!this.updatingChangesList &&
liveUpdateFeatureFlag;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52df598036a33fe203d6411fa9cfb6a485a8504d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Add answers class to proposals

2017-08-02 Thread Harjotsingh (Code Review)

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

Change subject: Add answers class to proposals
..

Add answers class to proposals

This patch adds answers class to proposal which can be used to put the
answers/proposals into columns using Common.css

Bug:T170800
Change-Id: I3a71af32162555ec861076622aef46d2fa3fbdc5
---
M Question.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/Question.php b/Question.php
index 4868061..7b79f90 100644
--- a/Question.php
+++ b/Question.php
@@ -283,6 +283,7 @@
$colSpan = ' colspan="13"';
}
if ( $text ) {
+   $rawClass = $rawClass === 'proposal' ? 
'proposal answer' : $rawClass;
$output .= '' . 
"\n";
$output .= $signesOutput;
$output .= '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a71af32162555ec861076622aef46d2fa3fbdc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Harjotsingh 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: lib/mt/Youdao.js: Fix Youdao API usages.

2017-08-02 Thread Ken Ookami Horo (Code Review)

Ken Ookami Horo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369826 )

Change subject: lib/mt/Youdao.js: Fix Youdao API usages.
..

lib/mt/Youdao.js: Fix Youdao API usages.

Migrate to latest Youdao translate API on
http://ai.youdao.com/docs/api.s .

Change-Id: Ibed08ac9e05cf44c03ea09f5cb830e9f957099f0
---
M config.dev.yaml
M lib/mt/Youdao.js
2 files changed, 88 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/26/369826/1

diff --git a/config.dev.yaml b/config.dev.yaml
index f171eef..33a2057 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -66,6 +66,8 @@
   api: https://translate.yandex.net
   key: null
 youdao:
-  api: https://fanyi.youdao.com/paidapi/fanyiapi
+  api: https://openapi.youdao.com/api
   key: null
-  registry: ./registry.yaml
+  salt: null
+  secret: null
+  registry: ./registry.yaml
\ No newline at end of file
diff --git a/lib/mt/Youdao.js b/lib/mt/Youdao.js
index 94cb4da..3dd1aa1 100644
--- a/lib/mt/Youdao.js
+++ b/lib/mt/Youdao.js
@@ -1,40 +1,42 @@
 'use strict';
 
 var
-   util = require( 'util' ),
-   preq = require( 'preq' ),
-   LinearDoc = require( './../lineardoc' ),
-   BBPromise = require( 'bluebird' ),
-   MTClient = require( './MTClient.js' ),
-   youdaoLanguageNameMap;
+   util = require('util'),
+   preq = require('preq'),
+   LinearDoc = require('./../lineardoc'),
+   BBPromise = require('bluebird'),
+   MTClient = require('./MTClient.js'),
+   crypto = require('crypto');
+youdaoLanguageNameMap;
 
 // Youdao language codes differ from the language codes that we use.
-youdaoLanguageNameMap = {
-   'en>zh': 'EN2ZH_CN', // English to Chinese Simplified
-   'simple>zh': 'EN2ZH_CN', // English to Chinese Simplified
-   'en>zh-cn': 'EN2ZH_CN', // English to Chinese Simplified
-   'simple>zh-cn': 'EN2ZH_CN', // English to Chinese Simplified
-   'ja>zh-cn': 'JA2ZH_CN', // Japanese to Chinese Simplified,
-   'ja>zh': 'JA2ZH_CN', // Japanese to Chinese Simplified,
-   'ko>zh-cn': 'KR2ZH_CN', // Korean to Chinese Simplified
-   'fr>zh-cn': 'FR2ZH_CN', // Korean to Chinese Simplified
-   'ru>zh-cn': 'RU2ZH_CN', // Russian to Chinese Simplified
-   'es>zh-cn': 'SP2ZH_CN', // Spanish to Chinese Simplified
-   'zh>en': 'ZH_CN2EN', // Chinese Simplified/Traditional to English
-   'zh>simple': 'ZH_CN2EN', // Chinese Simplified/Traditional to Simple 
English
-   'zh>ja': 'ZH_CN2JA', // Chinese Simplified/Traditional to Japanese
-   'zh>ko': 'ZH_CN2KR', // Chinese Simplified/Traditional to Korean
-   'zh>fr': 'ZH_CN2FR', // Chinese Simplified/Traditional to French
-   'zh>ru': 'ZH_CN2RU', // Chinese Simplified/Traditional to Russian
-   'zh>es': 'ZH_CN2SP' // Chinese Simplified/Traditional to Spanish
+// See Youdao's language list on http://ai.youdao.com/docs/api.s#id5
+
+
+
+var youdaoLanguageNameMap = {
+   'zh': 'zh-CHS',
+   'zh-cn': 'zh-CHS',
+   'ja': 'ja',
+   'en': 'en',
+   'simple': 'en',
+   'ko': 'ko',
+   'fr': 'fr',
+   'ru': 'ru',
+   'pt': 'pt',
+   'es': 'es',
 };
 
-function Youdao( options ) {
+function Youdao(options) {
this.logger = options.logger;
this.conf = options.conf;
 }
 
-util.inherits( Youdao, MTClient );
+Youdao.prototype.md5 = function (text) {
+   return crypto.createHash('md5').update(text).digest('hex');
+};
+
+util.inherits(Youdao, MTClient);
 
 /**
  * Translate marked-up text
@@ -48,24 +50,24 @@
  * @param {string} sourceHtml Source html
  * @return {Promise} promise: Translated html
  */
-Youdao.prototype.translateHtml = function ( sourceLang, targetLang, sourceHtml 
) {
+Youdao.prototype.translateHtml = function (sourceLang, targetLang, sourceHtml) 
{
var i, len, targetDoc, chain = [],
self = this;
 
-   this.buildSourceDoc( sourceHtml );
+   this.buildSourceDoc(sourceHtml);
// Clone and adapt sourceDoc
-   targetDoc = new LinearDoc.Doc( this.sourceDoc.wrapperTag );
+   targetDoc = new LinearDoc.Doc(this.sourceDoc.wrapperTag);
 
-   function translateItemDeferred( item ) {
-   if ( item.type !== 'textblock' ) {
-   return BBPromise.resolve( item );
+   function translateItemDeferred(item) {
+   if (item.type !== 'textblock') {
+   return BBPromise.resolve(item);
}
 
return self.translateText(
sourceLang,
targetLang,
item.item.getPlainText()
-   ).then( function ( translated ) {
+   ).then(function (translated) {
var newTextBlock;
 
newTextBlock =

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "cache::misc/phabricator: add director for phabricato...

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: Revert "cache::misc/phabricator: add director for 
phabricator-new, staging"
..


Revert "cache::misc/phabricator: add director for phabricator-new, staging"

This reverts commit 7db9a4869e1f55b931ab2931feffbe996a7d0825.

Change-Id: I66fbddc2f7ee801d4e154017d3c35bb98f2c71be
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index dc21dbf..f89330f 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -97,9 +97,6 @@
   phabricator:
 backends:
   eqiad: 'iridium.eqiad.wmnet'
-  phabricator-new:
-backends:
-  eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:
   eqiad: 'planet1001.eqiad.wmnet'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66fbddc2f7ee801d4e154017d3c35bb98f2c71be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "cache::misc/phabricator: add director for phabricato...

2017-08-02 Thread Dzahn (Code Review)

Hello Paladox, 20after4, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "cache::misc/phabricator: add director for 
phabricator-new, staging"
..

Revert "cache::misc/phabricator: add director for phabricator-new, staging"

This reverts commit 7db9a4869e1f55b931ab2931feffbe996a7d0825.

Change-Id: I66fbddc2f7ee801d4e154017d3c35bb98f2c71be
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/369825/1

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index dc21dbf..f89330f 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -97,9 +97,6 @@
   phabricator:
 backends:
   eqiad: 'iridium.eqiad.wmnet'
-  phabricator-new:
-backends:
-  eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:
   eqiad: 'planet1001.eqiad.wmnet'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66fbddc2f7ee801d4e154017d3c35bb98f2c71be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/phabricator: add director for phabricator-new, s...

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: cache::misc/phabricator: add director for phabricator-new, 
staging
..


cache::misc/phabricator: add director for phabricator-new, staging

phabricator-new already existed, but was used for codfw, now plans
changed and iridium is first replaced with phab1001.

Temp setup for migration.

Bug: T163938
Change-Id: I7baec5492b03c97861610b967ae9c50e65f4ee94
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index f89330f..dc21dbf 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -97,6 +97,9 @@
   phabricator:
 backends:
   eqiad: 'iridium.eqiad.wmnet'
+  phabricator-new:
+backends:
+  eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:
   eqiad: 'planet1001.eqiad.wmnet'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7baec5492b03c97861610b967ae9c50e65f4ee94
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: DefaultSettings: Update wgLocalVirtualHosts documentation

2017-08-02 Thread Krinkle (Code Review)

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

Change subject: DefaultSettings: Update wgLocalVirtualHosts documentation
..

DefaultSettings: Update wgLocalVirtualHosts documentation

Change-Id: I4fb4724b78a1270df951e59c58c7482f0fb5ff34
---
M includes/DefaultSettings.php
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/369824/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index aa4320d..de99e78 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8231,10 +8231,15 @@
  * Local virtual hosts.
  *
  * This lists domains that are configured as virtual hosts on the same machine.
- * If a request is to be made to a domain listed here, or any subdomain 
thereof,
- * then no proxy will be used.
- * Command-line scripts are not affected by this setting and will always use
- * proxy if it is configured.
+ *
+ * This affects the following:
+ * - MWHttpRequest: If a request is to be made to a domain listed here, or any
+ *   subdomain thereof, then no proxy will be used.
+ *   Command-line scripts are not affected by this setting and will always use
+ *   proxy if it is configured.
+ * - ChronologyProtector: Decide to shutdown LBFactory asynchronously instead
+ *   synchronously if the current response redirects to a local virtual host.
+ *
  * @since 1.25
  */
 $wgLocalVirtualHosts = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fb4724b78a1270df951e59c58c7482f0fb5ff34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: set phab_domain to phabricator-new for phab1001

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: phabricator: set phab_domain to phabricator-new for phab1001
..

phabricator: set phab_domain to phabricator-new for phab1001

Bug: T163938
Change-Id: Ic761144e7dda4ad86d7577397242aab70f2035ee
---
A hieradata/hosts/phab1001.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/369823/1

diff --git a/hieradata/hosts/phab1001.yaml b/hieradata/hosts/phab1001.yaml
new file mode 100644
index 000..8cb6a45
--- /dev/null
+++ b/hieradata/hosts/phab1001.yaml
@@ -0,0 +1,3 @@
+phabricator_domain: "phabricator-new.wikimedia.org"
+phabricator_altdomain: "phabricator-new.wikimedia.org"
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Add class field to input type in Answer.mustache

2017-08-02 Thread Harjotsingh (Code Review)

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

Change subject: Add class field to input type in Answer.mustache
..

Add class field to input type in Answer.mustache

The class attribute is used to give class value (numbers/wods) to
textfield object in the template.The patch adds the missing value
to the input type.

Bug:T172355
Change-Id: Ib28b88950d2c6566a8fec2c9ff723e5772ca034b
---
M templates/Answer.mustache
M tests/phpunit/QuestionTest.php
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/22/369822/1

diff --git a/templates/Answer.mustache b/templates/Answer.mustache
index 9f1082e..1025a13 100644
--- a/templates/Answer.mustache
+++ b/templates/Answer.mustache
@@ -4,7 +4,7 @@
{{{ possibility }}}

{{/if}} 
-   
+   
{{ big }}


diff --git a/tests/phpunit/QuestionTest.php b/tests/phpunit/QuestionTest.php
index a5c6975..0ba8b53 100644
--- a/tests/phpunit/QuestionTest.php
+++ b/tests/phpunit/QuestionTest.php
@@ -175,7 +175,7 @@
 . "\n\t\t\t" . ' StageiraPlatoGreece'
 . "\n\t\t\t" . '' . "\n\t\t\t" . ''
 . "\n\t\t\t\t"
-. ''
 . "\n\t\t\t\t\t" . '▼' . "\n\t\t\t\t\t" 
. '' . "\n\t\t\t"
 . '' . "\n\t\n" . '' . "\n",
@@ -187,7 +187,7 @@
 '' . "\n\t\n\t\t" . 
''
 . "\n\t\t\t" . '' . " 
\n\t\t\t" . '' . "\n\t\t\t"
 . '' . "\n\t\t\t\t"
-. ''
+. ''
 . "\n\t\t\t\t\t" . '' . 
"\n\t\t\t\t\t" . '' . "\n\t\t\t"
 . '' . "\n\t\n" . '' . "\n",
 ''
@@ -198,7 +198,7 @@
  '' . "\n\t\n\t\t" . 
''
 . "\n\t\t\t" . ' Plato' 
. "\n\t\t\t" . '' . "\n\t\t\t"
 . '' . 
"\n\t\t\t\t"
-. ''
 . "\n\t\t\t\t\t" . '▼' . "\n\t\t\t\t\t" 
. ''
 . "\n\t\t\t" . '' . "\n\t\n" . '' . "\n",
@@ -209,7 +209,7 @@
 '' . "\n\t\n\t\t" . 
''
 . "\n\t\t\t" . ' StageiraPlatoGreece'. "\n\t\t\t"
 . '' . "\n\t\t\t" . '' . "\n\t\t\t\t"
-. ''
 . "\n\t\t\t\t\t" . '▼' . "\n\t\t\t\t\t" 
. '' . "\n\t\t\t" . ''
 . "\n\t\n" . '' . "\n",
@@ -221,7 +221,7 @@
 '' . "\n\t\n\t\t" . 
''
 . "\n\t\t\t" . ' Plato' 
. "\n\t\t\t" . '' . "\n\t\t\t"
 . '' . 
"\n\t\t\t\t"
-. ''
 . "\n\t\t\t\t\t" . '▼' . "\n\t\t\t\t\t" 
. ''
 . "\n\t\t\t" . '' . "\n\t\n" . '' . "\n",
@@ -233,7 +233,7 @@
 '' . "\n\t\n\t\t" . 
''
 . "\n\t\t\t" . '' . 
"\n\t\t\t" . '' . "\n\t\t\t"
 . '' . 
"\n\t\t\t\t"
-. ''
 . "\n\t\t\t\t\t" . '' . "\n\t\t\t\t\t" . 
''
 . "\n\t\t\t" . '' . "\n\t\n" . '' . "\n",
@@ -245,7 +245,7 @@
 '' . "\n\t\n\t\t" . 
''
 . "\n\t\t\t" . ' 0' . 
"\n\t\t\t" . '' . "\n\t\t\t"
 . '' . 
"\n\t\t\t\t"
-. ''
 . "\n\t\t\t\t\t" . '▼' . "\n\t\t\t\t\t" 
. ''
 . "\n\t\t\t" . '' . "\n\t\n" . '' . "\n",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib28b88950d2c6566a8fec2c9ff723e5772ca034b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Harjotsingh 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/phabricator: add director for phabricator-new, s...

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: cache::misc/phabricator: add director for phabricator-new, 
staging
..

cache::misc/phabricator: add director for phabricator-new, staging

phabricator-new already existed, but was used for codfw, now plans
changed and iridium is first replaced with phab1001.

Temp setup for migration.

Bug: T163938
Change-Id: I7baec5492b03c97861610b967ae9c50e65f4ee94
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/369821/1

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 20b9be0..dc21dbf 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -96,6 +96,9 @@
   eqiad: 'terbium.eqiad.wmnet'
   phabricator:
 backends:
+  eqiad: 'iridium.eqiad.wmnet'
+  phabricator-new:
+backends:
   eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/phabricator: switch from iridium to phab1001 bac...

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: cache::misc/phabricator: switch from iridium to phab1001 backend
..

cache::misc/phabricator: switch from iridium to phab1001 backend

Bug: T163938
Change-Id: I7ec9733d15b777d12637d6becbe28632b379b31e
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/369820/1

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index f89330f..20b9be0 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -96,7 +96,7 @@
   eqiad: 'terbium.eqiad.wmnet'
   phabricator:
 backends:
-  eqiad: 'iridium.eqiad.wmnet'
+  eqiad: 'phab1001.eqiad.wmnet'
   planet:
 backends:
   eqiad: 'planet1001.eqiad.wmnet'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip] Fix highlight display for enhanced mode

2017-08-02 Thread Mooeypoo (Code Review)

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

Change subject: [wip] Fix highlight display for enhanced mode
..

[wip] Fix highlight display for enhanced mode

Bug: T170875
Change-Id: Ibd7d447aba1ae5576ea637a2d5ef06cb3f622b26
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
1 file changed, 53 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/369819/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 42fb5cc..e8fa39c 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -28,6 +28,7 @@
this.filtersViewModel = filtersViewModel;
this.changesListViewModel = changesListViewModel;
this.controller = controller;
+   this.highlightClasses = null;
 
// Events
this.filtersViewModel.connect( this, {
@@ -45,8 +46,8 @@
// We handle our own display/hide of the empty results 
message
.removeClass( 'mw-changeslist-empty' );
 
-   // Set up highlight containers
-   this.setupHighlightContainers( this.$element );
+   // // Set up highlight containers
+   // this.setupHighlightContainers( this.$element );
 
this.setupNewChangesButtonContainer( this.$element );
};
@@ -54,6 +55,22 @@
/* Initialization */
 
OO.inheritClass( mw.rcfilters.ui.ChangesListWrapperWidget, OO.ui.Widget 
);
+
+   /**
+* Get all available highlight classes
+*
+* @return {string[]} An array of available highlight class names
+*/
+   mw.rcfilters.ui.ChangesListWrapperWidget.prototype.getHighlightClasses 
= function () {
+   if ( !this.highlightClasses ) {
+   this.highlightClasses = 
this.filtersViewModel.getItemsSupportingHighlights()
+   .map( function ( filterItem ) {
+   return filterItem.getCssClass();
+   } );
+   }
+
+   return this.highlightClasses;
+   };
 
/**
 * Respond to the highlight feature being toggled on and off
@@ -235,7 +252,9 @@
 * @param {jQuery|string} $content The content of the updated changes 
list
 */

mw.rcfilters.ui.ChangesListWrapperWidget.prototype.setupHighlightContainers = 
function ( $content ) {
-   var uri = new mw.Uri(),
+   var $enhancedCells,
+   widget = this,
+   uri = new mw.Uri(),
highlightClass = 
'mw-rcfilters-ui-changesListWrapperWidget-highlights',
$highlights = $( '' )
.addClass( highlightClass )
@@ -262,13 +281,41 @@
( uri.query.enhanced !== undefined && Number( 
uri.query.enhanced ) ) ||
( uri.query.enhanced === undefined && Number( 
mw.user.options.get( 'usenewrc' ) ) )
) {
-   // Enhanced RC
-   $content.find( 'td.mw-enhanced-rc' )
-   .parent()
+   $enhancedTopPageCell = $content.find( 
'table.mw-enhanced-rc.mw-collapsible' );
+   $enhancedNestedPagesCell = $content.find( 
'td.mw-enhanced-rc-nested' );
+
+   // Enhanced RC highlight containers
+   $enhancedTopPageCell
+   .find( 'tr:first-child' )
.prepend(
$( '' )
.append( $highlights.clone() )
);
+
+debugger;
+   $enhancedNestedPagesCell
+   .before(
+   $( '' )
+   .append( $highlights.clone() )
+   );
+
+   // Go over pages that have sub results
+   // HACK: We really only can collect those by targetting 
the collapsible class
+   $enhancedTopPageCell.each( function () {
+   var collectedClasses = [],
+   $table = $( this );
+   // Go over s and pick up all recognized 
classes
+   widget.getHighlightClasses().forEach( function 
( className ) {
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wmf-config: Improve docs in CommonSettings.php and LocalSett...

2017-08-02 Thread Krinkle (Code Review)

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

Change subject: wmf-config: Improve docs in CommonSettings.php and 
LocalSettings.php header
..

wmf-config: Improve docs in CommonSettings.php and LocalSettings.php header

- CommonSettings: Better explain how this file gets loaded. Specifically how
  it is possible that CommonSettings.php this is the first and only wmf-config
  include from LocalSettings and yet $wmfRealm and $wmfDatacenter are already
  defined somehow. This is because index.php itself is actually a Multiversion
  entry point, and is in charge of loading MediaWiki. And as part of doing so
  it has to load multiversion/MWRealm.php, which defines those globals.

- LocalSettings.php: This is locally created on the deployment host by scap
  in each branch and not committed to Git. It wasn't clear where this came
  from when looking at it. Expand its generated header to include that it
  was managed by Scap and created by said plugin.

Change-Id: Ie87c33a901e9f1bfbb5998c327b942cf52ee6a93
---
M scap/plugins/prep.py
M wmf-config/CommonSettings.php
2 files changed, 15 insertions(+), 5 deletions(-)


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

diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index 68ae25e..ea757ee 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -89,7 +89,9 @@
 cs_file = os.path.join(self.config['deploy_dir'],
'wmf-config', 'CommonSettings.php')
 ls_stub = (
-'https://gerrit.wikimedia.org/r/369818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: keyholder: public keys publicly readable

2017-08-02 Thread Thcipriani (Code Review)

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

Change subject: keyholder: public keys publicly readable
..

keyholder: public keys publicly readable

As we add more identities to keyholder, we're beginning to run up
against the `MaxAuthTries` limit for sshd server. We can get around this
in scap by passing an explicit identityfile for ssh.

Ssh documentation seems to suggest that identityfiles are meant to be
private keys; however, it seems that it is actually reading the public
key files associated with a private key when a private key is passed as
an identityfile. Public keys passed as identityfiles work fine in
openssh.

These public keys are already available to anyone who has read access to
the keyholder proxy sock (everyone with ssh access to tin - which is
how I was able to test the modified scap command). This change just
makes the public read of public keys more explicit.

This change is needed for scap patch in phabricator: D733

Bug: T172333
Change-Id: Ic09e544fd8532785967673c65de905df44bd958a
---
M modules/keyholder/manifests/agent.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/keyholder/manifests/agent.pp 
b/modules/keyholder/manifests/agent.pp
index dc260cf..f7d5eb2 100644
--- a/modules/keyholder/manifests/agent.pp
+++ b/modules/keyholder/manifests/agent.pp
@@ -61,7 +61,7 @@
 show_diff => false,
 owner => 'root',
 group => 'keyholder',
-mode  => '0440',
+mode  => '0444',
 }
 
 # generate the mapping between groups and keys. Used by ssh-agent-proxy

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove all hacky overrides for ORES in labs

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Remove all hacky overrides for ORES in labs
..


Remove all hacky overrides for ORES in labs

ORES is deployed on enough wikis now that we can just have labs
be configured the same as production, it'll be less confusing
that way.

Change-Id: I28e11c671c8e60a034cbabc6933d8aa7d1362415
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 85db239..b3f0e90 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -427,42 +427,6 @@
'wikidataclient' => true,
],
 
-   'wmgUseORES' => [
-   'default' => false,
-   'wikipedia' => true, // T127661
-   ],
-   'wgOresModels' => [
-   'default' => [
-   'damaging' => true,
-   'goodfaith' => false,
-   'reverted' => true,
-   'wp10' => false,
-   ],
-   // This is separate because
-   // it uses the real wgOresWikiId
-   // below.
-   'enwiki' => [
-   'damaging' => true,
-   'goodfaith' => true,
-   'reverted' => false,
-   'wp10' => false,
-   ],
-   'wikipedia' => [
-   'damaging' => true,
-   'goodfaith' => false,
-   'reverted' => false,
-   'wp10' => false,
-   ], // T127661
-   ],
-   'wgOresEnabledNamespaces' => [
-   'default' => [],
-   'enwiki' => [ 0 => true ],
-   ],
-   'wgOresWikiId' => [
-   'default' => 'testwiki',
-   'enwiki' => 'enwiki',
-   ],
-
'wmgWikibaseAllowDataAccessInUserLanguage' => [
'default' => false,
'wikidatawiki' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28e11c671c8e60a034cbabc6933d8aa7d1362415
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove all hacky overrides for ORES in labs

2017-08-02 Thread Catrope (Code Review)

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

Change subject: Remove all hacky overrides for ORES in labs
..

Remove all hacky overrides for ORES in labs

ORES is deployed on enough wikis now that we can just have labs
be configured the same as production, it'll be less confusing
that way.

Change-Id: I28e11c671c8e60a034cbabc6933d8aa7d1362415
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 36 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 85db239..b3f0e90 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -427,42 +427,6 @@
'wikidataclient' => true,
],
 
-   'wmgUseORES' => [
-   'default' => false,
-   'wikipedia' => true, // T127661
-   ],
-   'wgOresModels' => [
-   'default' => [
-   'damaging' => true,
-   'goodfaith' => false,
-   'reverted' => true,
-   'wp10' => false,
-   ],
-   // This is separate because
-   // it uses the real wgOresWikiId
-   // below.
-   'enwiki' => [
-   'damaging' => true,
-   'goodfaith' => true,
-   'reverted' => false,
-   'wp10' => false,
-   ],
-   'wikipedia' => [
-   'damaging' => true,
-   'goodfaith' => false,
-   'reverted' => false,
-   'wp10' => false,
-   ], // T127661
-   ],
-   'wgOresEnabledNamespaces' => [
-   'default' => [],
-   'enwiki' => [ 0 => true ],
-   ],
-   'wgOresWikiId' => [
-   'default' => 'testwiki',
-   'enwiki' => 'enwiki',
-   ],
-
'wmgWikibaseAllowDataAccessInUserLanguage' => [
'default' => false,
'wikidatawiki' => true,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add wikimania2018wiki

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Add wikimania2018wiki
..


Add wikimania2018wiki

Bug: T155038
Change-Id: I5d45522beb4275d871b5f5d79521fa36944cfae3
---
M i18n/wikimediaprojectnames/en.json
M i18n/wikimediaprojectnames/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/i18n/wikimediaprojectnames/en.json 
b/i18n/wikimediaprojectnames/en.json
index cd1efa7..501562e 100644
--- a/i18n/wikimediaprojectnames/en.json
+++ b/i18n/wikimediaprojectnames/en.json
@@ -902,6 +902,7 @@
"project-localized-name-wikimania2015wiki": "Wikimania 2015 Wiki",
"project-localized-name-wikimania2016wiki": "Wikimania 2016 Wiki",
"project-localized-name-wikimania2017wiki": "Wikimania 2017 Wiki",
+   "project-localized-name-wikimania2018wiki": "Wikimania 2018 Wiki",
"project-localized-name-wikimaniateamwiki": "WikimaniaTeam",
"project-localized-name-zerowiki": "Wikipedia Zero"
 }
diff --git a/i18n/wikimediaprojectnames/qqq.json 
b/i18n/wikimediaprojectnames/qqq.json
index 2addfa2..dbaa119 100644
--- a/i18n/wikimediaprojectnames/qqq.json
+++ b/i18n/wikimediaprojectnames/qqq.json
@@ -910,6 +910,7 @@
"project-localized-name-wikimania2015wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2015.wikimedia.org|name=Wikimania
 2015 Wiki|language=en}}",
"project-localized-name-wikimania2016wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2016.wikimedia.org|name=Wikimania
 2016 Wiki|language=en}}",
"project-localized-name-wikimania2017wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2017.wikimedia.org|name=Wikimania
 2017 Wiki|language=en}}",
+   "project-localized-name-wikimania2018wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2018.wikimedia.org|name=Wikimania
 2018 Wiki|language=en}}",
"project-localized-name-wikimaniateamwiki": 
"{{ProjectNameDocumentation|url=https://wikimaniateam.wikimedia.org|name=WikimaniaTeam|language=en}}",
"project-localized-name-zerowiki": 
"{{ProjectNameDocumentation|url=https://zero.wikimedia.org|name=Wikipedia 
Zero|language=en}}\n{{Identical|Wikipedia Zero}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d45522beb4275d871b5f5d79521fa36944cfae3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Renameuser[master]: Output cleanup

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Output cleanup
..


Output cleanup

Change-Id: Icc8a642019d31be5e576ad39fe2f02a0e763947d
---
M renameUserCleanup.php
1 file changed, 138 insertions(+), 68 deletions(-)

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



diff --git a/renameUserCleanup.php b/renameUserCleanup.php
index 6b5a257..4aa8b49 100644
--- a/renameUserCleanup.php
+++ b/renameUserCleanup.php
@@ -32,8 +32,8 @@
 class RenameUserCleanup extends Maintenance {
public function __construct() {
parent::__construct();
-   $this->mDescription = 'Maintenance script to finish incomplete 
rename user, ' .
-   'in particular to reassign edits that were missed';
+   $this->mDescription = 'Maintenance script to finish incomplete 
rename user,'
+   . ' in particular to reassign edits that were missed';
$this->addOption( 'olduser', 'Old user name', true, true );
$this->addOption( 'newuser', 'New user name', true, true );
$this->addOption( 'olduid', 'Old user id in revision records 
(DANGEROUS)', false, true );
@@ -55,36 +55,36 @@
$this->doUpdates( $olduser, $newuser, $newuser->getId() );
$this->doUpdates( $olduser, $newuser, 0 );
 
-   print "Done!\n";
-   exit( 0 );
+   $this->output( "Done!\n" );
}
 
/**
-* @param $olduser User
-* @param $newuser User
+* @param User $olduser
+* @param User $newuser
 */
public function checkUserExistence( $olduser, $newuser ) {
if ( !$newuser->getId() ) {
$this->error( 'No such user: ' . $this->getOption( 
'newuser' ), true );
-   exit( 1 );
}
if ( $olduser->getId() ) {
-   print 'WARNING!!: Old user still exists: ' . 
$this->getOption( 'olduser' ) . "\n";
-   print "proceed anyways? We'll only re-attribute edits 
that have the new user uid (or 0)";
-   print ' or the uid specified by the caller, and the old 
user name.  [N/y]   ';
+   $this->output( 'WARNING!!: Old user still exists: ' . 
$this->getOption( 'olduser' ) . "\n" );
+   $this->output( 'We\'ll only re-attribute edits that 
have the new user uid (or 0) ' );
+   $this->output( 'or the uid specified by the caller, and 
the old user name.' );
+   $this->output( 'Proceed anyway? [N/y] ' );
+
$stdin = fopen( 'php://stdin', 'rt' );
$line = fgets( $stdin );
fclose( $stdin );
+
if ( $line[0] !== 'Y' && $line[0] !== 'y' ) {
-   print "Exiting at user's request\n";
-   exit( 0 );
+   $this->output( "Exiting at users request\n" );
}
}
}
 
/**
-* @param $olduser User
-* @param $newuser User
+* @param User $olduser
+* @param User $newuser
 */
public function checkRenameLog( $olduser, $newuser ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -102,7 +102,9 @@
);
if ( !$result || !$result->numRows() ) {
// try the old format
-   $result = $dbr->select( 'logging', '*',
+   $result = $dbr->select(
+   'logging',
+   '*',
[ 'log_type' => 'renameuser',
'log_action' => 'renameuser',
'log_namespace' => NS_USER,
@@ -111,144 +113,212 @@
__METHOD__
);
if ( !$result || !$result->numRows() ) {
-   print 'No log entry found for a rename of ' . 
$olduser->getName() .
-   ' to ' . $newuser->getName() . ', 
proceed anyways??? [N/y] ';
+   $this->output( 'No log entry found for a rename 
of ' . $olduser->getName() .
+   ' to ' . $newuser->getName() . ', 
proceed anyways? [N/y] ' );
+
$stdin = fopen( 'php://stdin', 'rt' );
$line = fgets( $stdin );
fclose( $stdin );
+
if ( $line[0] !== 'Y' && $line[0] !== 'y' ) {
-   print "Exiting at user's request\n";
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Adjust server default variable names for limit/days

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Adjust server default variable names for limit/days
..


RCFilters: Adjust server default variable names for limit/days

Change-Id: I4a204e1a61516cff505e6e0a71aa702034cea4dc
---
M includes/specials/SpecialRecentchanges.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index 46f7927..6ef75e0 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -196,9 +196,9 @@
$out->addJsConfigVars(
'StructuredChangeFiltersDisplayConfig',
[
-   'maxLimit' => 
(int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
-   'arrayLimit' => 
$this->getConfig()->get( 'RCLinkLimits' ),
-   'arrayDays' => $this->getConfig()->get( 
'RCLinkDays' ),
+   'maxDays' => 
(int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
+   'limitArray' => 
$this->getConfig()->get( 'RCLinkLimits' ),
+   'daysArray' => $this->getConfig()->get( 
'RCLinkDays' ),
]
);
}
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f07d3f1..864e397 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -115,7 +115,7 @@
// we should remove all sticky behavior 
methods completely
// See T172156
// isSticky: true,
-   filters: displayConfig.arrayLimit.map( 
function ( num ) {
+   filters: displayConfig.limitArray.map( 
function ( num ) {
return 
controller._createFilterDataFromNumber( num, num );
} )
},
@@ -128,7 +128,7 @@
validate: $.isNumeric,
range: {
min: 0,
-   max: displayConfig.maxLimit
+   max: displayConfig.maxDays
},
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
numToLabelFunc: function ( i ) {
@@ -143,7 +143,7 @@
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5
// Days
-   ].concat( displayConfig.arrayDays )
+   ].concat( displayConfig.daysArray )
.map( function ( num ) {
return 
controller._createFilterDataFromNumber(
num,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Adjust styling of 'other review tools' button

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Adjust styling of 'other review tools' button
..


RCFilters: Adjust styling of 'other review tools' button

Bug: T172237
Bug: T166919
Change-Id: Id13414274d099c2f9bb151b0b793eff172209929
---
M languages/i18n/en.json
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 497c87b..8f0ebb1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1350,7 +1350,7 @@
"recentchanges-legend-plusminus": "(±123)",
"recentchanges-submit": "Show",
"rcfilters-legend-heading": "List of abbreviations:",
-   "rcfilters-other-review-tools": "Other review tools:",
+   "rcfilters-other-review-tools": "Other review tools",
"rcfilters-group-results-by-page": "Group results by page",
"rcfilters-grouping-title": "Grouping",
"rcfilters-activefilters": "Active filters",
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 7f0d34e..d48d52d 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -7,6 +7,10 @@
.mw-recentchanges-toplinks {
padding: 0 0.5em;
 
+   
.oo-ui-widget-enabled.oo-ui-buttonElement.oo-ui-buttonElement-frameless 
.oo-ui-buttonElement-button {
+   padding: 0 2.5em 0 0.5em;
+   }
+
&-title,
.mw-collapsible-text {
// Same as the legend

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Normalize 'limit' to minimum 0, like the backend ...

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Normalize 'limit' to minimum 0, like the backend does
..


RCFilters: Normalize 'limit' to minimum 0, like the backend does

Bug: T172026
Change-Id: I7b5b0d7ef34b0702a55572591da2a11942e8c5d9
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 16822d8..decab47 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -105,7 +105,7 @@
allowArbitrary: true,
validate: $.isNumeric,
range: {
-   min: 1,
+   min: 0, // The server 
normalizes negative numbers to 0 results
max: 1000
},
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add wikimania2018wiki

2017-08-02 Thread Reedy (Code Review)

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

Change subject: Add wikimania2018wiki
..

Add wikimania2018wiki

Bug: T155038
Change-Id: I5d45522beb4275d871b5f5d79521fa36944cfae3
---
M i18n/wikimediaprojectnames/en.json
M i18n/wikimediaprojectnames/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/i18n/wikimediaprojectnames/en.json 
b/i18n/wikimediaprojectnames/en.json
index cd1efa7..501562e 100644
--- a/i18n/wikimediaprojectnames/en.json
+++ b/i18n/wikimediaprojectnames/en.json
@@ -902,6 +902,7 @@
"project-localized-name-wikimania2015wiki": "Wikimania 2015 Wiki",
"project-localized-name-wikimania2016wiki": "Wikimania 2016 Wiki",
"project-localized-name-wikimania2017wiki": "Wikimania 2017 Wiki",
+   "project-localized-name-wikimania2018wiki": "Wikimania 2018 Wiki",
"project-localized-name-wikimaniateamwiki": "WikimaniaTeam",
"project-localized-name-zerowiki": "Wikipedia Zero"
 }
diff --git a/i18n/wikimediaprojectnames/qqq.json 
b/i18n/wikimediaprojectnames/qqq.json
index 2addfa2..dbaa119 100644
--- a/i18n/wikimediaprojectnames/qqq.json
+++ b/i18n/wikimediaprojectnames/qqq.json
@@ -910,6 +910,7 @@
"project-localized-name-wikimania2015wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2015.wikimedia.org|name=Wikimania
 2015 Wiki|language=en}}",
"project-localized-name-wikimania2016wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2016.wikimedia.org|name=Wikimania
 2016 Wiki|language=en}}",
"project-localized-name-wikimania2017wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2017.wikimedia.org|name=Wikimania
 2017 Wiki|language=en}}",
+   "project-localized-name-wikimania2018wiki": 
"{{ProjectNameDocumentation|url=https://wikimania2018.wikimedia.org|name=Wikimania
 2018 Wiki|language=en}}",
"project-localized-name-wikimaniateamwiki": 
"{{ProjectNameDocumentation|url=https://wikimaniateam.wikimedia.org|name=WikimaniaTeam|language=en}}",
"project-localized-name-zerowiki": 
"{{ProjectNameDocumentation|url=https://zero.wikimedia.org|name=Wikipedia 
Zero|language=en}}\n{{Identical|Wikipedia Zero}}"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d45522beb4275d871b5f5d79521fa36944cfae3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove wikimania2015wiki from wmgCentralAuthLoginIcon

2017-08-02 Thread Reedy (Code Review)

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

Change subject: Remove wikimania2015wiki from wmgCentralAuthLoginIcon
..

Remove wikimania2015wiki from wmgCentralAuthLoginIcon

Change-Id: I6beb305dc1d174db61d44719606583ca65bfcffd
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5657220..d997da4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12422,7 +12422,6 @@
'specieswiki' => '/srv/mediawiki/static/images/sul/wikispecies.png',
'incubatorwiki' => '/srv/mediawiki/static/images/sul/incubatorwiki.png',
'wikivoyage' => '/srv/mediawiki/static/images/sul/wikivoyage.png',
-   'wikimania2015wiki' => '/srv/mediawiki/static/images/sul/wikimania.png',
'loginwiki' => '/srv/mediawiki/static/images/sul/foundation.png',
'brwikimedia' => '/srv/mediawiki/static/images/sul/foundation.png',
 ],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Make dropdown menus appear above VisualEditor toolbar

2017-08-02 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369813 )

Change subject: Make dropdown menus appear above VisualEditor toolbar
..

Make dropdown menus appear above VisualEditor toolbar

Bug: T171840
Change-Id: I36dc747ec2c41816df371aa5e1d4b81dff24a7dd
---
M components/tabs.less
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/13/369813/1

diff --git a/components/tabs.less b/components/tabs.less
index 4cc4625..803bab7 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -174,8 +174,8 @@
box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
text-align: left;
display: none;
-   // overlap indicators (which has z-index 1, too)
-   z-index: 1;
+   // Menus must overlap indicators (z-index: 1) and VisualEditor toolbar 
(z-index: 2)
+   z-index: 2;
 }
 
 /* Enable forcing showing of the menu for accessibility */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36dc747ec2c41816df371aa5e1d4b81dff24a7dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Adjust styling of 'other review tools' button

2017-08-02 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Adjust styling of 'other review tools' button
..

RCFilters: Adjust styling of 'other review tools' button

Bug: T172237
Bug: T166919
Change-Id: Id13414274d099c2f9bb151b0b793eff172209929
---
M languages/i18n/en.json
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/369812/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 497c87b..8f0ebb1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1350,7 +1350,7 @@
"recentchanges-legend-plusminus": "(±123)",
"recentchanges-submit": "Show",
"rcfilters-legend-heading": "List of abbreviations:",
-   "rcfilters-other-review-tools": "Other review tools:",
+   "rcfilters-other-review-tools": "Other review tools",
"rcfilters-group-results-by-page": "Group results by page",
"rcfilters-grouping-title": "Grouping",
"rcfilters-activefilters": "Active filters",
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 7f0d34e..d48d52d 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -7,6 +7,10 @@
.mw-recentchanges-toplinks {
padding: 0 0.5em;
 
+   
.oo-ui-widget-enabled.oo-ui-buttonElement.oo-ui-buttonElement-frameless 
.oo-ui-buttonElement-button {
+   padding: 0 2.5em 0 0.5em;
+   }
+
&-title,
.mw-collapsible-text {
// Same as the legend

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id13414274d099c2f9bb151b0b793eff172209929
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add copyright info for Wikidata API"

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Add copyright info for Wikidata API"
..


Revert "Add copyright info for Wikidata API"

This reverts commit 06fe762ab983c78d2d4434335cc543bcd5496ef4.

Change-Id: I954c302d95ee2b1eb7aaff06f2b41d41ede0a0a4
---
M wmf-config/Wikibase-production.php
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index fd06760..714fbd4 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -111,13 +111,6 @@
$wgWBQualityConstraintsEnableConstraintsImportFromStatements = true;
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
$wgWBRepoSettings['writeFullEntityIdColumn'] = true;
-
-   // T112606
-   $wgRightsPage = 'Wikidata:Copyright';
-   $wgRightsText = 'All structured data from the main and property 
namespace is available under ' .
-   'the Creative Commons CC0 License; text in the other namespaces 
is available under ' .
-   'the Creative Commons Attribution-ShareAlike License; 
additional terms may apply.';
-   $wgRightsUrl = null;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I954c302d95ee2b1eb7aaff06f2b41d41ede0a0a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.12]: Fix incorrect i18n keys in human relevance survey

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Fix incorrect i18n keys in human relevance survey
..


Fix incorrect i18n keys in human relevance survey

Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 3203f81..a4b72f5 100644
--- a/extension.json
+++ b/extension.json
@@ -206,7 +206,7 @@
"wikimediaevents-humanrel-yes",
"wikimediaevents-humanrel-no",
"wikimediaevents-humanrel-unsure",
-   "wikimediaevents-huamnrel-privacy-statement"
+   "wikimediaevents-humanrel-privacy-statement"
],
"styles": [
"ext.wikimediaEvents.humanSearchRelevance.css"
diff --git a/i18n/en.json b/i18n/en.json
index ac297ed..ae02eec 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,5 +21,5 @@
"wikimediaevents-humanrel-yes": "Yes",
"wikimediaevents-humanrel-no": "No",
"wikimediaevents-humanrel-unsure": "I don't know",
-   "wikimediaevents-huamnrel-privacy-statement": "Privacy Statement"
+   "wikimediaevents-humanrel-privacy-statement": "Privacy Statement"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5ac6013..7c96ef5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -23,5 +23,5 @@
"wikimediaevents-humanrel-yes": "Positive answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|Yes}}",
"wikimediaevents-humanrel-no": "Negative answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|No}}",
"wikimediaevents-humanrel-unsure": "Indecisive answer to articles 
relevance to a search query.\n\nSee also: 
{{msg-mw|wikimediaevents-humanrel-question-a}}, 
{{msg-mw|wikimediaevents-humanrel-yes}}, 
{{msg-mw|wikimediaevents-humanrel-no}}",
-   "wikimediaevents-huamnrel-privacy-statement": "Text for link to the 
survey privacy statement."
+   "wikimediaevents-humanrel-privacy-statement": "Text for link to the 
survey privacy statement."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add copyright info for Wikidata API"

2017-08-02 Thread EBernhardson (Code Review)

Hello Aude, Hoo man, Ladsgroup, Florianschmidtwelzow, jenkins-bot, Anomie,

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

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

to review the following change.


Change subject: Revert "Add copyright info for Wikidata API"
..

Revert "Add copyright info for Wikidata API"

This reverts commit 06fe762ab983c78d2d4434335cc543bcd5496ef4.

Change-Id: I954c302d95ee2b1eb7aaff06f2b41d41ede0a0a4
---
M wmf-config/Wikibase-production.php
1 file changed, 0 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index fd06760..714fbd4 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -111,13 +111,6 @@
$wgWBQualityConstraintsEnableConstraintsImportFromStatements = true;
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
$wgWBRepoSettings['writeFullEntityIdColumn'] = true;
-
-   // T112606
-   $wgRightsPage = 'Wikidata:Copyright';
-   $wgRightsText = 'All structured data from the main and property 
namespace is available under ' .
-   'the Creative Commons CC0 License; text in the other namespaces 
is available under ' .
-   'the Creative Commons Attribution-ShareAlike License; 
additional terms may apply.';
-   $wgRightsUrl = null;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I954c302d95ee2b1eb7aaff06f2b41d41ede0a0a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Normalize 'limit' to minimum 0, like the backend ...

2017-08-02 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Normalize 'limit' to minimum 0, like the backend does
..

RCFilters: Normalize 'limit' to minimum 0, like the backend does

Bug: T172026
Change-Id: I7b5b0d7ef34b0702a55572591da2a11942e8c5d9
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/369810/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 16822d8..decab47 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -105,7 +105,7 @@
allowArbitrary: true,
validate: $.isNumeric,
range: {
-   min: 1,
+   min: 0, // The server 
normalizes negative numbers to 0 results
max: 1000
},
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b5b0d7ef34b0702a55572591da2a11942e8c5d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.12]: Update url for survey privacy statement

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Update url for survey privacy statement
..


Update url for survey privacy statement

Change-Id: I1c7974d6f83e2a3e67786b530d4d4c62e85906de
(cherry picked from commit 1ac47de7af8319ca99b61b03f2ae71a7130f32df)
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
4 files changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/extension.json b/extension.json
index 93cd3a4..3203f81 100644
--- a/extension.json
+++ b/extension.json
@@ -205,7 +205,8 @@
"wikimediaevents-humanrel-question-d",
"wikimediaevents-humanrel-yes",
"wikimediaevents-humanrel-no",
-   "wikimediaevents-humanrel-unsure"
+   "wikimediaevents-humanrel-unsure",
+   "wikimediaevents-huamnrel-privacy-statement"
],
"styles": [
"ext.wikimediaEvents.humanSearchRelevance.css"
diff --git a/i18n/en.json b/i18n/en.json
index 928a796..ac297ed 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,5 +20,6 @@
"wikimediaevents-humanrel-question-d": "If someone searched for '$1', 
would they want to read this article?",
"wikimediaevents-humanrel-yes": "Yes",
"wikimediaevents-humanrel-no": "No",
-   "wikimediaevents-humanrel-unsure": "I don't know"
+   "wikimediaevents-humanrel-unsure": "I don't know",
+   "wikimediaevents-huamnrel-privacy-statement": "Privacy Statement"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index cc43957..5ac6013 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,5 +22,6 @@
"wikimediaevents-humanrel-question-d": "Question posed to readers of 
article pages about the relevance of a search query to the article they are 
reading.",
"wikimediaevents-humanrel-yes": "Positive answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|Yes}}",
"wikimediaevents-humanrel-no": "Negative answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|No}}",
-   "wikimediaevents-humanrel-unsure": "Indecisive answer to articles 
relevance to a search query.\n\nSee also: 
{{msg-mw|wikimediaevents-humanrel-question-a}}, 
{{msg-mw|wikimediaevents-humanrel-yes}}, {{msg-mw|wikimediaevents-humanrel-no}}"
+   "wikimediaevents-humanrel-unsure": "Indecisive answer to articles 
relevance to a search query.\n\nSee also: 
{{msg-mw|wikimediaevents-humanrel-question-a}}, 
{{msg-mw|wikimediaevents-humanrel-yes}}, 
{{msg-mw|wikimediaevents-humanrel-no}}",
+   "wikimediaevents-huamnrel-privacy-statement": "Text for link to the 
survey privacy statement."
 }
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index eb3fb7f..4410588 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -280,9 +280,9 @@
 
content.append( buttons.$element );
content.append( $( '' ).append( $( '', {
-   href: 
'//wikimediafoundation.org/wiki/Privacy_policy',
+   href: 
'//wikimediafoundation.org/wiki/Search_Relevance_Survey_Privacy_Statement',
target: '_blank'
-   } ).text( 'Privacy Policy' ) ) );
+   } ).text( mw.message( 
'wikimediaevents-humanrel-privacy-statement' ) ) ) );
 
notification = mw.notification.notify( content, {
autoHide: true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c7974d6f83e2a3e67786b530d4d4c62e85906de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.12]: Record interleaved search teams if available

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Record interleaved search teams if available
..


Record interleaved search teams if available

If an interleaved search was performed record the page id's associated
with each team in the searchResultPage event. This allows analysis to
match up click/visit events with the teams they belong to and tally up
which team 'won'.

Bug: T150032
Change-Id: Iddbc21d23ac9f85fbedcf73a9c484310eaf4f21a
(cherry picked from commit 50dc9df1a6fac0c9501f1896ff6052d2f9db96cf)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 07f7849..d88358a 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -755,6 +755,13 @@
serpExtras.iw = iwResultSet;
}
 
+   // Interleaved AB testing. This records the page id's 
that belong
+   // to each team, which can be matched up to the 
articleId property
+   // of click/visitPage events.
+   if ( mw.config.exists( 'wgCirrusSearchTeamDraft' ) ) {
+   serpExtras.teamDraft = mw.config.get( 
'wgCirrusSearchTeamDraft' );
+   }
+
params = {
query: mw.config.get( 'searchTerm' ),
hitsReturned: $( '.results-info' ).data( 
'mw-num-results-total' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddbc21d23ac9f85fbedcf73a9c484310eaf4f21a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Adding RTL database list for project with default RTL languages

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Adding RTL database list for project with default RTL languages
..


Adding RTL database list for project with default RTL languages

Bug: T172305
Change-Id: Ie03d2291715851e1034d9de16acabbd6a7fbf964
---
A dblists/rtl.dblist
A docroot/noc/conf/rtl.dblist
M wmf-config/CommonSettings.php
3 files changed, 55 insertions(+), 1 deletion(-)

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



diff --git a/dblists/rtl.dblist b/dblists/rtl.dblist
new file mode 100644
index 000..ee872aa
--- /dev/null
+++ b/dblists/rtl.dblist
@@ -0,0 +1,52 @@
+arcwiki
+arwiki
+arwikibooks
+arwikimedia
+arwikinews
+arwikiquote
+arwikisource
+arwikiversity
+arwiktionary
+arzwiki
+azbwiki
+ckbwiki
+dvwiki
+dvwiktionary
+fawiki
+fawikibooks
+fawikinews
+fawikiquote
+fawikisource
+fawikivoyage
+fawiktionary
+glkwiki
+hawiki
+hawiktionary
+hewiki
+hewikibooks
+hewikinews
+hewikiquote
+hewikisource
+hewikivoyage
+hewiktionary
+ladwiki
+mznwiki
+pnbwiki
+pnbwiktionary
+pswiki
+pswikibooks
+pswiktionary
+sdwiki
+sdwikinews
+sdwiktionary
+ugwiki
+ugwikibooks
+ugwikiquote
+ugwiktionary
+urwiki
+urwikibooks
+urwikiquote
+urwiktionary
+yiwiki
+yiwikisource
+yiwiktionary
diff --git a/docroot/noc/conf/rtl.dblist b/docroot/noc/conf/rtl.dblist
new file mode 12
index 000..9e2e25b
--- /dev/null
+++ b/docroot/noc/conf/rtl.dblist
@@ -0,0 +1 @@
+../../../dblists/rtl.dblist
\ No newline at end of file
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0fcbf52..b81093d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -170,6 +170,7 @@
# Get configuration from SiteConfiguration object
require "$wmfConfigDir/InitialiseSettings.php";
 
+   # Collect all the dblist tags associated with this wiki
$wikiTags = [];
# When updating list please run ./docroot/noc/createTxtFileSymlinks.sh
# Expand computed dblists with ./multiversion/bin/expanddblist
@@ -181,7 +182,7 @@
'wikipedia-english',
'nowikidatadescriptiontaglines',
'related-articles-footer-blacklisted-skins',
-   'top6-wikipedia'
+   'top6-wikipedia', 'rtl'
] as $tag ) {
$dblist = MWWikiversions::readDbListFile( $tag );
if ( in_array( $wgDBname, $dblist ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie03d2291715851e1034d9de16acabbd6a7fbf964
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add copyright info for Wikidata API

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Add copyright info for Wikidata API
..


Add copyright info for Wikidata API

Bug: T112606
Change-Id: Id2a6931392831c0a2312130908003e5637887e36
---
M wmf-config/Wikibase-production.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 714fbd4..fd06760 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -111,6 +111,13 @@
$wgWBQualityConstraintsEnableConstraintsImportFromStatements = true;
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
$wgWBRepoSettings['writeFullEntityIdColumn'] = true;
+
+   // T112606
+   $wgRightsPage = 'Wikidata:Copyright';
+   $wgRightsText = 'All structured data from the main and property 
namespace is available under ' .
+   'the Creative Commons CC0 License; text in the other namespaces 
is available under ' .
+   'the Creative Commons Attribution-ShareAlike License; 
additional terms may apply.';
+   $wgRightsUrl = null;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2a6931392831c0a2312130908003e5637887e36
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: clientlib refactor

2017-08-02 Thread Rush (Code Review)

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

Change subject: openstack: clientlib refactor
..

openstack: clientlib refactor

Bug: T171494
Change-Id: I491a04889097d286c551d2ca16d719b5efc8a604
---
M hieradata/labs.yaml
M modules/labstore/manifests/fileserver/exports.pp
M modules/openstack/manifests/keystonechecks.pp
A modules/openstack2/files/clientlib/mwopenstackclients.py
R modules/openstack2/manifests/clientlib.pp
A modules/profile/manifests/openstack/base/clientlib.pp
A modules/profile/manifests/openstack/labtest/clientlib.pp
A modules/profile/manifests/openstack/labtestn/clientlib.pp
A modules/profile/manifests/openstack/main/clientlib.pp
M modules/role/manifests/horizon.pp
M modules/role/manifests/labs/nfs/secondary.pp
M modules/role/manifests/labs/openstack/keystone/server.pp
M modules/role/manifests/labs/openstack/nova/controller.pp
M modules/role/manifests/labs/openstack/nova/manager.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
M modules/role/manifests/labs/shinken.pp
M modules/role/manifests/toollabs/clush/master.pp
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtest/web.pp
A modules/role/manifests/wmcs/openstack/labtest/wikitech.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/labtestn/web.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/net.pp
M modules/role/manifests/wmcs/openstack/main/web.pp
M modules/role/manifests/wmcs/openstack/main/wikitech.pp
M modules/shinken/manifests/shinkengen.pp
27 files changed, 231 insertions(+), 34 deletions(-)


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

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 0d265da..d6564be3 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -17,6 +17,7 @@
   recursor: 'labs-recursor0.wikimedia.org'
   recursor_secondary: 'labs-recursor1.wikimedia.org'
 
+profile::openstack::main::version: 'liberty'
 profile::openstack::base::region: "%{::site}"
 profile::openstack::main::nova_controller: 'labcontrol1001.wikimedia.org'
 profile::openstack::base::observer_user: 'novaobserver'
diff --git a/modules/labstore/manifests/fileserver/exports.pp 
b/modules/labstore/manifests/fileserver/exports.pp
index e932db8..aa3869c 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -52,7 +52,6 @@
 }
 
 
-include ::openstack::clientlib
 file { '/usr/local/bin/nfs-exportd':
 owner   => 'root',
 group   => 'root',
diff --git a/modules/openstack/manifests/keystonechecks.pp 
b/modules/openstack/manifests/keystonechecks.pp
index 7864031..7b3cef8 100644
--- a/modules/openstack/manifests/keystonechecks.pp
+++ b/modules/openstack/manifests/keystonechecks.pp
@@ -4,7 +4,6 @@
 #
 # This also checks the functionality of the keystone API generally.
 class openstack::keystonechecks() {
-include ::openstack::clientlib
 
 # Script to check all keystone projects for a given user and role
 file { '/usr/local/bin/check_keystone_roles.py':
diff --git a/modules/openstack2/files/clientlib/mwopenstackclients.py 
b/modules/openstack2/files/clientlib/mwopenstackclients.py
new file mode 100644
index 000..68d8c54
--- /dev/null
+++ b/modules/openstack2/files/clientlib/mwopenstackclients.py
@@ -0,0 +1,138 @@
+import os
+import yaml
+
+import glanceclient
+from keystoneclient.auth.identity import generic
+from keystoneclient import session as keystone_session
+from keystoneclient.v3 import client as keystone_client
+from novaclient import client as nova_client
+
+
+class Clients(object):
+# envfile should be a puppetized environment file like observerenv.sh.
+#
+#  If envfile is not specified, specific creds can be passed in as
+#  username, password, url, project args.  Failing that we fall
+#  back on the environment.
+def __init__(self,
+ envfile="",
+ username="",
+ password="",
+ url="",
+ project=""):
+self.sessions = {}
+self.keystoneclients = {}
+self.novaclients = {}
+self.glanceclients = {}
+
+if envfile:
+if username or password or url or project:
+raise Exception("envfile is incompatible with specific args")
+
+with open(envfile) as f:
+env = yaml.safe_load(f)
+self.username = env['OS_USERNAME']
+self.password = env['OS_PASSWORD']
+self.url = env['OS_AUTH_URL']
+self.project = env['OS_TENANT_NAME']
+else:
+if username:
+self.username = username
+else:
+self.username =

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: phpcs for refresh-dblist

2017-08-02 Thread Reedy (Code Review)

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

Change subject: phpcs for refresh-dblist
..

phpcs for refresh-dblist

Change-Id: Ida8f517e6f8071cbae5eae13edbe8494afb7e8a3
---
M refresh-dblist
1 file changed, 45 insertions(+), 42 deletions(-)


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

diff --git a/refresh-dblist b/refresh-dblist
index 6bdff17..e402571 100755
--- a/refresh-dblist
+++ b/refresh-dblist
@@ -30,25 +30,25 @@
s7.dblist
 */
 
-require_once( __DIR__ . '/multiversion/MWRealm.php' );
-require_once( __DIR__ . '/multiversion/defines.php' );
+require_once __DIR__ . '/multiversion/MWRealm.php';
+require_once __DIR__ . '/multiversion/defines.php';
 
 $base = MEDIAWIKI_STAGING_DIR;
 
 $defaultCluster = 's3';
-$clusterOverrides = loadClusterList(getRealmSpecificFilename( 
MEDIAWIKI_STAGING_DIR . '/wmf-config/db.php'));
-$clusterAssignments = array();
+$clusterOverrides = loadClusterList( getRealmSpecificFilename( 
MEDIAWIKI_STAGING_DIR . '/wmf-config/db.php' ) );
+$clusterAssignments = [];
 
 $dbList = $wmfRealm === 'labs' ? 'all-labs' : 'all';
 $all = MWWikiversions::readDbListFile( $dbList );
-listOut('all', $all, false);
-printf("%d wikis listed in " . 
basename(getRealmSpecificFilename(MEDIAWIKI_DBLIST_DIR . "/all.dblist")) . 
"...\n", count($all));
+listOut( 'all', $all, false );
+printf( "%d wikis listed in " . basename(getRealmSpecificFilename( 
MEDIAWIKI_DBLIST_DIR . "/all.dblist" ) ) . "...\n", count( $all ) );
 
 $special = MWWikiversions::readDbListFile( 'special' );
-listOut('special', $special, false);
-printf("%d special wikis to be exempted from wikipedia group...\n", 
count($special));
+listOut( 'special', $special, false );
+printf( "%d special wikis to be exempted from wikipedia group...\n", count( 
$special ) );
 
-$suffixes = array(
+$suffixes = [
"wiki" => "wikipedia",
"wikinews" => "wikinews",
"wikibooks" => "wikibooks",
@@ -57,81 +57,84 @@
"wiktionary" => "wiktionary",
"wikimedia" => "wikimedia",
"wikiversity" => "wikiversity",
-   "wikivoyage" => "wikivoyage" );
+   "wikivoyage" => "wikivoyage" 
+];
 
-$groups = array();
-$specialMatch = array();
+$groups = [];
+$specialMatch = p[;
 
-foreach ($all as $wiki) {
-   if (isset($clusterOverrides[$wiki])) {
+foreach ( $all as $wiki ) {
+   if ( isset( $clusterOverrides[$wiki] ) ) {
$cluster = $clusterOverrides[$wiki];
} else {
$cluster = $defaultCluster;
}
$clusterAssignments[$cluster][] = $wiki;
 
-   if (in_array($wiki, $special)) {
+   if ( in_array( $wiki, $special ) ) {
$specialMatch[] = $wiki;
continue;
}
-   foreach ($suffixes as $suffix => $group) {
-   if (substr($wiki, -strlen($suffix)) == $suffix) {
+   foreach ( $suffixes as $suffix => $group ) {
+   if ( substr( $wiki, -strlen( $suffix ) ) == $suffix ) {
$groups[$group][] = $wiki;
continue 2;
}
}
-   printf("Warning: wiki '%s' matches no known group.\n", $wiki);
+   printf( "Warning: wiki '%s' matches no known group.\n", $wiki );
 }
 
-if (count($special) != count($specialMatch)) {
-   printf("Warning: expected %d special wikis, matched %d.\n",
-   count($special), count($specialMatch));
+if ( count( $special ) != count( $specialMatch ) ) {
+   printf( "Warning: expected %d special wikis, matched %d.\n",
+   count( $special ),
+   count( $specialMatch )
+   );
 }
 
-foreach ($groups as $group => $list) {
-   listOut($group, $list);
+foreach ( $groups as $group => $list ) {
+   listOut( $group, $list );
 }
 
 echo "Writing out db cluster assignments...\n";
 
-foreach ($clusterAssignments as $cluster => $list) {
-   listOut($cluster, $list);
+foreach ( $clusterAssignments as $cluster => $list ) {
+   listOut( $cluster, $list );
 }
 
 echo "Done.\n";
 
-function loadClusterList($file) {
+function loadClusterList( $file ) {
$wgDBname = $wgDBuser = $wgDBpassword = '';
include( $file );
 
return $wgLBFactoryConf['sectionsByDB'];
 }
 
-function listOut($group, $list, $print = true) {
+function listOut( $group, $list, $print = true ) {
global $base;
 
-   $filename = getRealmSpecificFilename(MEDIAWIKI_DBLIST_DIR . 
"/$group.dblist");
+   $filename = getRealmSpecificFilename( MEDIAWIKI_DBLIST_DIR . 
"/$group.dblist" );
if ( $print ) {
-   printf("Listing %d wikis in %s...\n", count($list), $filename);
+   printf( "Listing %d wikis in %s...\n", count( $list ), 
$filename );
}
 
-   $out = fopen("$filename.new", "xt");
-   if ($out) {
-   sort($list);
-   foreach

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Restore non-mangled anchors in API help in all cases

2017-08-02 Thread Anomie (Code Review)

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

Change subject: Restore non-mangled anchors in API help in all cases
..

Restore non-mangled anchors in API help in all cases

Prior to Id304010a, the API help included non-mangled anchors even when
$wgExperimentalHtmlIds was false. This was lost in Id304010a when the
new $wgFragmentMode is [ 'legacy' ], as is the default, despite the loss
being pointed out multiple times in code review.

Change-Id: Ibcb86deb4e3ea2131211f184f46960e5ad390212
---
M includes/api/ApiMain.php
1 file changed, 12 insertions(+), 3 deletions(-)


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

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 6468235..fbe4d92 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1933,14 +1933,18 @@
 
$id = Sanitizer::escapeIdForAttribute( 
'main/datatypes', Sanitizer::ID_PRIMARY );
$idFallback = Sanitizer::escapeIdForAttribute( 
'main/datatypes', Sanitizer::ID_FALLBACK );
-
-   $help['datatypes'] .= Linker::makeHeadline( min( 6, 
$level ),
+   $headline = Linker::makeHeadline( min( 6, $level ),
' class="apihelp-header"',
$id,
$header,
'',
$idFallback
);
+   // Ensure we have a sane anchor
+   if ( $id !== 'main/datatypes' && $idFallback !== 
'main/datatypes' ) {
+   $headline = '' . 
$headline;
+   }
+   $help['datatypes'] .= $headline;
$help['datatypes'] .= $this->msg( 'api-help-datatypes' 
)->parseAsBlock();
if ( !isset( $tocData['main/datatypes'] ) ) {
$tocnumber[$level]++;
@@ -1957,13 +1961,18 @@
$header = $this->msg( 'api-credits-header' )->parse();
$id = Sanitizer::escapeIdForAttribute( 'main/credits', 
Sanitizer::ID_PRIMARY );
$idFallback = Sanitizer::escapeIdForAttribute( 
'main/credits', Sanitizer::ID_FALLBACK );
-   $help['credits'] .= Linker::makeHeadline( min( 6, 
$level ),
+   $headline = Linker::makeHeadline( min( 6, $level ),
' class="apihelp-header"',
$id,
$header,
'',
$idFallback
);
+   // Ensure we have a sane anchor
+   if ( $id !== 'main/credits' && $idFallback !== 
'main/credits' ) {
+   $headline = '' . 
$headline;
+   }
+   $help['credits'] .= $headline;
$help['credits'] .= $this->msg( 'api-credits' 
)->useDatabase( false )->parseAsBlock();
if ( !isset( $tocData['main/credits'] ) ) {
$tocnumber[$level]++;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcb86deb4e3ea2131211f184f46960e5ad390212
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSExtendedSearch: Fixed pseudo protocol issue with external ...

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: BSExtendedSearch: Fixed pseudo protocol issue with external 
files
..


BSExtendedSearch: Fixed pseudo protocol issue with external files

This stops the indexing process to crash if users link to resources
that can not be handled by SplFileInfo

Change-Id: I9c9a861860fb91afe504b59efdc72ea463b2db76
---
M ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php 
b/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
index ace6401..4b93e8b 100644
--- a/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
+++ b/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
@@ -92,7 +92,16 @@
$path = urldecode( $document->el_to );
$path = str_replace( "file:///", "", $path );
$fileInfo = new SplFileInfo( $path );
-   if ( !$fileInfo->isFile() ) continue;
+
+   //As we index all kinds of user provided urls here 
there might be
+   //cases that break SplFileInfo (e.g. 'onenote:' pseudo 
protocol)
+   try {
+   if ( !$fileInfo->isFile() ) continue;
+   }
+   catch( Exception $e ) {
+   wfDebugLog( 'ExtendedSearch', __METHOD__ . ': ' 
. $e->getMessage() );
+   continue;
+   }
 
$filename = explode( '/', $path );
$filename = array_pop( $filename );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c9a861860fb91afe504b59efdc72ea463b2db76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtendedSearch: Fixed pseudo protocol issue with external ...

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: BSExtendedSearch: Fixed pseudo protocol issue with external 
files
..


BSExtendedSearch: Fixed pseudo protocol issue with external files

This stops the indexing process to crash if users link to resources
that can not be handled by SplFileInfo

Change-Id: I9c9a861860fb91afe504b59efdc72ea463b2db76
---
M ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php 
b/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
index ace6401..4b93e8b 100644
--- a/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
+++ b/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
@@ -92,7 +92,16 @@
$path = urldecode( $document->el_to );
$path = str_replace( "file:///", "", $path );
$fileInfo = new SplFileInfo( $path );
-   if ( !$fileInfo->isFile() ) continue;
+
+   //As we index all kinds of user provided urls here 
there might be
+   //cases that break SplFileInfo (e.g. 'onenote:' pseudo 
protocol)
+   try {
+   if ( !$fileInfo->isFile() ) continue;
+   }
+   catch( Exception $e ) {
+   wfDebugLog( 'ExtendedSearch', __METHOD__ . ': ' 
. $e->getMessage() );
+   continue;
+   }
 
$filename = explode( '/', $path );
$filename = array_pop( $filename );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c9a861860fb91afe504b59efdc72ea463b2db76
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSExtendedSearch: Fixed pseudo protocol issue with external ...

2017-08-02 Thread Mglaser (Code Review)

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

Change subject: BSExtendedSearch: Fixed pseudo protocol issue with external 
files
..

BSExtendedSearch: Fixed pseudo protocol issue with external files

This stops the indexing process to crash if users link to resources
that can not be handled by SplFileInfo

Change-Id: I9c9a861860fb91afe504b59efdc72ea463b2db76
---
M ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
1 file changed, 10 insertions(+), 1 deletion(-)


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

diff --git a/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php 
b/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
index ace6401..4b93e8b 100644
--- a/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
+++ b/ExtendedSearch/includes/BuildIndex/BuildIndexMwLinked.class.php
@@ -92,7 +92,16 @@
$path = urldecode( $document->el_to );
$path = str_replace( "file:///", "", $path );
$fileInfo = new SplFileInfo( $path );
-   if ( !$fileInfo->isFile() ) continue;
+
+   //As we index all kinds of user provided urls here 
there might be
+   //cases that break SplFileInfo (e.g. 'onenote:' pseudo 
protocol)
+   try {
+   if ( !$fileInfo->isFile() ) continue;
+   }
+   catch( Exception $e ) {
+   wfDebugLog( 'ExtendedSearch', __METHOD__ . ': ' 
. $e->getMessage() );
+   continue;
+   }
 
$filename = explode( '/', $path );
$filename = array_pop( $filename );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c9a861860fb91afe504b59efdc72ea463b2db76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Bring back anchorencode and locutus dependency

2017-08-02 Thread BearND (Code Review)

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

Change subject: Bring back anchorencode and locutus dependency
..

Bring back anchorencode and locutus dependency

This is in preparation for Iebf446c2. When using the action API
instead of mobileview redirects.tofragment is not encoded.
While this may be fine eventually, once Parsoid implements T152540.
It's a bit early for now. Once Parsoid also implements T152540
the usage of anchorencode can be removed and this commit could
be reverted.

Bug: T103362
Change-Id: I7fc075d8626c07424662265226ad7f13d582ed7d
---
A lib/anchorencode.js
M package.json
A test/lib/anchorencode/anchorencode-test.js
3 files changed, 67 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/05/369805/1

diff --git a/lib/anchorencode.js b/lib/anchorencode.js
new file mode 100644
index 000..906f883
--- /dev/null
+++ b/lib/anchorencode.js
@@ -0,0 +1,25 @@
+'use strict';
+
+const urlencode = require('locutus/php/url/urlencode');
+
+/**
+ * Encodes an input string so that it can be used as an HTML anchor id
+ * (e.g. for a section in a page: ).
+ * See 
https://www.mediawiki.org/wiki/Manual:PAGENAMEE_encoding#Encodings_compared
+ * https://www.mediawiki.org/wiki/Special:Code/MediaWiki/16279
+ * core/include/parser/CoreParserFunctions.php
+ * https://phabricator.wikimedia.org/T9059
+ * https://gerrit.wikimedia.org/r/#/c/226032/
+ * @param {!string} input the input string (usually the heading text of a 
section heading)
+ * @return {!string} the sanitized version of the input string so it can be 
used as an anchor.
+ */
+function anchorencode(input) {
+const id = input.replace(/\s+/g, '_');
+return urlencode(id)
+.replace(/%3A/g, ':')
+.replace(/%/g, '.');
+}
+
+module.exports = {
+anchorencode
+};
diff --git a/package.json b/package.json
index ace1ab6..6dbcb37 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
 "express": "^4.14.0",
 "js-yaml": "^3.7.0",
 "mediawiki-title": "^0.6.3",
+"locutus": "^2.0.5",
 "preq": "^0.5.1",
 "service-runner": "^2.2.5",
 "swagger-router": "^0.5.5",
diff --git a/test/lib/anchorencode/anchorencode-test.js 
b/test/lib/anchorencode/anchorencode-test.js
new file mode 100644
index 000..b2eedd5
--- /dev/null
+++ b/test/lib/anchorencode/anchorencode-test.js
@@ -0,0 +1,41 @@
+'use strict';
+
+const assert = require('../../utils/assert.js');
+const a = require('../../../lib/anchorencode');
+
+describe('lib:anchorencode', function() {
+
+this.timeout(2); // eslint-disable-line no-invalid-this
+
+it('anchorencode(empty) should return an empty string', () => {
+assert.deepEqual(a.anchorencode(''), '');
+});
+
+it('anchorencode("a") should return a', () => {
+assert.deepEqual(a.anchorencode('a'), 'a');
+});
+
+it('anchorencode("Z") should return Z', () => {
+assert.deepEqual(a.anchorencode('Z'), 'Z');
+});
+
+it('anchorencode("  Z  ") should return Z', () => {
+assert.deepEqual(a.anchorencode('  Z  '), 'Z');
+});
+
+it('anchorencode("a b c") should return a_b_c', () => {
+assert.deepEqual(a.anchorencode('a b c'), 'a_b_c');
+});
+
+it('anchorencode("a  b  c") should return a_b_c', () => {
+assert.deepEqual(a.anchorencode('a  b  c'), 'a_b_c');
+});
+
+it('anchorencode("!@#$%^&*()") should return 
21.40.23.24.25.5E.26.2A.28.29', () => {
+assert.deepEqual(a.anchorencode('!@#$%^&*()'), 
'21.40.23.24.25.5E.26.2A.28.29');
+});
+
+it('anchorencode(":") should not be converted', () => {
+assert.deepEqual(a.anchorencode(':'), ':');
+});
+});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fc075d8626c07424662265226ad7f13d582ed7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.12]: Fix incorrect i18n keys in human relevance survey

2017-08-02 Thread EBernhardson (Code Review)

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

Change subject: Fix incorrect i18n keys in human relevance survey
..

Fix incorrect i18n keys in human relevance survey

Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/04/369804/1

diff --git a/extension.json b/extension.json
index 3203f81..a4b72f5 100644
--- a/extension.json
+++ b/extension.json
@@ -206,7 +206,7 @@
"wikimediaevents-humanrel-yes",
"wikimediaevents-humanrel-no",
"wikimediaevents-humanrel-unsure",
-   "wikimediaevents-huamnrel-privacy-statement"
+   "wikimediaevents-humanrel-privacy-statement"
],
"styles": [
"ext.wikimediaEvents.humanSearchRelevance.css"
diff --git a/i18n/en.json b/i18n/en.json
index ac297ed..ae02eec 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,5 +21,5 @@
"wikimediaevents-humanrel-yes": "Yes",
"wikimediaevents-humanrel-no": "No",
"wikimediaevents-humanrel-unsure": "I don't know",
-   "wikimediaevents-huamnrel-privacy-statement": "Privacy Statement"
+   "wikimediaevents-humanrel-privacy-statement": "Privacy Statement"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5ac6013..7c96ef5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -23,5 +23,5 @@
"wikimediaevents-humanrel-yes": "Positive answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|Yes}}",
"wikimediaevents-humanrel-no": "Negative answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|No}}",
"wikimediaevents-humanrel-unsure": "Indecisive answer to articles 
relevance to a search query.\n\nSee also: 
{{msg-mw|wikimediaevents-humanrel-question-a}}, 
{{msg-mw|wikimediaevents-humanrel-yes}}, 
{{msg-mw|wikimediaevents-humanrel-no}}",
-   "wikimediaevents-huamnrel-privacy-statement": "Text for link to the 
survey privacy statement."
+   "wikimediaevents-humanrel-privacy-statement": "Text for link to the 
survey privacy statement."
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Fix 'Only variables should be passed by reference'

2017-08-02 Thread Ejegg (Code Review)

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

Change subject: Fix 'Only variables should be passed by reference'
..

Fix 'Only variables should be passed by reference'

Oh hey, it was 'end' that was causing the warning, not 'val'.

Well, it was a good excuse to remove that silly by-reference stuff
from Configuration.

Bug: T171560
Change-Id: I4ab4f86a20e5cc62543388a78b33f5159c17b5b6
---
M Maintenance/MaintenanceBase.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/03/369803/1

diff --git a/Maintenance/MaintenanceBase.php b/Maintenance/MaintenanceBase.php
index 2fe77b4..e26394f 100755
--- a/Maintenance/MaintenanceBase.php
+++ b/Maintenance/MaintenanceBase.php
@@ -149,8 +149,10 @@
$providerConfig = 
ProviderConfiguration::createForProvider( $configNode, $config );
}
Context::init( $config, $providerConfig );
+   $maintClassParts = explode( "\\", $maintClass );
+
Logger::init(
-   $providerConfig->val( 'logging/root-context' ) . '-' . 
end( explode( "\\", $maintClass ) ),
+   $providerConfig->val( 'logging/root-context' ) . '-' . 
end( $maintClassParts ),
$providerConfig->val( 'logging/log-level' ),
$providerConfig,
Context::get()->getContextId()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ab4f86a20e5cc62543388a78b33f5159c17b5b6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Add {{GENDER:}} for flow-dialog-cancelconfirm-{title, message}

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Add {{GENDER:}} for flow-dialog-cancelconfirm-{title,message}
..


Add {{GENDER:}} for flow-dialog-cancelconfirm-{title,message}

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 89730fc..7f7c562 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -554,8 +554,8 @@
"flow-notification-enabled-on-talkpage-email-batch-body": "Flow, the 
new wiki discussion system, has been enabled on {{GENDER:$1|your}} user talk 
page on {{SITENAME}}. You can get more information, provide feedback or disable 
the new system any time from the Beta features section in {{GENDER:$1|your}} 
preferences.",
"flow-beta-feature-add-archive-template-edit-summary": "Adding archive 
template",
"flow-beta-feature-remove-archive-template-edit-summary": "Removing 
archive template",
-   "flow-dialog-cancelconfirm-title": "Are you sure?",
-   "flow-dialog-cancelconfirm-message": "Are you sure you want to cancel 
without saving first?",
+   "flow-dialog-cancelconfirm-title": "Are {{GENDER:|you}} sure?",
+   "flow-dialog-cancelconfirm-message": "Are {{GENDER:|you}} sure you want 
to cancel without saving first?",
"flow-dialog-cancelconfirm-keep": "Continue editing",
"flow-dialog-cancelconfirm-discard": "Discard changes",
"flow-optin-archive-wikitext": "Move wikitext page to make room for a 
discussion board.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f3c35ec0a000767ed85536ff345ea4253527242
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add label service to default query

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Add label service to default query
..


Add label service to default query

Bug: T170858
Change-Id: I7829dbb2ce9fdf024dae3b0a4dc4356e3e1586b0
---
M wikibase/queryService/ui/App.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  Lucas Werkmeister (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 886f6ff..9b3d3ad 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -8,7 +8,7 @@
var SHORTURL_API = '//tinyurl.com/api-create.php?url=',
RAWGRAPHS_BASE_URL = 'http://wikidata.rawgraphs.io/?url=',
TRACKING_NAMESPACE = 'wikibase.queryService.ui.app.',
-   DEFAULT_QUERY = 'SELECT * WHERE {} LIMIT 20';
+   DEFAULT_QUERY = 'SELECT * WHERE {  SERVICE wikibase:label { 
bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } } LIMIT 20';
 
/**
 * A ui application for the Wikibase query service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7829dbb2ce9fdf024dae3b0a4dc4356e3e1586b0
Gerrit-PatchSet: 3
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Limit Silverpop group import to Opt In by default

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Limit Silverpop group import to Opt In by default
..


Limit Silverpop group import to Opt In by default

(updating composer didn't fix the date :-()

Bug T160949

Change-Id: Iaa1877889ecece796ecb96128345170c7fcdb8b2
---
M composer.lock
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
3 files changed, 15 insertions(+), 5 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index d15ed38..d6e7dcf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -88,7 +88,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17T00:44:20+00:00"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -198,7 +198,7 @@
 "queue",
 "transaction"
 ],
-"time": "2017-04-17T14:11:55+00:00"
+"time": "2017-04-17 14:11:55"
 },
 {
 "name": "cogpowered/finediff",
@@ -2821,7 +2821,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "cd3933b8ee7b263d0472cc44d047b82f3ec4029c"
+"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
 },
 "require": {
 "league/csv": "^8.0",
@@ -2860,7 +2860,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-17 20:03:43"
+"time": "2017-07-27 02:53:46"
 },
 {
 "name": "wikimedia/smash-pig",
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index 465a01a..fd9a6b7 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -35,8 +35,12 @@
 $settings = CRM_Omnimail_Helper::getSettings();
 
 $mailerCredentials = CRM_Omnimail_Helper::getCredentials($params);
+$jobParameters = array();
+if ($params['is_opt_in_only']) {
+  $jobParameters['exportType'] = 'OPT_IN';
+}
 
-$request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getGroupMembers();
+$request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getGroupMembers($jobParameters);
 
 $startTimestamp = self::getStartTimestamp($params, $jobSettings);
 $endTimestamp = self::getEndTimestamp(CRM_Utils_Array::value('end_date', 
$params), $settings, $startTimestamp);
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
index 0f179f6..0281f62 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
@@ -83,5 +83,11 @@
   'country' => 'rml_country',
 ),
   );
+  $params['is_opt_in_only'] = array(
+'type' => CRM_Utils_Type::T_BOOLEAN,
+'title' => ts('Opted in contacts only'),
+'description' => array('Restrict to opted in contacts'),
+'api.default' => 1,
+  );
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa1877889ecece796ecb96128345170c7fcdb8b2
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs
..


Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

We used (\.+\/)* instead of (\.\.?\/)* in some places,
but that doesn't make much sense since we won't and shouldn't
ever see stuff like '.../'

Change-Id: I9efcff2d2a34499ca57321dfbae29392ecb422d7
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index fa5a3ec..e7c0e9f 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -179,7 +179,7 @@
imgModel.cacheOriginalImageAttributes( attrs );
 
imgModel.setImageSource( attrs.src );
-   imgModel.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.+\/)*/, '' ) ).getMainText() );
+   imgModel.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.\.?\/)*/, '' ) ).getMainText() );
imgModel.setImageHref( attrs.href );
 
// Set bounding box
@@ -283,7 +283,7 @@
}
if ( attrs.resource ) {
this.setImageResourceName( attrs.resource );
-   this.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.+\/)*/, '' ) ).getMainText() );
+   this.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.\.?\/)*/, '' ) ).getMainText() );
}
 
if ( attrs.src ) {
@@ -1118,7 +1118,7 @@
  * @param {ve.dm.Scalable} scalable Scalable object
  */
 ve.dm.MWImageModel.prototype.attachScalable = function ( scalable ) {
-   var imageName = this.getResourceName().replace( /^(\.+\/)*/, '' ),
+   var imageName = this.getResourceName().replace( /^(\.\.?\/)*/, '' ),
imageModel = this;
 
if ( this.scalable instanceof ve.dm.Scalable ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index f2a5e6f..ecef276 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -296,7 +296,7 @@
 ve.dm.MWImageNode.prototype.getFilename = function () {
// Strip ./ stuff and decode URI encoding
var resource = this.getAttribute( 'resource' ) || '',
-   filename = resource.replace( /^(\.+\/)*/, '' );
+   filename = resource.replace( /^(\.\.?\/)*/, '' );
 
return ve.decodeURIComponentIntoArticleTitle( filename, true );
 };
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 226d948..0d757c3 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -394,7 +394,7 @@
part = content.parts[ i ];
if ( part.template ) {
href = part.template.target.href;
-   page = href ? 
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.+\/)*/, '' ) ) : null;
+   page = href ? 
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.\.?\/)*/, '' ) ) : 
null;
this.partsList.push( {
template: part.template.target.wt,
templatePage: page

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9efcff2d2a34499ca57321dfbae29392ecb422d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add drush via composer.

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Add drush via composer.
..


Add drush via composer.

I discussed upgrading drush with Casey & he felt we were
better to switch to drush via composer - this commit adds it in

Bug: 171435

Change-Id: I6c821ff467ff891fb0c6e3d94046e237079123a6
---
M composer.json
M composer.lock
2 files changed, 987 insertions(+), 290 deletions(-)

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



diff --git a/composer.json b/composer.json
index 17283df..7633929 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
 "phpseclib/phpseclib":  "~2.0",
 "predis/predis": "1.*",
 "twig/twig": "1.*",
-"wikimedia/composer-merge-plugin": "^1.4"
+"wikimedia/composer-merge-plugin": "^1.4",
+"drush/drush": "^8.1"
 },
 "repositories": [
   {
diff --git a/composer.lock b/composer.lock
index b6be6ff..d15ed38 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "31353eb88ccf3548983207723255bb5f",
+"content-hash": "b27331ac0c4835d866123ea5c6b2f833",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -252,6 +252,105 @@
 "time": "2014-05-19T10:25:02+00:00"
 },
 {
+"name": "consolidation/annotated-command",
+"version": "1.4.1",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/annotated-command.git;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/annotated-command/zipball/c2dc2464e1edf0498bf97a99f34cac5805d00946;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+"psr/log": "~1.0",
+"symfony/console": "~2.5|~3.0",
+"symfony/event-dispatcher": "~2.5|~3.0",
+"symfony/finder": "~2.5|~3.0"
+},
+"require-dev": {
+"consolidation/output-formatters": "~1",
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\AnnotatedCommand\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Greg Anderson",
+"email": "greg.1.ander...@greenknowe.org"
+}
+],
+"description": "Initialize Symfony Console commands from annotated 
command class methods.",
+"time": "2016-09-13T21:37:50+00:00"
+},
+{
+"name": "consolidation/output-formatters",
+"version": "1.1.0",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/output-formatters.git;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/output-formatters/zipball/aadb1ed2deb72bc1351bb6f3b3ddd328222e9261;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"symfony/console": "~2.5|~3.0"
+},
+"require-dev": {
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\OutputFormatters\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: jsduck: Explcitly name library files so we don't pull in CSS...

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: jsduck: Explcitly name library files so we don't pull in CSS 
files
..


jsduck: Explcitly name library files so we don't pull in CSS files

Change-Id: I402988a3c27c2f3191010046ae9b83bd74a50bee
---
M jsduck.json
1 file changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/jsduck.json b/jsduck.json
index bfcf528..8fe2e5f 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -12,10 +12,15 @@
"--": [
".jsduck/external.js",
"lib/ve/.jsduck/external.js",
-   "lib/ve/lib/oojs",
-   "lib/ve/lib/oojs-ui",
-   "lib/ve/lib/unicodejs",
-   "lib/ve/lib/treeDiffer",
+   "lib/ve/lib/oojs/oojs.jquery.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-core.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-widgets.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-toolbars.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-windows.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-wikimediaui.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-apex.js",
+   "lib/ve/lib/unicodejs/unicodejs.js",
+   "lib/ve/lib/treeDiffer/treeDiffer-dist.js",
"lib/ve/src",
"lib/ve/tests",
"modules/ve-mw"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I402988a3c27c2f3191010046ae9b83bd74a50bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs
..


Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

See also I9efcff2d2 in VisualEditor

Change-Id: I9809487878e74ecf4d9ff589bd9c2f1fab04f3a5
---
M lib/translationunits/MWImage.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/translationunits/MWImage.js b/lib/translationunits/MWImage.js
index e3b24ca..0337a04 100644
--- a/lib/translationunits/MWImage.js
+++ b/lib/translationunits/MWImage.js
@@ -72,7 +72,7 @@
 
if ( this.isCommonsImage( sourceImage.attributes[ 'src' ] ) ) {
namespaceAlias = yield new MWAPIRequestManager( this.context 
).getNamespaceAlias( 'File', this.targetLanguage );
-   targetResource = this.sourceResource.replace( 
/^(\.+\/)*(.+)(:)/, '$1' + namespaceAlias + '$3' );
+   targetResource = this.sourceResource.replace( 
/^(\.\.?\/)*(.+)(:)/, '$1' + namespaceAlias + '$3' );
sourceImage.attributes[ 'resource' ] = imageLink.attributes[ 
'href' ] = targetResource;
} else {
// TODO: This format is not decided yet. We do need to inform 
client about failed

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9809487878e74ecf4d9ff589bd9c2f1fab04f3a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CreateUserPage[master]: Fixed MW 1.29 compatibility.

2017-08-02 Thread Cicalese (Code Review)

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

Change subject: Fixed MW 1.29 compatibility.
..


Fixed MW 1.29 compatibility.

Replaced call to WikiPage::doEdit(), which was removed in 1.29, with a call to 
WikiPage::doEditContent().

This should retain backwards compatibility to 1.27 since 
WikiPage::doEditContent() exists in 1.27 and 1.28 but this has not been tested.

Change-Id: Ie738f0c0abcd87d583917284afaf4f52ecd953bd
---
M extension.json
M includes/CreateUserPageHooks.php
2 files changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 4cb4a59..02848c2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "CreateUserPage",
-   "version": "1.0",
+   "version": "1.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],
diff --git a/includes/CreateUserPageHooks.php b/includes/CreateUserPageHooks.php
index d29a223..565d6a2 100755
--- a/includes/CreateUserPageHooks.php
+++ b/includes/CreateUserPageHooks.php
@@ -28,9 +28,8 @@
$title = Title::newFromText( 'User:' . $user->mName );
if ( !is_null( $title ) && !$title->exists() ) {
$page = new WikiPage( $title );
-   $page->doEdit( $GLOBALS['wgCreateUserPage_PageContent'],
-   'create user page', EDIT_NEW);
+   $pageContent = new TextContent( 
$GLOBALS['wgCreateUserPage_PageContent'] );
+   $page->doEditContent( $pageContent, 'create user page', 
EDIT_NEW);
}
-   return true;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie738f0c0abcd87d583917284afaf4f52ecd953bd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CreateUserPage
Gerrit-Branch: master
Gerrit-Owner: Kji 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: jsduck: Explcitly name library files so we don't pull in CSS...

2017-08-02 Thread Jforrester (Code Review)

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

Change subject: jsduck: Explcitly name library files so we don't pull in CSS 
files
..

jsduck: Explcitly name library files so we don't pull in CSS files

Change-Id: I402988a3c27c2f3191010046ae9b83bd74a50bee
---
M jsduck.json
1 file changed, 9 insertions(+), 4 deletions(-)


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

diff --git a/jsduck.json b/jsduck.json
index bfcf528..8fe2e5f 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -12,10 +12,15 @@
"--": [
".jsduck/external.js",
"lib/ve/.jsduck/external.js",
-   "lib/ve/lib/oojs",
-   "lib/ve/lib/oojs-ui",
-   "lib/ve/lib/unicodejs",
-   "lib/ve/lib/treeDiffer",
+   "lib/ve/lib/oojs/oojs.jquery.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-core.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-widgets.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-toolbars.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-windows.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-wikimediaui.js",
+   "lib/ve/lib/oojs-ui/oojs-ui-apex.js",
+   "lib/ve/lib/unicodejs/unicodejs.js",
+   "lib/ve/lib/treeDiffer/treeDiffer-dist.js",
"lib/ve/src",
"lib/ve/tests",
"modules/ve-mw"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I402988a3c27c2f3191010046ae9b83bd74a50bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

2017-08-02 Thread Catrope (Code Review)

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

Change subject: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs
..

Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

See also I9efcff2d2 in VisualEditor

Change-Id: I9809487878e74ecf4d9ff589bd9c2f1fab04f3a5
---
M lib/translationunits/MWImage.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/55/369755/1

diff --git a/lib/translationunits/MWImage.js b/lib/translationunits/MWImage.js
index e3b24ca..0337a04 100644
--- a/lib/translationunits/MWImage.js
+++ b/lib/translationunits/MWImage.js
@@ -72,7 +72,7 @@
 
if ( this.isCommonsImage( sourceImage.attributes[ 'src' ] ) ) {
namespaceAlias = yield new MWAPIRequestManager( this.context 
).getNamespaceAlias( 'File', this.targetLanguage );
-   targetResource = this.sourceResource.replace( 
/^(\.+\/)*(.+)(:)/, '$1' + namespaceAlias + '$3' );
+   targetResource = this.sourceResource.replace( 
/^(\.\.?\/)*(.+)(:)/, '$1' + namespaceAlias + '$3' );
sourceImage.attributes[ 'resource' ] = imageLink.attributes[ 
'href' ] = targetResource;
} else {
// TODO: This format is not decided yet. We do need to inform 
client about failed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9809487878e74ecf4d9ff589bd9c2f1fab04f3a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Normalize user-generated default values

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Normalize user-generated default values
..


RCFilters: Normalize user-generated default values

Bug: T172026
Change-Id: Id75116cf22a31f8b762801fc0a6aee554a9ca6b2
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 19 insertions(+), 11 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index c4cce8d..f7021e2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -736,11 +736,11 @@
this.getType() === 'single_option' &&
!oneWasSelected
) {
+   item = this.getItems()[ 0 ];
if ( defaultParams[ this.getName() ] ) {
item = this.getItemByParamName( defaultParams[ 
this.getName() ] );
-   } else {
-   item = this.getItems()[ 0 ];
}
+
result[ item.getName() ] = true;
}
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f07d3f1..16822d8 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -92,7 +92,7 @@
// Convert the default from the old preference
// since the limit preference actually affects more
// than just the RecentChanges page
-   limitDefault = Number( mw.user.options.get( 
'rcfilters-rclimit', mw.user.options.get( 'rclimit', '50' ) ) );
+   limitDefault = Number( mw.user.options.get( 'rclimit', '50' ) );
 
// Add parameter range operations
views.range = {
@@ -280,20 +280,28 @@
 * @param {string|string[]} arbitraryValues An array of arbitrary 
values to add to the group
 */
mw.rcfilters.Controller.prototype.addNumberValuesToGroup = function ( 
groupData, arbitraryValues ) {
-   var controller = this;
+   var controller = this,
+   normalizeWithinRange = function ( range, val ) {
+   if ( val < range.min ) {
+   return range.min; // Min
+   } else if ( val >= range.max ) {
+   return range.max; // Max
+   }
+   return val;
+   };
 
arbitraryValues = Array.isArray( arbitraryValues ) ? 
arbitraryValues : [ arbitraryValues ];
 
-   // Normalize the arbitrary values
+   // Normalize the arbitrary values and the default value for a 
range
if ( groupData.range ) {
arbitraryValues = arbitraryValues.map( function ( val ) 
{
-   if ( val < 0 ) {
-   return groupData.range.min; // Min
-   } else if ( val >= groupData.range.max ) {
-   return groupData.range.max; // Max
-   }
-   return val;
+   return normalizeWithinRange( groupData.range, 
val );
} );
+
+   // Normalize the default, since that's user defined
+   if ( groupData.default !== undefined ) {
+   groupData.default = String( 
normalizeWithinRange( groupData.range, groupData.default ) );
+   }
}
 
// This is only true for single_option group

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Icinga: add check_bfd check (part 1)"

2017-08-02 Thread Ayounsi (Code Review)

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

Change subject: Revert "Icinga: add check_bfd check (part 1)"
..


Revert "Icinga: add check_bfd check (part 1)"

This reverts commit 78a66ec1a5b9bc62924fdcf66717477543ab6df3.

Error: python-snimpy : Depends: python-cffi-backend-api-9729


Change-Id: I4792eff19209da90898d1539b56a04d4d7c87440
---
D modules/icinga/files/mib-jnx-bfd-exp.txt
D modules/icinga/files/mib-jnx-exp.txt
D modules/icinga/files/mib-jnx-smi.txt
M modules/icinga/manifests/plugins.pp
D modules/nagios_common/files/check_commands/check_bfd
D modules/nagios_common/files/check_commands/check_bfd.cfg
M modules/nagios_common/manifests/commands.pp
7 files changed, 0 insertions(+), 1,348 deletions(-)

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



diff --git a/modules/icinga/files/mib-jnx-bfd-exp.txt 
b/modules/icinga/files/mib-jnx-bfd-exp.txt
deleted file mode 100644
index 6c2189b..000
--- a/modules/icinga/files/mib-jnx-bfd-exp.txt
+++ /dev/null
@@ -1,857 +0,0 @@
-BFD-STD-MIB DEFINITIONS ::= BEGIN  
-   IMPORTS 
-  MODULE-IDENTITY, OBJECT-TYPE,  
-  Unsigned32, Counter32, Counter64,  
-  NOTIFICATION-TYPE 
- FROM SNMPv2-SMI-- [RFC2578]
-
-  MODULE-COMPLIANCE, OBJECT-GROUP, 
-  NOTIFICATION-GROUP 
-  FROM SNMPv2-CONF  -- [RFC2580]
-
-  TEXTUAL-CONVENTION, TruthValue, 
-  RowStatus, StorageType, TimeStamp 
- FROM SNMPv2-TC -- [RFC2579]
-
-  InetAddress, InetAddressType, InetPortNumber 
- FROM INET-ADDRESS-MIB  -- [RFC3291]
-
-  -- Juniper specific   *** JNX ***
-  jnxBfdExperiment   -- *** JNX ***
- FROM JUNIPER-EXPERIMENT-MIB -- *** JNX ***
-   ; 
-
-   bfdMIB MODULE-IDENTITY 
-  LAST-UPDATED "200507221200Z"  -- 04 July 2005 12:00:00 EST 
-  ORGANIZATION "IETF" 
-  CONTACT-INFO 
-  "Thomas D. Nadeau 
-   Cisco Systems, Inc. 
-   Email:  tnad...@cisco.com 
-
-   Zafar Ali  
-   Cisco Systems, Inc. 
-   Email:  z...@cisco.com 
-  " 
-  DESCRIPTION 
-  "Bidirectional Forwarding Management Information Base." 
-
-  -- Revision history. 
-  REVISION 
-  "200508221200Z"  -- 04 August 2005 12:00:00 EST 
-  DESCRIPTION 
-  "Initial version. Published as RFC ." -- RFC-editor pls fill 
--- in 
-   ::= { jnxBfdExperiment 1 }
-
-   -- Top level components of this MIB module. 
-
-   bfdNotifications OBJECT IDENTIFIER ::= { bfdMIB 0 } 
-
-   bfdObjects   OBJECT IDENTIFIER ::= { bfdMIB 1 } 
-
-   bfdConformance   OBJECT IDENTIFIER ::= { bfdMIB 3 } 
-
-   bfdScalarObjects OBJECT IDENTIFIER ::= { bfdObjects 1 } 
-
-
-   --  Textual Conventions 
-
-   BfdSessIndexTC ::= TEXTUAL-CONVENTION 
-  DISPLAY-HINT "d" 
-  STATUScurrent 
-  DESCRIPTION 
-  "An index used to uniquely identify BFD sessions." 
-  SYNTAX Unsigned32 (1..4294967295) 
-
-   BfdInterval ::= TEXTUAL-CONVENTION 
-  STATUScurrent 
-  DESCRIPTION 
-  "The BFD interval delay in microseconds." 
-  SYNTAXUnsigned32 (1..4294967295) 
-
-   BfdDiag ::=  TEXTUAL-CONVENTION 
-  STATUScurrent 
-  DESCRIPTION 
-  "A common BFD diagnostic code." 
-
-  SYNTAX INTEGER { noDiagnostic(1),  
-   controlDetectionTimeExpired(2),  
-   echoFunctionFailed(3),  
-   neighborSignaledSessionDown(4),  
-   forwardingPlaneReset(5), 
-   pathDown(6),  
-   concatenatedPathDown(7), 
-   administrativelyDown(8),  
-   reverseConcatenatedPathDown (9) 
- } 
-
---  BFD General Variables 
-
---  These parameters apply globally to the Router's 
---  BFD Process. 
-
-   bfdAdminStatus OBJECT-TYPE 
-  SYNTAX   INTEGER { enabled(1), disabled(2) } 
---  MAX-ACCESS   read-write 
-  MAX-ACCESS   read-only 
-  STATUS   current 
-  DESCRIPTION 
-  "The global administrative status of BFD in this router.  
-   The value 'enabled' denotes that the BFD Process is 
-   active on at least one interface; 'disabled' disables  
-   it on all interfaces." 
-  DEFVAL { enabled }  
-  ::= { bfdScalarObjects 1 } 
-
-   bfdVersionNumber OBJECT-TYPE 
-  SYNTAX   Unsigned32 
-  MAX-ACCESS   read-only 
-  STATUS   current 
-  DESCRIPTION 
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Add AuditParser interface, other audit cleanup

2017-08-02 Thread Ejegg (Code Review)

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

Change subject: Add AuditParser interface, other audit cleanup
..

Add AuditParser interface, other audit cleanup

Get rid of unnecessary / undeclared fields, fix missing 'use',
reset fileData on each new parse.

Change-Id: Icf3f9d927b6d3623aaf3d5c072f7d0b2e15c4307
---
A Core/DataFiles/AuditParser.php
M PaymentProviders/Adyen/Audit/AdyenAudit.php
R PaymentProviders/Amazon/Audit/AmazonAudit.php
M PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
M PaymentProviders/AstroPay/Audit/AstroPayAudit.php
M PaymentProviders/Ingenico/Audit/IngenicoAudit.php
6 files changed, 66 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/48/369748/1

diff --git a/Core/DataFiles/AuditParser.php b/Core/DataFiles/AuditParser.php
new file mode 100644
index 000..5dd777e
--- /dev/null
+++ b/Core/DataFiles/AuditParser.php
@@ -0,0 +1,14 @@
+https://docs.adyen.com/manuals/reporting-manual/settlement-detail-report-structure/settlement-detail-report-journal-types
  */
-class AdyenAudit {
+class AdyenAudit implements AuditParser {
 
protected $columnHeaders;
protected $ignoredStatuses;
@@ -73,17 +75,16 @@
);
}
 
-   // TODO base class this?
public function parseFile( $path ) {
-   $this->path = $path;
-   $this->file = fopen( $path, 'r' );
+   $this->fileData = array();
+   $file = fopen( $path, 'r' );
 
$ignoreLines = 1;
for ( $i = 0; $i < $ignoreLines; $i++ ) {
-   fgets( $this->file );
+   fgets( $file );
}
 
-   while ( $line = fgetcsv( $this->file, 0, ',', '"', '\\' ) ) {
+   while ( $line = fgetcsv( $file, 0, ',', '"', '\\' ) ) {
try {
$this->parseLine( $line );
} catch ( NormalizationException $ex ) {
@@ -91,7 +92,7 @@
Logger::error( $ex->getMessage() );
}
}
-   fclose( $this->file );
+   fclose( $file );
 
return $this->fileData;
}
diff --git a/PaymentProviders/Amazon/Audit/AuditParser.php 
b/PaymentProviders/Amazon/Audit/AmazonAudit.php
similarity index 84%
rename from PaymentProviders/Amazon/Audit/AuditParser.php
rename to PaymentProviders/Amazon/Audit/AmazonAudit.php
index d474c89..2d9db5d 100644
--- a/PaymentProviders/Amazon/Audit/AuditParser.php
+++ b/PaymentProviders/Amazon/Audit/AmazonAudit.php
@@ -1,11 +1,12 @@
 getProviderConfiguration();
diff --git a/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php 
b/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
index 29f13b0..aca8e15 100644
--- a/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
+++ b/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
@@ -3,7 +3,7 @@
 
 use SmashPig\Core\Context;
 use SmashPig\Tests\BaseSmashPigUnitTestCase;
-use SmashPig\PaymentProviders\Amazon\Audit\AuditParser;
+use SmashPig\PaymentProviders\Amazon\Audit\AmazonAudit;
 
 /**
  * Verify Amazon audit file processor functions
@@ -20,7 +20,7 @@
 * Normal donation
 */
public function testProcessDonation() {
-   $processor = new AuditParser();
+   $processor = new AmazonAudit();
$output = $processor->parseFile( __DIR__ . 
'/../Data/audit/2015-10-01-SETTLEMENT_DATA_37127304077.csv' );
$this->assertEquals( 1, count( $output ), 'Should have found 
one donation' );
$actual = $output[0];
@@ -42,7 +42,7 @@
 * Now try a refund
 */
public function testProcessRefund() {
-   $processor = new AuditParser();
+   $processor = new AmazonAudit();
$output = $processor->parseFile( __DIR__ . 
'/../Data/audit/2015-10-06-REFUND_DATA_41474930002.csv' );
$this->assertEquals( 1, count( $output ), 'Should have found 
one refund' );
$actual = $output[0];
@@ -62,7 +62,7 @@
 * And a chargeback
 */
public function testProcessChargeback() {
-   $processor = new AuditParser();
+   $processor = new AmazonAudit();
$output = $processor->parseFile( __DIR__ . 
'/../Data/audit/2015-10-06-REFUND_DATA_41474930003.csv' );
$this->assertEquals( 1, count( $output ), 'Should have found 
one chargeback' );
$actual = $output[0];
diff --git a/PaymentProviders/AstroPay/Audit/AstroPayAudit.php 
b/PaymentProviders/AstroPay/Audit/AstroPayAudit.php
index dc19101..771cb3f 100644
--- a/PaymentProviders/AstroPay/Audit/AstroPayAudit.php
+++ b/PaymentProviders/AstroPay/Audit/AstroPayAudit.php
@@ -1,59 +1,54 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Circumvent kafkcat circular dependnecy on librdkafka1

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Circumvent kafkcat circular dependnecy on librdkafka1
..


Circumvent kafkcat circular dependnecy on librdkafka1

Bug: T166162
Change-Id: Iea07cffb227bbaadec35e5e227d48e23596fcab0
---
M modules/profile/manifests/kafka/broker.pp
1 file changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index 8e4d835..41d22e2 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -96,14 +96,16 @@
 before => Package['kafkacat'],
 }
 }
-
 # kafkacat is handy!
-require_package('kafkacat')
+if !defined(Package['kafkacat']) {
+# not using require_package to allow dependency on librdkafka1 in 
stretch
+package { 'kafkacat': }
+}
 
-$plaintext_port = 9092
+$plaintext_port = 9092
 $plaintext_listener = "PLAINTEXT://:${plaintext_port}"
-$tls_port = 9093
-$tls_listener = "SSL://:${tls_port}"
+$tls_port   = 9093
+$tls_listener   = "SSL://:${tls_port}"
 
 # Conditionally set $listeners and $ssl_client_auth
 # based on values of $tls and $plaintext.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea07cffb227bbaadec35e5e227d48e23596fcab0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Adjust server default variable names for limit/days

2017-08-02 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Adjust server default variable names for limit/days
..

RCFilters: Adjust server default variable names for limit/days

Change-Id: I4a204e1a61516cff505e6e0a71aa702034cea4dc
---
M includes/specials/SpecialRecentchanges.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/369747/1

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index 46f7927..6ef75e0 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -196,9 +196,9 @@
$out->addJsConfigVars(
'StructuredChangeFiltersDisplayConfig',
[
-   'maxLimit' => 
(int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
-   'arrayLimit' => 
$this->getConfig()->get( 'RCLinkLimits' ),
-   'arrayDays' => $this->getConfig()->get( 
'RCLinkDays' ),
+   'maxDays' => 
(int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
+   'limitArray' => 
$this->getConfig()->get( 'RCLinkLimits' ),
+   'daysArray' => $this->getConfig()->get( 
'RCLinkDays' ),
]
);
}
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f07d3f1..864e397 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -115,7 +115,7 @@
// we should remove all sticky behavior 
methods completely
// See T172156
// isSticky: true,
-   filters: displayConfig.arrayLimit.map( 
function ( num ) {
+   filters: displayConfig.limitArray.map( 
function ( num ) {
return 
controller._createFilterDataFromNumber( num, num );
} )
},
@@ -128,7 +128,7 @@
validate: $.isNumeric,
range: {
min: 0,
-   max: displayConfig.maxLimit
+   max: displayConfig.maxDays
},
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
numToLabelFunc: function ( i ) {
@@ -143,7 +143,7 @@
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5
// Days
-   ].concat( displayConfig.arrayDays )
+   ].concat( displayConfig.daysArray )
.map( function ( num ) {
return 
controller._createFilterDataFromNumber(
num,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a204e1a61516cff505e6e0a71aa702034cea4dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: harvest_template.py: Catch InvalidTitle

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: harvest_template.py: Catch InvalidTitle
..


harvest_template.py: Catch InvalidTitle

Change-Id: If7607297bb6911bbdaa955743b6db14b91af97c9
---
M scripts/harvest_template.py
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index ef0dab6..0f542d0 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -99,7 +99,12 @@
 
 def _template_link_target(self, item, link_text):
 link = pywikibot.Link(link_text)
-linked_page = pywikibot.Page(link)
+try:
+linked_page = pywikibot.Page(link)
+except pywikibot.exceptions.InvalidTitle:
+pywikibot.error('%s is not a valid title so it cannot be linked. '
+'Skipping.' % link_text)
+return
 
 if not linked_page.exists():
 pywikibot.output('%s does not exist so it cannot be linked. '

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7607297bb6911bbdaa955743b6db14b91af97c9
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Danmichaelo 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Icinga: add check_bfd check (part 1)"

2017-08-02 Thread Ayounsi (Code Review)

Hello Faidon Liambotis, BBlack, jenkins-bot, Dzahn,

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

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

to review the following change.


Change subject: Revert "Icinga: add check_bfd check (part 1)"
..

Revert "Icinga: add check_bfd check (part 1)"

This reverts commit 78a66ec1a5b9bc62924fdcf66717477543ab6df3.

Change-Id: I4792eff19209da90898d1539b56a04d4d7c87440
---
D modules/icinga/files/mib-jnx-bfd-exp.txt
D modules/icinga/files/mib-jnx-exp.txt
D modules/icinga/files/mib-jnx-smi.txt
M modules/icinga/manifests/plugins.pp
D modules/nagios_common/files/check_commands/check_bfd
D modules/nagios_common/files/check_commands/check_bfd.cfg
M modules/nagios_common/manifests/commands.pp
7 files changed, 0 insertions(+), 1,348 deletions(-)


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

diff --git a/modules/icinga/files/mib-jnx-bfd-exp.txt 
b/modules/icinga/files/mib-jnx-bfd-exp.txt
deleted file mode 100644
index 6c2189b..000
--- a/modules/icinga/files/mib-jnx-bfd-exp.txt
+++ /dev/null
@@ -1,857 +0,0 @@
-BFD-STD-MIB DEFINITIONS ::= BEGIN  
-   IMPORTS 
-  MODULE-IDENTITY, OBJECT-TYPE,  
-  Unsigned32, Counter32, Counter64,  
-  NOTIFICATION-TYPE 
- FROM SNMPv2-SMI-- [RFC2578]
-
-  MODULE-COMPLIANCE, OBJECT-GROUP, 
-  NOTIFICATION-GROUP 
-  FROM SNMPv2-CONF  -- [RFC2580]
-
-  TEXTUAL-CONVENTION, TruthValue, 
-  RowStatus, StorageType, TimeStamp 
- FROM SNMPv2-TC -- [RFC2579]
-
-  InetAddress, InetAddressType, InetPortNumber 
- FROM INET-ADDRESS-MIB  -- [RFC3291]
-
-  -- Juniper specific   *** JNX ***
-  jnxBfdExperiment   -- *** JNX ***
- FROM JUNIPER-EXPERIMENT-MIB -- *** JNX ***
-   ; 
-
-   bfdMIB MODULE-IDENTITY 
-  LAST-UPDATED "200507221200Z"  -- 04 July 2005 12:00:00 EST 
-  ORGANIZATION "IETF" 
-  CONTACT-INFO 
-  "Thomas D. Nadeau 
-   Cisco Systems, Inc. 
-   Email:  tnad...@cisco.com 
-
-   Zafar Ali  
-   Cisco Systems, Inc. 
-   Email:  z...@cisco.com 
-  " 
-  DESCRIPTION 
-  "Bidirectional Forwarding Management Information Base." 
-
-  -- Revision history. 
-  REVISION 
-  "200508221200Z"  -- 04 August 2005 12:00:00 EST 
-  DESCRIPTION 
-  "Initial version. Published as RFC ." -- RFC-editor pls fill 
--- in 
-   ::= { jnxBfdExperiment 1 }
-
-   -- Top level components of this MIB module. 
-
-   bfdNotifications OBJECT IDENTIFIER ::= { bfdMIB 0 } 
-
-   bfdObjects   OBJECT IDENTIFIER ::= { bfdMIB 1 } 
-
-   bfdConformance   OBJECT IDENTIFIER ::= { bfdMIB 3 } 
-
-   bfdScalarObjects OBJECT IDENTIFIER ::= { bfdObjects 1 } 
-
-
-   --  Textual Conventions 
-
-   BfdSessIndexTC ::= TEXTUAL-CONVENTION 
-  DISPLAY-HINT "d" 
-  STATUScurrent 
-  DESCRIPTION 
-  "An index used to uniquely identify BFD sessions." 
-  SYNTAX Unsigned32 (1..4294967295) 
-
-   BfdInterval ::= TEXTUAL-CONVENTION 
-  STATUScurrent 
-  DESCRIPTION 
-  "The BFD interval delay in microseconds." 
-  SYNTAXUnsigned32 (1..4294967295) 
-
-   BfdDiag ::=  TEXTUAL-CONVENTION 
-  STATUScurrent 
-  DESCRIPTION 
-  "A common BFD diagnostic code." 
-
-  SYNTAX INTEGER { noDiagnostic(1),  
-   controlDetectionTimeExpired(2),  
-   echoFunctionFailed(3),  
-   neighborSignaledSessionDown(4),  
-   forwardingPlaneReset(5), 
-   pathDown(6),  
-   concatenatedPathDown(7), 
-   administrativelyDown(8),  
-   reverseConcatenatedPathDown (9) 
- } 
-
---  BFD General Variables 
-
---  These parameters apply globally to the Router's 
---  BFD Process. 
-
-   bfdAdminStatus OBJECT-TYPE 
-  SYNTAX   INTEGER { enabled(1), disabled(2) } 
---  MAX-ACCESS   read-write 
-  MAX-ACCESS   read-only 
-  STATUS   current 
-  DESCRIPTION 
-  "The global administrative status of BFD in this router.  
-   The value 'enabled' denotes that the BFD Process is 
-   active on at least one interface; 'disabled' disables  
-   it on all interfaces." 
-  DEFVAL { enabled }  
-  ::= { bfdScalarObjects 1 } 
-
-   bfdVersionNumber OBJECT-TYPE 
-  SYNTAX   Unsigned32 
-  MAX-ACCESS   read-only 
-  STATUS

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Circumvent kafkcat circular dependnecy on librdkafka1

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Circumvent kafkcat circular dependnecy on librdkafka1
..

Circumvent kafkcat circular dependnecy on librdkafka1

Bug: T166162
Change-Id: Iea07cffb227bbaadec35e5e227d48e23596fcab0
---
M modules/profile/manifests/kafka/broker.pp
1 file changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/369745/1

diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index 8e4d835..41d22e2 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -96,14 +96,16 @@
 before => Package['kafkacat'],
 }
 }
-
 # kafkacat is handy!
-require_package('kafkacat')
+if !defined(Package['kafkacat']) {
+# not using require_package to allow dependency on librdkafka1 in 
stretch
+package { 'kafkacat': }
+}
 
-$plaintext_port = 9092
+$plaintext_port = 9092
 $plaintext_listener = "PLAINTEXT://:${plaintext_port}"
-$tls_port = 9093
-$tls_listener = "SSL://:${tls_port}"
+$tls_port   = 9093
+$tls_listener   = "SSL://:${tls_port}"
 
 # Conditionally set $listeners and $ssl_client_auth
 # based on values of $tls and $plaintext.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Fix incorrect i18n keys in human relevance survey

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Fix incorrect i18n keys in human relevance survey
..


Fix incorrect i18n keys in human relevance survey

Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 3203f81..a4b72f5 100644
--- a/extension.json
+++ b/extension.json
@@ -206,7 +206,7 @@
"wikimediaevents-humanrel-yes",
"wikimediaevents-humanrel-no",
"wikimediaevents-humanrel-unsure",
-   "wikimediaevents-huamnrel-privacy-statement"
+   "wikimediaevents-humanrel-privacy-statement"
],
"styles": [
"ext.wikimediaEvents.humanSearchRelevance.css"
diff --git a/i18n/en.json b/i18n/en.json
index ac297ed..ae02eec 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,5 +21,5 @@
"wikimediaevents-humanrel-yes": "Yes",
"wikimediaevents-humanrel-no": "No",
"wikimediaevents-humanrel-unsure": "I don't know",
-   "wikimediaevents-huamnrel-privacy-statement": "Privacy Statement"
+   "wikimediaevents-humanrel-privacy-statement": "Privacy Statement"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5ac6013..7c96ef5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -23,5 +23,5 @@
"wikimediaevents-humanrel-yes": "Positive answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|Yes}}",
"wikimediaevents-humanrel-no": "Negative answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|No}}",
"wikimediaevents-humanrel-unsure": "Indecisive answer to articles 
relevance to a search query.\n\nSee also: 
{{msg-mw|wikimediaevents-humanrel-question-a}}, 
{{msg-mw|wikimediaevents-humanrel-yes}}, 
{{msg-mw|wikimediaevents-humanrel-no}}",
-   "wikimediaevents-huamnrel-privacy-statement": "Text for link to the 
survey privacy statement."
+   "wikimediaevents-humanrel-privacy-statement": "Text for link to the 
survey privacy statement."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Fix incorrect i18n keys in human relevance survey

2017-08-02 Thread EBernhardson (Code Review)

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

Change subject: Fix incorrect i18n keys in human relevance survey
..

Fix incorrect i18n keys in human relevance survey

Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/38/369738/1

diff --git a/extension.json b/extension.json
index 3203f81..a4b72f5 100644
--- a/extension.json
+++ b/extension.json
@@ -206,7 +206,7 @@
"wikimediaevents-humanrel-yes",
"wikimediaevents-humanrel-no",
"wikimediaevents-humanrel-unsure",
-   "wikimediaevents-huamnrel-privacy-statement"
+   "wikimediaevents-humanrel-privacy-statement"
],
"styles": [
"ext.wikimediaEvents.humanSearchRelevance.css"
diff --git a/i18n/en.json b/i18n/en.json
index ac297ed..ae02eec 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,5 +21,5 @@
"wikimediaevents-humanrel-yes": "Yes",
"wikimediaevents-humanrel-no": "No",
"wikimediaevents-humanrel-unsure": "I don't know",
-   "wikimediaevents-huamnrel-privacy-statement": "Privacy Statement"
+   "wikimediaevents-humanrel-privacy-statement": "Privacy Statement"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5ac6013..7c96ef5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -23,5 +23,5 @@
"wikimediaevents-humanrel-yes": "Positive answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|Yes}}",
"wikimediaevents-humanrel-no": "Negative answer to articles relevance 
to a search query.\n\nAppears with the question: 
{{msg-mw|wikimediaevents-humanrel-question-a}}\n\n{{Identical|No}}",
"wikimediaevents-humanrel-unsure": "Indecisive answer to articles 
relevance to a search query.\n\nSee also: 
{{msg-mw|wikimediaevents-humanrel-question-a}}, 
{{msg-mw|wikimediaevents-humanrel-yes}}, 
{{msg-mw|wikimediaevents-humanrel-no}}",
-   "wikimediaevents-huamnrel-privacy-statement": "Text for link to the 
survey privacy statement."
+   "wikimediaevents-humanrel-privacy-statement": "Text for link to the 
survey privacy statement."
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I264a513df9bbbd3805b018ac2c0789734e9636df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "add IPv6 for labtestservices*"

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: Revert "add IPv6 for labtestservices*"
..


Revert "add IPv6 for labtestservices*"

This reverts commit ee5c06bed1a82d9e7f0fc66f2f12086354a7bad1.

Unfortunately this breaks labtestservices2001, due to
role "labs::dns_floating_ip_updater" which uses
/usr/local/bin/labs-ip-alias-dump.py.

Dnsrecursor::Labsaliaser/Exec[/usr/local/bin/labs-ip-alias-dump.py]/returns:
change from notrun to 0 failed

Change-Id: Ifd300592491c6b5e700e171aef34c1c32676f14a
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index fc1fae4..1b763b4 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -42,7 +42,6 @@
 0.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   alsafi.wikimedia.org.
 2.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   dbmonitor2001.wikimedia.org.
 3.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install2002.wikimedia.org.
-8.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2001.wikimedia.org.
 
 ; public1-c-codfw (2620:0:860:3::/64)
 $ORIGIN 3.0.0.0.{{ zonename }}.
@@ -52,7 +51,6 @@
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-2003.cr2-codfw.wikimedia.org.
 
 4.7.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   tegmen.wikimedia.org.
-6.7.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2002.wikimedia.org.
 
 ; public1-d-codfw (2620:0:860:4::/64)
 $ORIGIN 4.0.0.0.{{ zonename }}.
@@ -65,7 +63,6 @@
 7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   gerrit-slave.wikimedia.org.
 
 8.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   
labtestpuppetmaster2001.wikimedia.org.
-9.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2003.wikimedia.org.
 
 0.1.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   netmon2001.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 2e45d05..50e1b97 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -168,11 +168,8 @@
 labtestpuppetmaster2001 1H IN A 208.80.153.108
 labtestpuppetmaster2001 1H IN  2620:0:860:4:208:80:153:108
 labtestservices2001 1H  IN A208.80.153.48
-labtestservices2001 1H  IN  2620:0:860:2:208:80:153:48
 labtestservices2002 1H  IN A208.80.153.76
-labtestservices2002 1H  IN  2620:0:860:3:208:80:153:76
 labtestservices2003 1H  IN A208.80.153.109
-labtestservices2003 1H  IN  2620:0:860:4:208:80:153:109
 labtestweb2001  1H  IN A208.80.153.14
 labtestweb2001  1H  IN  2620:0:860:1:208:80:153:14
 labweb1001  1H  IN A208.80.154.160

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd300592491c6b5e700e171aef34c1c32676f14a
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Make sure librdkafka1 is installed before kafkacat

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Make sure librdkafka1 is installed before kafkacat
..


Make sure librdkafka1 is installed before kafkacat

Bug: T166162
Change-Id: I28146f72d8fcc303dc12ff26a7a406a2f677e24b
---
M modules/profile/manifests/kafka/broker.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index 505f156..8e4d835 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -93,6 +93,7 @@
 if !defined(Package['librdkafka1']) and os_version('debian == stretch') {
 package { 'librdkafka1':
 ensure => '0.9.3-1',
+before => Package['kafkacat'],
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28146f72d8fcc303dc12ff26a7a406a2f677e24b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Make sure librdkafka1 is installed before kafkacat

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Make sure librdkafka1 is installed before kafkacat
..

Make sure librdkafka1 is installed before kafkacat

Bug: T166162
Change-Id: I28146f72d8fcc303dc12ff26a7a406a2f677e24b
---
M modules/profile/manifests/kafka/broker.pp
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index 505f156..8e4d835 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -93,6 +93,7 @@
 if !defined(Package['librdkafka1']) and os_version('debian == stretch') {
 package { 'librdkafka1':
 ensure => '0.9.3-1',
+before => Package['kafkacat'],
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Icinga: add check_bfd check (part 1)

2017-08-02 Thread Ayounsi (Code Review)

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

Change subject: Icinga: add check_bfd check (part 1)
..


Icinga: add check_bfd check (part 1)

Bug: T83992
Change-Id: Id36d7febc47d64f23e4507d8860ba3fcf5d10eb4
---
A modules/icinga/files/mib-jnx-bfd-exp.txt
A modules/icinga/files/mib-jnx-exp.txt
A modules/icinga/files/mib-jnx-smi.txt
M modules/icinga/manifests/plugins.pp
A modules/nagios_common/files/check_commands/check_bfd
A modules/nagios_common/files/check_commands/check_bfd.cfg
M modules/nagios_common/manifests/commands.pp
7 files changed, 1,348 insertions(+), 0 deletions(-)

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



diff --git a/modules/icinga/files/mib-jnx-bfd-exp.txt 
b/modules/icinga/files/mib-jnx-bfd-exp.txt
new file mode 100644
index 000..6c2189b
--- /dev/null
+++ b/modules/icinga/files/mib-jnx-bfd-exp.txt
@@ -0,0 +1,857 @@
+BFD-STD-MIB DEFINITIONS ::= BEGIN  
+   IMPORTS 
+  MODULE-IDENTITY, OBJECT-TYPE,  
+  Unsigned32, Counter32, Counter64,  
+  NOTIFICATION-TYPE 
+ FROM SNMPv2-SMI-- [RFC2578]
+
+  MODULE-COMPLIANCE, OBJECT-GROUP, 
+  NOTIFICATION-GROUP 
+  FROM SNMPv2-CONF  -- [RFC2580]
+
+  TEXTUAL-CONVENTION, TruthValue, 
+  RowStatus, StorageType, TimeStamp 
+ FROM SNMPv2-TC -- [RFC2579]
+
+  InetAddress, InetAddressType, InetPortNumber 
+ FROM INET-ADDRESS-MIB  -- [RFC3291]
+
+  -- Juniper specific   *** JNX ***
+  jnxBfdExperiment   -- *** JNX ***
+ FROM JUNIPER-EXPERIMENT-MIB -- *** JNX ***
+   ; 
+
+   bfdMIB MODULE-IDENTITY 
+  LAST-UPDATED "200507221200Z"  -- 04 July 2005 12:00:00 EST 
+  ORGANIZATION "IETF" 
+  CONTACT-INFO 
+  "Thomas D. Nadeau 
+   Cisco Systems, Inc. 
+   Email:  tnad...@cisco.com 
+
+   Zafar Ali  
+   Cisco Systems, Inc. 
+   Email:  z...@cisco.com 
+  " 
+  DESCRIPTION 
+  "Bidirectional Forwarding Management Information Base." 
+
+  -- Revision history. 
+  REVISION 
+  "200508221200Z"  -- 04 August 2005 12:00:00 EST 
+  DESCRIPTION 
+  "Initial version. Published as RFC ." -- RFC-editor pls fill 
+-- in 
+   ::= { jnxBfdExperiment 1 }
+
+   -- Top level components of this MIB module. 
+
+   bfdNotifications OBJECT IDENTIFIER ::= { bfdMIB 0 } 
+
+   bfdObjects   OBJECT IDENTIFIER ::= { bfdMIB 1 } 
+
+   bfdConformance   OBJECT IDENTIFIER ::= { bfdMIB 3 } 
+
+   bfdScalarObjects OBJECT IDENTIFIER ::= { bfdObjects 1 } 
+
+
+   --  Textual Conventions 
+
+   BfdSessIndexTC ::= TEXTUAL-CONVENTION 
+  DISPLAY-HINT "d" 
+  STATUScurrent 
+  DESCRIPTION 
+  "An index used to uniquely identify BFD sessions." 
+  SYNTAX Unsigned32 (1..4294967295) 
+
+   BfdInterval ::= TEXTUAL-CONVENTION 
+  STATUScurrent 
+  DESCRIPTION 
+  "The BFD interval delay in microseconds." 
+  SYNTAXUnsigned32 (1..4294967295) 
+
+   BfdDiag ::=  TEXTUAL-CONVENTION 
+  STATUScurrent 
+  DESCRIPTION 
+  "A common BFD diagnostic code." 
+
+  SYNTAX INTEGER { noDiagnostic(1),  
+   controlDetectionTimeExpired(2),  
+   echoFunctionFailed(3),  
+   neighborSignaledSessionDown(4),  
+   forwardingPlaneReset(5), 
+   pathDown(6),  
+   concatenatedPathDown(7), 
+   administrativelyDown(8),  
+   reverseConcatenatedPathDown (9) 
+ } 
+
+--  BFD General Variables 
+
+--  These parameters apply globally to the Router's 
+--  BFD Process. 
+
+   bfdAdminStatus OBJECT-TYPE 
+  SYNTAX   INTEGER { enabled(1), disabled(2) } 
+--  MAX-ACCESS   read-write 
+  MAX-ACCESS   read-only 
+  STATUS   current 
+  DESCRIPTION 
+  "The global administrative status of BFD in this router.  
+   The value 'enabled' denotes that the BFD Process is 
+   active on at least one interface; 'disabled' disables  
+   it on all interfaces." 
+  DEFVAL { enabled }  
+  ::= { bfdScalarObjects 1 } 
+
+   bfdVersionNumber OBJECT-TYPE 
+  SYNTAX   Unsigned32 
+  MAX-ACCESS   read-only 
+  STATUS   current 
+  DESCRIPTION 
+  "The current version number of the BFD protocol." 
+  REFERENCE

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "add IPv6 for labtestservices*"

2017-08-02 Thread Dzahn (Code Review)

Hello Andrew Bogott, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "add IPv6 for labtestservices*"
..

Revert "add IPv6 for labtestservices*"

This reverts commit ee5c06bed1a82d9e7f0fc66f2f12086354a7bad1.

Change-Id: Ifd300592491c6b5e700e171aef34c1c32676f14a
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/32/369732/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index d5b1386..fdd58b7 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -34,7 +34,6 @@
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr2-codfw.wikimedia.org.
-4.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestweb2001.wikimedia.org.
 2.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   achernar.wikimedia.org.
 5.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   mx2001.wikimedia.org.
 4.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   kraz.wikimedia.org.
@@ -42,7 +41,6 @@
 0.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   alsafi.wikimedia.org.
 2.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   dbmonitor2001.wikimedia.org.
 3.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install2002.wikimedia.org.
-8.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2001.wikimedia.org.
 
 ; public1-c-codfw (2620:0:860:3::/64)
 $ORIGIN 3.0.0.0.{{ zonename }}.
@@ -52,7 +50,6 @@
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-2003.cr2-codfw.wikimedia.org.
 
 4.7.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   tegmen.wikimedia.org.
-6.7.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2002.wikimedia.org.
 
 ; public1-d-codfw (2620:0:860:4::/64)
 $ORIGIN 4.0.0.0.{{ zonename }}.
@@ -65,7 +62,6 @@
 7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   gerrit-slave.wikimedia.org.
 
 8.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   
labtestpuppetmaster2001.wikimedia.org.
-9.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2003.wikimedia.org.
 
 0.1.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   netmon2001.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 2e45d05..50e1b97 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -168,11 +168,8 @@
 labtestpuppetmaster2001 1H IN A 208.80.153.108
 labtestpuppetmaster2001 1H IN  2620:0:860:4:208:80:153:108
 labtestservices2001 1H  IN A208.80.153.48
-labtestservices2001 1H  IN  2620:0:860:2:208:80:153:48
 labtestservices2002 1H  IN A208.80.153.76
-labtestservices2002 1H  IN  2620:0:860:3:208:80:153:76
 labtestservices2003 1H  IN A208.80.153.109
-labtestservices2003 1H  IN  2620:0:860:4:208:80:153:109
 labtestweb2001  1H  IN A208.80.153.14
 labtestweb2001  1H  IN  2620:0:860:1:208:80:153:14
 labweb1001  1H  IN A208.80.154.160

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd300592491c6b5e700e171aef34c1c32676f14a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Cleanup] Remove PatrolRule class

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: [Cleanup] Remove PatrolRule class
..


[Cleanup] Remove PatrolRule class

PatrolRule is a superclass for LinkedPagesRule but never used anywhere in
the script (or other framework scripts). The title() method is the only one
difference (maybe this method isn't used). Merge the base class to the
child class.

Change-Id: I8e331857d9b7e3f51d5fef431d8ff586c6d7ecfc
---
M scripts/patrol.py
1 file changed, 6 insertions(+), 24 deletions(-)

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



diff --git a/scripts/patrol.py b/scripts/patrol.py
index 8396467..14c24a7 100755
--- a/scripts/patrol.py
+++ b/scripts/patrol.py
@@ -185,7 +185,7 @@
 if pywikibot.config.verbose_output:
 pywikibot.output(u'checking against whitelist item = %s' % 
item)
 
-if isinstance(item, PatrolRule):
+if isinstance(item, LinkedPagesRule):
 if pywikibot.config.verbose_output:
 pywikibot.output(u'invoking programmed rule')
 if item.match(title):
@@ -377,29 +377,7 @@
 return
 
 
-class PatrolRule(object):
-
-"""Bot marks the edit.startswith("-s as patrolled based on info obtained 
by whitelist."""
-
-def __init__(self, page_title):
-"""
-Constructor.
-
-@param page_title: The page title for this rule
-@type page_title: pywikibot.Page
-"""
-self.page_title = page_title
-
-def title(self):
-"""Obtain page title."""
-return self.page_title
-
-def match(self, page):
-"""Added for future use."""
-pass
-
-
-class LinkedPagesRule(PatrolRule):
+class LinkedPagesRule(object):
 
 """Matches of page site title and linked pages title."""
 
@@ -413,6 +391,10 @@
 self.page_title = page_title
 self.linkedpages = None
 
+def title(self):
+"""Obtain page title."""
+return self.page_title
+
 def match(self, page_title):
 """Match page_title to linkedpages elements."""
 if page_title == self.page_title:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e331857d9b7e3f51d5fef431d8ff586c6d7ecfc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: fix reverse IPv6 for labtestweb2001

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: fix reverse IPv6 for labtestweb2001
..


fix reverse IPv6 for labtestweb2001

The line was right but in the wrong place, wrong subnet.

Change-Id: Ifb8a3689db08b10de9f36562b431685b51b75146
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index d5b1386..fc1fae4 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -22,6 +22,7 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr2-codfw.wikimedia.org.
 
+4.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestweb2001.wikimedia.org.
 6.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   alcyone.wikimedia.org.
 5.0.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   bast2001.wikimedia.org.
 2.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   acamar.wikimedia.org.
@@ -34,7 +35,6 @@
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr2-codfw.wikimedia.org.
-4.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestweb2001.wikimedia.org.
 2.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   achernar.wikimedia.org.
 5.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   mx2001.wikimedia.org.
 4.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   kraz.wikimedia.org.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb8a3689db08b10de9f36562b431685b51b75146
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: fix reverse IPv6 for labtestweb2001

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: fix reverse IPv6 for labtestweb2001
..

fix reverse IPv6 for labtestweb2001

The line was right but in the wrong place, wrong subnet.

Change-Id: Ifb8a3689db08b10de9f36562b431685b51b75146
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/31/369731/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index d5b1386..fc1fae4 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -22,6 +22,7 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr2-codfw.wikimedia.org.
 
+4.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestweb2001.wikimedia.org.
 6.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   alcyone.wikimedia.org.
 5.0.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   bast2001.wikimedia.org.
 2.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   acamar.wikimedia.org.
@@ -34,7 +35,6 @@
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr2-codfw.wikimedia.org.
-4.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestweb2001.wikimedia.org.
 2.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   achernar.wikimedia.org.
 5.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   mx2001.wikimedia.org.
 4.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   kraz.wikimedia.org.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Normalize user-generated default values

2017-08-02 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Normalize user-generated default values
..

RCFilters: Normalize user-generated default values

Bug: T172026
Change-Id: Id75116cf22a31f8b762801fc0a6aee554a9ca6b2
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 18 insertions(+), 10 deletions(-)


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

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index c4cce8d..f7021e2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -736,11 +736,11 @@
this.getType() === 'single_option' &&
!oneWasSelected
) {
+   item = this.getItems()[ 0 ];
if ( defaultParams[ this.getName() ] ) {
item = this.getItemByParamName( defaultParams[ 
this.getName() ] );
-   } else {
-   item = this.getItems()[ 0 ];
}
+
result[ item.getName() ] = true;
}
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f07d3f1..ede8ad7 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -280,20 +280,28 @@
 * @param {string|string[]} arbitraryValues An array of arbitrary 
values to add to the group
 */
mw.rcfilters.Controller.prototype.addNumberValuesToGroup = function ( 
groupData, arbitraryValues ) {
-   var controller = this;
+   var controller = this,
+   normalizeWithinRange = function ( range, val ) {
+   if ( val < 0 ) {
+   return range.min; // Min
+   } else if ( val >= range.max ) {
+   return range.max; // Max
+   }
+   return val;
+   };
 
arbitraryValues = Array.isArray( arbitraryValues ) ? 
arbitraryValues : [ arbitraryValues ];
 
-   // Normalize the arbitrary values
+   // Normalize the arbitrary values and the default value for a 
range
if ( groupData.range ) {
arbitraryValues = arbitraryValues.map( function ( val ) 
{
-   if ( val < 0 ) {
-   return groupData.range.min; // Min
-   } else if ( val >= groupData.range.max ) {
-   return groupData.range.max; // Max
-   }
-   return val;
+   return normalizeWithinRange( groupData.range, 
val );
} );
+
+   // Normalize the default, since that's user defined
+   if ( groupData.default !== undefined ) {
+   groupData.default = String( 
normalizeWithinRange( groupData.default ) );
+   }
}
 
// This is only true for single_option group

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id75116cf22a31f8b762801fc0a6aee554a9ca6b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: add IPv6 for labtestservices*

2017-08-02 Thread Dzahn (Code Review)

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

Change subject: add IPv6 for labtestservices*
..


add IPv6 for labtestservices*

Change-Id: I36654850b28a9cc30eb4b67b3d996d133ea988c6
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index fdd58b7..d5b1386 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -34,6 +34,7 @@
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae2-2002.cr2-codfw.wikimedia.org.
+4.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestweb2001.wikimedia.org.
 2.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   achernar.wikimedia.org.
 5.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   mx2001.wikimedia.org.
 4.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   kraz.wikimedia.org.
@@ -41,6 +42,7 @@
 0.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   alsafi.wikimedia.org.
 2.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   dbmonitor2001.wikimedia.org.
 3.5.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install2002.wikimedia.org.
+8.4.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2001.wikimedia.org.
 
 ; public1-c-codfw (2620:0:860:3::/64)
 $ORIGIN 3.0.0.0.{{ zonename }}.
@@ -50,6 +52,7 @@
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-2003.cr2-codfw.wikimedia.org.
 
 4.7.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   tegmen.wikimedia.org.
+6.7.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2002.wikimedia.org.
 
 ; public1-d-codfw (2620:0:860:4::/64)
 $ORIGIN 4.0.0.0.{{ zonename }}.
@@ -62,6 +65,7 @@
 7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   gerrit-slave.wikimedia.org.
 
 8.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   
labtestpuppetmaster2001.wikimedia.org.
+9.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   labtestservices2003.wikimedia.org.
 
 0.1.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   netmon2001.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 50e1b97..2e45d05 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -168,8 +168,11 @@
 labtestpuppetmaster2001 1H IN A 208.80.153.108
 labtestpuppetmaster2001 1H IN  2620:0:860:4:208:80:153:108
 labtestservices2001 1H  IN A208.80.153.48
+labtestservices2001 1H  IN  2620:0:860:2:208:80:153:48
 labtestservices2002 1H  IN A208.80.153.76
+labtestservices2002 1H  IN  2620:0:860:3:208:80:153:76
 labtestservices2003 1H  IN A208.80.153.109
+labtestservices2003 1H  IN  2620:0:860:4:208:80:153:109
 labtestweb2001  1H  IN A208.80.153.14
 labtestweb2001  1H  IN  2620:0:860:1:208:80:153:14
 labweb1001  1H  IN A208.80.154.160

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36654850b28a9cc30eb4b67b3d996d133ea988c6
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Refactor storing of item meta data

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Refactor storing of item meta data
..


Refactor storing of item meta data


Fixes issue where data attribute is not updated.

Change-Id: I9fff3967b9f13e4b47c1ec8a37161ae4604377bc
---
M wikibase/queryService/ui/queryHelper/SelectorBox.js
1 file changed, 28 insertions(+), 10 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  Lucas Werkmeister (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikibase/queryService/ui/queryHelper/SelectorBox.js 
b/wikibase/queryService/ui/queryHelper/SelectorBox.js
index d009bb3..ac44256 100644
--- a/wikibase/queryService/ui/queryHelper/SelectorBox.js
+++ b/wikibase/queryService/ui/queryHelper/SelectorBox.js
@@ -375,7 +375,7 @@
 
$select.change( function( e ) {
if ( listener ) {
-   listener( $select.val(), $select.find( 
'option:selected' ).text(), $( e.target ).data( 'options' ) );
+   listener( $select.val(), $select.find( 
'option:selected' ).text(), $element.data( 'items' ) );
}
$element.click();// hide clickover
$select.html( '' );
@@ -393,7 +393,7 @@
 
$select.change( function( e ) {
if ( listener ) {
-   listener( $select.val(), $select.find( 
'option:selected' ).text(), $( e.target ).data( 'options' ) );
+   listener( $select.val(), $select.find( 
'option:selected' ).text(), $element.data( 'items' ) );
}
} );
 
@@ -460,6 +460,8 @@
self._searchEntities( params.data.term, 
type )
).done( function ( r1, r2 ) {
 
+   self._addItemMetaData( $element, 
r1.concat( r2 ) );
+
if ( r1.length > 0 ) {
r1 = [ {
text: 
self._i18n( 'suggestions', 'Suggestions' ),
@@ -479,6 +481,29 @@
} );
} );
};
+   };
+
+   /**
+* @private
+*/
+   SELF.prototype._addItemMetaData = function( $element, items ) {
+   var data = {};
+
+   items.forEach( function ( item ) {
+
+   if ( !data[item.data.id] ) {
+   data[item.data.id] = {};
+   }
+
+   data[item.data.id].text = item.text;
+
+   if ( item.data.propertyId ) {
+   data[item.data.id].propertyId = 
item.data.propertyId;
+   }
+
+   } );
+
+   $element.data( 'items', data );
};
 
/**
@@ -633,17 +658,10 @@
 * @private
 */
SELF.prototype._renderSelect2 = function( $select, $element, triple ) {
-   var data = {},
-   formatter = function( item, li ) {
+   var formatter = function( item, li ) {
if ( !item.data ) {
return item.text;
}
-
-   data[ item.data.id  ] = {
-   text: item.text,
-   propertyId: item.data.propertyId
-   };
-   $select.attr( 'data-options', JSON.stringify( 
data ) );
 
return $( '' + item.text + ' (' + 
item.data.id + ')' + '' +
item.data.description + 
'' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fff3967b9f13e4b47c1ec8a37161ae4604377bc
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

2017-08-02 Thread Catrope (Code Review)

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

Change subject: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs
..

Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs

We used (\.+\/)* instead of (\.\.?\/)* in some places,
but that doesn't make much sense since we won't and shouldn't
ever see stuff like '.../'

Change-Id: I9efcff2d2a34499ca57321dfbae29392ecb422d7
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
3 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index fa5a3ec..e7c0e9f 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -179,7 +179,7 @@
imgModel.cacheOriginalImageAttributes( attrs );
 
imgModel.setImageSource( attrs.src );
-   imgModel.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.+\/)*/, '' ) ).getMainText() );
+   imgModel.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.\.?\/)*/, '' ) ).getMainText() );
imgModel.setImageHref( attrs.href );
 
// Set bounding box
@@ -283,7 +283,7 @@
}
if ( attrs.resource ) {
this.setImageResourceName( attrs.resource );
-   this.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.+\/)*/, '' ) ).getMainText() );
+   this.setFilename( new mw.Title( attrs.resource.replace( 
/^(\.\.?\/)*/, '' ) ).getMainText() );
}
 
if ( attrs.src ) {
@@ -1118,7 +1118,7 @@
  * @param {ve.dm.Scalable} scalable Scalable object
  */
 ve.dm.MWImageModel.prototype.attachScalable = function ( scalable ) {
-   var imageName = this.getResourceName().replace( /^(\.+\/)*/, '' ),
+   var imageName = this.getResourceName().replace( /^(\.\.?\/)*/, '' ),
imageModel = this;
 
if ( this.scalable instanceof ve.dm.Scalable ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index f2a5e6f..ecef276 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -296,7 +296,7 @@
 ve.dm.MWImageNode.prototype.getFilename = function () {
// Strip ./ stuff and decode URI encoding
var resource = this.getAttribute( 'resource' ) || '',
-   filename = resource.replace( /^(\.+\/)*/, '' );
+   filename = resource.replace( /^(\.\.?\/)*/, '' );
 
return ve.decodeURIComponentIntoArticleTitle( filename, true );
 };
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 226d948..0d757c3 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -394,7 +394,7 @@
part = content.parts[ i ];
if ( part.template ) {
href = part.template.target.href;
-   page = href ? 
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.+\/)*/, '' ) ) : null;
+   page = href ? 
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.\.?\/)*/, '' ) ) : 
null;
this.partsList.push( {
template: part.template.target.wt,
templatePage: page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9efcff2d2a34499ca57321dfbae29392ecb422d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Compilations: close the loop.

2017-08-02 Thread jenkins-bot (Code Review)

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

Change subject: Compilations: close the loop.
..


Compilations: close the loop.

This implements downloading of compilations.

Some architecture notes:
This introduces an abstract Fragment that becomes an observer of the
system DownloadManager, by polling it at a predefined interval.

So then, the other fragments that show lists of compilations (or a single
compilation) will automatically become subscribers to the polling of the
DownloadManager.  Upon every poll event, we'll update each compilation
item with the appropriate state that the DownloadManager reports.

If a compilation item is in the middle of being downloaded, we show the
DownloadControlView component inline with the item.

TODO:
- Implement deleting a downloaded compilation from disk.
- Implement more robust behavior upon successful download completion.

Bug: T167523
Bug: T164764
Bug: T167527
Change-Id: I2741c14894d990c59c30bd685546c2dd61c5cab3
---
M app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/offline/Compilation.java
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
A app/src/main/java/org/wikipedia/offline/DownloadManagerItem.java
A app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
A app/src/main/java/org/wikipedia/offline/DownloadObserverFragment.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/OfflineManager.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
M app/src/main/java/org/wikipedia/views/PageItemView.java
M app/src/main/res/layout/fragment_compilation_detail.xml
M app/src/main/res/layout/item_page_list_entry.xml
M app/src/main/res/layout/view_compilation_download_widget.xml
A app/src/main/res/menu/menu_remote_compilation_item.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/strings.xml
20 files changed, 572 insertions(+), 97 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.java 
b/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.java
index bc4ae04..c667b47 100644
--- a/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.java
+++ b/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.java
@@ -15,6 +15,7 @@
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.feed.image.FeaturedImage;
+import org.wikipedia.offline.Compilation;
 import org.wikipedia.util.FileUtil;
 
 import java.io.File;
@@ -32,13 +33,19 @@
 this.callback = callback;
 }
 
-public void download(@NonNull Context context, @NonNull FeaturedImage 
featuredImage) {
+public static void download(@NonNull Context context, @NonNull Compilation 
compilation) {
+String filename = 
FileUtil.sanitizeFileName(compilation.uri().getLastPathSegment());
+String targetDirectory = Environment.DIRECTORY_DOWNLOADS;
+performDownloadRequest(context, compilation.uri(), targetDirectory, 
filename, Compilation.MIME_TYPE);
+}
+
+public static void download(@NonNull Context context, @NonNull 
FeaturedImage featuredImage) {
 String filename = FileUtil.sanitizeFileName(featuredImage.title());
 String targetDirectory = Environment.DIRECTORY_PICTURES;
 performDownloadRequest(context, featuredImage.image().source(), 
targetDirectory, filename, null);
 }
 
-public void download(@NonNull Context context, @NonNull GalleryItem 
galleryItem) {
+public static void download(@NonNull Context context, @NonNull GalleryItem 
galleryItem) {
 String saveFilename = 
FileUtil.sanitizeFileName(trimFileNamespace(galleryItem.getName()));
 String targetDirectoryType;
 if (FileUtil.isVideo(galleryItem.getMimeType())) {
@@ -54,7 +61,7 @@
 saveFilename, galleryItem.getMimeType());
 }
 
-private void performDownloadRequest(@NonNull Context context, @NonNull Uri 
uri,
+private static void performDownloadRequest(@NonNull Context context, 
@NonNull Uri uri,
 @NonNull String targetDirectoryType,
 @NonNull String targetFileName, 
@Nullable String mimeType) {
 final String targetSubfolderName = 
WikipediaApp.getInstance().getString(R.string.app_name);
@@ -104,7 +111,7 @@
 }
 }
 
-@NonNull private String trimFileNamespace(@NonNull String filename) {
+@NonNull private static String

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Specify librkafka version in Stretch (so kafkacat installs p...

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Specify librkafka version in Stretch (so kafkacat installs 
properly)
..


Specify librkafka version in Stretch (so kafkacat installs properly)

Bug: T166162
Change-Id: If478d151cc4163113b7e8fe0684e6df9a0f83efe
---
M modules/profile/manifests/kafka/broker.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index b7a1a19..505f156 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -88,6 +88,14 @@
 
 require_package('openjdk-8-jdk')
 
+# WMF's librdkafka is overriding that in Debian stretch. Require the 
Stretch version.
+# https://packages.debian.org/stretch/librdkafka1
+if !defined(Package['librdkafka1']) and os_version('debian == stretch') {
+package { 'librdkafka1':
+ensure => '0.9.3-1',
+}
+}
+
 # kafkacat is handy!
 require_package('kafkacat')
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If478d151cc4163113b7e8fe0684e6df9a0f83efe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Specify librkafka version in Stretch (so kafkacat installs p...

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Specify librkafka version in Stretch (so kafkacat installs 
properly)
..

Specify librkafka version in Stretch (so kafkacat installs properly)

Bug: T166162
Change-Id: If478d151cc4163113b7e8fe0684e6df9a0f83efe
---
M modules/profile/manifests/kafka/broker.pp
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index b7a1a19..505f156 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -88,6 +88,14 @@
 
 require_package('openjdk-8-jdk')
 
+# WMF's librdkafka is overriding that in Debian stretch. Require the 
Stretch version.
+# https://packages.debian.org/stretch/librdkafka1
+if !defined(Package['librdkafka1']) and os_version('debian == stretch') {
+package { 'librdkafka1':
+ensure => '0.9.3-1',
+}
+}
+
 # kafkacat is handy!
 require_package('kafkacat')
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Manage /srv/kafka to be nice in profile, don't render zk set...

2017-08-02 Thread Ottomata (Code Review)

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

Change subject: Manage /srv/kafka to be nice in profile, don't render zk 
settings if undef
..


Manage /srv/kafka to be nice in profile, don't render zk settings if undef

Bug: T166162
Change-Id: I4ae3c11475af0f769899ff06f2d2174b879e2a1d
---
M modules/confluent/templates/kafka/server.properties.erb
M modules/profile/manifests/kafka/broker.pp
2 files changed, 16 insertions(+), 2 deletions(-)

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



diff --git a/modules/confluent/templates/kafka/server.properties.erb 
b/modules/confluent/templates/kafka/server.properties.erb
index 34e654a..c2a8fe6 100644
--- a/modules/confluent/templates/kafka/server.properties.erb
+++ b/modules/confluent/templates/kafka/server.properties.erb
@@ -242,15 +242,19 @@
 # root directory for all kafka znodes.
 zookeeper.connect=<%= @zookeeper_connect %>
 
+<% if @zookeeper_connection_timeout_ms -%>
 # Timeout in ms for connecting to zookeeper
 zookeeper.connection.timeout.ms=<%= @zookeeper_connection_timeout_ms %>
 
+<% end -%>
+<% if @zookeeper_session_timeout_ms -%>
 # Zookeeper session timeout. If the server fails to heartbeat to Zookeeper
 # within this period of time it is considered dead. If you set this too low
 # the server may be falsely considered dead; if you set it too high it may
 # take too long to recognize a truly dead server.
 zookeeper.session.timeout.ms=<%= @zookeeper_session_timeout_ms %>
 
+<% end -%>
 # Confluent Proactive Support ##
 # If set to true, and confluent-support-metrics package is installed
 # then the feature to collect and report support metrics
diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index fb353be..b7a1a19 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -34,8 +34,9 @@
 #
 # [*log_dirs*]
 #   Array of Kafka log data directories.  The confluent::kafka::broker class
-#   manages these directories but not anything above them.
-#   You must ensure that any parent directories exist outside of this class.
+#   manages these directories but not anything above them.  Unless the prefix
+#   is /srv/kafka, then this profile tries to be nice.  Otherwise,
+#   you must ensure that any parent directories exist outside of this class.
 #   Hiera: profile::kafka::broker::log_dirs
 #
 # [*auto_leader_rebalance_enable*]
@@ -143,6 +144,15 @@
 $ssl_truststore_password= undef
 }
 
+# Be nice, and manage /srv/kafka if it is the prefix for kafka data 
directories.
+# This is the common case.
+if '/srv/kafka' in $log_dirs[0] and !defined(File['/srv/kafka']) {
+file { '/srv/kafka':
+ensure => 'directory',
+mode   => '0755',
+}
+}
+
 class { '::confluent::kafka::client':
 # TODO: These should be removed once they are
 # the default in ::confluent::kafka module

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ae3c11475af0f769899ff06f2d2174b879e2a1d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 360 matches

Mail list logo