[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EmailNotification: Add newline before minor edit text

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404161 )

Change subject: EmailNotification: Add newline before minor edit text
..

EmailNotification: Add newline before minor edit text

Otherwise you get something like this:
"Editor's summary: interwiki fix This is a minor edit"
It's not entirely clear that the editor's summary has ended and the minor edit
text has been added by the software.

Change-Id: Iab79b5f8a1f6f319e9fd284835b7a4e86c3f0394
---
M includes/mail/EmailNotification.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/404161/1

diff --git a/includes/mail/EmailNotification.php 
b/includes/mail/EmailNotification.php
index 2931d9d..fd0881e 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -342,7 +342,7 @@
 
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalURL();
-   $keys['$PAGEMINOREDIT'] = $this->minorEdit ?
+   $keys['$PAGEMINOREDIT'] = "\n" . $this->minorEdit ?
wfMessage( 'enotif_minoredit' 
)->inContentLanguage()->text() : '';
$keys['$UNWATCHURL'] = $this->title->getCanonicalURL( 
'action=unwatch' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab79b5f8a1f6f319e9fd284835b7a4e86c3f0394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: letsencrypt: Update LE subscriber agreement URL

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403326 )

Change subject: letsencrypt: Update LE subscriber agreement URL
..

letsencrypt: Update LE subscriber agreement URL

Changes that I've noticed:
* No longer have to maintain *sole* control etc. of private key
* They will use technical measures to ensure we have control
  over a domain but not *exclusive* control

Could be others that I missed.
This is needed to prevent this error:
Exec[acme-setup-acme-deployment_mx02]/returns:   "detail": "Provided agreement 
URL [https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf] does not 
match current agreement URL 
[https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf];,

Change-Id: I190a4613cb06e32f34b100c39d8b2330185466d3
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/403326/1

diff --git a/modules/letsencrypt/files/acme_tiny.py 
b/modules/letsencrypt/files/acme_tiny.py
index 4e9a6e1..330637e 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -104,7 +104,7 @@
 log.info("Registering account...")
 code, result = _send_signed_request(CA + "/acme/new-reg", {
 "resource": "new-reg",
-"agreement": 
"https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf;,
+"agreement": 
"https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf;,
 })
 if code == 201:
 log.info("Registered!")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I190a4613cb06e32f34b100c39d8b2330185466d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Copy deployment-mx file to deployment-mx02

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402899 )

Change subject: Copy deployment-mx file to deployment-mx02
..

Copy deployment-mx file to deployment-mx02

Bug: T184244
Change-Id: I469f831a9039e7567a8c7f43eff254f694554da8
---
A hieradata/labs/deployment-prep/host/deployment-mx02.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/402899/1

diff --git a/hieradata/labs/deployment-prep/host/deployment-mx02.yaml 
b/hieradata/labs/deployment-prep/host/deployment-mx02.yaml
new file mode 100644
index 000..7ad0377
--- /dev/null
+++ b/hieradata/labs/deployment-prep/host/deployment-mx02.yaml
@@ -0,0 +1 @@
+standard::has_default_mail_relay: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I469f831a9039e7567a8c7f43eff254f694554da8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: swift: Fix checks on drive/filesystem titles to allow for la...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402758 )

Change subject: swift: Fix checks on drive/filesystem titles to allow for labs 
ones
..

swift: Fix checks on drive/filesystem titles to allow for labs ones

Added support for the lv- prefix used on deployment-ms-be0[34] machines in
deployment-prep.

Bug: T184236
Change-Id: I1eb608cf96e2e79a84772faaf7bedae6c0ecfb96
---
M modules/swift/manifests/init_device.pp
M modules/swift/manifests/mount_filesystem.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/402758/1

diff --git a/modules/swift/manifests/init_device.pp 
b/modules/swift/manifests/init_device.pp
index eaca102..8c72c66 100644
--- a/modules/swift/manifests/init_device.pp
+++ b/modules/swift/manifests/init_device.pp
@@ -1,5 +1,5 @@
 define swift::init_device($partition_nr='1') {
-if ($title !~ /^([hvs]d[a-z]+|md[0-9]+)$/) {
+if ($title !~ /^([hvs]d[a-z]+|md[0-9]+|lv\-[a-z]+)$/) {
 fail("Invalid name ${title} for swift::init_device")
 }
 
diff --git a/modules/swift/manifests/mount_filesystem.pp 
b/modules/swift/manifests/mount_filesystem.pp
index 1a7a86e..38f478d 100644
--- a/modules/swift/manifests/mount_filesystem.pp
+++ b/modules/swift/manifests/mount_filesystem.pp
@@ -1,7 +1,7 @@
 define swift::mount_filesystem (
 $mount_base = '/srv/swift-storage',
 ){
-if ($title !~ /^[hvs]d[a-z]+[0-9]+$/) {
+if ($title !~ /^([hvs]d|lv\-)[a-z]+[0-9]+$/) {
 fail("Invalid name ${title} for swift::mount_filesystem")
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb608cf96e2e79a84772faaf7bedae6c0ecfb96
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] keystone: Create top-level domain for each new project

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375089 )

Change subject: [WIP] keystone: Create top-level domain for each new project
..

[WIP] keystone: Create top-level domain for each new project

I have no way of testing this.

Bug: T162977
Change-Id: I3994c66127a592fe99644782286033ca1eeb29c0
---
M modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/hooks.pp
M modules/openstack2/manifests/keystone/hooks.pp
4 files changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/375089/1

diff --git 
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py 
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
index f6aaa96..46e5986 100644
--- 
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
+++ 
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
@@ -18,6 +18,7 @@
 from keystone import exception
 from novaclient import client as nova_client
 from novaclient import exceptions
+import designatemakedomain
 
 from oslo_log import log as logging
 from oslo_config import cfg
@@ -162,6 +163,14 @@
  project_id,
  
roledict[CONF.wmfhooks.observer_role_name])
 
+designatemakedomain.createdomain(
+CONF.wmfhooks.auth_url,
+CONF.wmfhooks.admin_user,
+CONF.wmfhooks.admin_pass,
+project_id,
+'{}.wmflabs.org'.format(project_id)
+)
+
 # Use the nova api to set up security groups for the new project
 auth = generic.Password(
 auth_url=CONF.wmfhooks.auth_url,
diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index b7ce1a9..6348815 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -262,7 +262,7 @@
 mode=> '0644',
 }
 
-# Arbitrary handy script that needs to be on the horizon host because it 
only works with Liberty
+# Arbitrary handy script that historically needed to be on the horizon 
host because it only works with Liberty and above. From an era when everything 
else ran Kilo
 file { '/root/makedomain':
 source => 
"puppet:///modules/openstack2/${openstack_version}/admin_scripts/makedomain",
 owner  => 'root',
diff --git a/modules/openstack/manifests/keystone/hooks.pp 
b/modules/openstack/manifests/keystone/hooks.pp
index 5b7cd74..012e06c 100644
--- a/modules/openstack/manifests/keystone/hooks.pp
+++ b/modules/openstack/manifests/keystone/hooks.pp
@@ -3,6 +3,13 @@
 class openstack::keystone::hooks(
 $openstack_version  = $::openstack::version)
 {
+file { '/usr/lib/python2.7/dist-packages/designatemakedomain.py':
+source => 
"puppet:///modules/openstack2/${openstack_version}/admin_scripts/makedomain",
+owner  => 'root',
+group  => 'root',
+mode   => '0744',
+}
+
 file { '/usr/lib/python2.7/dist-packages/wmfkeystonehooks':
 source  => 
"puppet:///modules/openstack/${openstack_version}/keystone/wmfkeystonehooks",
 owner   => 'root',
diff --git a/modules/openstack2/manifests/keystone/hooks.pp 
b/modules/openstack2/manifests/keystone/hooks.pp
index a99fef0..f11541a 100644
--- a/modules/openstack2/manifests/keystone/hooks.pp
+++ b/modules/openstack2/manifests/keystone/hooks.pp
@@ -5,6 +5,13 @@
 ) {
 include openstack2::keystone::service
 
+file { '/usr/lib/python2.7/dist-packages/designatemakedomain.py':
+source => 
"puppet:///modules/openstack2/${openstack_version}/admin_scripts/makedomain",
+owner  => 'root',
+group  => 'root',
+mode   => '0744',
+}
+
 file { '/usr/lib/python2.7/dist-packages/wmfkeystonehooks':
 source  => 
"puppet:///modules/openstack/${version}/keystone/wmfkeystonehooks",
 owner   => 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3994c66127a592fe99644782286033ca1eeb29c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] shinkengen for all projects

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374897 )

Change subject: [WIP] shinkengen for all projects
..

[WIP] shinkengen for all projects

Untested!

Cleans up some now-unused config and heira etc.

Bug: T166845
Change-Id: Idcf1e283c0dfdd8546cd46c76155b836b7c7677c
---
M hieradata/labs.yaml
M modules/shinken/files/shinkengen
M modules/shinken/templates/shinkengen.yaml.erb
3 files changed, 24 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/374897/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index d085d2e..e5b9569 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -86,7 +86,6 @@
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it
-keystone_public_port: '5000'
 
 # All labs instances have internet connectivity, so do not bother with proxies
 profile::base::use_apt_proxy: false
diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 619f172..40b0539 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -40,6 +40,7 @@
 from keystoneclient.session import Session as KeystoneSession
 from keystoneclient.auth.identity.v3 import Password as KeystonePassword
 
+from keystoneclient.v3 import Client as KeystoneClient
 from novaclient import client as novaclient
 
 
@@ -61,21 +62,18 @@
  for key, value in self.properties.iteritems())
 return 'define %s {\n%s}\n' % (self.type, config_str)
 
+def get_keystone_session(project, observer_config):
+return KeystoneSession(auth=KeystonePassword(
+auth_url=observer_config['OS_AUTH_URL'],
+username=observer_config['OS_USERNAME'],
+password=observer_config['OS_PASSWORD'],
+project_name=project,
+user_domain_name='default',
+project_domain_name='default'
+))
 
-def get_instances(project, observer_pass, keystone_host, keystone_port):
-client = novaclient.Client(
-"2.0",
-session=KeystoneSession(auth=KeystonePassword(
-auth_url="http://{host}:{port}/v3".format(host=keystone_host,
-  port=keystone_port),
-username="novaobserver",
-password=observer_pass,
-project_name=project,
-user_domain_name='default',
-project_domain_name='default'
-))
-)
-
+def get_instances(project, keystone_session):
+client = novaclient.Client("2.0", session=keystone_session)
 hosts = []
 for instance in client.servers.list():
 hosts.append({
@@ -112,10 +110,14 @@
 nova_observer = yaml.safe_load(n)
 observer_pass = nova_observer['OS_PASSWORD']
 
-for project in config['projects']:
-instances = get_instances(project, observer_pass,
-  config['keystone_host'],
-  config['keystone_port'])
+client = KeystoneClient(
+session=get_keystone_session('bastion', nova_observer),
+endpoint=nova_observer['OS_AUTH_URL'],
+interface='public'
+)
+
+for project in client.projects.list():
+instances = get_instances(project.name, 
get_keystone_session(project.name, nova_observer))
 host_configs = []
 for instance in instances:
 co = ConfigObject('host')
@@ -127,7 +129,7 @@
 # particular roles with checks.  role::labs::instance is
 # implicitly applied to all instances via
 # manifests/site.pp, so we need to add it here explicitly.
-hostgroups = [project, 'role::labs::instance']
+hostgroups = [project.name, 'role::labs::instance']
 hostgroups += get_instance_roles(instance['project'],
  instance['fqdn'],
  config['puppet_enc_host'])
@@ -135,13 +137,13 @@
 # For each project added to monitoring we expect a contactgroup 
with the same
 # name added.
 # FIXME: Implement access mechanism more fine grained than 
per-project
-co.properties['contact_groups'] = project
+co.properties['contact_groups'] = project.name
 # Used to auto derive metric paths in graphite, which is of the 
form
 # ...
-co.properties['notes'] = project  # Used for auto deriving 
graphite path
+co.properties['notes'] = project.name  # Used for auto deriving 
graphite path
 host_configs.append(co)
 hosts_config_path = '%s/%s.cfg' % (
-config['output_path'], project
+config['output_path'], project.name
 )
 file_content = ''.join([str(hc) 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add me back to deployment-prep shinken contacts

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374866 )

Change subject: Add me back to deployment-prep shinken contacts
..

Add me back to deployment-prep shinken contacts

Change-Id: I13a492e4fd2423e9dc49b8bdab4b9b352948f527
---
M modules/nagios_common/files/contactgroups-labs.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/374866/1

diff --git a/modules/nagios_common/files/contactgroups-labs.cfg 
b/modules/nagios_common/files/contactgroups-labs.cfg
index 2165ca9..76f0f5f 100644
--- a/modules/nagios_common/files/contactgroups-labs.cfg
+++ b/modules/nagios_common/files/contactgroups-labs.cfg
@@ -16,7 +16,7 @@
 define contactgroup {
 contactgroup_name   deployment-prep
 alias   Beta Cluster Administrators
-members 
guest,greg_g,twentyafterfour,betacluster-alerts-list,irc-releng,kart_,gehel
+members 
guest,greg_g,twentyafterfour,betacluster-alerts-list,irc-releng,kart_,gehel,krenair
 }
 
 define contactgroup {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13a492e4fd2423e9dc49b8bdab4b9b352948f527
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove allowances for IPs that are no longer in use

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374665 )

Change subject: Remove allowances for IPs that are no longer in use
..

Remove allowances for IPs that are no longer in use

All from labs

Change-Id: I7d65c0e6de664811de67caaa7069de02f01d3a49
---
M hieradata/labs.yaml
M hieradata/role/common/labs/nfs/misc.yaml
2 files changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/374665/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index d085d2e..e66088e 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -77,7 +77,6 @@
 hosts:
   "%{::fqdn}": 1
 
-profile::base::nrpe_allowed_hosts: '10.68.16.195' # icinga
 profile::base::ssh_server_settings:
   disable_agent_forwarding: false
   challenge_response_auth: false
diff --git a/hieradata/role/common/labs/nfs/misc.yaml 
b/hieradata/role/common/labs/nfs/misc.yaml
index f2d584d..a8b9671 100644
--- a/hieradata/role/common/labs/nfs/misc.yaml
+++ b/hieradata/role/common/labs/nfs/misc.yaml
@@ -20,8 +20,6 @@
   - '10.68.16.6'
   - '10.68.17.110'
   - '10.68.16.103'
-  - '10.68.16.125'
-  - '10.68.17.33'
   - '10.68.16.70'
   - '10.68.20.112'
 debdeploy::grains:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d65c0e6de664811de67caaa7069de02f01d3a49
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: reload JS: Get captcha ID using JSON

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374537 )

Change subject: reload JS: Get captcha ID using JSON
..

reload JS: Get captcha ID using JSON

Change-Id: I0cc5293bd9dd0f0e71a3f5b3277bd8d53cb740f8
---
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
1 file changed, 6 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/37/374537/1

diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js 
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
index b57b965..950d970 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
@@ -1,30 +1,18 @@
 ( function ( $, mw ) {
-   var api = new mw.Api();
$( document ).on( 'click', '.fancycaptcha-reload', function () {
var $this = $( this ),
-   $root, $captchaImage;
-
-   $root = $this.closest( '.fancycaptcha-captcha-container' );
+   $captchaImage = $root.find( '.fancycaptcha-image' ),
+   $root = $this.closest( 
'.fancycaptcha-captcha-container' );
 
$this.addClass( 'fancycaptcha-reload-loading' );
 
-   $captchaImage = $root.find( '.fancycaptcha-image' );
-
// AJAX request to get captcha index key
-   api.post( {
-   action: 'fancycaptchareload',
-   format: 'xml'
-   }, {
-   dataType: 'xml'
-   } )
-   .done( function ( xmldata ) {
-   var imgSrc, captchaIndex;
-
-   captchaIndex = $( xmldata ).find( 'fancycaptchareload' 
).attr( 'index' );
+   new mw.Api().post( { action: 'fancycaptchareload' } ).done( 
function ( data ) {
+   var captchaIndex = data.fancycaptchareload.index,
+   imgSrc;
if ( typeof captchaIndex === 'string' ) {
// replace index key with a new one for captcha 
image
-   imgSrc = $captchaImage.attr( 'src' )
-   .replace( /(wpCaptchaId=)\w+/, '$1' + 
captchaIndex );
+   imgSrc = $captchaImage.attr( 'src' ).replace( 
/(wpCaptchaId=)\w+/, '$1' + captchaIndex );
$captchaImage.attr( 'src', imgSrc );
 
// replace index key with a new one for hidden 
tag

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cc5293bd9dd0f0e71a3f5b3277bd8d53cb740f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix mwrepl to require expanddblist dependency, from scap::sc...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372764 )

Change subject: Fix mwrepl to require expanddblist dependency, from 
scap::scripts
..

Fix mwrepl to require expanddblist dependency, from scap::scripts

Change-Id: I5d2f62c3c5d825cc98768c1da162def94c5422f5
---
M modules/mediawiki/manifests/mwrepl.pp
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/mediawiki/manifests/mwrepl.pp 
b/modules/mediawiki/manifests/mwrepl.pp
index df006a1..a9961f9 100644
--- a/modules/mediawiki/manifests/mwrepl.pp
+++ b/modules/mediawiki/manifests/mwrepl.pp
@@ -21,10 +21,12 @@
 mode   => '0444',
 }
 
+include ::scap::scripts
 file { '/usr/local/bin/mwrepl':
 source => 'puppet:///modules/mediawiki/mwrepl',
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
+require => File['/usr/local/bin/expanddblist']
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d2f62c3c5d825cc98768c1da162def94c5422f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Wikibase on deployment-prep: Exclude non-existent wikis from...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372761 )

Change subject: Wikibase on deployment-prep: Exclude non-existent wikis from 
clientDbList
..

Wikibase on deployment-prep: Exclude non-existent wikis from clientDbList

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


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 7ef0e97..109c68b 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -103,6 +103,13 @@
$wgWBRepoSettings['clientDbList'],
MWWikiversions::readDbListFile( $wmfRealm === 'labs' ? 
'closed-labs' : 'closed' )
);
+   // Exclude non-existent wikis in labs
+   if ( $wmfRealm === 'labs' ) {
+   $wgWBRepoSettings['clientDbList'] = array_intersect(
+   $wgWBRepoSettings['clientDbList'],
+   MWWikiversions::readDbListFile( 'all-labs' )
+   );
+   }
}
 
$wgWBRepoSettings['localClientDatabases'] = array_combine(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaba18f76557717f3dc0844bfd3af491644e26eea
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Followup Ia5d07908: Fix sentry class's base::service_unit to...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372495 )

Change subject: Followup Ia5d07908: Fix sentry class's base::service_unit to 
require correct resource class
..

Followup Ia5d07908: Fix sentry class's base::service_unit to require correct 
resource class

Bug: T173554
Change-Id: I95d185b6e7a64d9cccda64339573d61f0a8afb43
---
M modules/sentry/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/372495/1

diff --git a/modules/sentry/manifests/init.pp b/modules/sentry/manifests/init.pp
index 9882aaa..49e1ac1 100644
--- a/modules/sentry/manifests/init.pp
+++ b/modules/sentry/manifests/init.pp
@@ -118,7 +118,7 @@
 base::service_unit { 'sentry':
 systemd   => true,
 subscribe => File['/etc/sentry.conf.py'],
-require   => Base::Service_unit['sentry-worker'],
+require   => Systemd::Service['sentry-worker'],
 }
 
 nginx::site { 'sentry':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95d185b6e7a64d9cccda64339573d61f0a8afb43
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use prop instead of removeAttr

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371026 )

Change subject: Use prop instead of removeAttr
..

Use prop instead of removeAttr

Change-Id: I683ec23e12afaade0463c55657b0808c0968a1dd
---
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js 
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index 8b99bd0..6538b6c 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -279,7 +279,7 @@
apiUrl = $( '#wbclient-linkItem-site' 
).siteselector( 'getSelectedSite' ).getApi();
} catch ( e ) {
// Invalid input (likely incomplete). Disable 
the page input an re-disable to button
-   $page.attr( 'disabled', 'disabled' );
+   $page.prop( 'disabled', true );
this.$goButton.button( 'disable' );
return;
}
@@ -288,7 +288,7 @@
// input element. Furthermore, we remove the old 
suggestor (if there's one) and create a new
// one working on the right wiki.
$page
-   .removeAttr( 'disabled' )
+   .prop( 'disabled', false )
.suggester( {
source: function ( term ) {
var deferred = $.Deferred();
@@ -330,9 +330,9 @@
.attr( {
name: 'wbclient-linkItem-page',
id: 'wbclient-linkItem-page',
-   disabled: 'disabled',
'class': 'wbclient-linkItem-input'
} )
+   .prop( 'disabled', true )
.on( 'eachchange', function () {
// Enable the button if the field has a 
value
self.$goButton.button( $( this ).val() 
=== '' ? 'disable' : 'enable' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I683ec23e12afaade0463c55657b0808c0968a1dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Use .length instead of .size() as it's getting removed in jQ...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371024 )

Change subject: Use .length instead of .size() as it's getting removed in 
jQuery 3.0
..

Use .length instead of .size() as it's getting removed in jQuery 3.0

Change-Id: I86d0a9414960a190e4eda1e732b2530110287a55
---
M resources/js/ext.translate.quickedit.js
M resources/js/ext.translate.special.languagestats.js
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/resources/js/ext.translate.quickedit.js 
b/resources/js/ext.translate.quickedit.js
index 3e4f93e..8b7a512 100644
--- a/resources/js/ext.translate.quickedit.js
+++ b/resources/js/ext.translate.quickedit.js
@@ -201,7 +201,7 @@
id = 'jsedit' + page.replace( /[^a-zA-Z0-9_]/g, '_' );
dialogElement = $( '#' + id );
 
-   if ( dialogElement.size() > 0 ) {
+   if ( dialogElement.length > 0 ) {
dialogElement.dialog( 'option', 'position', 
'top' );
dialogElement.dialog( 'open' );
return false;
diff --git a/resources/js/ext.translate.special.languagestats.js 
b/resources/js/ext.translate.special.languagestats.js
index c01920e..24800d7 100644
--- a/resources/js/ext.translate.special.languagestats.js
+++ b/resources/js/ext.translate.special.languagestats.js
@@ -14,7 +14,7 @@
$metaRows = $( 'tr.AggregateMessageGroup', 
$translateTable );
 
// Quick return
-   if ( !$metaRows.size() ) {
+   if ( !$metaRows.length ) {
return;
}
 
@@ -25,7 +25,7 @@
$children = $( 'tr[data-parentgroup="' + 
thisGroupId + '"]', $translateTable );
 
// Only do the collapse stuff if this Meta-group 
actually has children on this page
-   if ( !$children.size() ) {
+   if ( !$children.length ) {
return;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d0a9414960a190e4eda1e732b2530110287a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...SVGEdit[master]: Use prop instead of removeAttr

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371019 )

Change subject: Use prop instead of removeAttr
..

Use prop instead of removeAttr

Change-Id: Id9c8c62877477f35a858d742e9e80802e8f15ebf
---
M modules/ext.svgedit.editor.js
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/ext.svgedit.editor.js b/modules/ext.svgedit.editor.js
index 818dab2..e121f63 100644
--- a/modules/ext.svgedit.editor.js
+++ b/modules/ext.svgedit.editor.js
@@ -116,8 +116,8 @@
};
 
var spinnerOn = function() {
-   $('#mw-svgedit-summary').attr('disabled', 'disabled');
-   $('#mw-svgedit-save').attr('disabled', 'disabled');
+   $('#mw-svgedit-summary').prop('disabled', true);
+   $('#mw-svgedit-save').prop('disabled', true);
var offset = frame.offset();
spinner
.css('left', offset.left)
@@ -127,8 +127,8 @@
.show();
};
var spinnerOff = function() {
-   $('#mw-svgedit-summary').removeAttr('disabled');
-   $('#mw-svgedit-save').removeAttr('disabled');
+   $('#mw-svgedit-summary').prop('disabled', false);
+   $('#mw-svgedit-save').prop('disabled', false);
spinner.hide();
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9c8c62877477f35a858d742e9e80802e8f15ebf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SVGEdit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...MwEmbedSupport[master]: Use .length instead of .size() as it's getting removed in jQ...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371018 )

Change subject: Use .length instead of .size() as it's getting removed in 
jQuery 3.0
..

Use .length instead of .size() as it's getting removed in jQuery 3.0

Change-Id: Ie2645db7a837e5f08b9b85c09aff9b67ff0c3b63
---
M MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
1 file changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js 
b/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
index 5b8314a..1821412 100644
--- a/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
+++ b/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
@@ -229,13 +229,13 @@
case 37: // left arrow
if (menuType == 'flyout') {

$(event.target).trigger('mouseout');
-   if 
($('.'+options.flyOutOnState).size() > 0) { 
$('.'+options.flyOutOnState).trigger('mouseover'); };
+   if 
($('.'+options.flyOutOnState).length > 0) { 
$('.'+options.flyOutOnState).trigger('mouseover'); };
};
 
if (menuType == 'ipod') {

$(event.target).trigger('mouseout');
-   if 
($('.fg-menu-footer').find('a').size() > 0) { 
$('.fg-menu-footer').find('a').trigger('click'); };
-   if 
($('.fg-menu-header').find('a').size() > 0) { 
$('.fg-menu-current-crumb').prev().find('a').trigger('click'); };
+   if 
($('.fg-menu-footer').find('a').length > 0) { 
$('.fg-menu-footer').find('a').trigger('click'); };
+   if 
($('.fg-menu-header').find('a').length > 0) { 
$('.fg-menu-current-crumb').prev().find('a').trigger('click'); };
if 
($('.fg-menu-current').prev().is('.fg-menu-indicator')) {

$('.fg-menu-current').prev().trigger('mouseover');
};
@@ -246,7 +246,7 @@
case 38: // up arrow
if ($(event.target).is('.' + 
options.linkHover)) {
var prevLink = 
$(event.target).parent().prev().find('a:eq(0)');
-   if (prevLink.size() > 0) {
+   if (prevLink.length > 0) {

$(event.target).trigger('mouseout');

prevLink.trigger('mouseover');
};
@@ -273,7 +273,7 @@
case 40: // down arrow
if ($(event.target).is('.' + 
options.linkHover)) {
var nextLink = 
$(event.target).parent().next().find('a:eq(0)');
-   if (nextLink.size() > 0) {
+   if (nextLink.length > 0) {

$(event.target).trigger('mouseout');

nextLink.trigger('mouseover');
};
@@ -322,7 +322,7 @@
container.find( 'a' ).attr('tabindex', '-1');
 
// when there are multiple levels of hierarchy, create flyout 
or drilldown menu
-   if ( container.find( 'ul' ).size() > 1 ) {
+   if ( container.find( 'ul' ).length > 1 ) {
if ( options.flyOut ) {
mw.log("jquery.embedMenu:: call menu.flyout ");
menu.flyout(container, options);
@@ -531,7 +531,7 @@
 
// initialize "back" link
if (options.backLink) {
-   if (footer.find('a').size() == 
0) {
+   if (footer.find('a').length == 
0) {
footer.show();
$(' Back')

.appendTo(footer)
@@ -547,7 +547,7 @@
}
  

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Use prop instead of removeAttr

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371017 )

Change subject: Use prop instead of removeAttr
..

Use prop instead of removeAttr

Change-Id: Ie272357a6ba7929ca4cfd410640bdc9adea18971
---
M modules/collection.js
1 file changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/modules/collection.js b/modules/collection.js
index f63971e..b36d51a 100644
--- a/modules/collection.js
+++ b/modules/collection.js
@@ -165,30 +165,30 @@
 
function update_buttons() {
if ( $( '#collectionList .article' ).length === 0 ) {
-   $( '#saveButton, #downloadButton, input.order' ).attr( 
'disabled', 'disabled' );
+   $( '#saveButton, #downloadButton, input.order' ).prop( 
'disabled', true );
return;
} else {
-   $( '#downloadButton, input.order' ).removeAttr( 
'disabled' );
+   $( '#downloadButton, input.order' ).prop( 'disabled', 
false );
}
if ( !$( '#saveButton' ).length ) {
return;
}
if ( !$( '#communityCollTitle' ).length || $( 
'#personalCollType:checked' ).val() ) {
-   $( '#personalCollTitle' ).removeAttr( 'disabled' );
-   $( '#communityCollTitle' ).attr( 'disabled', 'disabled' 
);
+   $( '#personalCollTitle' ).prop( 'disabled', false );
+   $( '#communityCollTitle' ).prop( 'disabled', true );
if ( !$.trim( $( '#personalCollTitle' ).val() ) ) {
-   $( '#saveButton' ).attr( 'disabled', 'disabled' 
);
+   $( '#saveButton' ).prop( 'disabled', true );
return;
}
} else if ( !$( '#personalCollTitle' ).length || $( 
'#communityCollType:checked' ).val() ) {
-   $( '#communityCollTitle' ).removeAttr( 'disabled' );
-   $( '#personalCollTitle' ).attr( 'disabled', 'disabled' 
);
+   $( '#communityCollTitle' ).prop( 'disabled', false );
+   $( '#personalCollTitle' ).prop( 'disabled', true );
if ( !$.trim( $( '#communityCollTitle' ).val() ) ) {
-   $( '#saveButton' ).attr( 'disabled', 'disabled' 
);
+   $( '#saveButton' ).prop( 'disabled', true );
return;
}
}
-   $( '#saveButton' ).removeAttr( 'disabled' );
+   $( '#saveButton' ).prop( 'disabled', false );
}
 
function make_sortable() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie272357a6ba7929ca4cfd410640bdc9adea18971
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Use .length instead of .size() as it's getting removed in jQ...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371016 )

Change subject: Use .length instead of .size() as it's getting removed in 
jQuery 3.0
..

Use .length instead of .size() as it's getting removed in jQuery 3.0

Change-Id: I572d1d93c03abe8bd604ff0c099dfd4558ac8ce6
---
M modules/ext.codereview.overview.js
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/modules/ext.codereview.overview.js 
b/modules/ext.codereview.overview.js
index 1368835..715cd8c 100644
--- a/modules/ext.codereview.overview.js
+++ b/modules/ext.codereview.overview.js
@@ -12,8 +12,8 @@
"use strict";
 
// check if we're on a page with a useful list of revisions
-   if ( $( '#path' ).size() && $( 'table.TablePager' ).size() ) {
-   var portlet = $( '#p-namespaces' ).size() ? 'p-namespaces' : 
'p-cactions';
+   if ( $( '#path' ).length && $( 'table.TablePager' ).length ) {
+   var portlet = $( '#p-namespaces' ).length ? 'p-namespaces' : 
'p-cactions';
mw.util.addPortletLink(
portlet,
'#',
@@ -25,9 +25,9 @@
 
$( '#ca-scapmap' ).click( function () {
var $tr = $( 'table.TablePager tr' );
-   if ( $tr.size() < 2 ) {
+   if ( $tr.length < 2 ) {
return;
-   } else if ( $( '#overviewmap' ).size() ) {
+   } else if ( $( '#overviewmap' ).length ) {
// We've already created it; maybe they just want to 
toggle it on and off
$( '#overviewmap' ).slideToggle();
return;
@@ -100,11 +100,11 @@
}
sumtext.sort();
var $summary = $( '' )
-   .text( 'Total revisions: ' + ( $tr.size() - 1 ) + '. [' 
+ sumtext.join( ', ' ) + ']' );
+   .text( 'Total revisions: ' + ( $tr.length - 1 ) + '. [' 
+ sumtext.join( ', ' ) + ']' );
 
$( '#overviewmap' )
.append( $summary )
-   .css( 'max-width', Math.floor( Math.sqrt( $tr.size() ) 
) * 30 )
+   .css( 'max-width', Math.floor( Math.sqrt( $tr.length ) 
) * 30 )
.slideDown();
 
// Add the hover popup

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I572d1d93c03abe8bd604ff0c099dfd4558ac8ce6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: Use prop instead of removeAttr for submit button disabled st...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370860 )

Change subject: Use prop instead of removeAttr for submit button disabled status
..

Use prop instead of removeAttr for submit button disabled status

Change-Id: Ida2f07ff0220bd3ead3140c6b5c3539282f6e5a0
---
M modules/ext.wikihiero.Special.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/wikihiero 
refs/changes/60/370860/1

diff --git a/modules/ext.wikihiero.Special.js b/modules/ext.wikihiero.Special.js
index aea5536..47aaeca 100644
--- a/modules/ext.wikihiero.Special.js
+++ b/modules/ext.wikihiero.Special.js
@@ -7,9 +7,9 @@
 
$textarea.keyup( function () {
if ( $textarea.val().length === 0 ) {
-   $submit.attr( 'disabled', 'disabled' );
+   $submit.prop( 'disabled', true );
} else {
-   $submit.removeAttr( 'disabled' );
+   $submit.prop( 'disabled', false );
}
} );
$textarea.keyup();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida2f07ff0220bd3ead3140c6b5c3539282f6e5a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Use prop instead of removeAttr for syntax check disabled status

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370845 )

Change subject: Use prop instead of removeAttr for syntax check disabled status
..

Use prop instead of removeAttr for syntax check disabled status

Change-Id: Ia3f598a3ccd0c12ec0c35450ed12f0ddbd739962
---
M modules/ext.abuseFilter.edit.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/45/370845/1

diff --git a/modules/ext.abuseFilter.edit.js b/modules/ext.abuseFilter.edit.js
index cc15ec9..53a8c73 100644
--- a/modules/ext.abuseFilter.edit.js
+++ b/modules/ext.abuseFilter.edit.js
@@ -39,7 +39,7 @@
api = new mw.Api();
 
$( this )
-   .attr( 'disabled', 'disabled' )
+   .prop( 'disabled', true )
.injectSpinner( 'abusefilter-syntaxcheck' );
 
api.post( {
@@ -59,7 +59,7 @@
 */
function processSyntaxResultAlways( resultText, className, syntaxOk ) {
$.removeSpinner( 'abusefilter-syntaxcheck' );
-   $( '#mw-abusefilter-syntaxcheck' ).removeAttr( 'disabled' );
+   $( '#mw-abusefilter-syntaxcheck' ).prop( 'disabled', false );
 
$( '#mw-abusefilter-syntaxresult' )
.show()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3f598a3ccd0c12ec0c35450ed12f0ddbd739962
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Interwiki map update

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334240 )

Change subject: Interwiki map update
..

Interwiki map update

Bug: T156334
Change-Id: Icfbb3264eddab7e4861fc40d44213bf2c137e205
---
M wmf-config/interwiki.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index f18b6a3..384bfde 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,5 +1,5 @@
  '0 
http://www.acronymfinder.com/af-query.asp?String=exact=$1',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
@@ -301,6 +301,8 @@
'__global:usej' => '0 http://www.tejo.org/usej/$1',
'__global:usemod' => '0 http://www.usemod.com/cgi-bin/wiki.pl?$1',
'__global:usability' => '1 https://usability.wikimedia.org/wiki/$1',
+   '__global:utrs' => '0 https://utrs.wmflabs.org/appeal.php?id=$1',
+   '__global:utrs' => '0 https://utrs.wmflabs.org/appeal.php?id=$1',
'__global:vikidia' => '0 //fr.vikidia.org/wiki/$1',
'__global:vlos' => '0 http://www.thuvienkhoahoc.com/tusach/$1',
'__global:vkol' => '0 http://kol.coldfront.net/thekolwiki/index.php/$1',
@@ -11447,7 +11449,7 @@
'__global:meta' => '1 https://meta.wikimedia.org/wiki/$1',
'__global:sep11' => '1 https://sep11.wikipedia.org/wiki/$1',
'__global:d' => '1 https://www.wikidata.org/wiki/$1',
-   '__list:__global' => 'acronym advisory advogato aew appropedia 
aquariumwiki arborwiki arxiv atmwiki baden battlestarwiki bcnbio beacha 
betawiki betawikiversity bibcode bluwiki blw botwiki boxrec brickwiki bugzilla 
bulba c c2 c2find cache cellwiki centralwikia chej choralwiki citizendium 
ckwiss comixpedia commons communityscheme communitywiki comune creativecommons 
creativecommonswiki cxej d dbdump dcc dcdatabase dcma delicious devmo dict 
dictionary disinfopedia distributedproofreaders distributedproofreadersca dmoz 
dmozs doi donate doom_wiki download dpd drae dreamhost drumcorpswiki dwjwiki 
ecoreality ecxei elibre emacswiki encyc energiewiki englyphwiki enkol 
eokulturcentro esolang etherpad ethnologue ethnologuefamily evowiki exotica 
eĉei fanimutationwiki fedora finalfantasy finnix flickrphoto flickruser 
floralwiki foldoc forthfreak foundation foxwiki freebio freebsdman 
freeculturewiki freedomdefined freefeel freekiwiki freenode freesoft ganfyd 
gardenology gausswiki gentoo genwiki gerrit git globalvoices glossarwiki 
glossarywiki google googledefine googlegroups guildwarswiki guildwiki gutenberg 
gutenbergwiki h2wiki hackerspaces hammondwiki hdl heroeswiki horizon hrfwiki 
hrwiki hupwiki iarchive imdbcharacter imdbcompany imdbname imdbtitle incubator 
infosecpedia infosphere irc ircrc iso639-3 issn iuridictum jaglyphwiki javanet 
javapedia jefo jerseydatabase jira jspwiki jstor kamelo karlsruhe kinowiki 
kmwiki komicawiki kontuwiki koslarwiki labsconsole libreplanet linguistlist 
linuxwiki linuxwikide liswiki literateprograms livepedia localwiki lojban 
lostpedia lqwiki luxo m mail mailarchive mariowiki marveldatabase meatball 
mediawikiwiki mediazilla memoryalpha meta metawiki metawikimedia metawikipedia 
metawikisearch mineralienatlas moinmoin monstropedia mosapedia mozcom 
mozillawiki mozillazinekb musicbrainz mw mwod mwot nara nkcells nosmoke nost 
nostalgia oeis oldwikisource olpc onelook openlibrary openstreetmap openwetware 
openwiki opera7wiki organicdesign orthodoxwiki osmwiki otrs otrswiki ourmedia 
outreach outreachwiki owasp panawiki patwiki personaltelco petscan phab 
phabricator phpwiki phwiki planetmath pmeg pmid pokewiki pokéwiki policy 
proofwiki psycle pyrev pythoninfo pythonwiki pywiki quality quarry rcirc 
reuterswiki rev revo rfc rheinneckar robowiki rodovid rowiki rt rtfm s23wiki 
scholar schoolswp scores scoutwiki scramble seapig seattlewiki securewikidc 
semantic-mw senseislibrary sep11 sharemap silcode slashdot slwiki sourceforge 
spcom species squeak stats stewardry strategy strategywiki sulutil svn 
swinbrain swtrain tabwiki tclerswiki technorati tenwiki test2wiki testwiki 
testwikidata tfwiki thelemapedia theopedia thinkwiki ticket tmbw tmnet tmwiki 
toollabs tools translatewiki tswiki tviv tvtropes twiki tyvawiki uncyclopedia 
unihan unreal urbandict usability usej usemod viaf vikidia vkol vlos voipinfo 
votewiki werelate wg wikia wikiapiary wikiasite wikibooks wikichristian 
wikicities wikicity wikiconference wikidata wikif1 wikifur wikihow wikiindex 
wikilemon wikilivres wikilivresru wikimac-de wikimedia wikinews wikinfo 
wikinvest wikiotics wikipapers wikipedia wikipediawikipedia wikiquote 
wikiskripta wikisophia wikisource wikispecies wikispot wikitech wikiti wikitree 
wikiversity wikivoyage wikiwikiweb wiktionary wipipedia wlug wm2005 wm2006 
wm2007 wm2008 wm2009 wm2010 wm2011 wm2012 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: Allow tuning.conf to have a different shared_buffe...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333473 )

Change subject: puppetdb: Allow tuning.conf to have a different shared_buffers 
value
..

puppetdb: Allow tuning.conf to have a different shared_buffers value

Bug: T72792
Bug: T153163
Change-Id: Ic26a157d323c5945ad6a177c8669b23cbbe4d10c
---
M modules/role/manifests/puppetmaster/puppetdb.pp
R modules/role/templates/puppetdb/tuning.conf.erb
2 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/333473/1

diff --git a/modules/role/manifests/puppetmaster/puppetdb.pp 
b/modules/role/manifests/puppetmaster/puppetdb.pp
index 69ef1d3..2db8c1b 100644
--- a/modules/role/manifests/puppetmaster/puppetdb.pp
+++ b/modules/role/manifests/puppetmaster/puppetdb.pp
@@ -1,4 +1,6 @@
-class role::puppetmaster::puppetdb {
+class role::puppetmaster::puppetdb (
+$shared_buffers = '7680MB'
+) {
 include standard
 include ::base::firewall
 include ::passwords::postgres
@@ -56,11 +58,11 @@
 
 # Tuning
 file { '/etc/postgresql/9.4/main/tuning.conf':
-ensure => 'present',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/role/puppetdb/tuning.conf',
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('role/puppetdb/tuning.conf.erb'),
 }
 
 sysctl::parameters { 'postgres_shmem':
diff --git a/modules/role/files/puppetdb/tuning.conf 
b/modules/role/templates/puppetdb/tuning.conf.erb
similarity index 77%
rename from modules/role/files/puppetdb/tuning.conf
rename to modules/role/templates/puppetdb/tuning.conf.erb
index 8c8431c..59bddc7 100644
--- a/modules/role/files/puppetdb/tuning.conf
+++ b/modules/role/templates/puppetdb/tuning.conf.erb
@@ -3,5 +3,5 @@
 effective_cache_size = 8GB
 work_mem = 192MB
 wal_buffers = 8MB
-shared_buffers = 7680MB
+shared_buffers = <%= @shared_buffers %>
 max_connections = 120

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic26a157d323c5945ad6a177c8669b23cbbe4d10c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ssh: Don't add IPv6 address as an alias in exported resource...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333472 )

Change subject: ssh: Don't add IPv6 address as an alias in exported resource if 
it's undefined
..

ssh: Don't add IPv6 address as an alias in exported resource if it's undefined

Bug: T72792
Bug: T153163
Change-Id: Ifd359d9dbe750ba30bf39c52169fe56889a747a8
---
M modules/ssh/manifests/server.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/333472/1

diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 5d95f9c..7dc7bd4 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -72,11 +72,17 @@
 err("No valid SSH host key found for ${::fqdn}")
 }
 
+if $::ipaddress6 {
+$aliases = [ $::hostname, $::ipaddress, $::ipaddress6 ]
+} else {
+$aliases = [ $::hostname, $::ipaddress ]
+}
+
 debug("Storing ${type} SSH hostkey for ${::fqdn}")
 @@sshkey { $::fqdn:
 ensure   => present,
 type => $type,
 key  => $key,
-host_aliases => [ $::hostname, $::ipaddress, $::ipaddress6 ],
+host_aliases => $aliases,
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd359d9dbe750ba30bf39c52169fe56889a747a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Allow use of PuppetDB in labs for sshknowngen

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333471 )

Change subject: Allow use of PuppetDB in labs for sshknowngen
..

Allow use of PuppetDB in labs for sshknowngen

Where it is enabled. Split out of Iee22dab0 from Tim

Bug: T72792
Bug: T153163
Change-Id: I8cfba01da13191384a607ac75917c55a28ecfda1
---
M modules/ssh/manifests/client.pp
1 file changed, 15 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/333471/1

diff --git a/modules/ssh/manifests/client.pp b/modules/ssh/manifests/client.pp
index 8cf8808..3850714 100644
--- a/modules/ssh/manifests/client.pp
+++ b/modules/ssh/manifests/client.pp
@@ -3,24 +3,21 @@
 ensure => present,
 }
 
-# no exported resources on Labs == no sshknowngen
-if $::realm == 'production' {
-if $::use_puppetdb {
-file { '/etc/ssh/ssh_known_hosts':
-content => template('ssh/known_hosts.erb'),
-backup  => false,
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-}
-} else {
-file { '/etc/ssh/ssh_known_hosts':
-content => generate('/usr/local/bin/sshknowngen'),
-backup  => false,
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-}
+if $::use_puppetdb {
+file { '/etc/ssh/ssh_known_hosts':
+content => template('ssh/known_hosts.erb'),
+backup  => false,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+}
+} elsif $::realm == 'production' {
+file { '/etc/ssh/ssh_known_hosts':
+content => generate('/usr/local/bin/sshknowngen'),
+backup  => false,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
 }
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cfba01da13191384a607ac75917c55a28ecfda1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move postgres tuning.conf into module

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333470 )

Change subject: Move postgres tuning.conf into module
..

Move postgres tuning.conf into module

Change-Id: I699f2331303b263d85f3cd72371560206f335b14
---
R modules/role/files/postgres/tuning.conf
M modules/role/manifests/postgres/common.pp
2 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/333470/1

diff --git a/files/postgres/tuning.conf 
b/modules/role/files/postgres/tuning.conf
similarity index 100%
rename from files/postgres/tuning.conf
rename to modules/role/files/postgres/tuning.conf
diff --git a/modules/role/manifests/postgres/common.pp 
b/modules/role/manifests/postgres/common.pp
index 43e742f..52e6033 100644
--- a/modules/role/manifests/postgres/common.pp
+++ b/modules/role/manifests/postgres/common.pp
@@ -3,16 +3,13 @@
 
 $root_dir = '/srv/postgres'
 
-# move file to module?
-# lint:ignore:puppet_url_without_modules
 file { '/etc/postgresql/9.4/main/tuning.conf':
 ensure => 'present',
 owner  => 'root',
 group  => 'root',
 mode   => '0444',
-source => 'puppet:///files/postgres/tuning.conf',
+source => 'puppet:///modules/role/postgres/tuning.conf',
 }
-# lint:endignore
 
 sysctl::parameters { 'postgres_shmem':
 values => {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I699f2331303b263d85f3cd72371560206f335b14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

___
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 account creation throttle exception for event before nex...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333468 )

Change subject: Add account creation throttle exception for event before next 
window
..

Add account creation throttle exception for event before next window

Bug: T155877
Change-Id: I379fc7d85df143a7ba319094067da0603758e7fd
---
M wmf-config/throttle.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index a91c6ef..0a9313c 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -70,6 +70,14 @@
'value' => 30 // 20 expected
 ];
 
+$wmgThrottlingExceptions[] = [ // T155877
+   'from'   => '2017-01-23T09:00 +05:30',
+   'to' => '2017-01-23T18:00 +05:30',
+   'IP' => '117.200.183.66',
+   'dbname' => [ 'mrwiki', 'enwiki', 'commonswiki' ],
+   'value'  => 70 // 50 expected
+];
+
 ## Add throttling definitions above.
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I379fc7d85df143a7ba319094067da0603758e7fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Follow-up I94eb86ba: Ignore projects where we can't list ins...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333289 )

Change subject: Follow-up I94eb86ba: Ignore projects where we can't list 
instances
..

Follow-up I94eb86ba: Ignore projects where we can't list instances

E.g. the admin project

Bug: T104575
Change-Id: I6b158f999a5adbe9e5d6bba59a5d4ae9190afa8b
---
M modules/graphite/files/archive-instances
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/333289/1

diff --git a/modules/graphite/files/archive-instances 
b/modules/graphite/files/archive-instances
index 2745754..af6399a 100755
--- a/modules/graphite/files/archive-instances
+++ b/modules/graphite/files/archive-instances
@@ -104,7 +104,10 @@
 deleted_hosts = {}
 for project in projects:
 hosts_with_metrics = get_hosts_with_metrics(project)
-actual_hosts = get_hosts_for_project(project)
+try:
+actual_hosts = get_hosts_for_project(project)
+except Exception:
+continue
 deleted = set(hosts_with_metrics) - set(actual_hosts)
 if deleted:
 deleted_hosts[project] = deleted

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b158f999a5adbe9e5d6bba59a5d4ae9190afa8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Read closed-labs as closed tag on labs

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332940 )

Change subject: Read closed-labs as closed tag on labs
..

Read closed-labs as closed tag on labs

Bug: T115584
Change-Id: Ic14e033622140f45b04e3c12b682dac754365a86
---
M tests/cirrusTest.php
M wmf-config/CommonSettings.php
M wmf-config/DatabaseLists.php
3 files changed, 10 insertions(+), 5 deletions(-)


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

diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 30c540a..617b54c 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -99,12 +99,13 @@
}
 
private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
+   global $wmfRealm;
$wmfConfigDir = __DIR__ . "/../wmf-config";
require __DIR__ . '/TestServices.php';
$wgConf = $this->loadWgConf( $wmfRealm );
 
list( $site, $lang ) = $wgConf->siteFromDB( $wgDBname );
-   $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname );
+   $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname, 
$wmfRealm );
 
$dbSuffix = ( $site === 'wikipedia' ) ? 'wiki' : $site;
$confParams = [
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e1486a3..4b8b574 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -163,7 +163,7 @@
# Get configuration from SiteConfiguration object
require( "$wmfConfigDir/InitialiseSettings.php" );
 
-   $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname );
+   $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname, $wmfRealm );
 
$dbSuffix = ( $site === 'wikipedia' ) ? 'wiki' : $site;
$confParams = [
@@ -713,7 +713,7 @@
],
 ];
 
-$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile( 'closed' );
+$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile( $wmfRealm === 
'labs' ? 'closed-labs' : 'closed' );
 $wgSiteMatrixPrivateSites = MWWikiversions::readDbListFile( 'private' );
 $wgSiteMatrixFishbowlSites = MWWikiversions::readDbListFile( 'fishbowl' );
 
diff --git a/wmf-config/DatabaseLists.php b/wmf-config/DatabaseLists.php
index 59f44dc..405bd77 100644
--- a/wmf-config/DatabaseLists.php
+++ b/wmf-config/DatabaseLists.php
@@ -37,11 +37,15 @@
/**
 * @return string[]
 */
-   public static function getTagsListsFor ( $databaseName ) {
+   public static function getTagsListsFor ( $databaseName, $realm ) {
$tags = [];
 
foreach ( self::getAllTagsLists() as $tag ) {
-   $databaseList = MWWikiversions::readDbListFile( 
$databaseName );
+   $fname = $tag;
+   if ( $realm === 'labs' && $tag === 'closed' ) {
+   $fname .= '-labs';
+   }
+   $databaseList = MWWikiversions::readDbListFile( $fname 
);
if ( in_array( $databaseName, $databaseList ) ) {
$tags[] = $tag;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic14e033622140f45b04e3c12b682dac754365a86
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use LE for wikitech

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331638 )

Change subject: Use LE for wikitech
..

Use LE for wikitech

Bug: T154913
Change-Id: I325ab9c1f2a56e42f1460435958d27445f5a1a6b
---
D files/ssl/labtestwikitech.wikimedia.org.crt
D files/ssl/wikitech.wikimedia.org.crt
M hieradata/regex.yaml
M modules/role/manifests/labs/openstack/nova/manager.pp
4 files changed, 9 insertions(+), 80 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/331638/1

diff --git a/files/ssl/labtestwikitech.wikimedia.org.crt 
b/files/ssl/labtestwikitech.wikimedia.org.crt
deleted file mode 100644
index f6adbbd..000
--- a/files/ssl/labtestwikitech.wikimedia.org.crt
+++ /dev/null
@@ -1,34 +0,0 @@
--BEGIN CERTIFICATE-
-MIIF1jCCA74CCQDKK3TuPMyhMzANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28x
-HTAbBgNVBAoMFFdpa2ltZWRpYSBGb3VuZGF0aW9uMRMwEQYDVQQLDApPcGVyYXRp
-b25zMRYwFAYDVQQDDA1BbmRyZXcgQm9nb3R0MSQwIgYJKoZIhvcNAQkBFhVhYm9n
-b3R0QHdpa2ltZWRpYS5vcmcwHhcNMTYwMTE2MTQwNTIzWhcNMTcwMTE1MTQwNTIz
-WjCBrDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
-DVNhbiBGcmFuY2lzY28xHTAbBgNVBAoMFFdpa2ltZWRpYSBGb3VuZGF0aW9uMRMw
-EQYDVQQLDApPcGVyYXRpb25zMRYwFAYDVQQDDA1BbmRyZXcgQm9nb3R0MSQwIgYJ
-KoZIhvcNAQkBFhVhYm9nb3R0QHdpa2ltZWRpYS5vcmcwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDMOc5OH9PRGSM5AKVL6F7hyNCRYJduvFva367/yAyc
-ImCPzyU8yMu/O82LQgLFR8fQS/AEnTSZT0ihIj85PJ+FHRf+gdmqmjOHr7b2bsHm
-kb77pkWNvLxkbEM4lJWq+8t5juEGf5d3hf7lIkSjISLz3aI9rQYYWYR2oEi1L9Tg
-cRfYQGJ3Zt8Npoi9Rq2JYIyKem+4+akIkvNxDIgxCi3w43U67rQuin39T9WAyhuk
-9xBZ74ACtvBBLguavpRIm2zAwm2G/uAacoYpmTB5yDmGTEnemLnc1q8Ko76T9+V2
-LrZ763LfuhsNcJZ3xXKPznqIV0LVtRco3UkuGnecs2MtMzPu4faf3qAyVGes5oae
-EiHrP7FQgLiT9YDsPL+7lXUyyKrke3QKkVj2hZJfDg4E1PUrhccwAPLih2Sqjl2y
-DuNRq8ldJdXZ3GWmnru+H7UyXd+L07utajAz857No7sBEBSDxHJMqyGmzy9x10PK
-itPpAE39u/4hJUHQhTz2S7Ujmo+X+iEeYNp48FapARMjIcoM9h8ayojxu7cEH5GA
-EL/NITu1LZW6269KFLTYagXP/pZuQCUrLoIKjPoo0S+EgER9g6HaFb/srecZWaZe
-/uEbBAffFjFwFQfxOC//WlyZA8Gz2k+DZ3isDWAJj9rczCN0hAeGALb8nrmiaGpD
-dQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQC51UH5CP76zYABj2PyZGCzLLBXDZQ1
-AW1b06McCixV8Igr3VZKQYL70Wysc9j3/iKtTVAm1grcgnPGXfB8t0hl5OZd5UVg
-/fJCN2DOBfwzLWa/7ApAILDra6ydPVbhM0+f+piqFi9wWShyC2Hi+Ew5CyhHj0P9
-V3BCqIqYQvlBex6jtHgE+FvWQC1p3TEYZ4VeM7FCBZWzVG5NWMfgZMwEnFfTUAMC
-F0ZB90FD8/EG+8SGMFqwZ3Ulk+2gt/aH4tYCbaaMJ52hemefeFx5UMRBYoXAkVEQ
-IRzKIjksLdzgoQMgQ8xfF9vOhmG5zK2RIbs/ZtqpDVr0OATmuONvR5+v/746/DMX
-dyaKPcLziM25TtOtZHCB9Uvt/yJkNzRrSDpQ8RI+Ec5p/H6QcO+58bZWg4/V/hqA
-7YX53SEQ/vMPEy7REcOrMpQPiQ/qALvolIHL+Uf6jqiBj3C7tM5HO2S6OXDDWgaN
-NPwqj6IkSzeh6THuUlsawb8XuYYzdzie0QzXUJTsUqxgSmmF0k2VVLeW6iAx9ehv
-7KMy6oauTbYoP/vx6eSYgZ/Mk73ip5JGu3T6A63+uucO6uWIEgD0+rVegIsL12TB
-mdFtZIGoCevVLLkKX4Ps4AvW3HKXRsZBKndrS2vMDimTjgVxVl5v2AV5lGHmMUJI
-Sy236b+rdcO+Gg==
--END CERTIFICATE-
diff --git a/files/ssl/wikitech.wikimedia.org.crt 
b/files/ssl/wikitech.wikimedia.org.crt
deleted file mode 100644
index 10abaa1..000
--- a/files/ssl/wikitech.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFTzCCBDegAwIBAgISESHOsj6ApadNbvj3xLyEHmFzMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUxMjExMjAyMTExWhcNMTcwMjI0MDQ0NDEzWjCBgDELMAkG
-A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu
-Y2lzY28xIzAhBgNVBAoTGldpa2ltZWRpYSBGb3VuZGF0aW9uLCBJbmMuMR8wHQYD
-VQQDExZ3aWtpdGVjaC53aWtpbWVkaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtdROlVzflJGw1k+RxVu7HHG8QSpiPLqbardSkB63aVxlHKN7
-26K5sSS2SLYuju4a3nEIErkZBXtAMGfBlBJVFZ4/UZgD4vjaAP5HiPpUKMx4xHz/
-2OOrqF68PXc2+yTTOkEMeniH4XPRmmY/GzIIpmDRzVzlRsVBtEdqvfoyCyeC8zTb
-n+bHd6lFGK0R3sRDBO7soJXd58svcBijI1mXpDo3WT4q9O3QDfvoGZO1xK/7Jz8m
-Yk2vYt5zG+dFvqjN62fQxD8JFNdargrgfkoZxiBmskii03e6+ymxoNdQUc0T8CkZ
-l8D3IeRXb8bsXcG8O+QFiZne+yNc0kL/xwcb0wIDAQABo4IB2jCCAdYwDgYDVR0P
-AQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEWJmh0
-dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCEGA1UdEQQaMBiC
-Fndpa2l0ZWNoLndpa2ltZWRpYS5vcmcwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5n
-bG9iYWxzaWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAG
-CCsGAQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2Jh
-bHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/
-BggrBgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5p
-emF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBT0xfeMunJJ2IWrUAelaPocSGrN6jAf
-BgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOC
-AQEAMF6mlBiBOfOirbVejNcaOcwxLTBEc/WTFTvk3KDs1369sWWBrvkWebkJNRic
-DJ6PAloCwyC7qZUfbYC4g1UWVo0UrFdGOpwK7HcLWzZB6CLpAX+q3lRs8BowAExI
-ShT3WdlkG24jdGIKtCYlRAYIxCnayba5Ad/FSaiOXXzIjC998UAMaSST20ONfsEl
-mAIbgK33bI69rem7Br977Bj4nFZ4JSsqMJS7GSvmedtF7XtGCFNE0pTh+DEs6lym

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "labtest hiera: use labtestwikitech, not wiki...

[Alex Monk (Code Review)]

Hello Yuvipanda, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Revert "labtest hiera: use labtestwikitech, not 
wikitech""
..

Revert "Revert "labtest hiera: use labtestwikitech, not wikitech""

It should work now, I think.

This reverts commit d9055e2f79bf679ad0caa9459c3430d098602a2d.

Bug: T145808
Change-Id: Ic478ca4a5701d3157a235d63cb888501ad75587e
---
M modules/puppetmaster/files/labtest.hiera.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/puppetmaster/files/labtest.hiera.yaml 
b/modules/puppetmaster/files/labtest.hiera.yaml
index 8f29c36..dbbbae3 100644
--- a/modules/puppetmaster/files/labtest.hiera.yaml
+++ b/modules/puppetmaster/files/labtest.hiera.yaml
@@ -5,7 +5,7 @@
 :nuyaml:
   :datadir: /etc/puppet/hieradata
 :mwyaml:
-  :host: https://wikitech.wikimedia.org
+  :host: https://labtestwikitech.wikimedia.org
   :cache_ttl: 120
 :private:
   :datadir: /etc/puppet/private/hieradata

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic478ca4a5701d3157a235d63cb888501ad75587e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add a test to prevent people from making new dblist files wi...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331441 )

Change subject: Add a test to prevent people from making new dblist files 
without appropriate noc symlinks
..

Add a test to prevent people from making new dblist files without appropriate 
noc symlinks

Change-Id: If982a12516bfabddcdd7c02647aca436d6047cfd
---
A tests/noc-conf/NOCDblistTest.php
1 file changed, 21 insertions(+), 0 deletions(-)


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

diff --git a/tests/noc-conf/NOCDblistTest.php b/tests/noc-conf/NOCDblistTest.php
new file mode 100644
index 000..6a6726d
--- /dev/null
+++ b/tests/noc-conf/NOCDblistTest.php
@@ -0,0 +1,21 @@
+assertEquals( $linkDestination, 
'../../../dblists/' . $fname );
+   $existingLinks[] = substr( $linkDestination, 
strlen( '../../../dblists/' ) );
+   }
+   }
+   $expectedLinks = array_values( array_diff( scandir( $dblistsDir 
), [ '.', '..' ] ) );
+
+   $this->assertEquals( $expectedLinks, $existingLinks );
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If982a12516bfabddcdd7c02647aca436d6047cfd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove me from researchers group

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330714 )

Change subject: Remove me from researchers group
..

Remove me from researchers group

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/330714/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c535f0d..15505cb 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -108,7 +108,7 @@
   nuria, ori, otto, springle, yurik, yuvipanda,
   mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal,
   daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, 
niedzielski,
-  neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan, 
krenair,
+  neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan,
   jminor, asherman, etonkovidova, sbisson, addshore, matmarex, 
elukey,
   nikerabbit, nschaaf, dstrine, joewalsh, mpany, hjiang, jsamra, 
bcohn,
   jdittrich, chelsyx, ovasileva, mtizzoni, panisson, paolotti, 
ciro, debt,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d25d7ebb5bbc543987966bcc0ccd6f828803991
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Partial revert of I89bd171e (LE part)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330694 )

Change subject: Partial revert of I89bd171e (LE part)
..

Partial revert of I89bd171e (LE part)

Seems to create a dependency loop.

Change-Id: I2c27e2c51715a1d1e9d06912e0702a12bcdc908e
---
M modules/tlsproxy/manifests/localssl.pp
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/tlsproxy/manifests/localssl.pp 
b/modules/tlsproxy/manifests/localssl.pp
index a6e78a7..0d73e07 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -94,7 +94,6 @@
 subjects   => join($acme_subjects, ','),
 puppet_svc => 'nginx',
 system_svc => 'nginx',
-before => Service['nginx'],
 }
 # TODO: Maybe add monitoring to this in role::cache::ssl::unified
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c27e2c51715a1d1e9d06912e0702a12bcdc908e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: More error handling fixes

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330419 )

Change subject: More error handling fixes
..

More error handling fixes

See T154565

Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa
---
M ApiVisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
3 files changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 6e40807..e527bb1 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -113,12 +113,12 @@
} elseif ( $response['error'] !== '' ) {
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http-error', 
wfEscapeWikiText( $response['error'] ) ],
-   $response['error']
+   'apierror-visualeditor-docserver-http-error'
);
} else { // error null, code not 200
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http', 
$response['code'] ],
-   (string) $response['code']
+   'apierror-visualeditor-docserver-http'
);
}
return $response['body'];
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 4dd37d3..6f1f066 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -54,8 +54,8 @@
"apierror-visualeditor-badcachekey": "No cached serialization found 
with that key",
"apierror-visualeditor-difffailed": "Diff failed",
"apierror-visualeditor-docserver": "Error contacting the 
Parsoid/RESTbase server",
-   "apierror-visualeditor-docserver-http": "docserver-http: HTTP $1",
-   "apierror-visualeditor-docserver-http-error": "docserver-http-error: 
$1",
+   "apierror-visualeditor-docserver-http": "HTTP $1",
+   "apierror-visualeditor-docserver-http-error": "$1",
"apierror-visualeditor-invaliddeflate": "Content provided is not 
properly deflated",
"apierror-visualeditor-latestnotfound": "Could not find latest revision 
for title",
"tooltip-ca-createsource": "Create the source code of this page",
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index d138d29..e26c543 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -688,11 +688,11 @@
// Don't show an error if the load was manually aborted
// The response.status check here is to catch aborts triggered by 
navigation away from the page
if (
-   error &&
-   Object.prototype.hasOwnProperty.call( error, 'error' ) &&
-   Object.prototype.hasOwnProperty.call( error.error, 'info' )
+   errorText &&
+   Object.prototype.hasOwnProperty.call( errorText, 'error' ) &&
+   Object.prototype.hasOwnProperty.call( errorText.error, 'info' )
) {
-   errorInfo = error.error.info;
+   errorInfo = errorText.error.info;
}
 
if ( !error || error.statusText !== 'abort' ) {
@@ -709,7 +709,7 @@
);
}
} else if ( errorInfo ) {
-   confirmPromptMessage = ve.msg( 
'visualeditor-loadwarning', errorText + ': ' + errorInfo );
+   confirmPromptMessage = ve.msg( 
'visualeditor-loadwarning', error + ': ' + errorInfo );
} else if ( typeof error === 'string' ) {
confirmPromptMessage = error;
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_graphite: Fix some IndexError exceptions in Threshold....

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330332 )

Change subject: check_graphite: Fix some IndexError exceptions in 
Threshold.parse_result
..

check_graphite: Fix some IndexError exceptions in Threshold.parse_result

The server can return an empty list, so the 'No valid datapoints found' warning 
should now appear from check_data

Bug: T154533
Change-Id: I4161b059eff4ea579387884add734129bea78777
---
M modules/nagios_common/files/check_commands/check_graphite
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_graphite 
b/modules/nagios_common/files/check_commands/check_graphite
index d35c3ce..b5b2a5b 100755
--- a/modules/nagios_common/files/check_commands/check_graphite
+++ b/modules/nagios_common/files/check_commands/check_graphite
@@ -251,6 +251,8 @@
 '''
 datapoints = defaultdict(list)
 datapoints['_total'] = 0
+if len(result) == 0:
+return datapoints
 for (data, time) in result[0]['datapoints']:
 if not isinstance(data, Real):
 datapoints['UNKNOWN'].append((time, data))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4161b059eff4ea579387884add734129bea78777
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_graphite: Fix some KeyError exceptions in SeriesThresh...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330329 )

Change subject: check_graphite: Fix some KeyError exceptions in 
SeriesThreshold.format_message
..

check_graphite: Fix some KeyError exceptions in SeriesThreshold.format_message

'UNKNOWN' key will only be set if self.allow_undefined

Bug: T154533
Change-Id: If6bba197d39877befb5833e91c5ac23bbc8b3002
---
M modules/nagios_common/files/check_commands/check_graphite
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_graphite 
b/modules/nagios_common/files/check_commands/check_graphite
index 87184af..d35c3ce 100755
--- a/modules/nagios_common/files/check_commands/check_graphite
+++ b/modules/nagios_common/files/check_commands/check_graphite
@@ -387,11 +387,11 @@
 return message
 
 def format_message(self, messages):
-if not (messages['CRITICAL'] or messages['WARNING'] or 
messages['UNKNOWN']):
+if not (messages['CRITICAL'] or messages['WARNING'] or ('UNKNOWN' in 
messages and messages['UNKNOWN'])):
 return 'All targets OK'
 sign = '<' if self.under else '>'
 message = ''
-if messages['UNKNOWN']:
+if 'UNKNOWN' in messages and messages['UNKNOWN']:
 message += ' '.join(['%s (%s)' % (k, v) for k, v in 
messages['UNKNOWN']])
 if messages['CRITICAL']:
 message += ' '.join(['%s (%s%3.2f%%)' % (k, sign, v) for k, v in 
messages['CRITICAL']])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6bba197d39877befb5833e91c5ac23bbc8b3002
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: After saving a specific section, scroll to it

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329119 )

Change subject: After saving a specific section, scroll to it
..

After saving a specific section, scroll to it

Bug: T153297
Change-Id: I233e5226abc44d5d0bf8e56957a133d595e7be6f
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 17 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index ac5819a..33da804 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1436,7 +1436,7 @@
html, categoriesHtml, displayTitle, lastModified, contentSub, isRedirect
 ) {
var $content = $( $.parseHTML( html ) ),
-   $veSectionLinks, $categories;
+   $veSectionLinks, $categories, $sections, editedSectionHeader;
 
if ( lastModified ) {
// If we were not viewing the most recent revision before (a 
requirement
@@ -1498,6 +1498,22 @@
$( '.redirectMsg' )
.addClass( 'mw-content-' + $( 'html' ).attr( 'dir' ) )
.addClass( 've-redirect-header' );
+
+   if ( this.section !== null ) {
+   $sections = $( '#mw-content-text' )
+   .find( 'h1, h2, h3, h4, h5, h6' )
+   .not( '#toc h2' );
+   if ( this.section === 'new' ) {
+   editedSectionHeader = $sections.last().get( 0 );
+   } else if ( this.section > 0 ) {
+   editedSectionHeader = $sections.get( this.section - 1 );
+   }
+   if ( editedSectionHeader ) {
+   setTimeout( function () {
+   OO.ui.Element.static.scrollIntoView( 
editedSectionHeader );
+   }, 0 );
+   }
+   }
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I233e5226abc44d5d0bf8e56957a133d595e7be6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix MWInternalLinkAnnotation.getTargetDataFromHref's behavio...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329061 )

Change subject: Fix MWInternalLinkAnnotation.getTargetDataFromHref's behaviour 
with URLs containing query parts
..

Fix MWInternalLinkAnnotation.getTargetDataFromHref's behaviour with URLs 
containing query parts

ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(

'http://mediawiki.krenair.dev/mediawiki_dev/wiki/Main_Page?veaction=editsource',
ve.init.target.surface.model.documentModel.htmlDocument
)

Wrong, current result:
Object {
title: "Main Page?veaction=editsource",
rawTitle: "Main_Page?veaction=editsource",
hrefPrefix: "",
isInternal: true
}

New result:
Object {
title: "http://mediawiki.krenair.dev/mediawiki dev/wiki/Main 
Page?veaction=editsource",
rawTitle: 
"http://mediawiki.krenair.dev/mediawiki_dev/wiki/Main_Page?veaction=editsource;,
hrefPrefix: "",
isInternal: false
}

Change-Id: I3d6d7fcfeb0d8354623026c831605c7633c3e11a
---
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js 
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index c2dfa35..6af0718 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -112,7 +112,7 @@
// Check if this matches the server's article path
matches = relativeHref.match( relativeBaseRegex );
 
-   if ( matches ) {
+   if ( matches && matches[ 1 ].indexOf( '?' ) === -1 ) {
// Take the relative path
href = matches[ 1 ];
isInternal = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d6d7fcfeb0d8354623026c831605c7633c3e11a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: rm stray fileRepoPromise property from media dialog

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329057 )

Change subject: rm stray fileRepoPromise property from media dialog
..

rm stray fileRepoPromise property from media dialog

seems to have gone upstream to core's mw.widgets.APIResultsQueue

Change-Id: I3c2a6dbdca60ceadc9e7175e5f8ad83b7fc4b7a0
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index d9ad95f..acfc1b8 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -20,7 +20,6 @@
 
// Properties
this.imageModel = null;
-   this.fileRepoPromise = null;
this.pageTitle = '';
this.isSettingUpModel = false;
this.isInsertion = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c2a6dbdca60ceadc9e7175e5f8ad83b7fc4b7a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: Don't use wikitech API to find labs instances in t...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329021 )

Change subject: toollabs: Don't use wikitech API to find labs instances in 
tools-clush-generator
..

toollabs: Don't use wikitech API to find labs instances in tools-clush-generator

Use the OpenStack API instead now that we hav the new observer credentials.

Some parts tested.

Bug: T104575
Change-Id: I6c26aac3c19e3ff7dec0e831926a535fef7480cb
---
M modules/role/files/toollabs/clush/tools-clush-generator
M modules/role/manifests/toollabs/clush/master.pp
2 files changed, 29 insertions(+), 14 deletions(-)


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

diff --git a/modules/role/files/toollabs/clush/tools-clush-generator 
b/modules/role/files/toollabs/clush/tools-clush-generator
index 4fbf845..833f218 100644
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ b/modules/role/files/toollabs/clush/tools-clush-generator
@@ -9,10 +9,13 @@
 
 This is run in a cron every hour.
 """
-import json
 import yaml
 import argparse
-from urllib.request import urlopen
+
+from keystoneclient.session import Session as KeystoneSession
+from keystoneclient.auth.identity.v3 import Password as KeystonePassword
+
+from novaclient import client as novaclient
 
 
 # Maps prefixes to hostgroup names
@@ -46,17 +49,21 @@
 }
 
 
-def get_hostgroups(classifier):
+def get_hostgroups(classifier, observer_pass):
 hostgroups = {name: [] for name in classifier.values()}
-
-api_url = 'https://wikitech.wikimedia.org/w/api.php' \
-'?action=query=novainstances=eqiad=json' \
-'=tools'
-
-data = json.loads(urlopen(api_url).read().decode('utf-8'))
-
-for instance in data['query']['novainstances']:
-name = instance['name']
+client = novaclient.Client(
+"2.0",
+session=KeystoneSession(auth=KeystonePassword(
+auth_url="http://labcontrol1001.wikimedia.org:5000/v3;,
+username="novaobserver",
+password=observer_pass,
+project_name='tools',
+user_domain_name='default',
+project_domain_name='default'
+))
+)
+for instance in client.servers.list():
+name = instance.name
 for prefix in classifier:
 if name.startswith('tools-' + prefix):
 role = classifier[prefix]
@@ -71,8 +78,13 @@
 'outputpath',
 help='Path to output hostgroup to host mappings'
 )
+parser.add_argument(
+'--observer-pass',
+required=True,
+help='Password for the OpenStack observer account'
+)
 args = parser.parse_args()
 
-hostgroups = get_hostgroups(TOOLS_PREFIX_CLASSIFIER)
+hostgroups = get_hostgroups(TOOLS_PREFIX_CLASSIFIER, args.observer_pass)
 with open(args.outputpath, 'w') as f:
 f.write(yaml.safe_dump(hostgroups, default_flow_style=False))
diff --git a/modules/role/manifests/toollabs/clush/master.pp 
b/modules/role/manifests/toollabs/clush/master.pp
index eb869a2..7a50a29 100644
--- a/modules/role/manifests/toollabs/clush/master.pp
+++ b/modules/role/manifests/toollabs/clush/master.pp
@@ -24,6 +24,7 @@
 
 require_package('python3-yaml')
 
+include ::openstack::clientlib
 file { '/usr/local/sbin/tools-clush-generator':
 ensure => file,
 source => 
'puppet:///modules/role/toollabs/clush/tools-clush-generator',
@@ -51,9 +52,11 @@
 mode   => '0555',
 }
 
+$novaconfig = hiera_hash('novaconfig', {})
+$observer_pass = $novaconfig['observer_password']
 cron { 'update_tools_clush':
 ensure  => present,
-command => '/usr/local/sbin/tools-clush-generator 
/etc/clustershell/tools.yaml',
+command => "/usr/local/sbin/tools-clush-generator 
/etc/clustershell/tools.yaml --observer-pass ${observer_pass}",
 hour=> '*/1',
 user=> 'root'
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c26aac3c19e3ff7dec0e831926a535fef7480cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move shinkengen from using LDAP to the OpenStack APIs

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328611 )

Change subject: Move shinkengen from using LDAP to the OpenStack APIs
..

Move shinkengen from using LDAP to the OpenStack APIs

Not tested.

Change-Id: I0bda5e651cf265c984f0f19abdfaf821efeaeb9e
---
M modules/shinken/files/shinkengen
M modules/shinken/manifests/shinkengen.pp
M modules/shinken/templates/shinkengen.yaml.erb
3 files changed, 37 insertions(+), 69 deletions(-)


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

diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 310aae1..1e39c0d 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -14,7 +14,7 @@
 #   limitations under the License.
 #
 """
-Generates config about labs instances for shinken, taking info from LDAP.
+Generates config about labs instances for shinken, taking info from OpenStack 
and our puppetmaster.
 
 Emits a host definition for each instance in the whitelisted projects
 (whitelist in the config file).
@@ -34,9 +34,13 @@
 import argparse
 import sys
 import yaml
-import ldap3
 import requests
 from collections import OrderedDict
+
+from keystoneclient.session import Session as KeystoneSession
+from keystoneclient.auth.identity.v3 import Password as KeystonePassword
+
+from novaclient import client as novaclient
 
 
 class ConfigObject():
@@ -58,48 +62,32 @@
 return 'define %s {\n%s}\n' % (self.type, config_str)
 
 
-class LDAPSource(object):
-"""
-A source of information about labs instances, querying LDAP
-"""
-def __init__(self, server, bindas, passwd):
-server = ldap3.Server(server)
-self.conn = ldap3.Connection(server, read_only=True,
- user=bindas, password=passwd)
-self.conn.bind()
-self.conn.start_tls()
+def get_instances(project, observer_pass):
+client = novaclient.Client(
+"2.0",
+session=KeystoneSession(auth=KeystonePassword(
+auth_url="http://labcontrol1001.wikimedia.org:5000/v3;,
+username="novaobserver",
+password=observer_pass,
+project_name=project,
+user_domain_name='default',
+project_domain_name='default'
+))
+)
 
-def get_instances(self, project):
-"""
-Get info about all instances in the given project.
+hosts = []
+for instance in client.servers.list():
+hosts.append({
+'ip': [
+str(ip['addr']) for ip in instance.addresses['public']
+if ip['OS-EXT-IPS:type'] == 'fixed'
+][0],
+'project': project,
+'name': instance.name,
+'fqdn': '.'.join([instance.name, project, 'eqiad', 'wmflabs'])
+})
 
-Returns the following information for each instance in given project:
-- ec2id: Permanent id for this particular instance
-- ip: Internal IP of this instance
-- region: Which OpenStack Region this Instance is in
-- puppetClasses: List of puppet classes applied to this instance 
via
- configure page in wikitech.
-- project: Name of project the instance is contained in
-- name: Name of the instance
-"""
-self.conn.search('ou=hosts,dc=wikimedia,dc=org',
- '(dc=*.%s.eqiad.wmflabs)' % project,
- ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
- attributes=ldap3.ALL_ATTRIBUTES)
-hosts = []
-for responseitem in self.conn.response:
-hostinfo = responseitem['attributes']
-ip = [a for a in hostinfo['aRecord'] if a.startswith('10.')][0]
-instancename, projectname, site, realm = 
hostinfo['dc'][0].split(".")
-hosts.append({
-'ip': ip,
-'puppetClasses': hostinfo.get('puppetClass', []),
-'project': project,
-'name': instancename,
-'fqdn': hostinfo['dc'][0]
-})
-
-return hosts
+return hosts
 
 def get_instance_roles(project, fqdn):
 url = 
'http://labcontrol1001.wikimedia.org:8100/v1/{project}/node/{fqdn}'.format(
@@ -117,12 +105,8 @@
 with open('/etc/shinkengen.yaml') as f:
 config = yaml.load(f)
 
-ldapsource = LDAPSource(config['ldap']['server'],
-config['ldap']['bindas'],
-config['ldap']['password'])
-
 for project in config['projects']:
-instances = ldapsource.get_instances(project)
+instances = get_instances(project, config['observer_pass'])
 host_configs = []
 for instance in instances:
 co = ConfigObject('host')
@@ -134,7 +118,7 @@
 # particular roles with checks.  

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Don't use wikitech API to find labs instances in n...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328609 )

Change subject: labstore: Don't use wikitech API to find labs instances in 
nfs-exportd
..

labstore: Don't use wikitech API to find labs instances in nfs-exportd

Use the OpenStack API instead. The new observer credentials will do
for this purpose.

Some parts tested.

Bug: T104575
Change-Id: Iff63395c01ac3dd0dd6edd3a437c88bf7aa28e71
---
M modules/labstore/files/nfs-exportd
1 file changed, 33 insertions(+), 22 deletions(-)


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

diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 1e33d9a..79b1edd 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -19,17 +19,19 @@
 #  THIS FILE IS MANAGED BY PUPPET
 #
 
-from urllib.request import urlopen
 import ipaddress
 import argparse
 import yaml
-import json
 import os
 import time
 import logging
 import sys
 import subprocess
 
+from keystoneclient.session import Session as KeystoneSession
+from keystoneclient.auth.identity.v3 import Password as KeystonePassword
+
+from novaclient import client as novaclient
 
 # Volumes that need an entry in exports.d
 VOLUMES_NEEDING_EXPORTS = ['project', 'home', 'tools-home', 'tools-project']
@@ -72,30 +74,33 @@
 )
 
 
-def get_instance_ips(project):
+def get_instance_ips(project, observer_pass):
 """
 Return a list of Instance internal IPs for a given project
 
 This uses the Wikitech API to fetch this data
 """
-url = ("https://wikitech.wikimedia.org/w/api.php; +
-   "?action=query=novainstances=%s" +
-   "=eqiad=json") % project
-try:
-data = json.loads(urlopen(url, timeout=15).read().decode('utf-8'))
-except:
-logging.exception('Error fetching instance ip list for project %s', 
project)
-sys.exit(1)
-
+client = novaclient.Client(
+"2.0",
+session=KeystoneSession(auth=KeystonePassword(
+auth_url="http://labcontrol1001.wikimedia.org:5000/v3;,
+username="novaobserver",
+password=observer_pass,
+project_name=project,
+user_domain_name='default',
+project_domain_name='default'
+))
+)
 ips = []
-if 'query' in data and 'novainstances' in data['query']:
-for instance in data['query']['novainstances']:
-# Only provide internal IPs!
-ips += [ip for ip in instance['ip']
-if is_valid_ipv4(ip) and ip.startswith('10.')]
+for instance in client.servers.list():
+# Only provide internal IPs!
+ips += [
+str(ip['addr']) for ip in instance.addresses['public']
+if ip['OS-EXT-IPS:type'] == 'fixed' and is_valid_ipv4(ip)
+]
 return ips
 
-def get_projects_with_nfs(mounts_config):
+def get_projects_with_nfs(mounts_config, observer_pass):
 """
 Get populated project objects that need NFS exports
 :param mounts_config: dict
@@ -112,7 +117,7 @@
 continue
 else:
 continue
-project = Project(name, config['gid'], get_instance_ips(name), mounts)
+project = Project(name, config['gid'], get_instance_ips(name, 
observer_pass), mounts)
 projects.append(project)
 logging.debug('project %s has %s instances',
  name, len(project.instance_ips))
@@ -154,12 +159,12 @@
 logging.info("found %s public NFS exports" % (len(public_paths)))
 return public_paths
 
-def write_project_exports(mounts_config, exports_d_path):
+def write_project_exports(mounts_config, exports_d_path, observer_pass):
 """ output project export definitions
 :param mounts_config: dict of defined exports
 """
 project_paths = []
-projects = get_projects_with_nfs(mounts_config)
+projects = get_projects_with_nfs(mounts_config, observer_pass)
 for project in projects:
 logging.debug('writing exports file for %s', project.name)
 path = os.path.join(exports_d_path, '%s.exports' % project.name)
@@ -182,6 +187,12 @@
 '--config-path',
 default='/etc/nfs-mounts.yaml',
 help='Path to YAML file containing config of which exports to 
maintain',
+)
+
+argparser.add_argument(
+'--observer-pass',
+required=True,
+help='Password for the OpenStack observer account',
 )
 
 argparser.add_argument(
@@ -223,7 +234,7 @@
 for filename in os.listdir(exports_d_path)]
 
 public_paths = write_public_exports(config['public'], exports_d_path)
-project_paths = write_project_exports(config, exports_d_path)
+project_paths = write_project_exports(config, exports_d_path, 
args.observer_pass)
 
 # compile list of entries in export_d path that are not defined in 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: graphite: Don't use wikitech API to find labs projects/insta...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328608 )

Change subject: graphite: Don't use wikitech API to find labs projects/instances
..

graphite: Don't use wikitech API to find labs projects/instances

Use the OpenStack API instead. The new observer credentials will do
for this purpose.

Also get rid of the (seemingly now unused) HOSTNAME_MAPPING.

Some parts tested.

Bug: T104575
Change-Id: Ia7ae8975bb79a1587ae5cbbb66849f9d042e7ae2
---
M modules/graphite/files/archive-instances
M modules/graphite/manifests/labs/archiver.pp
2 files changed, 26 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/328608/1

diff --git a/modules/graphite/files/archive-instances 
b/modules/graphite/files/archive-instances
index dfda3f5..2745754 100755
--- a/modules/graphite/files/archive-instances
+++ b/modules/graphite/files/archive-instances
@@ -16,22 +16,27 @@
 '''
 import os
 import time
-import urllib.request
-import codecs
-import json
 import logging
+import sys
 
+from keystoneclient.session import Session as KeystoneSession
+from keystoneclient.auth.identity.v3 import Password as KeystonePassword
+from keystoneclient.client import Client as KeystoneClient
 
-# Hostname Mapping, for hosts that have a different name in graphite
-# and on wikitech. This seems like a bug in diamond that needs to be
-# fixed. In the mean time, update this mapping! Can be moved into
-# an external file if this gets too big.
-# Maps hostname as in wikitech to graphite metric name.
-HOSTNAME_MAPPING = {
-'tools-webproxy': 'tools',
-}
+from novaclient import client as novaclient
 
 WHISPER_PATH = '/srv/carbon/whisper'
+
+
+def get_keystone_session(project_name):
+return KeystoneSession(auth=KeystonePassword(
+auth_url="http://labcontrol1001.wikimedia.org:5000/v3;,
+username="novaobserver",
+password=sys.argv[1],
+project_name=project_name,
+user_domain_name='default',
+project_domain_name='default'
+))
 
 
 def archive_host(project_name, host_name):
@@ -74,30 +79,20 @@
 '''
 Get hosts that are currently present in the given project
 '''
-req = urllib.request.urlopen(
-'https://wikitech.wikimedia.org/w/api.php' +
-
'?action=query=novainstances=%s=eqiad=json' % (
-project_name,
-)
-)
-reader = codecs.getreader('utf-8')
-data = json.load(reader(req))
-logging.info('Fetched instance list for project %s', project_name)
-return [HOSTNAME_MAPPING.get(instance['name'], instance['name'])
-for instance in data['query']['novainstances']]
+client = novaclient.Client("2.0", 
session=get_keystone_session(project_name))
+return [instance.name for instance in client.servers.list()]
 
 
 def get_projects_list():
 '''
 Get a list of all active projects from the wikitech API
 '''
-req = urllib.request.urlopen(
-
'https://wikitech.wikimedia.org/w/api.php?action=query=novaprojects=json'
+keystone_client = KeystoneClient(
+session=get_keystone_session('observer'),
+endpoint="http://labcontrol1001.wikimedia.org:5000/v3;,
+interface='public'
 )
-reader = codecs.getreader('utf-8')
-data = json.load(reader(req))
-return data['query']['novaprojects']
-
+return [project.name for project in keystone_client.projects.list()]
 
 def get_deleted_instances():
 '''
diff --git a/modules/graphite/manifests/labs/archiver.pp 
b/modules/graphite/manifests/labs/archiver.pp
index db83b09..adb3b7d 100644
--- a/modules/graphite/manifests/labs/archiver.pp
+++ b/modules/graphite/manifests/labs/archiver.pp
@@ -10,9 +10,11 @@
 mode   => '0700',
 }
 
+$novaconfig = hiera_hash('novaconfig', {})
+$observer_pass = $novaconfig['observer_password']
 cron { 'archive-deleted-instances':
 ensure  => present,
-command => '/usr/local/bin/archive-instances',
+command => "/usr/local/bin/archive-instances ${observer_pass}",
 user=> '_graphite',
 minute  => 0,
 hour=> 13,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7ae8975bb79a1587ae5cbbb66849f9d042e7ae2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't try to JSON stringify load error messages that are alr...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328449 )

Change subject: Don't try to JSON stringify load error messages that are 
already strings
..

Don't try to JSON stringify load error messages that are already strings

Change-Id: Ib180c3ac7eb62d351e05153defd6330c3397c478
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 8bb7d28..5295737 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -700,6 +700,8 @@
}
} else if ( errorInfo ) {
confirmPromptMessage = ve.msg( 
'visualeditor-loadwarning', errorText + ': ' + errorInfo );
+   } else if ( typeof error === 'string' ) {
+   confirmPromptMessage = error;
} else {
// At least give the devs something to work from
confirmPromptMessage = JSON.stringify( error );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib180c3ac7eb62d351e05153defd6330c3397c478
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Also allow opening in source mode if VE is unavailable on ac...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328029 )

Change subject: Also allow opening in source mode if VE is unavailable on 
action=edit
..

Also allow opening in source mode if VE is unavailable on action=edit

Bug: T153508
Change-Id: I5678d3b417c93707edc90bbb76ce4dafcd2098c6
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 7c8b6d0..5d7a7c4 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -910,6 +910,10 @@
(

tabPreference === 'remember-last' &&

getLastEditor() === 'wikitext'
+   ) ||
+   (
+   
!init.isVisualAvailable &&
+   [ 
'edit', 'submit' ].indexOf( uri.query.action ) !== -1
)
)
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5678d3b417c93707edc90bbb76ce4dafcd2098c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't break everything if we end up with strange accesskey m...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327892 )

Change subject: Don't break everything if we end up with strange accesskey 
messages
..

Don't break everything if we end up with strange accesskey messages

Quietly continue instead.

Bug: T153472
Change-Id: I7c325624734f122c9fd939aee1192187c63d9247
---
M modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js 
b/modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js
index 0b7814e..7a4ad8f 100644
--- a/modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js
+++ b/modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js
@@ -91,9 +91,14 @@
saveShortcut = ve.msg( 'accesskey-save' );
 
if ( saveShortcut !== '-' && saveShortcut !== '' ) {
-   ve.ui.triggerRegistry.register(
-   'showSave', new ve.ui.Trigger( accessKeyPrefix + 
saveShortcut )
-   );
+   try {
+   ve.ui.triggerRegistry.register(
+   'showSave', new ve.ui.Trigger( accessKeyPrefix 
+ saveShortcut )
+   );
+   } catch ( e ) {
+   mw.log.warn( 'Invalid accesskey data? Failed to 
register ' + accessKeyPrefix + saveShortcut );
+   return;
+   }
ve.ui.commandHelpRegistry.register( 'other', 'save', {
trigger: 'showSave',
label: function () { return 
ve.init.target.getSaveButtonLabel(); }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c325624734f122c9fd939aee1192187c63d9247
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix check for HTTP error

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327721 )

Change subject: Fix check for HTTP error
..

Fix check for HTTP error

For some reason these parameters are backwards in this particular case?

Not sure about the other case here ('error').

Bug: T152429
Change-Id: I435ac148007db87da69e8cf48568fafa646abb71
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 8bb7d28..1b08706 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -686,11 +686,11 @@
}
 
if ( !error || error.statusText !== 'abort' ) {
-   if ( errorText === 'http' || errorText === 'error' ) {
-   if ( error && ( error.status || ( error.xhr && 
error.xhr.status ) ) ) {
+   if ( error === 'http' || errorText === 'error' ) {
+   if ( errorText && ( errorText.status || ( errorText.xhr 
&& errorText.xhr.status ) ) ) {
confirmPromptMessage = ve.msg(
'visualeditor-loadwarning',
-   'HTTP ' + ( error.status || 
error.xhr.status )
+   'HTTP ' + ( errorText.status || 
errorText.xhr.status )
);
} else {
confirmPromptMessage = ve.msg(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I435ac148007db87da69e8cf48568fafa646abb71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Show HTTP status alongside 'Unknown error' when it's not 200

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327719 )

Change subject: Show HTTP status alongside 'Unknown error' when it's not 200
..

Show HTTP status alongside 'Unknown error' when it's not 200

Change-Id: If14dc14f2cc43a1f12c1314342d5028ec524c31e
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 33a4d8f..1628812 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -785,13 +785,18 @@
  */
 ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( editApi, data 
) {
var errorMsg = ( editApi && editApi.info ) || ( data && data.error && 
data.error.info ),
-   errorCode = ( editApi && editApi.code ) || ( data && data.error 
&& data.error.code );
+   errorCode = ( editApi && editApi.code ) || ( data && data.error 
&& data.error.code ),
+   unknown = 'Unknown error';
+
+   if ( data.xhr.status !== 200 ) {
+   unknown += ', HTTP status ' + data.xhr.status;
+   }
 
this.showSaveError(
-   $( document.createTextNode( errorMsg || errorCode || 'Unknown 
error' ) ),
+   $( document.createTextNode( errorMsg || errorCode || unknown ) 
),
false // prevents reapply
);
-   this.emit( 'saveErrorUnknown', errorCode || errorMsg || 'Unknown error' 
);
+   this.emit( 'saveErrorUnknown', errorCode || errorMsg || unknown );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If14dc14f2cc43a1f12c1314342d5028ec524c31e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix I0e802a47: Don't try to send dieWithError error codes as...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327718 )

Change subject: Fix I0e802a47: Don't try to send dieWithError error codes as 
integers
..

Fix I0e802a47: Don't try to send dieWithError error codes as integers

Bug: T152429
Change-Id: If882b14adc945ca49e51a912a676aee0be9c9fec
---
M ApiVisualEditor.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index b3981d8..dd8eef2 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -116,7 +116,7 @@
} else { // error null, code not 200
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http', 
$response['code'] ],
-   $response['code']
+   (string) $response['code']
);
}
return $response['body'];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If882b14adc945ca49e51a912a676aee0be9c9fec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[wmf/1.29.0-wmf.6]: Fix typo in function name

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327714 )

Change subject: Fix typo in function name
..

Fix typo in function name

Bug: T153424
Change-Id: I8c93dab31b860c698f6a4592e8261e95947636db
(cherry picked from commit da21a074783223e3ff9859f7972011c2e45db007)
---
M api/MWOAuthSessionProvider.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/14/327714/1

diff --git a/api/MWOAuthSessionProvider.php b/api/MWOAuthSessionProvider.php
index 54e5b30..8f9ff11 100644
--- a/api/MWOAuthSessionProvider.php
+++ b/api/MWOAuthSessionProvider.php
@@ -49,7 +49,7 @@
array_shift( $params );
$msg = wfMessage( $key, $params );
if ( class_exists( \ApiUsageException::class ) ) {
-   $exception = \ApiUsageException::newWithMesage( null, 
$msg );
+   $exception = \ApiUsageException::newWithMessage( null, 
$msg );
} else {
$msg = $msg->inLanguage( 'en' )->useDatabase( false 
)->plain();
$exception = new \UsageException( $msg, $key );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c93dab31b860c698f6a4592e8261e95947636db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Fix typo in function name

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327713 )

Change subject: Fix typo in function name
..

Fix typo in function name

Bug: T153424
Change-Id: I8c93dab31b860c698f6a4592e8261e95947636db
---
M api/MWOAuthSessionProvider.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/13/327713/1

diff --git a/api/MWOAuthSessionProvider.php b/api/MWOAuthSessionProvider.php
index 54e5b30..8f9ff11 100644
--- a/api/MWOAuthSessionProvider.php
+++ b/api/MWOAuthSessionProvider.php
@@ -49,7 +49,7 @@
array_shift( $params );
$msg = wfMessage( $key, $params );
if ( class_exists( \ApiUsageException::class ) ) {
-   $exception = \ApiUsageException::newWithMesage( null, 
$msg );
+   $exception = \ApiUsageException::newWithMessage( null, 
$msg );
} else {
$msg = $msg->inLanguage( 'en' )->useDatabase( false 
)->plain();
$exception = new \UsageException( $msg, $key );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c93dab31b860c698f6a4592e8261e95947636db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Wrap localStorage.getItem calls in try { ... } catch () {}

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327663 )

Change subject: Wrap localStorage.getItem calls in try { ... } catch () {}
..

Wrap localStorage.getItem calls in try { ... } catch () {}

Bug: T153291
Change-Id: Ic4f8c390bfe6936bd182b28b1f2c6d19bf459eba
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 13 insertions(+), 4 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 2abcf62..7c8b6d0 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -830,7 +830,8 @@
isLoggedIn = !mw.user.isAnon(),
prefSaysShowWelcome = isLoggedIn && 
!mw.user.options.get( 'visualeditor-hidebetawelcome' ),
urlSaysHideWelcome = 'hidewelcomedialog' in new mw.Uri( 
location.href ).query,
-   action = 'edit';
+   action = 'edit',
+   welcomeDialogLocalStorageValue = null;
 
if ( uri.query.action === 'edit' && $( '#wpTextbox1' ).length ) 
{
initialWikitext = $( '#wpTextbox1' ).textSelection( 
'getContents' );
@@ -1067,6 +1068,9 @@
}
}
 
+   try {
+   welcomeDialogLocalStorageValue = localStorage.getItem( 
've-beta-welcome-dialog' );
+   } catch ( e ) {}
if (
showWikitextWelcome &&
mw.config.get( 'wgVisualEditorConfig' ).showBetaWelcome 
&&
@@ -1076,7 +1080,7 @@
prefSaysShowWelcome ||
(
!isLoggedIn &&
-   localStorage.getItem( 
've-beta-welcome-dialog' ) === null &&
+   welcomeDialogLocalStorageValue === null 
&&
$.cookie( 've-beta-welcome-dialog' ) 
=== null
)
)
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 848de5a..33a4d8f 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1959,7 +1959,12 @@
 ve.init.mw.ArticleTarget.prototype.maybeShowWelcomeDialog = function () {
var usePrefs, prefSaysShow, urlSaysHide,
windowManager = this.getSurface().dialogs,
-   target = this;
+   target = this,
+   welcomeDialogLocalStorageValue = null;
+
+   try {
+   welcomeDialogLocalStorageValue = localStorage.getItem( 
've-beta-welcome-dialog' );
+   } catch ( e ) {}
 
this.welcomeDialogPromise = $.Deferred();
 
@@ -1980,7 +1985,7 @@
prefSaysShow ||
(
!usePrefs &&
-   localStorage.getItem( 
've-beta-welcome-dialog' ) === null &&
+   welcomeDialogLocalStorageValue === null 
&&
$.cookie( 've-beta-welcome-dialog' ) 
=== null
)
)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4f8c390bfe6936bd182b28b1f2c6d19bf459eba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.6]: Revert "Add Terms of Use link on static and dynamic maps"

[Alex Monk (Code Review)]

Alex Monk has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327422 )

Change subject: Revert "Add Terms of Use link on static and dynamic maps"
..


Revert "Add Terms of Use link on static and dynamic maps"

This reverts commit eb2d8ca7b2f64e3bf967468ab6be09765d57c4d1.

Change-Id: Ia315d2a1cb3c0cee97ff363adb99482fecc0e4c0
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/staticframe/staticframe.js
M styles/control-attribution.less
5 files changed, 12 insertions(+), 37 deletions(-)

Approvals:
  Alex Monk: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 73935eb..6b2729d 100644
--- a/extension.json
+++ b/extension.json
@@ -300,7 +300,6 @@
"modules/staticframe/staticframe.js"
],
"messages": [
-   "kartographer-attribution-short",
"kartographer-fullscreen-text"
],
"targets": [
diff --git a/i18n/en.json b/i18n/en.json
index 016f501..ba868dd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,10 +14,9 @@
"apihelp-query+mapdata-param-continue": "Use this parameter to continue 
iterating through results",
"apihelp-query+mapdata-param-groups": "Pipe-separated groups to return 
data for",
"apihelp-query+mapdata-param-limit": "Data for how many pages to 
return",
-   "kartographer-attribution": 
"[https://wikimediafoundation.org/wiki/Maps_Terms_of_Use Wikimedia maps] | Map 
data © [https://www.openstreetmap.org/copyright OpenStreetMap contributors]",
+   "kartographer-attribution": "Wikimedia maps | Map data © 
[https://www.openstreetmap.org/copyright OpenStreetMap contributors]",
"kartographer-attribution-externaldata": "$1: $2",
"kartographer-attribution-externaldata-query": "query",
-   "kartographer-attribution-short": 
"[https://wikimediafoundation.org/wiki/Maps_Terms_of_Use Wikimedia] | © 
[https://www.openstreetmap.org/copyright OpenStreetMap]",
"kartographer-broken-category": "Pages with broken maps",
"kartographer-broken-category-desc": "The page includes an invalid map 
usage",
"kartographer-desc": "Allows maps to be added to the wiki pages",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2f6b323..54569f2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,10 +18,9 @@
"apihelp-query+mapdata-param-continue": 
"{{doc-apihelp-param|query+mapdata|continue}}",
"apihelp-query+mapdata-param-groups": 
"{{doc-apihelp-param|query+mapdata|groups}}",
"apihelp-query+mapdata-param-limit": 
"{{doc-apihelp-param|query+mapdata|limit}}",
-   "kartographer-attribution": "Attribution text shown at the bottom of 
the map.",
-   "kartographer-attribution-externaldata": "Formats external data layer 
attribution: $1 is external data service (e.g. Wikidata), $2 is link to 
external data link (e.g. query).",
+   "kartographer-attribution": "Attribution text shown at the bottom of 
the map. $1 is external data service (e.g. Wikidata), $2 is link to external 
data link (e.g. query)",
+   "kartographer-attribution-externaldata": "Formats external data layer 
attribution",
"kartographer-attribution-externaldata-query": "Label for external data 
'query'.\n{{Identical|Query}}",
-   "kartographer-attribution-short": "Shorter version of the attribution 
text shown at the bottom of the map, for static maps embedded in the article.",
"kartographer-broken-category": "Name of the tracking category",
"kartographer-broken-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|kartographer-broken-category}} 
tracking category.",
"kartographer-desc": 
"{{desc|name=Kartographer|url=https://www.mediawiki.org/wiki/Extension:Kartographer}};,
diff --git a/modules/staticframe/staticframe.js 
b/modules/staticframe/staticframe.js
index ac36428..09e55dc 100644
--- a/modules/staticframe/staticframe.js
+++ b/modules/staticframe/staticframe.js
@@ -90,11 +90,6 @@
$div = $( '' ).append( button.$element );
 
$container.append( $div );
-   $container.append(
-   '' +
-   mw.message( 
'kartographer-attribution-short' ).parse() +
-   ''
-   );
} );
 
$container.attr( 'href', '#/map/' + index );
diff --git a/styles/control-attribution.less b/styles/control-attribution.less
index 75e5233..a7f1af1 100644
--- a/styles/control-attribution.less
+++ b/styles/control-attribution.less
@@ -1,40 +1,23 @@
 /* == Attribution control == */
-@import '../lib/wmui-base.less';
-

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.6]: Revert "Add Terms of Use link on static and dynamic maps"

[Alex Monk (Code Review)]

Hello JGirault, Yurik, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Add Terms of Use link on static and dynamic maps"
..

Revert "Add Terms of Use link on static and dynamic maps"

This reverts commit eb2d8ca7b2f64e3bf967468ab6be09765d57c4d1.

Change-Id: Ia315d2a1cb3c0cee97ff363adb99482fecc0e4c0
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/staticframe/staticframe.js
M styles/control-attribution.less
5 files changed, 12 insertions(+), 37 deletions(-)


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

diff --git a/extension.json b/extension.json
index 73935eb..6b2729d 100644
--- a/extension.json
+++ b/extension.json
@@ -300,7 +300,6 @@
"modules/staticframe/staticframe.js"
],
"messages": [
-   "kartographer-attribution-short",
"kartographer-fullscreen-text"
],
"targets": [
diff --git a/i18n/en.json b/i18n/en.json
index 016f501..ba868dd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,10 +14,9 @@
"apihelp-query+mapdata-param-continue": "Use this parameter to continue 
iterating through results",
"apihelp-query+mapdata-param-groups": "Pipe-separated groups to return 
data for",
"apihelp-query+mapdata-param-limit": "Data for how many pages to 
return",
-   "kartographer-attribution": 
"[https://wikimediafoundation.org/wiki/Maps_Terms_of_Use Wikimedia maps] | Map 
data © [https://www.openstreetmap.org/copyright OpenStreetMap contributors]",
+   "kartographer-attribution": "Wikimedia maps | Map data © 
[https://www.openstreetmap.org/copyright OpenStreetMap contributors]",
"kartographer-attribution-externaldata": "$1: $2",
"kartographer-attribution-externaldata-query": "query",
-   "kartographer-attribution-short": 
"[https://wikimediafoundation.org/wiki/Maps_Terms_of_Use Wikimedia] | © 
[https://www.openstreetmap.org/copyright OpenStreetMap]",
"kartographer-broken-category": "Pages with broken maps",
"kartographer-broken-category-desc": "The page includes an invalid map 
usage",
"kartographer-desc": "Allows maps to be added to the wiki pages",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2f6b323..54569f2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,10 +18,9 @@
"apihelp-query+mapdata-param-continue": 
"{{doc-apihelp-param|query+mapdata|continue}}",
"apihelp-query+mapdata-param-groups": 
"{{doc-apihelp-param|query+mapdata|groups}}",
"apihelp-query+mapdata-param-limit": 
"{{doc-apihelp-param|query+mapdata|limit}}",
-   "kartographer-attribution": "Attribution text shown at the bottom of 
the map.",
-   "kartographer-attribution-externaldata": "Formats external data layer 
attribution: $1 is external data service (e.g. Wikidata), $2 is link to 
external data link (e.g. query).",
+   "kartographer-attribution": "Attribution text shown at the bottom of 
the map. $1 is external data service (e.g. Wikidata), $2 is link to external 
data link (e.g. query)",
+   "kartographer-attribution-externaldata": "Formats external data layer 
attribution",
"kartographer-attribution-externaldata-query": "Label for external data 
'query'.\n{{Identical|Query}}",
-   "kartographer-attribution-short": "Shorter version of the attribution 
text shown at the bottom of the map, for static maps embedded in the article.",
"kartographer-broken-category": "Name of the tracking category",
"kartographer-broken-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|kartographer-broken-category}} 
tracking category.",
"kartographer-desc": 
"{{desc|name=Kartographer|url=https://www.mediawiki.org/wiki/Extension:Kartographer}};,
diff --git a/modules/staticframe/staticframe.js 
b/modules/staticframe/staticframe.js
index ac36428..09e55dc 100644
--- a/modules/staticframe/staticframe.js
+++ b/modules/staticframe/staticframe.js
@@ -90,11 +90,6 @@
$div = $( '' ).append( button.$element );
 
$container.append( $div );
-   $container.append(
-   '' +
-   mw.message( 
'kartographer-attribution-short' ).parse() +
-   ''
-   );
} );
 
$container.attr( 'href', '#/map/' + index );
diff --git a/styles/control-attribution.less b/styles/control-attribution.less
index 75e5233..a7f1af1 100644
--- a/styles/control-attribution.less
+++ 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.5]: Update VisualEditor for I0dc6be0d, I0b43fd65, Ida6ffffa

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327403 )

Change subject: Update VisualEditor for I0dc6be0d, I0b43fd65, Ida6a
..

Update VisualEditor for I0dc6be0d, I0b43fd65, Ida6a

Change-Id: I1927557dbc4d7927a2fa5bd818e32762f0b9dff7
---
M extensions/VisualEditor
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 2dd202e..b132e5f 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
@@ -1 +1 @@
-Subproject commit 2dd202ecc1213ede5f4c437b080c63e044ae4a16
+Subproject commit b132e5ff270e4817b28da6e82dd01fc1c6d8b667

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1927557dbc4d7927a2fa5bd818e32762f0b9dff7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.5
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.5]: Fix wikitext handling of DataTransferHandlers when IVStore i...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327395 )

Change subject: Fix wikitext handling of DataTransferHandlers when IVStore is 
used
..

Fix wikitext handling of DataTransferHandlers when IVStore is used

Bug: T153269
Change-Id: Ida6ac6e6a65784dc84a388d3702680a79db9
(cherry picked from commit c92418e4dae7a77139ebae3a604ce29dab32a448)
---
M modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js 
b/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
index 0a2609a..03d9140 100644
--- a/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
+++ b/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
@@ -50,8 +50,12 @@
if ( typeof dataOrDoc === 'string' || ( Array.isArray( 
dataOrDoc ) && dataOrDoc.every( isPlain ) ) ) {
resolve( dataOrDoc );
} else {
-   doc = dataOrDoc instanceof ve.dm.Document ? dataOrDoc : 
new ve.dm.Document( dataOrDoc );
-   ve.init.target.getWikitextFragment( doc )
+   doc = dataOrDoc instanceof ve.dm.Document ?
+   dataOrDoc :
+   // The handler may have also written items to 
the store
+   new ve.dm.Document( new 
ve.dm.ElementLinearData( handler.surface.getModel().getDocument().getStore(), 
dataOrDoc ) );
+
+   ve.init.target.getWikitextFragment( doc, false )
.done( resolve )
.fail( function () {
handler.abort();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6ac6e6a65784dc84a388d3702680a79db9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.5
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.6]: Fix wikitext handling of DataTransferHandlers when IVStore i...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327392 )

Change subject: Fix wikitext handling of DataTransferHandlers when IVStore is 
used
..

Fix wikitext handling of DataTransferHandlers when IVStore is used

Bug: T153269
Change-Id: Ida6ac6e6a65784dc84a388d3702680a79db9
(cherry picked from commit c92418e4dae7a77139ebae3a604ce29dab32a448)
---
M modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js 
b/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
index 417b5d2..03d9140 100644
--- a/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
+++ b/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
@@ -50,7 +50,11 @@
if ( typeof dataOrDoc === 'string' || ( Array.isArray( 
dataOrDoc ) && dataOrDoc.every( isPlain ) ) ) {
resolve( dataOrDoc );
} else {
-   doc = dataOrDoc instanceof ve.dm.Document ? dataOrDoc : 
new ve.dm.Document( dataOrDoc );
+   doc = dataOrDoc instanceof ve.dm.Document ?
+   dataOrDoc :
+   // The handler may have also written items to 
the store
+   new ve.dm.Document( new 
ve.dm.ElementLinearData( handler.surface.getModel().getDocument().getStore(), 
dataOrDoc ) );
+
ve.init.target.getWikitextFragment( doc, false )
.done( resolve )
.fail( function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6ac6e6a65784dc84a388d3702680a79db9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Esanders 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Resolve URLs in preview elements

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326278 )

Change subject: Resolve URLs in preview elements
..

Resolve URLs in preview elements

Bug: T152645
Change-Id: Id9b9f8f9b56fb33ca33b89a0fbec33fad49b01da
---
M src/ui/elements/ve.ui.PreviewElement.js
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/78/326278/1

diff --git a/src/ui/elements/ve.ui.PreviewElement.js 
b/src/ui/elements/ve.ui.PreviewElement.js
index d9a5863..99b5813 100644
--- a/src/ui/elements/ve.ui.PreviewElement.js
+++ b/src/ui/elements/ve.ui.PreviewElement.js
@@ -66,17 +66,22 @@
  */
 ve.ui.PreviewElement.prototype.replaceWithModelDom = function () {
var htmlDocument = ve.dm.converter.getDomFromNode( this.model, true ),
-   element = this.$element[ 0 ];
+   element = this.$element[ 0 ],
+   modelHtmlDoc = this.model.getDocument().getHtmlDocument();
 
// Resolve attributes
ve.resolveAttributes(
htmlDocument.body,
-   this.model.getDocument().getHtmlDocument(),
+   modelHtmlDoc,
ve.dm.Converter.static.computedAttributes
);
 
// Make all links open in a new window (sync view)
Array.prototype.forEach.call( htmlDocument.body.querySelectorAll( 
'a[href]' ), function ( el ) {
+   el.setAttribute(
+   'href',
+   ve.resolveUrl( el.getAttribute( 'href' ), modelHtmlDoc )
+   );
el.setAttribute( 'target', '_blank' );
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9b9f8f9b56fb33ca33b89a0fbec33fad49b01da
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Don't show approvals as 0 with new Gerrit version

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/325839 )

Change subject: Don't show approvals as 0 with new Gerrit version
..

Don't show approvals as 0 with new Gerrit version

This is now live

Change-Id: Ieccf25c4a749405990a396fd41677f7b94081f79
---
M src/preprocess.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/39/325839/1

diff --git a/src/preprocess.js b/src/preprocess.js
index 471fab8..6c62e26 100644
--- a/src/preprocess.js
+++ b/src/preprocess.js
@@ -106,13 +106,16 @@
 if(message.approvals) {
 ret.approvals = {};
 message.approvals.forEach(function(approval) {
-if(approval.type === 'Verified') {
+if(approval.type === 'Verified' && approval.value !== "0") {
 ret.approvals.V = approval.value;
-} else if (approval.type === 'Code-Review') {
+} else if (approval.type === 'Code-Review' && approval.value 
!== "0") {
 ret.approvals.C = approval.value;
 }
 });
 }
+if(Object.keys(ret.approvals).length === 0) {
+ret.approvals = undefined;
+}
 if(ret.user === 'jenkins-bot') {
 ret.message = message.change.subject;
 if(!ret.approvals || ret.approvals.V > 0) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieccf25c4a749405990a396fd41677f7b94081f79
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Send secondary DNS recursor IP from labs DHCP

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Send secondary DNS recursor IP from labs DHCP
..

Send secondary DNS recursor IP from labs DHCP

Bug: T137460
Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
---
M modules/openstack/manifests/nova/network.pp
M modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
M modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
3 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/325278/1

diff --git a/modules/openstack/manifests/nova/network.pp 
b/modules/openstack/manifests/nova/network.pp
index 72aeacb..34442ba 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -38,6 +38,7 @@
 $dnsconfig = hiera_hash('labsdnsconfig', {})
 $labs_metal = hiera('labs_metal',{})
 $recursor_ip = ipresolve($dnsconfig['recursor'],4)
+$recursor_secondary_ip = ipresolve($dnsconfig['recursor_secondary'],4)
 file { '/etc/dnsmasq-nova.conf':
 content => 
template("openstack/${openstack_version}/nova/dnsmasq-nova.conf.erb"),
 owner   => 'root',
diff --git a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb 
b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
 <% end -%>
 
 #Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
 
 dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%= 
scope.function_ipresolve([@tftp_host, 4]) %>
 
diff --git a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb 
b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
 <% end -%>
 
 #Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
 
 dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%= 
scope.function_ipresolve([@tftp_host, 4]) %>
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Follow-up I863367b8, Ic9db0829: These two commits conflicted

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Follow-up I863367b8, Ic9db0829: These two commits conflicted
..

Follow-up I863367b8, Ic9db0829: These two commits conflicted

Change-Id: I5bb7dc90764bb6178b97c96f646c8040d8651a58
---
M modules/beta/files/shinken.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/325122/1

diff --git a/modules/beta/files/shinken.cfg b/modules/beta/files/shinken.cfg
index c638ef6..6389c7e 100644
--- a/modules/beta/files/shinken.cfg
+++ b/modules/beta/files/shinken.cfg
@@ -88,5 +88,5 @@
 service_description Mediawiki Error Rate
 host_name   graphite-labs
 use generic-service
-check_command   
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!transformNull(sumSeries(logstash.rate.mediawiki.fatal.ERROR.sum,
 logstash.rate.mediawiki.exception.ERROR.sum), 0)!1!10!5min!1!--over
+check_command   
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!transformNull(sumSeries(logstash.rate.mediawiki.fatal.ERROR.sum,
 logstash.rate.mediawiki.exception.ERROR.sum), 0)!1!10!5min!0min!1!--over
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bb7dc90764bb6178b97c96f646c8040d8651a58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOA...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOARD 
is no longer set by Flow.php
..

deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOARD is no longer set 
by Flow.php

Production will need to have the same change made before the next train
deployment, but right now I'm dealing with deployment-prep which runs master
and is already broken by this.

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


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 5ebafa1..0c39c43 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -72,7 +72,7 @@
191 => true,
];
 
-   $wgNamespaceContentModels[ 191 ] = CONTENT_MODEL_FLOW_BOARD;
+   $wgNamespaceContentModels[ 191 ] = 'flow-board'; // 
CONTENT_MODEL_FLOW_BOARD
 }
 
 if ( $wmgUseContentTranslation ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id62d8d77c0aa591b875c83eb57ce033cff877a49
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Follow-up I3b706396: no more wg = wmg for this variable

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Follow-up I3b706396: no more wg = wmg for this variable
..

Follow-up I3b706396: no more wg = wmg for this variable

Change-Id: I066329d5e1d176d69ca0593cfb3e02e4396c3cba
---
M wmf-config/mobile-labs.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index 131bf50..a27e368 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -18,8 +18,6 @@
 
 $wgMFForceSecureLogin = false;
 
-$wgMFMobileFormatterHeadings = $wmgMFMobileFormatterHeadings;
-
 // T49647
 $wgHooks['EnterMobileMode'][] = function() {
global $wgCentralAuthCookieDomain, $wgHooks;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I066329d5e1d176d69ca0593cfb3e02e4396c3cba
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use widget.getApi, not this.getApi

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Use widget.getApi, not this.getApi
..

Use widget.getApi, not this.getApi

Bug: T152154
Change-Id: Id7e77323ffabf43e73481cf6bcb9a1e649dc
---
M modules/ve-mw/ui/widgets/ve.ui.MWTemplateTitleInputWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTemplateTitleInputWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWTemplateTitleInputWidget.js
index eb34fc4..93e812e 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTemplateTitleInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTemplateTitleInputWidget.js
@@ -93,7 +93,7 @@
if ( widget.showRedirects ) {
params.redirects = '1';
}
-   xhr = this.getApi().get( params );
+   xhr = widget.getApi().get( params );
return xhr.promise( { abort: xhr.abort 
} );
}
} )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7e77323ffabf43e73481cf6bcb9a1e649dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "RESTBase configuration for fi.wikivoyage.org""

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Revert "Revert "RESTBase configuration for fi.wikivoyage.org""
..

Revert "Revert "RESTBase configuration for fi.wikivoyage.org""

This reverts commit 6665b0f48c93607f0368e7029483024b77acf6e7.

Change-Id: I89bf1c7e6e7a3fdea5bdf347921de208fb646e6b
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/324766/1

diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 12baccc..b1592ec 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -823,6 +823,7 @@
 /{domain:es.wikivoyage.org}: *default_project
 /{domain:fa.wikivoyage.org}: *default_project
 /{domain:fr.wikivoyage.org}: *default_project
+/{domain:fi.wikivoyage.org}: *default_project
 /{domain:he.wikivoyage.org}: *default_project
 /{domain:it.wikivoyage.org}: *default_project
 /{domain:nl.wikivoyage.org}: *default_project

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89bf1c7e6e7a3fdea5bdf347921de208fb646e6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "RESTBase configuration for fi.wikivoyage.org"

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Revert "RESTBase configuration for fi.wikivoyage.org"
..

Revert "RESTBase configuration for fi.wikivoyage.org"

This reverts commit ec32500b2014b469f4b293936e74b775de7f46e6.

Hasn't been applied to production.

Change-Id: Ib99152e53a9f427c0d99194d879b2cd1c899bdee
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/324624/1

diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index b1592ec..12baccc 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -823,7 +823,6 @@
 /{domain:es.wikivoyage.org}: *default_project
 /{domain:fa.wikivoyage.org}: *default_project
 /{domain:fr.wikivoyage.org}: *default_project
-/{domain:fi.wikivoyage.org}: *default_project
 /{domain:he.wikivoyage.org}: *default_project
 /{domain:it.wikivoyage.org}: *default_project
 /{domain:nl.wikivoyage.org}: *default_project

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib99152e53a9f427c0d99194d879b2cd1c899bdee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Whitelist fiwikivoyage

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Whitelist fiwikivoyage
..

Whitelist fiwikivoyage

Bug: T151570
Change-Id: I7465d4f9fd894b49e12346f63983f27b6f454144
---
M static_data/pageview/whitelist/whitelist.tsv
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/16/324616/1

diff --git a/static_data/pageview/whitelist/whitelist.tsv 
b/static_data/pageview/whitelist/whitelist.tsv
index 9d59f51..dbeb39c 100644
--- a/static_data/pageview/whitelist/whitelist.tsv
+++ b/static_data/pageview/whitelist/whitelist.tsv
@@ -234,6 +234,7 @@
 projectfi.wikiquote2015-10-12 00:00:00
 projectfi.wikisource   2015-10-12 00:00:00
 projectfi.wikiversity  2015-10-12 00:00:00
+projectfi.wikivoyage   2015-10-12 00:00:00
 projectfi.wiktionary   2015-10-12 00:00:00
 projectfj.wikipedia2015-10-12 00:00:00
 projectfj.wiktionary   2015-10-12 00:00:00

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7465d4f9fd894b49e12346f63983f27b6f454144
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update SiteMatrix data fork for last 3 wiki creations

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Update SiteMatrix data fork for last 3 wiki creations
..

Update SiteMatrix data fork for last 3 wiki creations

Bug: T151570
Change-Id: I9e8b1c67231e6b474b72bb78363a23ed44b0fcce
---
M lib/config/sitematrix.json
1 file changed, 24 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/14/324614/1

diff --git a/lib/config/sitematrix.json b/lib/config/sitematrix.json
index 056386a..242ec5e 100644
--- a/lib/config/sitematrix.json
+++ b/lib/config/sitematrix.json
@@ -763,7 +763,7 @@
"sitename": "উইকিসংকলন"
}
],
-   "localname": "Bengali"
+   "localname": "Bangla"
},
"31": {
"code": "bo",
@@ -1875,6 +1875,12 @@
"dbname": "fiwikiversity",
"code": "wikiversity",
"sitename": "Wikiopisto"
+   },
+   {
+   "url": "https://fi.wikivoyage.org;,
+   "dbname": "fiwikivoyage",
+   "code": "wikivoyage",
+   "sitename": "Wikimatkat"
}
],
"localname": "Finnish"
@@ -4591,7 +4597,7 @@
},
"194": {
"code": "olo",
-   "name": "Livvinкarjala",
+   "name": "Livvinkarjala",
"site": [
{
"url": "https://olo.wikipedia.org;,
@@ -4644,7 +4650,7 @@
"sitename": "ଉଇକିପାଠାଗାର"
}
],
-   "localname": "Oriya"
+   "localname": "Odia"
},
"197": {
"code": "os",
@@ -7019,7 +7025,7 @@
],
"localname": "Zulu"
},
-   "count": 898,
+   "count": 901,
"specials": [
{
"url": "https://advisory.wikimedia.org;,
@@ -7172,6 +7178,13 @@
"code": "donate",
"sitename": "Donate",
"fishbowl": ""
+   },
+   {
+   "url": "https://ec.wikimedia.org;,
+   "dbname": "ecwikimedia",
+   "code": "ecwikimedia",
+   "sitename": "Wikimedistas de Ecuador",
+   "private": ""
},
{
"url": "https://ee.wikimedia.org;,
@@ -7376,6 +7389,13 @@
"sitename": "Wikimedia"
},
{
+   "url": "https://projectcom.wikipedia.org;,
+   "dbname": "projectcomwiki",
+   "code": "projectcom",
+   "sitename": "Project Grants Committee",
+   "private": ""
+   },
+   {
"url": "https://quality.wikimedia.org;,
"dbname": "qualitywiki",
"code": "quality",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e8b1c67231e6b474b72bb78363a23ed44b0fcce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Follow-up I3b706396 and Id8c53f8f: Fix -labs variations of w...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Follow-up I3b706396 and Id8c53f8f: Fix -labs variations of 
wmgM(F|Mobile) variables
..

Follow-up I3b706396 and Id8c53f8f: Fix -labs variations of wmgM(F|Mobile) 
variables

Bug: T151894
Change-Id: I8c7cfa93be0207a47712946b4bc9f04bf240b5bd
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index f1ed239..0c19676 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -232,11 +232,11 @@
'enwiki'=> true,
],
 
-   'wmgMobileUrlTemplate' => [
+   'wgMobileUrlTemplate' => [
'default' => '%h0.m.%h1.%h2.%h3.%h4',
'wikidatawiki' => 'm.%h0.%h1.%h2.%h3', // T87440
],
-   'wmgMFMobileFormatterHeadings' => [
+   'wgMFMobileFormatterHeadings' => [
'default' => [ 'h2', 'h3', 'h4', 'h5', 'h6' ], // 
T110436, T110837
],
 
@@ -250,10 +250,10 @@
'wgMFAllowNonJavaScriptEditing' => [
'default' => true,
],
-   'wmgMFPhotoUploadEndpoint' => [
+   'wgMFPhotoUploadEndpoint' => [
'default' => 
'https://commons.wikimedia.$variant.wmflabs.org/w/api.php',
],
-   'wmgMFSpecialCaseMainPage' => [
+   'wgMFSpecialCaseMainPage' => [
'default' => true,
'enwiki' => false,
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c7cfa93be0207a47712946b4bc9f04bf240b5bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wikitech cloudadmin: remove right that no longer exists

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: wikitech cloudadmin: remove right that no longer exists
..

wikitech cloudadmin: remove right that no longer exists

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 523dde3..68b84cd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8348,7 +8348,6 @@
'manageproject' => true,
'userrights' => true,
'managednsdomain' => true,
-   'manageglobalpuppet' => true,
'accessrestrictedregions' => true,
'editallhiera' => true,
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ba14c913f9958e0468edc4b0eff7ecde6bbf844
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Don't try to get revision ID for a link update if no revisio...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Don't try to get revision ID for a link update if no revision 
triggered it
..

Don't try to get revision ID for a link update if no revision triggered it

Change-Id: I618f9fb50ec73090234509e26e25f607878779e6
---
M EventBus.hooks.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/53/323653/1

diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index c08482a..47c9df2 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -664,10 +664,13 @@
'page_id'=> $title->getArticleID(),
'page_title' => $title->getPrefixedDBkey(),
'page_namespace' => $title->getNamespace(),
-   'page_is_redirect'   => $title->isRedirect(),
-   'rev_id' => $revision->getId()
+   'page_is_redirect'   => $title->isRedirect()
];
 
+   if ( $revision ) {
+   $attrs['rev_id'] = $revision->getId();
+   }
+
if ( !is_null( $user ) ) {
$attrs['performer'] = self::createPerformerAttrs( $user 
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I618f9fb50ec73090234509e26e25f607878779e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: [WIP] Undo support

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: [WIP] Undo support
..

[WIP] Undo support

TODO:
* Inline VE API TODOs
* Check revision deletion? (see EditPage) - may already effectively be handled
* Check content models (see EditPage) - possibly OK to revert non-wikitext
  change, as long as *resulting* revision is wikitext?
* nochange case where newContent=oldContent? probably need to set
  fromEditedState on the server (see EditPage)
* Auto-summary (see EditPage)
* Open save dialog in review mode

Bug: T78550
Change-Id: Ic8b13b6bb129a46934c5ea31c944e3db78fff828
---
M ApiVisualEditor.php
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
5 files changed, 77 insertions(+), 24 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 0ff5f49..30c20c7 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -219,20 +219,32 @@
$baseTimestamp = 
$latestRevision->getTimestamp();
$oldid = intval( $parserParams['oldid'] 
);
 
+   $fetchRevs = [ $oldid ];
+
+   $undo = intval( $params['undo'] );
+   $undoafter = intval( 
$params['undoafter'] );
+   if ( $undo > 0 && $undoafter > 0 ) {
+   // TODO: current rev rather 
than oldid here? below too
+   $fetchRevs = array_values( 
array_unique( [ $oldid, $undo, $undoafter ] ) );
+   }
+   $revContents = [];
+
// If requested, request HTML from 
Parsoid/RESTBase
if ( $params['paction'] === 'parse' ) {
-   $content = 
$this->requestRestbase(
-   'GET',
-   'page/html/' . 
urlencode( $title->getPrefixedDBkey() ) . '/' . $oldid . '?redirect=false',
-   []
-   );
-   if ( $content === false ) {
-   $this->dieUsage( 'Error 
contacting the document server', 'docserver' );
+   foreach ( $fetchRevs as $rev ) {
+   $revContents[$rev] = 
$this->requestRestbase(
+   'GET',
+   'page/html/' . 
urlencode( $title->getPrefixedDBkey() ) . '/' . $rev . '?redirect=false',
+   []
+   );
+   if ( $revContents[$rev] 
=== false ) {
+   
$this->dieUsage( 'Error contacting the document server to fetch revision ' . 
$rev, 'docserver' );
+   }
}
} elseif ( $params['paction'] === 
'wikitext' ) {
$apiParams = [
'action' => 'query',
-   'revids' => $oldid,
+   'revids' => implode( 
'|', $fetchRevs ),
'prop' => 'revisions',
'rvprop' => 
'content|ids'
];
@@ -252,19 +264,45 @@
$api->execute();
$result = 
$api->getResult()->getResultData();
$pid = $title->getArticleID();
-   $content = false;
+   foreach ( $fetchRevs as $rev ) {
+   $revContents[$rev] = 
false;
+   }
if ( isset( 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Respect oldid parameter in NWE

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Respect oldid parameter in NWE
..

Respect oldid parameter in NWE

Change-Id: I5a6388f50cc432421343974eb9f721f5e5a94d93
---
M ApiVisualEditor.php
1 file changed, 10 insertions(+), 5 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 648fa22..0ff5f49 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -232,9 +232,9 @@
} elseif ( $params['paction'] === 
'wikitext' ) {
$apiParams = [
'action' => 'query',
-   'titles' => 
$title->getPrefixedDBkey(),
+   'revids' => $oldid,
'prop' => 'revisions',
-   'rvprop' => 'content'
+   'rvprop' => 
'content|ids'
];
 
if ( isset( $params['section'] 
) ) {
@@ -252,9 +252,14 @@
$api->execute();
$result = 
$api->getResult()->getResultData();
$pid = $title->getArticleID();
-   $content = isset( 
$result['query']['pages'][$pid]['revisions']['0']['content'] ) ?
-   
$result['query']['pages'][$pid]['revisions']['0']['content'] :
-   false;
+   $content = false;
+   if ( isset( 
$result['query']['pages'][$pid]['revisions'] ) ) {
+   foreach ( 
$result['query']['pages'][$pid]['revisions'] as $revArr ) {
+   if ( 
$revArr['revid'] === $oldid ) {
+   
$content = $revArr['content'];
+   }
+   }
+   }
if ( $content === false ) {
$this->dieUsage( 'Error 
contacting the document server', 'docserver' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a6388f50cc432421343974eb9f721f5e5a94d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up I63ab27cb: Get rid of notices tool when there are ...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Follow-up I63ab27cb: Get rid of notices tool when there are no 
notices
..

Follow-up I63ab27cb: Get rid of notices tool when there are no notices

Change-Id: I3dd9d2cbfb1fa536490eb8b4b7d630e9c6cfdd48
---
M modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
index 7de42cd..6a63322 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
@@ -93,7 +93,7 @@
this.popup.$body.append( this.$items );
 
if ( !count ) {
-   this.$element = $( [] );
+   this.destroy();
}
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dd9d2cbfb1fa536490eb8b4b7d630e9c6cfdd48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move around code that sets up edit notices to ensure it runs...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Move around code that sets up edit notices to ensure it runs 
after we receive the notices to display
..

Move around code that sets up edit notices to ensure it runs after we receive 
the notices to display

Bug: T151236
Change-Id: I63ab27cb236169f300295b2ed4c88e01048092e7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
2 files changed, 43 insertions(+), 30 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 8b412b2..297a6b1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1414,6 +1414,7 @@
if ( this.welcomeDialogPromise ) {
this.welcomeDialogPromise
.always( function () {
+   var noticesTool;
// Pop out the notices when the welcome dialog 
is closed
if (
target.switched &&
@@ -1421,7 +1422,9 @@
) {

target.actionsToolbar.tools.editModeSource.getPopup().toggle( true );
} else {
-   
target.actionsToolbar.tools.notices.getPopup().toggle( true );
+   noticesTool = 
target.actionsToolbar.tools.notices;
+   noticesTool.setNotices( 
target.getEditNotices() );
+   noticesTool.getPopup().toggle( true );
}
} );
}
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
index 92aa978..d074462 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
@@ -40,36 +40,13 @@
  * @param {Object} [config]
  */
 ve.ui.MWNoticesPopupTool = function VeUiMWNoticesPopupTool( toolGroup, config 
) {
-   var tool = this,
-   items = toolGroup.getToolbar().getTarget().getEditNotices(),
-   count = items.length,
-   title = ve.msg(
-   'visualeditor-editnotices-tool',
-   mw.language.convertNumber( count )
-   );
-
// Parent constructor
-   ve.ui.MWNoticesPopupTool.super.call( this, title, toolGroup, config );
-
-   // Properties
-   this.$items = $( '' ).addClass( 've-ui-mwNoticesPopupTool-items' );
-
-   // Initialization
-   items.forEach( function ( itemHtml ) {
-   var $node = $( '' )
-   .addClass( 've-ui-mwNoticesPopupTool-item' )
-   .append( $.parseHTML( itemHtml ) );
-
-   $node.find( 'a' ).attr( 'target', '_blank' );
-
-   tool.$items.append( $node );
-   } );
-
-   this.popup.$body.append( this.$items );
-
-   if ( !count ) {
-   this.$element = $( [] );
-   }
+   ve.ui.MWNoticesPopupTool.super.call(
+   this,
+   ve.msg( 'visualeditor-editnotices-tooltip' ),
+   toolGroup,
+   config
+   );
 };
 
 /* Inheritance */
@@ -92,6 +69,39 @@
  *
  * @inheritdoc
  */
+ve.ui.MWNoticesPopupTool.prototype.setNotices = function ( notices ) {
+   var tool = this,
+   count = notices.length;
+
+   this.popup.setLabel( ve.msg(
+   'visualeditor-editnotices-tool',
+   mw.language.convertNumber( count )
+   ) );
+
+   this.$items = $( '' ).addClass( 've-ui-mwNoticesPopupTool-items' );
+
+   notices.forEach( function ( itemHtml ) {
+   var $node = $( '' )
+   .addClass( 've-ui-mwNoticesPopupTool-item' )
+   .append( $.parseHTML( itemHtml ) );
+
+   $node.find( 'a' ).attr( 'target', '_blank' );
+
+   tool.$items.append( $node );
+   } );
+
+   this.popup.$body.append( this.$items );
+
+   if ( !count ) {
+   this.$element = $( [] );
+   }
+};
+
+/**
+ * Get the tool title.
+ *
+ * @inheritdoc
+ */
 ve.ui.MWNoticesPopupTool.prototype.getTitle = function () {
var items = this.toolbar.getTarget().getEditNotices();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63ab27cb236169f300295b2ed4c88e01048092e7
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Template out reference to deployment.eqiad.wmnet in inactive...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Template out reference to deployment.eqiad.wmnet in 
inactive.motd
..

Template out reference to deployment.eqiad.wmnet in inactive.motd

Bug: T146505
Change-Id: I390113ba7670b079b6c5f633e86fdcbbe2942e21
---
M modules/role/manifests/deployment/server.pp
R modules/role/templates/deployment/inactive.motd.erb
2 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 48b115b..6c8b267 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -100,10 +100,11 @@
 cron_ensure   => $deploy_ensure,
 }
 
+$main_deployment_server = hiera('scap::deployment_server')
 motd::script { 'inactive_warning':
 ensure   => $deploy_ensure,
 priority => 01,
-source   => 'puppet:///modules/role/deployment/inactive.motd',
+content  => template('role/deployment/inactive.motd.erb'),
 }
 
 # Bacula backups (T125527)
diff --git a/modules/role/files/deployment/inactive.motd 
b/modules/role/templates/deployment/inactive.motd.erb
similarity index 90%
rename from modules/role/files/deployment/inactive.motd
rename to modules/role/templates/deployment/inactive.motd.erb
index 7c544dc..4eb13bc 100755
--- a/modules/role/files/deployment/inactive.motd
+++ b/modules/role/templates/deployment/inactive.motd.erb
@@ -18,6 +18,6 @@
 
 If you want to deploy software, you should /not/ do it from here; it
 will probably work, but the next deployer could lose track of any of
-your changes. Connect to 'deployment.eqiad.wmnet' instead, it will
+your changes. Connect to '<%= @main_deployment_server %>' instead, it will
 route you to the correct server.
 MOTD

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I390113ba7670b079b6c5f633e86fdcbbe2942e21
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use production apache config on beta

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Use production apache config on beta
..

Use production apache config on beta

Bug: T1256
Change-Id: I5b05b096d08d8829ddc5837518b4f35719a514dd
---
M modules/mediawiki/manifests/web/beta_sites.pp
D modules/mediawiki/manifests/web/prod_sites.pp
M modules/mediawiki/manifests/web/sites.pp
M modules/mediawiki/templates/apache/sites/main.conf.erb
M modules/mediawiki/templates/apache/sites/remnant.conf.erb
M modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
M modules/role/manifests/mediawiki/webserver.pp
7 files changed, 80 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/322603/1

diff --git a/modules/mediawiki/manifests/web/beta_sites.pp 
b/modules/mediawiki/manifests/web/beta_sites.pp
index 9cbfd5e..7cebfac 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -1,49 +1,38 @@
 class mediawiki::web::beta_sites {
 tag 'mediawiki', 'mw-apache-config'
 
-apache::mod_conf { 'php5':
-ensure => 'absent',
-}
-
-# w-beta.wmflabs.org depends on proxy_http
-include ::apache::mod::proxy_http
-apache::site { 'beta-specific':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/beta_specific.conf',
-priority => 1,
-}
-
 apache::site { 'main':
-source   => 'puppet:///modules/mediawiki/apache/beta/sites/main.conf',
+ensure   => absent,
 priority => 1,
 }
 
 apache::site { 'wikibooks':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikibooks.conf',
+ensure   => absent,
 priority => 2,
 }
 
 apache::site { 'wikipedia':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikipedia.conf',
+ensure   => absent,
 priority => 3,
 }
 
 apache::site { 'wikidata':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikidata.conf',
+ensure   => absent,
 priority => 4,
 }
 
 apache::site { 'wikisource':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikisource.conf',
+ensure   => absent,
 priority => 5,
 }
 
 apache::site { 'wikiversity':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikiversity.conf',
+ensure   => absent,
 priority => 7,
 }
 
 apache::site { 'wikiquote':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikiquote.conf',
+ensure   => absent,
 priority => 8,
 }
 
@@ -53,32 +42,32 @@
 }
 
 apache::site { 'wiktionary':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wiktionary.conf',
+ensure   => absent,
 priority => 10,
 }
 
 apache::site { 'wikinews':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikinews.conf',
+ensure   => absent,
 priority => 11,
 }
 
 apache::site { 'loginwiki':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/loginwiki.conf',
+ensure   => absent,
 priority => 12,
 }
 
 apache::site { 'wikimedia':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikimedia.conf',
+ensure   => absent,
 priority => 16,
 }
 
 apache::site { 'wikivoyage':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikivoyage.conf',
+ensure   => absent,
 priority => 17,
 }
 
 apache::site { 'remnant':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/remnant.conf',
+ensure   => absent,
 priority => 20,
 }
 
diff --git a/modules/mediawiki/manifests/web/prod_sites.pp 
b/modules/mediawiki/manifests/web/prod_sites.pp
deleted file mode 100644
index db71450..000
--- a/modules/mediawiki/manifests/web/prod_sites.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-class mediawiki::web::prod_sites {
-tag 'mediawiki', 'mw-apache-config'
-
-apache::site { 'redirects':
-source   => 'puppet:///mediawiki/apache/sites/redirects.conf',
-priority => 2,
-}
-
-apache::site { 'main':
-content  => template('mediawiki/apache/sites/main.conf.erb'),
-priority => 3,
-}
-
-apache::site { 'remnant':
-content  => template('mediawiki/apache/sites/remnant.conf.erb'),
-priority => 4,
-}
-
-apache::site { 'search.wikimedia':
-source   => 'puppet:///mediawiki/apache/sites/search.wikimedia.conf',
-priority => 5,
-}
-
-apache::site { 'secure.wikimedia':
-source   => 'puppet:///mediawiki/apache/sites/secure.wikimedia.conf',
-priority => 6,
-}
-
-apache::site { 'wikimania':
-content  => 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Get rid of old beta_sites class now just containing a load o...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Get rid of old beta_sites class now just containing a load of 
ensure => absent
..

Get rid of old beta_sites class now just containing a load of ensure => absent

Bug: T1256
Change-Id: Ibdc60e5059223d694b5f9d06862f8f3c0d7cd3b4
---
D modules/mediawiki/manifests/web/beta_sites.pp
M modules/role/manifests/mediawiki/webserver.pp
2 files changed, 0 insertions(+), 77 deletions(-)


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

diff --git a/modules/mediawiki/manifests/web/beta_sites.pp 
b/modules/mediawiki/manifests/web/beta_sites.pp
deleted file mode 100644
index 7cebfac..000
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-class mediawiki::web::beta_sites {
-tag 'mediawiki', 'mw-apache-config'
-
-apache::site { 'main':
-ensure   => absent,
-priority => 1,
-}
-
-apache::site { 'wikibooks':
-ensure   => absent,
-priority => 2,
-}
-
-apache::site { 'wikipedia':
-ensure   => absent,
-priority => 3,
-}
-
-apache::site { 'wikidata':
-ensure   => absent,
-priority => 4,
-}
-
-apache::site { 'wikisource':
-ensure   => absent,
-priority => 5,
-}
-
-apache::site { 'wikiversity':
-ensure   => absent,
-priority => 7,
-}
-
-apache::site { 'wikiquote':
-ensure   => absent,
-priority => 8,
-}
-
-apache::site { 'testwiki':
-ensure   => absent,
-priority => 9,
-}
-
-apache::site { 'wiktionary':
-ensure   => absent,
-priority => 10,
-}
-
-apache::site { 'wikinews':
-ensure   => absent,
-priority => 11,
-}
-
-apache::site { 'loginwiki':
-ensure   => absent,
-priority => 12,
-}
-
-apache::site { 'wikimedia':
-ensure   => absent,
-priority => 16,
-}
-
-apache::site { 'wikivoyage':
-ensure   => absent,
-priority => 17,
-}
-
-apache::site { 'remnant':
-ensure   => absent,
-priority => 20,
-}
-
-}
diff --git a/modules/role/manifests/mediawiki/webserver.pp 
b/modules/role/manifests/mediawiki/webserver.pp
index 39d7e18..1a46330 100644
--- a/modules/role/manifests/mediawiki/webserver.pp
+++ b/modules/role/manifests/mediawiki/webserver.pp
@@ -4,9 +4,6 @@
 include ::mediawiki::web
 include ::mediawiki::web::sites
 include ::mediawiki::packages::fonts
-if $::realm == 'labs' {
-include ::mediawiki::web::beta_sites
-}
 
 if hiera('has_lvs', true) {
 include ::lvs::configuration

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdc60e5059223d694b5f9d06862f8f3c0d7cd3b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move production apache config files to templates

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Move production apache config files to templates
..

Move production apache config files to templates

So we can add beta suffixes later

Bug: T1256
Change-Id: I15ff34ce1c125949b78c1953de407a6fb97c766b
---
M modules/mediawiki/manifests/web/prod_sites.pp
R modules/mediawiki/templates/apache/sites/main.conf.erb
R modules/mediawiki/templates/apache/sites/remnant.conf.erb
R modules/mediawiki/templates/apache/sites/wikimania.conf.erb
R modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
5 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/modules/mediawiki/manifests/web/prod_sites.pp 
b/modules/mediawiki/manifests/web/prod_sites.pp
index d5119cf..db71450 100644
--- a/modules/mediawiki/manifests/web/prod_sites.pp
+++ b/modules/mediawiki/manifests/web/prod_sites.pp
@@ -2,42 +2,42 @@
 tag 'mediawiki', 'mw-apache-config'
 
 apache::site { 'redirects':
-source   => 'puppet:///modules/mediawiki/apache/sites/redirects.conf',
+source   => 'puppet:///mediawiki/apache/sites/redirects.conf',
 priority => 2,
 }
 
 apache::site { 'main':
-source   => 'puppet:///modules/mediawiki/apache/sites/main.conf',
+content  => template('mediawiki/apache/sites/main.conf.erb'),
 priority => 3,
 }
 
 apache::site { 'remnant':
-source   => 'puppet:///modules/mediawiki/apache/sites/remnant.conf',
+content  => template('mediawiki/apache/sites/remnant.conf.erb'),
 priority => 4,
 }
 
 apache::site { 'search.wikimedia':
-source   => 
'puppet:///modules/mediawiki/apache/sites/search.wikimedia.conf',
+source   => 'puppet:///mediawiki/apache/sites/search.wikimedia.conf',
 priority => 5,
 }
 
 apache::site { 'secure.wikimedia':
-source   => 
'puppet:///modules/mediawiki/apache/sites/secure.wikimedia.conf',
+source   => 'puppet:///mediawiki/apache/sites/secure.wikimedia.conf',
 priority => 6,
 }
 
 apache::site { 'wikimania':
-source   => 'puppet:///modules/mediawiki/apache/sites/wikimania.conf',
+content  => template('mediawiki/apache/sites/wikimania.conf.erb'),
 priority => 7,
 }
 
 apache::site { 'wikimedia':
-source   => 'puppet:///modules/mediawiki/apache/sites/wikimedia.conf',
+content   => template('mediawiki/apache/sites/wikimedia.conf.erb'),
 priority => 8,
 }
 
 apache::site { 'foundation':
-source   => 'puppet:///modules/mediawiki/apache/sites/foundation.conf',
+source   => 'puppet:///mediawiki/apache/sites/foundation.conf',
 priority => 9,
 }
 }
diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/templates/apache/sites/main.conf.erb
similarity index 100%
rename from modules/mediawiki/files/apache/sites/main.conf
rename to modules/mediawiki/templates/apache/sites/main.conf.erb
diff --git a/modules/mediawiki/files/apache/sites/remnant.conf 
b/modules/mediawiki/templates/apache/sites/remnant.conf.erb
similarity index 100%
rename from modules/mediawiki/files/apache/sites/remnant.conf
rename to modules/mediawiki/templates/apache/sites/remnant.conf.erb
diff --git a/modules/mediawiki/files/apache/sites/wikimania.conf 
b/modules/mediawiki/templates/apache/sites/wikimania.conf.erb
similarity index 100%
rename from modules/mediawiki/files/apache/sites/wikimania.conf
rename to modules/mediawiki/templates/apache/sites/wikimania.conf.erb
diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf 
b/modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
similarity index 100%
rename from modules/mediawiki/files/apache/sites/wikimedia.conf
rename to modules/mediawiki/templates/apache/sites/wikimedia.conf.erb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ff34ce1c125949b78c1953de407a6fb97c766b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Consolidate all of the simple wikimedia.org VHosts into two

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Consolidate all of the simple wikimedia.org VHosts into two
..

Consolidate all of the simple wikimedia.org VHosts into two

Similar to the chapter wikis setup.
These are mostly private wikis, and the two new VHosts indicate whether the 
legacy
(UseModWiki) include file is used.

Change-Id: Iddc28a2c8cee5fabccc2a218bafc0c54ba0d69a8
---
M modules/mediawiki/files/apache/sites/remnant.conf
1 file changed, 7 insertions(+), 130 deletions(-)


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

diff --git a/modules/mediawiki/files/apache/sites/remnant.conf 
b/modules/mediawiki/files/apache/sites/remnant.conf
index b3a160a..b4030b1 100644
--- a/modules/mediawiki/files/apache/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/sites/remnant.conf
@@ -94,46 +94,19 @@
 
 
 
-# Internal grants wiki
 
-ServerName grants.wikimedia.org
+ServerName commonwikimediadotorg
+ServerAlias grants.wikimedia.org fdc.wikimedia.org internal.wikimedia.org 
board.wikimedia.org boardgovcom.wikimedia.org spcom.wikimedia.org 
affcom.wikimedia.org searchcom.wikimedia.org office.wikimedia.org 
auditcom.wikimedia.org otrs-wiki.wikimedia.org exec.wikimedia.org 
collab.wikimedia.org movementroles.wikimedia.org checkuser.wikimedia.org 
steward.wikimedia.org ombudsmen.wikimedia.org projectcom.wikimedia.org
+UseCanonicalName off
 Include "sites-enabled/wikimedia-common.incl"
 
 
-# fdc.wikimedia.org - Funds Dissemination Committee Wiki
 
-ServerName fdc.wikimedia.org
+ServerName commonlegacywikimediadotorg
+ServerAlias outreach.wikimedia.org quality.wikimedia.org 
advisory.wikimedia.org chair.wikimedia.org
+UseCanonicalName off
 Include "sites-enabled/wikimedia-common.incl"
-
-
-# Internal wiki
-
-ServerName internal.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Board wiki
-
-ServerName board.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Board Governance Committee
-
-ServerName boardgovcom.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Spcom wiki
-
-ServerName spcom.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Affcom wiki
-
-ServerName affcom.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
+Include "sites-enabled/wikimedia-legacy.incl"
 
 
 # Incubator wiki
@@ -162,12 +135,6 @@
 Include "sites-enabled/wikimedia-legacy.incl"
 # Uploads are offsite
 RewriteRule ^/upload/(.*)$ 
%{ENV:RW_PROTO}://upload.wikimedia.org/wikipedia/species/$1 [R=302]
-
-
-# search committee private wiki
-
-ServerName searchcom.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
 
 
 # Usability Wiki
@@ -217,96 +184,6 @@
 
 Include "sites-enabled/wikimedia-common.incl"
 Include "sites-enabled/wikimedia-legacy.incl"
-
-
-# office private wiki
-
-ServerName office.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# chair private wiki
-
-ServerName chair.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-Include "sites-enabled/wikimedia-legacy.incl"
-
-
-# advisory board PUBLIC wiki
-
-ServerName advisory.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-Include "sites-enabled/wikimedia-legacy.incl"
-
-
-# auditcom private wiki
-
-ServerName auditcom.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-
-# quality private wiki
-
-ServerName quality.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-Include "sites-enabled/wikimedia-legacy.incl"
-
-
-
-# OTRS private wiki
-
-ServerName otrs-wiki.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Executive director's private wiki
-
-ServerName exec.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Private wiki for Jay and his minions
-
-ServerName collab.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Outreach Wiki
-
-ServerName outreach.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-Include "sites-enabled/wikimedia-legacy.incl"
-
-
-#movementroles wiki
-
-ServerName movementroles.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# checkuser private wiki
-
-ServerName checkuser.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# steward private wiki
-
-ServerName steward.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# ombudsmen private wiki
-
-ServerName ombudsmen.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
-
-
-# Project Grants Committee (private)
-
-ServerName projectcom.wikimedia.org
-Include "sites-enabled/wikimedia-common.incl"
 
 
 ## donatewiki has been moved to 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: bring remnant.conf closer to prod version

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: beta: bring remnant.conf closer to prod version
..

beta: bring remnant.conf closer to prod version

By moving the commons block down and changing a comment or two

Change-Id: I0c11a40382261e177cd54dc969508463defd8f3e
---
M modules/mediawiki/files/apache/beta/sites/remnant.conf
1 file changed, 21 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/322424/1

diff --git a/modules/mediawiki/files/apache/beta/sites/remnant.conf 
b/modules/mediawiki/files/apache/beta/sites/remnant.conf
index fe060f4..aa504c4 100644
--- a/modules/mediawiki/files/apache/beta/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/beta/sites/remnant.conf
@@ -1,23 +1,3 @@
-# Commons
-
-ServerName commons.wikimedia.beta.wmflabs.org
-DocumentRoot "/srv/mediawiki/docroot/commons"
-
-AllowEncodedSlashes On
-RewriteEngine On
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/favicon.php  [P]
-
-# Primary wiki redirector
-Alias /wiki /srv/mediawiki/docroot/commons/w/index.php
-Include "sites-enabled/public-wiki-rewrites.incl"
-
-
 # Meta
 
 ServerName meta.wikimedia.beta.wmflabs.org
@@ -39,6 +19,26 @@
 AddType application/x-web-app-manifest+json .webapp
 
 
+# Wikimedia Commons
+
+ServerName commons.wikimedia.beta.wmflabs.org
+DocumentRoot "/srv/mediawiki/docroot/commons"
+
+AllowEncodedSlashes On
+RewriteEngine On
+
+ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php retry=0
+ProxyPass   /w/extensions!
+ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/$1
+RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/index.php[P]
+RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/robots.php   [P]
+RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/favicon.php  [P]
+
+# Primary wiki redirector:
+Alias /wiki /srv/mediawiki/docroot/commons/w/index.php
+Include "sites-enabled/public-wiki-rewrites.incl"
+
+
 # Labs
 
 ServerName deployment.wikimedia.beta.wmflabs.org
@@ -54,7 +54,7 @@
 RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/robots.php   [P]
 RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/favicon.php  [P]
 
-# Primary wiki redirector
+# Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/labs/w/index.php
 Include "sites-enabled/public-wiki-rewrites.incl"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c11a40382261e177cd54dc969508463defd8f3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove apache-level HTTPS redirects

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Remove apache-level HTTPS redirects
..

Remove apache-level HTTPS redirects

Varnish does this everywhere these days.

... but obviously don't merge this until someone like brandon confirms

Change-Id: I56f2a285485746792b602bcad6b113102a6fdb02
---
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/remnant.conf
M modules/mediawiki/files/apache/sites/wikimania.conf
M modules/mediawiki/files/apache/sites/wikimedia.conf
4 files changed, 0 insertions(+), 121 deletions(-)


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

diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index 1606688..5134c51 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -232,10 +232,6 @@
 RewriteCond %{ENV:RW_PROTO} !=https
 RewriteRule . - [E=RW_PROTO:http]
 
-# Push to SSL
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule (.) https://donate.wikimedia.org%{REQUEST_URI} [R=301]
-
 RewriteRule ^/$ 
https://donate.wikimedia.org/wiki/Special:FundraiserRedirector [R=302,L]
 
 # Don't allow rewriting robots.txt
@@ -247,13 +243,7 @@
 
 
 ServerName vote.wikimedia.org
-
-RewriteEngine On
 Include "sites-enabled/wikimedia-common.incl"
-
-# Push to SSL
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule (.) https://vote.wikimedia.org%{REQUEST_URI} [R=301]
 
 
 # Wikipedias
diff --git a/modules/mediawiki/files/apache/sites/remnant.conf 
b/modules/mediawiki/files/apache/sites/remnant.conf
index 30bd128..b3a160a 100644
--- a/modules/mediawiki/files/apache/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/sites/remnant.conf
@@ -97,77 +97,42 @@
 # Internal grants wiki
 
 ServerName grants.wikimedia.org
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://grants.wikimedia.org/$1 [R=301,L,NE]
-
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # fdc.wikimedia.org - Funds Dissemination Committee Wiki
 
 ServerName fdc.wikimedia.org
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://fdc.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # Internal wiki
 
 ServerName internal.wikimedia.org
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://internal.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # Board wiki
 
 ServerName board.wikimedia.org
-AllowEncodedSlashes On
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://board.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # Board Governance Committee
 
 ServerName boardgovcom.wikimedia.org
-
-AllowEncodedSlashes On
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://boardgovcom.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # Spcom wiki
 
 ServerName spcom.wikimedia.org
-
-AllowEncodedSlashes On
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://spcom.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # Affcom wiki
 
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
 ServerName affcom.wikimedia.org
-
-AllowEncodedSlashes On
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://affcom.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
@@ -202,11 +167,6 @@
 # search committee private wiki
 
 ServerName searchcom.wikimedia.org
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://searchcom.wikimedia.org/$1 [R=301,L,NE]
-
 Include "sites-enabled/wikimedia-common.incl"
 
 
@@ -262,20 +222,12 @@
 # office private wiki
 
 ServerName office.wikimedia.org
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://office.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
 
 # chair private wiki
 
 ServerName chair.wikimedia.org
-
-RewriteEngine On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://chair.wikimedia.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 Include "sites-enabled/wikimedia-legacy.incl"
 
@@ -283,8 +235,6 @@
 # advisory board PUBLIC wiki
 
 ServerName advisory.wikimedia.org
-
-RewriteEngine On
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove bits.wikimedia.org apache config

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Remove bits.wikimedia.org apache config
..

Remove bits.wikimedia.org apache config

Change-Id: I129ac1a4fc46e4dc562632f7e0f292afced13d49
---
M modules/mediawiki/files/apache/sites/wikimedia.conf
1 file changed, 0 insertions(+), 19 deletions(-)


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

diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 2df1f70..624b2d6 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -25,25 +25,6 @@
 Include "sites-enabled/wikimedia-legacy.incl"
 
 
-#bits
-
-ServerName bits.wikimedia.org
-DocumentRoot "/srv/mediawiki/docroot/bits/"
-
-# Version-independent aliases for backwards-compatibility
-Alias /w/extensions/ /srv/mediawiki/php/extensions/
-Alias /skins-1.5/ /srv/mediawiki/php/skins/
-Alias /skins/ /srv/mediawiki/php/skins/
-
-Alias /images/ /srv/mediawiki/images/
-
-# Handle error pages correctly if mod_php is absent
-ProxyPass  /w/404.php  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
-
-# Used for Firefox OS web application manifest living on bits.wikimedia.org
-AddType application/x-web-app-manifest+json .webapp
-
-
 # loginwiki
 
 ServerName login.wikimedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I129ac1a4fc46e4dc562632f7e0f292afced13d49
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta sites: copy zerowiki config from prod

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: beta sites: copy zerowiki config from prod
..

beta sites: copy zerowiki config from prod

Change-Id: Ifafebd21301e2ad5a3993090ddd704916e2e27e9
---
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
1 file changed, 3 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/322416/1

diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index 000b8c1..3634994 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -1,18 +1,7 @@
 
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
 ServerName zero.wikimedia.beta.wmflabs.org
-
-AllowEncodedSlashes On
 RewriteEngine On
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
-
-# Primary wiki redirector
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
-Include "sites-enabled/public-wiki-rewrites.incl"
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteRule ^/(.*)$ https://zero.wikimedia.beta.wmflabs.org/$1 [R=301,L,NE]
+Include "sites-enabled/wikimedia-common.incl"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifafebd21301e2ad5a3993090ddd704916e2e27e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: copy metawiki config from prod instead of having our own

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: beta: copy metawiki config from prod instead of having our own
..

beta: copy metawiki config from prod instead of having our own

Change-Id: Id24033ac4d520fca01c4d8bde9ef7cf9beada573
---
M modules/mediawiki/files/apache/beta/sites/remnant.conf
1 file changed, 13 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/322419/1

diff --git a/modules/mediawiki/files/apache/beta/sites/remnant.conf 
b/modules/mediawiki/files/apache/beta/sites/remnant.conf
index ea30121..fe060f4 100644
--- a/modules/mediawiki/files/apache/beta/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/beta/sites/remnant.conf
@@ -21,21 +21,22 @@
 # Meta
 
 ServerName meta.wikimedia.beta.wmflabs.org
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-
-AllowEncodedSlashes On
 RewriteEngine On
+RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
+RewriteCond %{ENV:RW_PROTO} !=https
+RewriteRule . - [E=RW_PROTO:http]
 
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
+Include "sites-enabled/wikimedia-common.incl"
+Include "sites-enabled/wikimedia-legacy.incl"
 
-# Primary wiki redirector
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
-Include "sites-enabled/public-wiki-rewrites.incl"
+# Early phase 2 compatibility URLs
+RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php 
[R=301,L]
+
+# Uploads are offsite
+RewriteRule ^/upload/(.*)$ 
%{ENV:RW_PROTO}://upload.beta.wmflabs.org/wikipedia/meta/$1 [R=302]
+
+# Used for Firefox OS web application manifest living on 
meta.beta.wmflabs.org
+AddType application/x-web-app-manifest+json .webapp
 
 
 # Labs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id24033ac4d520fca01c4d8bde9ef7cf9beada573
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: configure loginwiki the same as prod

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: beta: configure loginwiki the same as prod
..

beta: configure loginwiki the same as prod

Change-Id: I7ead6cc849234ffce452ab785a19c949cff837bd
---
D modules/mediawiki/files/apache/beta/sites/loginwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
M modules/mediawiki/manifests/web/beta_sites.pp
3 files changed, 5 insertions(+), 27 deletions(-)


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

diff --git a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf 
b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
deleted file mode 100644
index 4782c91..000
--- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-
-ServerName login.wikimedia.beta.wmflabs.org
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-
-AllowEncodedSlashes On
-RewriteEngine On
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
-
-#RewriteCond %{HTTP:X-Forwarded-Proto} !https
-#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
-
-# Primary wiki redirector:
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
-RewriteRule ^/$ /w/index.php
-
-
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index 3634994..b044345 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -1,4 +1,9 @@
 
+ServerName login.wikimedia.beta.wmflabs.org
+Include "sites-enabled/wikimedia-common.incl"
+
+
+
 ServerName zero.wikimedia.beta.wmflabs.org
 RewriteEngine On
 RewriteCond %{HTTP:X-Forwarded-Proto} !https
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp 
b/modules/mediawiki/manifests/web/beta_sites.pp
index e18ff3a..c2a031f 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -57,11 +57,6 @@
 priority => 11,
 }
 
-apache::site { 'loginwiki':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/loginwiki.conf',
-priority => 12,
-}
-
 apache::site { 'wikimedia':
 source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wikimedia.conf',
 priority => 16,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ead6cc849234ffce452ab785a19c949cff837bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta: Use wikimedia-common.incl for testwiki

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: beta: Use wikimedia-common.incl for testwiki
..

beta: Use wikimedia-common.incl for testwiki

Change-Id: Ida30d060b2739895bffcd24ae71f97e22cdef92f
---
D modules/mediawiki/files/apache/beta/sites/testwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
M modules/mediawiki/manifests/web/beta_sites.pp
3 files changed, 5 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/322418/1

diff --git a/modules/mediawiki/files/apache/beta/sites/testwiki.conf 
b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
deleted file mode 100644
index 112cdfe..000
--- a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-
-ServerName testwikimedia
-ServerAlias test.wikimedia.beta.wmflabs.org
-UseCanonicalName off
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-
-AllowEncodedSlashes On
-RewriteEngine On
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
-
-# Primary wiki redirector
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
-Include "sites-enabled/public-wiki-rewrites.incl"
-
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index b044345..9147da7 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -10,3 +10,8 @@
 RewriteRule ^/(.*)$ https://zero.wikimedia.beta.wmflabs.org/$1 [R=301,L,NE]
 Include "sites-enabled/wikimedia-common.incl"
 
+
+
+ServerName test.wikimedia.beta.wmflabs.org
+Include "sites-enabled/wikimedia-common.incl"
+
\ No newline at end of file
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp 
b/modules/mediawiki/manifests/web/beta_sites.pp
index c2a031f..6b27985 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -42,11 +42,6 @@
 priority => 8,
 }
 
-apache::site { 'testwiki':
-source   => 
'puppet:///modules/mediawiki/apache/beta/sites/testwiki.conf',
-priority => 9,
-}
-
 apache::site { 'wiktionary':
 source   => 
'puppet:///modules/mediawiki/apache/beta/sites/wiktionary.conf',
 priority => 10,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida30d060b2739895bffcd24ae71f97e22cdef92f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki: move redirects site from prod_sites to sites

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: mediawiki: move redirects site from prod_sites to sites
..

mediawiki: move redirects site from prod_sites to sites

i.e. include it in beta too - mainly for consistency, beta won't actually
be hosting these domains, but will know how to handle them.

Change-Id: If430fd1d9f01b709d8369c6a2b39a4ba65246d42
---
M modules/mediawiki/manifests/web/prod_sites.pp
M modules/mediawiki/manifests/web/sites.pp
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/322413/1

diff --git a/modules/mediawiki/manifests/web/prod_sites.pp 
b/modules/mediawiki/manifests/web/prod_sites.pp
index d5119cf..5f17d33 100644
--- a/modules/mediawiki/manifests/web/prod_sites.pp
+++ b/modules/mediawiki/manifests/web/prod_sites.pp
@@ -1,11 +1,6 @@
 class mediawiki::web::prod_sites {
 tag 'mediawiki', 'mw-apache-config'
 
-apache::site { 'redirects':
-source   => 'puppet:///modules/mediawiki/apache/sites/redirects.conf',
-priority => 2,
-}
-
 apache::site { 'main':
 source   => 'puppet:///modules/mediawiki/apache/sites/main.conf',
 priority => 3,
diff --git a/modules/mediawiki/manifests/web/sites.pp 
b/modules/mediawiki/manifests/web/sites.pp
index 92d7a07..d49469b 100644
--- a/modules/mediawiki/manifests/web/sites.pp
+++ b/modules/mediawiki/manifests/web/sites.pp
@@ -45,4 +45,9 @@
 content  => template('mediawiki/apache/sites/wwwportals.conf.erb'),
 priority => 1,
 }
+
+apache::site { 'redirects':
+source   => 'puppet:///modules/mediawiki/apache/sites/redirects.conf',
+priority => 2,
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If430fd1d9f01b709d8369c6a2b39a4ba65246d42
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: beta::autoupdater: Stop wmf-beta-mwconfig-update being a tem...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: beta::autoupdater: Stop wmf-beta-mwconfig-update being a 
template just to get the staging dir
..

beta::autoupdater: Stop wmf-beta-mwconfig-update being a template just to get 
the staging dir

Change-Id: If6e4922747a7a9176275784a104ca8ed1b644329
---
R modules/beta/files/wmf-beta-mwconfig-update
M modules/beta/manifests/autoupdater.pp
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/322408/1

diff --git a/modules/beta/templates/wmf-beta-mwconfig-update.erb 
b/modules/beta/files/wmf-beta-mwconfig-update
similarity index 77%
rename from modules/beta/templates/wmf-beta-mwconfig-update.erb
rename to modules/beta/files/wmf-beta-mwconfig-update
index 3b04ee7..95430a0 100755
--- a/modules/beta/templates/wmf-beta-mwconfig-update.erb
+++ b/modules/beta/files/wmf-beta-mwconfig-update
@@ -4,13 +4,10 @@
 # Update operations/mediawiki-config.git clone in beta.
 #
 set -e
-
-# Directory containing checkout to update
-TARGET_DIR="<%= @stage_dir %>"
-
 set -x
 pwd
-cd "$TARGET_DIR"
+. /etc/profile.d/mediawiki.sh
+cd $MEDIAWIKI_STAGING_DIR
 pwd
 git remote update
 git reset --hard "$ZUUL_COMMIT"
diff --git a/modules/beta/manifests/autoupdater.pp 
b/modules/beta/manifests/autoupdater.pp
index 585c3d9..58c456d 100644
--- a/modules/beta/manifests/autoupdater.pp
+++ b/modules/beta/manifests/autoupdater.pp
@@ -25,8 +25,11 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-require => Package['git'],
-content => template('beta/wmf-beta-mwconfig-update.erb'),
+require => [
+Package['git'],
+File['/etc/profile.d/mediawiki.sh']
+],
+source => 'puppet:///modules/beta/wmf-beta-mwconfig-update',
 }
 
 file { '/usr/local/bin/wmf-beta-update-databases.py':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6e4922747a7a9176275784a104ca8ed1b644329
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Kill role::beta::trebuchet_testing

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Kill role::beta::trebuchet_testing
..

Kill role::beta::trebuchet_testing

Unused AFAICT

Change-Id: I891b60644d97baf8b5a11a8c2e537b6362fa2128
---
D modules/role/manifests/beta/trebuchet_testing.pp
1 file changed, 0 insertions(+), 18 deletions(-)


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

diff --git a/modules/role/manifests/beta/trebuchet_testing.pp 
b/modules/role/manifests/beta/trebuchet_testing.pp
deleted file mode 100644
index e489a9c..000
--- a/modules/role/manifests/beta/trebuchet_testing.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class role::beta::trebuchet_testing {
-system::role { 'role::beta::trebuchet_testing':
-description => 'Trebuchet testing host'
-}
-
-include ::beta::config
-package { 'test/testrepo':
-provider => 'trebuchet',
-}
-
-
-# Allow ssh inbound from beta bastion_ip for testing
-ferm::rule { 'deployment-bastion-trebuchet-testing-ssh':
-ensure => present,
-rule   => "proto tcp dport ssh saddr ${::beta::config::bastion_ip} 
ACCEPT;",
-}
-}
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I891b60644d97baf8b5a11a8c2e537b6362fa2128
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Kill role::beta::uploadservice

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Kill role::beta::uploadservice
..

Kill role::beta::uploadservice

This was replaced with Swift

Change-Id: I1376e7f9dc0beab58cd745da0814c01a97089a54
---
M modules/mariadb
D modules/role/manifests/beta/uploadservice.pp
2 files changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/322403/1

diff --git a/modules/mariadb b/modules/mariadb
index 057540d..4d96e95 16
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 057540db856000b8904ce7d30b4e59535c4ea019
+Subproject commit 4d96e95500cfbceb8fa552e503644d387e56e334
diff --git a/modules/role/manifests/beta/uploadservice.pp 
b/modules/role/manifests/beta/uploadservice.pp
deleted file mode 100644
index 2dada5b..000
--- a/modules/role/manifests/beta/uploadservice.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# To be applied on deployment-upload.eqiad.wmflabs
-# Queried by Varnish upload cache whenever we need to serve thumbnails
-# There is a hacked nginx on it and a php5 cgi service
-class role::beta::uploadservice {
-
-system::role { 'role::beta::uploadservice':
-description => 'Upload/thumbs backend used by Varnish'
-}
-
-ferm::rule { 'allow_http':
-rule => 'proto tcp dport http ACCEPT;'
-}
-
-}
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1376e7f9dc0beab58cd745da0814c01a97089a54
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Interwiki map update

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Interwiki map update
..

Interwiki map update

Includes creation of projectcomwiki as well as several changes to HTTPS links

Bug: T150926
Change-Id: Ibd3a975d2d081f31a42ffedc25f83ef87a131c3f
---
M wmf-config/interwiki.php
1 file changed, 17 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index c8d0672..bb74124 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,5 +1,5 @@
  '0 
http://www.acronymfinder.com/af-query.asp?String=exact=$1',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
@@ -170,7 +170,7 @@
'__global:lojban' => '0 http://mw.lojban.org/papri/$1',
'__global:lostpedia' => '0 http://lostpedia.wikia.com/wiki/$1',
'__global:lqwiki' => '0 http://wiki.linuxquestions.org/wiki/$1',
-   '__global:luxo' => '0 //tools.wmflabs.org/guc/?user=$1',
+   '__global:luxo' => '0 https://tools.wmflabs.org/guc/?user=$1',
'__global:mail' => '1 https://lists.wikimedia.org/mailman/listinfo/$1',
'__global:mailarchive' => '1 https://lists.wikimedia.org/pipermail/$1',
'__global:mariowiki' => '0 http://www.mariowiki.com/$1',
@@ -270,7 +270,7 @@
'__global:species' => '1 //species.wikimedia.org/wiki/$1',
'__global:squeak' => '0 http://wiki.squeak.org/squeak/$1',
'__global:stats' => '1 //stats.wikimedia.org/$1',
-   '__global:stewardry' => '0 //tools.wmflabs.org/meta/stewardry/?wiki=$1',
+   '__global:stewardry' => '0 
https://tools.wmflabs.org/meta/stewardry/?wiki=$1',
'__global:strategy' => '1 https://strategy.wikimedia.org/wiki/$1',
'__global:strategywiki' => '0 http://strategywiki.org/wiki/$1',
'__global:sulutil' => '1 
https://meta.wikimedia.org/wiki/Special:CentralAuth/$1',
@@ -293,7 +293,7 @@
'__global:tmbw' => '0 http://tmbw.net/wiki/$1',
'__global:tmnet' => '0 http://www.technomanifestos.net/?$1',
'__global:tmwiki' => '0 http://www.EasyTopicMaps.com/?page=$1',
-   '__global:toollabs' => '0 //tools.wmflabs.org/$1',
+   '__global:toollabs' => '0 https://tools.wmflabs.org/$1',
'__global:tools' => '0 //toolserver.org/$1',
'__global:tswiki' => '1 //www.mediawiki.org/wiki/Toolserver:$1',
'__global:translatewiki' => '0 https://translatewiki.net/wiki/$1',
@@ -404,7 +404,7 @@
'__global:wmtw' => '0 http://wikimedia.tw/wiki/index.php5/$1',
'__global:wmua' => '1 https://ua.wikimedia.org/wiki/$1',
'__global:wmuk' => '1 https://wikimedia.org.uk/wiki/$1',
-   '__global:wmve' => '1 http://wikimedia.org.ve/wiki/$1',
+   '__global:wmve' => '1 https://wikimedia.org.ve/wiki/$1',
'__global:wmza' => '1 http://wikimedia.org.za/wiki/$1',
'__global:wm2005' => '1 https://wikimania2005.wikimedia.org/wiki/$1',
'__global:wm2006' => '1 https://wikimania2006.wikimedia.org/wiki/$1',
@@ -8801,6 +8801,16 @@
'pntwiki:chapter' => '1 https://pnt.wikimedia.org/wiki/$1',
'pntwiki:v' => '1 https://pnt.wikiversity.org/wiki/$1',
'pntwiki:voy' => '1 https://pnt.wikivoyage.org/wiki/$1',
+   '__sites:projectcomwiki' => 'wiki',
+   'projectcomwiki:w' => '1 https://en.wikipedia.org/wiki/$1',
+   'projectcomwiki:wikt' => '1 https://en.wiktionary.org/wiki/$1',
+   'projectcomwiki:q' => '1 https://en.wikiquote.org/wiki/$1',
+   'projectcomwiki:b' => '1 https://en.wikibooks.org/wiki/$1',
+   'projectcomwiki:n' => '1 https://en.wikinews.org/wiki/$1',
+   'projectcomwiki:s' => '1 https://en.wikisource.org/wiki/$1',
+   'projectcomwiki:chapter' => '1 https://en.wikimedia.org/wiki/$1',
+   'projectcomwiki:v' => '1 https://en.wikiversity.org/wiki/$1',
+   'projectcomwiki:voy' => '1 https://en.wikivoyage.org/wiki/$1',
'__sites:pswiki' => 'wiki',
'pswiki:wikt' => '1 https://ps.wiktionary.org/wiki/$1',
'pswiki:q' => '1 https://ps.wikiquote.org/wiki/$1',
@@ -11437,7 +11447,7 @@
'__list:_wikimedia' => 'aa ab ace ady af ak als am an ang ar arc arz as 
ast av ay az azb ba bar bat-smg bcl be be-tarask be-x-old bg bh bi bjn bm bn bo 
bpy br bs bug bxr ca cbk-zam cdo ce ceb ch cho chr chy ckb cmn co cr crh cs csb 
cu cv cy cz da de diq dk dsb dv dz ee egl el eml en eo epo es et eu ext fa ff 
fi fiu-vro fj fo fr frp frr fur fy ga gag gan gd gl glk gn gom got gsw gu gv ha 
hak haw he hi hif ho hr hsb ht hu hy hz ia id ie ig ii ik ilo io is it iu ja 
jam jbo jp jv ka kaa kab kbd kg ki kj kk kl km kn ko koi kr krc ks ksh ku kv kw 
ky la lad lb lbe lez lg li lij lmo ln lo lrc lt ltg lv lzh mai map-bms mdf mg 
mh mhr mi min minnan mk ml mn mo mr mrj ms mt mus mwl my myv mzn na nah nan nap 
nb nds nds-nl ne 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Prevent endless error loop if falling back to wikitext (afte...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Prevent endless error loop if falling back to wikitext (after a 
load failure) fails.
..

Prevent endless error loop if falling back to wikitext (after a load failure) 
fails.

Change-Id: Id48fa13a33aee9fabf857d20a75d26463c329f44
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 17082a3..339c61d 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -317,6 +317,7 @@
// Parent method
ve.init.mw.DesktopArticleTarget.super.prototype.loadSuccess.apply( 
this, arguments );
 
+   this.wikitextFallbackLoading = false;
// Duplicate of this code in ve.init.mw.DesktopArticleTarget.init.js
if ( $( '#ca-edit' ).hasClass( 'visualeditor-showtabdialog' ) ) {
$( '#ca-edit' ).removeClass( 'visualeditor-showtabdialog' );
@@ -609,6 +610,13 @@
// Parent method
ve.init.mw.DesktopArticleTarget.super.prototype.loadFail.apply( this, 
arguments );
 
+   if ( this.wikitextFallbackLoading ) {
+   // Failed twice now
+   mw.log.warn( "Failed to fall back to wikitext", errorText, 
error );
+   location.href = target.viewUri.clone().extend( { action: 
'edit', veswitched: 1 } );
+   return;
+   }
+
// Don't show an error if the load was manually aborted
// The response.status check here is to catch aborts triggered by 
navigation away from the page
if (
@@ -650,6 +658,7 @@
target.deactivate( true );
} else {
// TODO: Some sort of progress bar?
+   target.wikitextFallbackLoading = true;
target.switchToWikitextEditor( true, false );
}
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id48fa13a33aee9fabf857d20a75d26463c329f44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Follow-up I83714188: Don't turn every MW page into an exception

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Follow-up I83714188: Don't turn every MW page into an exception
..

Follow-up I83714188: Don't turn every MW page into an exception

A hook function was removed, now we remove the reference to it from wgHooks.

Change-Id: I2d6c6b8f7948ec69f6ee04f904c48812b34ddaa2
---
M extension.json
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor 
refs/changes/80/321580/1

diff --git a/extension.json b/extension.json
index fcb30e0..0662257 100644
--- a/extension.json
+++ b/extension.json
@@ -19,9 +19,6 @@
"EditPage::showReadOnlyForm:initial": [
"CodeEditorHooks::editPageShowEditFormInitial"
],
-   "BeforePageDisplay": [
-   "CodeEditorHooks::onBeforePageDisplay"
-   ],
"GetPreferences": [
"CodeEditorHooks::getPreferences"
]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d6c6b8f7948ec69f6ee04f904c48812b34ddaa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Move around a load more logging, responses etc.

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Move around a load more logging, responses etc.
..

Move around a load more logging, responses etc.

Change-Id: I5ec5e06b53716d822b106f2fbbfb37e876c3499a
---
M src/relay.js
1 file changed, 15 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/38/321338/1

diff --git a/src/relay.js b/src/relay.js
index c534981..dac448a 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -177,15 +177,13 @@
 if (from_trusted) {
 console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connecting to gerrit..');
-
-ircClient.say(to, "re-connecting to gerrit");
-
 if (sshConn) {
 sshConn.end();
+logging.info('re-connecting to gerrit..');
+ircClient.say(to, "Ended SSH connection to Gerrit.");
+} else {
+ircClient.say(to, "No SSH connection to Gerrit.");
 }
-
-ircClient.say(to, "reconnected to gerrit");
 } else {
 ircClient.say(to, "Permission is denied.");
 }
@@ -195,32 +193,31 @@
 if (from_trusted) {
 console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+ircClient.say(to, "Re-connecting to Gerrit and IRC.");
 
-logging.info('Disconnecting from irc.');
+logging.info('Disconnecting from IRC.');
 
 ircClient.send('QUIT', "quit");
 
-logging.info('re-connecting to gerrit..');
-
 if (sshConn) {
 sshConn.end();
+ircClient.say(to, "Ended SSH connection to Gerrit.");
+} else {
+ircClient.say(to, "No SSH connection to Gerrit.");
 }
 
-logging.info('re-connected to gerrit.');
+setTimeout(function(){ ircClient.say(to, "re-connected to 
Gerrit and IRC."); }, 17000); // TODO: wtf?
 
-setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
-
-logging.info('re-connected to irc.');
+logging.info('Re-connecting to IRC.');
 } else {
 ircClient.say(to, "Permission is denied.");
 }
 }
 
-if (text.indexOf(ircClient.nick + ': ' + 'nick') === 0) {
+if (text.indexOf(ircClient.nick + ': nick') === 0) {
 if (!from_trusted) {
 ircClient.say(to, "Permission is denied.");
-} else if (config.nick.indexOf(ircClient.nick) === 0) {
+} else if (config.nick === ircClient.nick) {
 console.log(from + ' => ' + to  + ' ' + text);
 
 ircClient.say(to, "Nick is already " + ircClient.nick + " 
not changing the nick.");
@@ -234,11 +231,11 @@
 if (ircClient.pass) {
 ircClient.pass(config.password);
 }
-logging.info('changed nick to' + ' ' + config.nick);
+logging.info('Changed nick to ' + config.nick);
 }
 }
 
-if (text.indexOf(ircClient.nick + ': ' + 'help') === 0) {
+if (text.indexOf(ircClient.nick + ': help') === 0) {
ircClient.say(to, "My current commands are: " + ircClient.nick 
+ ": restart" + ", " + ircClient.nick  + ": force-restart" + ", " + " and " + 
ircClient.nick + ": nick");
 }
 } catch (err) {}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ec5e06b53716d822b106f2fbbfb37e876c3499a
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Simplify command handling section

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Simplify command handling section
..

Simplify command handling section

Change-Id: I2871437dac136130365089dfbefab27c47f747f7
---
M src/relay.js
1 file changed, 44 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/37/321337/1

diff --git a/src/relay.js b/src/relay.js
index 2c51552..c534981 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -171,69 +171,71 @@
 
 ircClient.whois(from, function(info){
 try {
-var command_restart = text.indexOf(ircClient.nick + ': ' + 
'restart') === 0;
-var command_force_restart = text.indexOf(ircClient.nick + ': ' + 
'force-restart') === 0;
-var command_nick = text.indexOf(ircClient.nick + ': ' + 'nick') 
=== 0;
 var from_trusted = info.host ? info.host.match(whitelist_cloaks) : 
false;
-var using_intended_nick = config.nick.indexOf(ircClient.nick) === 
0;
 
-if (command_restart && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'restart') === 0) {
+if (from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connecting to gerrit..');
+logging.info('re-connecting to gerrit..');
 
-ircClient.say(to, "re-connecting to gerrit");
+ircClient.say(to, "re-connecting to gerrit");
 
-if (sshConn) {
-sshConn.end();
+if (sshConn) {
+sshConn.end();
+}
+
+ircClient.say(to, "reconnected to gerrit");
+} else {
+ircClient.say(to, "Permission is denied.");
 }
-
-ircClient.say(to, "reconnected to gerrit");
-} else if (command_restart && !from_trusted) {
-   ircClient.say(to, "Permission is denied.");
 }
 
-if (command_force_restart && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0) {
+if (from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+ircClient.say(to, "re-connecting to gerrit and irc.");
 
-logging.info('Disconnecting from irc.');
+logging.info('Disconnecting from irc.');
 
-ircClient.send('QUIT', "quit");
+ircClient.send('QUIT', "quit");
 
-logging.info('re-connecting to gerrit..');
+logging.info('re-connecting to gerrit..');
 
-if (sshConn) {
-sshConn.end();
+if (sshConn) {
+sshConn.end();
+}
+
+logging.info('re-connected to gerrit.');
+
+setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
+
+logging.info('re-connected to irc.');
+} else {
+ircClient.say(to, "Permission is denied.");
 }
-
-logging.info('re-connected to gerrit.');
-
-setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
-
-logging.info('re-connected to irc.');
-} else if (command_force_restart && !from_trusted) {
-   ircClient.say(to, "Permission is denied.");
 }
 
-if (command_nick && from_trusted && using_intended_nick) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'nick') === 0) {
+if (!from_trusted) {
+ircClient.say(to, "Permission is denied.");
+} else if (config.nick.indexOf(ircClient.nick) === 0) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "Nick is already " + ircClient.nick + " not 
changing the nick.");
-} else if (command_nick && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+ircClient.say(to, "Nick is already " + ircClient.nick + " 
not changing the nick.");
+} else {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('Changing nick');
+logging.info('Changing nick');
 
-ircClient.send('NICK', config.nick);
+ircClient.send('NICK', config.nick);
 
-  

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Remove whitelist_nicks

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Remove whitelist_nicks
..

Remove whitelist_nicks

The users intended to be allowed by this list are all eligible for cloaks,
which require actual authentication and can therefore be trusted.
This couldn't.

Change-Id: I3e24f40f19f4e9902688b4a39b0b8aacc85938ea
---
M src/relay.js
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/35/321335/1

diff --git a/src/relay.js b/src/relay.js
index af57f11..8f40d87 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -169,11 +169,6 @@
 ircClient.addListener('message', function (from, to, text) {
 var whitelist_cloaks = 
/^((mediawiki|wikimedia|wikipedia|wiktionary|wikiquote|wikisource|wikispecies|wikibooks|wikinews|wikiversity|wikivoyage|wikidata|wikimedia-commons)\/|fsf\/member\/marktraceur$)/g;
 
-var whitelist_nicks = [
-"twentyafterfour",
-"thcipriani"
-];
-
 ircClient.whois(from, function(info){
   try {
 
@@ -184,11 +179,7 @@
 var $irc_nick1;
 var $irc_nick2 = config.nick.indexOf(ircClient.nick) >= 0;
 
-if (info.host) {
-$irc_nick1 = (info.host.match(whitelist_cloaks) || 
whitelist_nicks.indexOf(from) >= 0);
-} else {
-$irc_nick1 = whitelist_nicks.indexOf(from) >= 0;
-}
+$irc_nick1 = info.host ? info.host.match(whitelist_cloaks) : false;
 
 if ($irc_nick_restart && $irc_nick1) {
 console.log(from + ' => ' + to  + ' ' + text);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e24f40f19f4e9902688b4a39b0b8aacc85938ea
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move NWE URL changes into JS

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Move NWE URL changes into JS
..

Move NWE URL changes into JS

Bug: T148077
Change-Id: Ic9b94184a48026254cf4a0a812fe6fc8455841b5
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 10 insertions(+), 30 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 5fcc4d4..bb726b7 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -336,17 +336,6 @@
$user->getOption( 
'visualeditor-tabs' ) === 'multi-tab'
)
) {
-   if (
-   $config->get( 
'VisualEditorEnableWikitext' ) &&
-   $user->getOption( 
'visualeditor-newwikitext' )
-   ) {
-   $parsed = wfParseUrl( 
wfExpandUrl( $editTab['href'] ) );
-   $q = wfCgiToArray( 
$parsed['query'] );
-   unset( $q['action'] );
-   $q['veaction'] = 'editsource';
-   $parsed['query'] = 
wfArrayToCgi( $q );
-   $editTab['href'] = 
wfAssembleUrl( $parsed );
-   }
// Inject the VE tab before or after 
the edit tab
if ( $config->get( 
'VisualEditorTabPosition' ) === 'before' ) {
$editTab['class'] .= ' 
collapsible';
@@ -468,25 +457,6 @@
$sourceEditSection = $tabMessages['editsectionsource'] 
!== null ?
$tabMessages['editsectionsource'] : 
'editsection';
$result['editsection']['text'] = $skin->msg( 
$sourceEditSection )->inLanguage( $lang )->text();
-   }
-
-   if (
-   $config->get( 'VisualEditorEnableWikitext' ) &&
-   $user->getOption( 'visualeditor-newwikitext' ) &&
-   (
-   !$config->get( 'VisualEditorUseSingleEditTab' ) 
||
-   $user->getOption( 'visualeditor-tabs' ) === 
'prefer-wt' ||
-   $user->getOption( 'visualeditor-tabs' ) === 
'multi-tab' ||
-   (
-   $user->getOption( 'visualeditor-tabs' ) 
=== 'remember-last' &&
-   $editor === 'wikitext'
-   )
-   )
-   ) {
-   $result['editsection']['query'] = [
-   'veaction' => 'editsource',
-   'vesection' => $section
-   ];
}
 
// Exit if we're using the single edit tab.
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 0aa340d..88b021d 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -1007,6 +1007,16 @@
mw.libs.ve.setEditorPreference( 'wikitext' );
}
 
+   // NWE
+   if ( init.isWikitextAvailable ) {
+   $( '.mw-editsection a, #ca-edit a' ).each( 
function () {
+   var uri = new mw.Uri( $( this ).attr( 
'href' ) );
+   delete uri.query.action;
+   uri.query.veaction = 'editsource';
+   $( this ).attr( 'href', uri.toString() 
);
+   } );
+   }
+
// Set up the tabs appropriately if the user has VE on
if ( init.isAvailable && userPrefPreferShow ) {
// … on two-edit-tab wikis, or single-edit-tab 
wikis, where the user wants both …

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move save dialog checkbox code up from DAT into ArticleTarget

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Move save dialog checkbox code up from DAT into ArticleTarget
..

Move save dialog checkbox code up from DAT into ArticleTarget

So it applies to MobileArticleTarget.

This shows the checkboxes on mobile.

Bug: T148914
Change-Id: Ib6559d5601004e58b72903805059e04f42acc85f
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 94 insertions(+), 106 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 8ce1ee6..958c635 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -41,9 +41,6 @@
this.recreating = false;
this.activatingDeferred = null;
this.toolbarSetupDeferred = null;
-   this.checkboxFields = null;
-   this.checkboxesByName = null;
-   this.$otherFields = null;
this.suppressNormalStartupDialogs = false;
this.editingTabDialog = null;
 
@@ -314,7 +311,7 @@
  * @inheritdoc
  */
 ve.init.mw.DesktopArticleTarget.prototype.loadSuccess = function ( response ) {
-   var $checkboxes, defaults, data, windowManager,
+   var windowManager,
target = this;
 
// Parent method
@@ -353,66 +350,6 @@
new mw.Api().saveOption( 
'visualeditor-hidebetawelcome', '1' );
}
this.suppressNormalStartupDialogs = true;
-   }
-
-   data = response ? ( response.visualeditor || response.visualeditoredit 
) : {};
-
-   this.checkboxFields = [];
-   this.checkboxesByName = {};
-   this.$otherFields = $( [] );
-   if ( [ 'edit', 'submit' ].indexOf( mw.util.getParamValue( 'action' ) ) 
!== -1 ) {
-   $( '#content #firstHeading' ).text(
-   mw.Title.newFromText( mw.config.get( 'wgPageName' ) 
).getPrefixedText()
-   );
-   }
-
-   if ( data.checkboxes ) {
-   defaults = {};
-   $( '.editCheckboxes input' ).each( function () {
-   defaults[ this.name ] = this.checked;
-   } );
-
-   $checkboxes = $( '' ).html( ve.getObjectValues( 
data.checkboxes ).join( '' ) );
-   $checkboxes.find( 'input[type=checkbox]' ).each( function () {
-   var $label, title, checkbox,
-   $this = $( this ),
-   name = $this.attr( 'name' ),
-   id = $this.attr( 'id' );
-
-   if ( !name ) {
-   // This really shouldn't happen..
-   return;
-   }
-
-   // Label with for=id
-   if ( id ) {
-   $label = $checkboxes.find( 'label[for=' + id + 
']' );
-   }
-   // Label wrapped input
-   if ( !$label ) {
-   $label = $this.closest( 'label' );
-   }
-   if ( $label ) {
-   title = $label.attr( 'title' );
-   $label.find( 'a' ).attr( 'target', '_blank' );
-   }
-   checkbox = new OO.ui.CheckboxInputWidget( {
-   value: $this.attr( 'value' ),
-   selected: defaults[ name ] !== undefined ? 
defaults[ name ] : $this.prop( 'checked' ),
-   classes: [ 've-ui-mwSaveDialog-checkbox-' + 
name ]
-   } );
-   // HACK: CheckboxInputWidget doesn't support access keys
-   checkbox.$input.attr( 'accesskey', $( this ).attr( 
'accesskey' ) );
-   target.checkboxFields.push(
-   new OO.ui.FieldLayout( checkbox, {
-   align: 'inline',
-   label: $label ? $label.contents() : 
undefined,
-   title: title
-   } )
-   );
-   target.checkboxesByName[ name ] = checkbox;
-   } );
-   this.$otherFields = $checkboxes.find( 'input[type!=checkbox]' );
}
 };
 
@@ -1012,31 +949,6 @@
 };
 
 /**
- * @inheritdoc
- */
-ve.init.mw.DesktopArticleTarget.prototype.getSaveFields = function () {
-   var name, fieldValues = {};
-
-   for ( name in this.checkboxesByName ) {
-   if ( 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Hacks to get VE loading on mobile while user has NWE enabled

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Hacks to get VE loading on mobile while user has NWE enabled
..

Hacks to get VE loading on mobile while user has NWE enabled

* ext.visualEditor.mwwikitext does not have mobile target
* We call mw.libs.ve.setEditorPreference from ArticleTarget

Change-Id: Ifae6e951155c83b13f3111732b0dc500349b1df2
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
2 files changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index d29a99d..d715173 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -197,7 +197,10 @@
 
if ( this.mode !== oldMode ) {
this.updateTabs( true );
-   mw.libs.ve.setEditorPreference( this.mode === 'visual' ? 
'visualeditor' : 'wikitext' );
+   if ( mw.libs.ve.setEditorPreference ) {
+   // only set up by DAT.init
+   mw.libs.ve.setEditorPreference( this.mode === 'visual' 
? 'visualeditor' : 'wikitext' );
+   }
}
 };
 
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
index e9de268..8b62bd9 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
@@ -38,7 +38,8 @@
(
mw.user.options.get( 'visualeditor-newwikitext' ) ||
new mw.Uri().query.veaction === 'editsource'
-   )
+   ) &&
+   mw.loader.getState( 'ext.visualEditor.mwwikitext' )
) {
modules.push( 'ext.visualEditor.mwwikitext' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifae6e951155c83b13f3111732b0dc500349b1df2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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