[MediaWiki-commits] [Gerrit] jobqueue: Record stats on how long it takes before a job is run - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: jobqueue: Record stats on how long it takes before a job is run
..

jobqueue: Record stats on how long it takes before a job is run

Bug: T101054
Change-Id: I5dc13d79a5ec2e8cb6679e3ff2535b5cb031ca30
---
M includes/jobqueue/Job.php
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobQueueRedis.php
M includes/jobqueue/JobRunner.php
4 files changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/215698/1

diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php
index 87bd836..b971bd5 100644
--- a/includes/jobqueue/Job.php
+++ b/includes/jobqueue/Job.php
@@ -135,6 +135,16 @@
}
 
/**
+* @return int|null UNIX timestamp of when the job was queued, or null
+* @since 1.26
+*/
+   public function getQueuedTimestamp() {
+   return isset( $this-metadata['timestamp'] )
+   ? wfTimestampOrNull( TS_UNIX, 
$this-metadata['timestamp'] )
+   : null;
+   }
+
+   /**
 * Whether the queue should reject insertion of this job if a duplicate 
exists
 *
 * This can be used to avoid duplicated effort or combined with delayed 
jobs to
diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index e094850..07c87dc 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -299,6 +299,7 @@
$job = Job::factory( $row-job_cmd, $title,
self::extractBlob( $row-job_params ), 
$row-job_id );
$job-metadata['id'] = $row-job_id;
+   $job-metadata['timestamp'] = 
$row-job_timestamp;
break; // done
} while ( true );
 
diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index ea94226..0f7ab19 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -610,6 +610,7 @@
$title = Title::makeTitle( $item['namespace'], 
$item['title'] );
$job = Job::factory( $item['type'], $title, 
$item['params'] );
$job-metadata['uuid'] = $item['uuid'];
+   $job-metadata['timestamp'] = $item['timestamp'];
 
return $job;
} catch ( RedisException $e ) {
@@ -647,6 +648,7 @@
$title = Title::makeTitle( $fields['namespace'], 
$fields['title'] );
$job = Job::factory( $fields['type'], $title, $fields['params'] 
);
$job-metadata['uuid'] = $fields['uuid'];
+   $job-metadata['timestamp'] = $fields['timestamp'];
 
return $job;
}
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index bb12298..dba44f6 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -135,6 +135,7 @@
$backoffDeltas = array(); // map of (type = seconds)
$wait = 'wait'; // block to read backoffs the first time
 
+   $stats = RequestContext::getMain()-getStats();
$jobsRun = 0;
$timeMsTotal = 0;
$flags = JobQueueGroup::USE_CACHE;
@@ -146,6 +147,7 @@
$backoffs = $this-syncBackoffDeltas( $backoffs, 
$backoffDeltas, $wait );
$blacklist = $noThrottle ? array() : array_keys( 
$backoffs );
$wait = 'nowait'; // less important now
+   $timeToRun = false;
 
if ( $type === false ) {
$job = $group-pop( 
JobQueueGroup::TYPE_DEFAULT, $flags, $blacklist );
@@ -178,6 +180,10 @@
$jobStartTime = microtime( true );
try {
++$jobsRun;
+   $queuedTime = 
$job-getQueuedTimestamp();
+   if ( $queuedTime !== null ) {
+   $timeToRun = time() - 
$queuedTime;
+   }
$status = $job-run();
$error = $job-getLastError();
$this-commitMasterChanges( $job );
@@ -201,6 +207,10 @@
$timeMs = intval( ( microtime( true ) - 
$jobStartTime ) * 1000 );
$timeMsTotal += $timeMs;
$profiler-scopedProfileOut( $psection );
+   if ( $timeToRun !== false ) {
+ 

[MediaWiki-commits] [Gerrit] glance: qualify var - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: glance: qualify var
..


glance: qualify var

bug: T97251
Change-Id: Ie393723a68e078f683645e3838d4f586d75c2b09
---
M modules/openstack/templates/icehouse/keystone/keystone.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb 
b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
index f436f11..eb182a8 100644
--- a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
@@ -9,7 +9,7 @@
 # public_port = 5000
 
 # The port number which the public admin listens on
-admin_port = %= glanceconfig[keystone_auth_port] %
+admin_port = %= @glanceconfig[keystone_auth_port] %
 
 # The port number which the OpenStack Compute service listens on
 # compute_port = 8774

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie393723a68e078f683645e3838d4f586d75c2b09
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Correctly align the heading edit icon - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Correctly align the heading edit icon
..


Correctly align the heading edit icon

Bug: T100348
Change-Id: Ic719b09fba40ea13cab21566b147ddc94436820f
---
M resources/mobile.toggling/toggle.less
M resources/skins.minerva.base.styles/ui.less
2 files changed, 3 insertions(+), 24 deletions(-)

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



diff --git a/resources/mobile.toggling/toggle.less 
b/resources/mobile.toggling/toggle.less
index 38b8e1d..3ebc356 100644
--- a/resources/mobile.toggling/toggle.less
+++ b/resources/mobile.toggling/toggle.less
@@ -24,7 +24,7 @@
}
}
 
-   .section-heading {
+   .mw-headline {
padding-right: @sectionIconWidth + 15px;
}
 
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index cfda712..dba3692 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -181,34 +181,13 @@
 
.edit-page {
display: none;
-   top: 0;
-   bottom: 0;
-   right: 0;
-   }
-
-   // edit pencils for section headings (collapsible)
-   .collapsible-heading {
-   .edit-page {
-   position: absolute;
-   }
-   }
-
-   // show edit section pencils on section headings inside collapsible 
blocks
-   .in-block {
-   position: relative;
-
-.edit-page {
-   display: none;
-   // edit pencils for inline/sub-section headings - bug 
T90245
-   position: relative;
-   float: right;
-   }
+   float: right;
}
 
.open-block {
// Restrict to child so that child section edit links do not 
get revealed.
 .edit-page {
-   display: block;
+   display: inline-block;
}
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic719b09fba40ea13cab21566b147ddc94436820f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] keystongconfig: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: keystongconfig: qualify var
..

keystongconfig: qualify var

bug: T97251
Change-Id: Ia6087aaa1c31060c9b0258682ff40dd5a04d286a
---
M modules/openstack/templates/icehouse/keystone/keystone.conf.erb
1 file changed, 15 insertions(+), 15 deletions(-)


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

diff --git a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb 
b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
index eb182a8..3a54ea0 100644
--- a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
@@ -1,6 +1,6 @@
 [DEFAULT]
 # A shared secret between keystone and other openstack services
-admin_token = %= keystoneconfig[admin_token] %
+admin_token = %= @keystoneconfig[admin_token] %
 
 # The IP address of the network interface to listen on
 # bind_host = 0.0.0.0
@@ -59,7 +59,7 @@
 
 [database]
 # The SQLAlchemy connection string used to connect to the database
-connection = mysql://%= keystoneconfig[db_user] %:%= 
keystoneconfig[db_pass] %@%= keystoneconfig[db_host] %/%= 
keystoneconfig[db_name] %
+connection = mysql://%= @keystoneconfig[db_user] %:%= 
@keystoneconfig[db_pass] %@%= @keystoneconfig[db_host] %/%= 
@keystoneconfig[db_name] %
 
 [identity]
 driver = keystone.identity.backends.ldap.Identity
@@ -74,7 +74,7 @@
 # template_file = default_catalog.templates
 
 [token]
-% if keystoneconfig[token_driver] == 'redis' %
+% if @keystoneconfig[token_driver] == 'redis' %
 driver = keystoneredis.token.Token
 % else %
 driver = keystone.token.backends.sql.Token
@@ -84,7 +84,7 @@
 # Using 7.1 days, as we'll set MediaWiki to 7 days
 expiration = 613440
 
-% if keystoneconfig[token_driver] == 'redis' %
+% if @keystoneconfig[token_driver] == 'redis' %
 [redis]
 password = %= keystoneconfig[token_driver_password] %
 % end -%
@@ -113,16 +113,16 @@
 #token_format = PKI
 
 [ldap]
-url = ldap://%= keystoneconfig[ldap_host] %
-tree_dn = %= keystoneconfig[ldap_base_dn] %
-user_tree_dn = ou=people,%= keystoneconfig[ldap_base_dn] %
-tenant_tree_dn = ou=projects,%= keystoneconfig[ldap_base_dn] %
-user_id_attribute = %= keystoneconfig[ldap_user_id_attribute] %
-tenant_id_attribute = %= keystoneconfig[ldap_tenant_id_attribute] %
-user_name_attribute = %= keystoneconfig[ldap_user_name_attribute] %
-tenant_name_attribute = %= keystoneconfig[ldap_tenant_name_attribute] %
-user = %= keystoneconfig[ldap_user_dn] %
-password = %= keystoneconfig[ldap_user_pass] %
+url = ldap://%= @keystoneconfig[ldap_host] %
+tree_dn = %= @keystoneconfig[ldap_base_dn] %
+user_tree_dn = ou=people,%= @keystoneconfig[ldap_base_dn] %
+tenant_tree_dn = ou=projects,%= @keystoneconfig[ldap_base_dn] %
+user_id_attribute = %= @keystoneconfig[ldap_user_id_attribute] %
+tenant_id_attribute = %= @keystoneconfig[ldap_tenant_id_attribute] %
+user_name_attribute = %= @keystoneconfig[ldap_user_name_attribute] %
+tenant_name_attribute = %= @keystoneconfig[ldap_tenant_name_attribute] %
+user = %= @keystoneconfig[ldap_user_dn] %
+password = %= @keystoneconfig[ldap_user_pass] %
 # url = ldap://localhost
 # user = dc=Manager,dc=example,dc=com
 # password = None
@@ -140,7 +140,7 @@
 # tenant_member_attribute = member
 # tenant_name_attribute = ou
 
-role_tree_dn = ou=roles,%= keystoneconfig[ldap_base_dn] %
+role_tree_dn = ou=roles,%= @keystoneconfig[ldap_base_dn] %
 role_objectclass = organizationalRole
 role_id_attribute = cn
 role_name_attribute = cn

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6087aaa1c31060c9b0258682ff40dd5a04d286a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] keystongconfig: qualify var - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: keystongconfig: qualify var
..


keystongconfig: qualify var

bug: T97251
Change-Id: Ia6087aaa1c31060c9b0258682ff40dd5a04d286a
---
M modules/openstack/templates/icehouse/keystone/keystone.conf.erb
1 file changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb 
b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
index eb182a8..3a54ea0 100644
--- a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
@@ -1,6 +1,6 @@
 [DEFAULT]
 # A shared secret between keystone and other openstack services
-admin_token = %= keystoneconfig[admin_token] %
+admin_token = %= @keystoneconfig[admin_token] %
 
 # The IP address of the network interface to listen on
 # bind_host = 0.0.0.0
@@ -59,7 +59,7 @@
 
 [database]
 # The SQLAlchemy connection string used to connect to the database
-connection = mysql://%= keystoneconfig[db_user] %:%= 
keystoneconfig[db_pass] %@%= keystoneconfig[db_host] %/%= 
keystoneconfig[db_name] %
+connection = mysql://%= @keystoneconfig[db_user] %:%= 
@keystoneconfig[db_pass] %@%= @keystoneconfig[db_host] %/%= 
@keystoneconfig[db_name] %
 
 [identity]
 driver = keystone.identity.backends.ldap.Identity
@@ -74,7 +74,7 @@
 # template_file = default_catalog.templates
 
 [token]
-% if keystoneconfig[token_driver] == 'redis' %
+% if @keystoneconfig[token_driver] == 'redis' %
 driver = keystoneredis.token.Token
 % else %
 driver = keystone.token.backends.sql.Token
@@ -84,7 +84,7 @@
 # Using 7.1 days, as we'll set MediaWiki to 7 days
 expiration = 613440
 
-% if keystoneconfig[token_driver] == 'redis' %
+% if @keystoneconfig[token_driver] == 'redis' %
 [redis]
 password = %= keystoneconfig[token_driver_password] %
 % end -%
@@ -113,16 +113,16 @@
 #token_format = PKI
 
 [ldap]
-url = ldap://%= keystoneconfig[ldap_host] %
-tree_dn = %= keystoneconfig[ldap_base_dn] %
-user_tree_dn = ou=people,%= keystoneconfig[ldap_base_dn] %
-tenant_tree_dn = ou=projects,%= keystoneconfig[ldap_base_dn] %
-user_id_attribute = %= keystoneconfig[ldap_user_id_attribute] %
-tenant_id_attribute = %= keystoneconfig[ldap_tenant_id_attribute] %
-user_name_attribute = %= keystoneconfig[ldap_user_name_attribute] %
-tenant_name_attribute = %= keystoneconfig[ldap_tenant_name_attribute] %
-user = %= keystoneconfig[ldap_user_dn] %
-password = %= keystoneconfig[ldap_user_pass] %
+url = ldap://%= @keystoneconfig[ldap_host] %
+tree_dn = %= @keystoneconfig[ldap_base_dn] %
+user_tree_dn = ou=people,%= @keystoneconfig[ldap_base_dn] %
+tenant_tree_dn = ou=projects,%= @keystoneconfig[ldap_base_dn] %
+user_id_attribute = %= @keystoneconfig[ldap_user_id_attribute] %
+tenant_id_attribute = %= @keystoneconfig[ldap_tenant_id_attribute] %
+user_name_attribute = %= @keystoneconfig[ldap_user_name_attribute] %
+tenant_name_attribute = %= @keystoneconfig[ldap_tenant_name_attribute] %
+user = %= @keystoneconfig[ldap_user_dn] %
+password = %= @keystoneconfig[ldap_user_pass] %
 # url = ldap://localhost
 # user = dc=Manager,dc=example,dc=com
 # password = None
@@ -140,7 +140,7 @@
 # tenant_member_attribute = member
 # tenant_name_attribute = ou
 
-role_tree_dn = ou=roles,%= keystoneconfig[ldap_base_dn] %
+role_tree_dn = ou=roles,%= @keystoneconfig[ldap_base_dn] %
 role_objectclass = organizationalRole
 role_id_attribute = cn
 role_name_attribute = cn

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6087aaa1c31060c9b0258682ff40dd5a04d286a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] novaconfig: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: novaconfig: qualify var
..

novaconfig: qualify var

bug: T97251
Change-Id: I0e70397299d9e3e7731d9591fda0473f53e0791c
---
M modules/openstack/templates/common/nova/nova-compute.conf.erb
M modules/openstack/templates/icehouse/horizon/local_settings.py.erb
M modules/openstack/templates/icehouse/nova/api-paste.ini.erb
M modules/openstack/templates/icehouse/nova/nova.conf.erb
4 files changed, 37 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/215769/1

diff --git a/modules/openstack/templates/common/nova/nova-compute.conf.erb 
b/modules/openstack/templates/common/nova/nova-compute.conf.erb
index 2982e89..f31ad50 100644
--- a/modules/openstack/templates/common/nova/nova-compute.conf.erb
+++ b/modules/openstack/templates/common/nova/nova-compute.conf.erb
@@ -1,2 +1,2 @@
 [DEFAULT]
-libvirt_type=%= novaconfig[libvirt_type] %
+libvirt_type=%= @novaconfig[libvirt_type] %
diff --git a/modules/openstack/templates/icehouse/horizon/local_settings.py.erb 
b/modules/openstack/templates/icehouse/horizon/local_settings.py.erb
index 1907f55..c16d93c 100644
--- a/modules/openstack/templates/icehouse/horizon/local_settings.py.erb
+++ b/modules/openstack/templates/icehouse/horizon/local_settings.py.erb
@@ -151,7 +151,7 @@
 # ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
 # ]
 
-OPENSTACK_HOST = %= novaconfig['controller_hostname'] %
+OPENSTACK_HOST = %= @novaconfig['controller_hostname'] %
 OPENSTACK_KEYSTONE_URL = http://%s:5000/v2.0; % OPENSTACK_HOST
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = _member_
 
diff --git a/modules/openstack/templates/icehouse/nova/api-paste.ini.erb 
b/modules/openstack/templates/icehouse/nova/api-paste.ini.erb
index 2b36b0f..bbabd92 100644
--- a/modules/openstack/templates/icehouse/nova/api-paste.ini.erb
+++ b/modules/openstack/templates/icehouse/nova/api-paste.ini.erb
@@ -120,11 +120,11 @@
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 service_protocol = http
-service_host = %= novaconfig[keystone_auth_host] %
+service_host = %= @novaconfig[keystone_auth_host] %
 service_port = 5000
-auth_host = %= novaconfig[keystone_auth_host] %
-auth_port = %= novaconfig[keystone_auth_port] %
-auth_protocol = %= novaconfig[keystone_auth_protocol] %
-admin_token = %= novaconfig[keystone_admin_token] %
+auth_host = %= @novaconfig[keystone_auth_host] %
+auth_port = %= @novaconfig[keystone_auth_port] %
+auth_protocol = %= @novaconfig[keystone_auth_protocol] %
+admin_token = %= @novaconfig[keystone_admin_token] %
 signing_dir = /tmp/keystone-signing-nova
-auth_uri = %= novaconfig[auth_uri] %
+auth_uri = %= @novaconfig[auth_uri] %
diff --git a/modules/openstack/templates/icehouse/nova/nova.conf.erb 
b/modules/openstack/templates/icehouse/nova/nova.conf.erb
index a3d6516..edc1506 100644
--- a/modules/openstack/templates/icehouse/nova/nova.conf.erb
+++ b/modules/openstack/templates/icehouse/nova/nova.conf.erb
@@ -18,30 +18,30 @@
 # Don't allow duplicate instance names
 osapi_compute_unique_server_name_scope='global'
 
-my_ip=%= novaconfig[my_ip] %
+my_ip=%= @novaconfig[my_ip] %
 logdir=/var/log/nova
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
-sql_connection=mysql://%= novaconfig[db_user] %:%= novaconfig[db_pass] 
%@%= novaconfig[db_host] %/%= novaconfig[db_name] %
+sql_connection=mysql://%= @novaconfig[db_user] %:%= 
@novaconfig[db_pass] %@%= @novaconfig[db_host] %/%= 
@novaconfig[db_name] %
 image_service=nova.image.glance.GlanceImageService
 remove_unused_base_images=False
-s3_host=%= novaconfig[glance_host] %
-glance_api_servers=%= novaconfig[glance_host] %:9292
-cc_host=%= novaconfig[cc_host] %
-network_host=%= novaconfig[network_host] %
-ec2_url=http://%= novaconfig[api_host] %:8773/services/Cloud
-ec2_dmz_host=%= novaconfig[api_ip] %
-dmz_cidr=%= novaconfig[dmz_cidr] %
-libvirt_type=%= novaconfig[libvirt_type] %
+s3_host=%= @novaconfig[glance_host] %
+glance_api_servers=%= @novaconfig[glance_host] %:9292
+cc_host=%= @novaconfig[cc_host] %
+network_host=%= @novaconfig[network_host] %
+ec2_url=http://%= @novaconfig[api_host] %:8773/services/Cloud
+ec2_dmz_host=%= @novaconfig[api_ip] %
+dmz_cidr=%= @novaconfig[dmz_cidr] %
+libvirt_type=%= @novaconfig[libvirt_type] %
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
-dhcp_domain=%= novaconfig[dhcp_domain] %
-quota_floating_ips=%= novaconfig[quota_floating_ips] %
+dhcp_domain=%= @novaconfig[dhcp_domain] %
+quota_floating_ips=%= @novaconfig[quota_floating_ips] %
 quota_fixed_ips=200
 api_paste_config=/etc/nova/api-paste.ini
 #use_ipv6=True
 allow_same_net_traffic=False
-live_migration_uri=%= novaconfig[live_migration_uri] %
+live_migration_uri=%= @novaconfig[live_migration_uri] %
 libvirt_use_virtio_for_bridges=True
 force_dhcp_release=True
 # 

[MediaWiki-commits] [Gerrit] Don't run rspec for pre-1.0 branches of mediawiki_selenium - change (integration/config)

[Dduvall (Code Review)]

Dduvall has uploaded a new change for review.

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

Change subject: Don't run rspec for pre-1.0 branches of mediawiki_selenium
..

Don't run rspec for pre-1.0 branches of mediawiki_selenium

Change-Id: I96649bc92a387021a32d354c374ad844e1680db2
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/70/215770/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e8d1b8a..b8d46d5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1688,6 +1688,9 @@
 
   - name: 'mediawiki-selenium-bundle-yard-publish'
 branch: ^master$
+  - name: 'mediawiki-selenium-bundle-rspec'
+branch: ^(?!0\.)
+
   - name: 'mediawiki-ruby-api-bundle-yard-publish'
 branch: ^master$
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96649bc92a387021a32d354c374ad844e1680db2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Dduvall dduv...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] puppet_certname: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: puppet_certname: qualify var
..

puppet_certname: qualify var

bug: T97251
Change-Id: I1e096d5b4bb410573bbc5da74f1be8c20e931014
---
M modules/strongswan/templates/ipsec.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/strongswan/templates/ipsec.conf.erb 
b/modules/strongswan/templates/ipsec.conf.erb
index d132335..9aa3f8d 100644
--- a/modules/strongswan/templates/ipsec.conf.erb
+++ b/modules/strongswan/templates/ipsec.conf.erb
@@ -9,7 +9,7 @@
   if left_ipv4 !=  and right_ipv4 != 
   result  conn #{@fqdn}-#{node}_by_ipv4
   result  \tleft=#{left_ipv4} 
-  result  \tleftcert=#{puppet_certname}.pem
+  result  \tleftcert=#{@puppet_certname}.pem
   result  \tright=#{right_ipv4}
   result  \trightid=\CN=#{node}\
   result  
@@ -17,7 +17,7 @@
   if left_ipv6 !=  and right_ipv6 != 
   result  conn #{@fqdn}-#{node}_by_ipv6
   result  \tleft=#{left_ipv6} 
-  result  \tleftcert=#{puppet_certname}.pem
+  result  \tleftcert=#{@puppet_certname}.pem
   result  \tright=#{right_ipv6}
   result  \trightid=\CN=#{node}\
   result  

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e096d5b4bb410573bbc5da74f1be8c20e931014
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] sslcert: remove source/content checks - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sslcert: remove source/content checks
..


sslcert: remove source/content checks

These fail with ensure = absent callers, which rightfully have neither
source nor content.

Change-Id: Ic73a2bd776b614ed73582e41f5ca932f6ec2f683
---
M modules/sslcert/manifests/ca.pp
1 file changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/sslcert/manifests/ca.pp b/modules/sslcert/manifests/ca.pp
index 540e736..6f18f90 100644
--- a/modules/sslcert/manifests/ca.pp
+++ b/modules/sslcert/manifests/ca.pp
@@ -36,14 +36,6 @@
 ) {
 include sslcert
 
-if $source == undef and $content == undef  {
-fail('you must provide either source or content')
-}
-
-if $source != undef and $content != undef  {
-fail('source and content are mutually exclusive')
-}
-
 file { /usr/local/share/ca-certificates/${title}.crt:
 ensure  = $ensure,
 owner   = 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic73a2bd776b614ed73582e41f5ca932f6ec2f683
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] sslcert: remove source/content checks - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: sslcert: remove source/content checks
..

sslcert: remove source/content checks

These fail with ensure = absent callers, which rightfully have neither
source nor content.

Change-Id: Ic73a2bd776b614ed73582e41f5ca932f6ec2f683
---
M modules/sslcert/manifests/ca.pp
1 file changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/modules/sslcert/manifests/ca.pp b/modules/sslcert/manifests/ca.pp
index 540e736..6f18f90 100644
--- a/modules/sslcert/manifests/ca.pp
+++ b/modules/sslcert/manifests/ca.pp
@@ -36,14 +36,6 @@
 ) {
 include sslcert
 
-if $source == undef and $content == undef  {
-fail('you must provide either source or content')
-}
-
-if $source != undef and $content != undef  {
-fail('source and content are mutually exclusive')
-}
-
 file { /usr/local/share/ca-certificates/${title}.crt:
 ensure  = $ensure,
 owner   = 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic73a2bd776b614ed73582e41f5ca932f6ec2f683
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Reverting a test to see if gerrit irc bots start working again - change (operations/puppet)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Reverting a test to see if gerrit irc bots start working again
..

Reverting a test to see if gerrit irc bots start working again

Change-Id: I43087d26985b82eed787ae6fbdd9078e8857eff9
---
R modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
R modules/base/files/ca/GeoTrust_Global_CA.crt
R modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
M modules/base/manifests/certificates.pp
M modules/gerrit/templates/gerrit.config.erb
5 files changed, 25 insertions(+), 10 deletions(-)


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

diff --git a/modules/base/files/ca/DigiCertHighAssuranceCA-3.crt 
b/modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
similarity index 100%
rename from modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
rename to modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
diff --git a/modules/base/files/ca/RapidSSL_CA_2.crt 
b/modules/base/files/ca/GeoTrust_Global_CA.crt
similarity index 100%
rename from modules/base/files/ca/RapidSSL_CA_2.crt
rename to modules/base/files/ca/GeoTrust_Global_CA.crt
diff --git a/modules/base/files/ca/GlobalSign_CA.crt 
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
similarity index 100%
rename from modules/base/files/ca/GlobalSign_CA.crt
rename to 
modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 879880d..84ee219 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -10,19 +10,37 @@
 sslcert::ca { 'RapidSSL_CA':
 source  = 'puppet:///modules/base/ca/RapidSSL_CA.crt',
 }
-sslcert::ca { 'RapidSSL_CA_2':
-source  = 'puppet:///modules/base/ca/RapidSSL_CA_2.crt',
-}
 sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
 source  = 'puppet:///modules/base/ca/RapidSSL_SHA256_CA_-_G3.crt',
 }
+sslcert::ca { 'GeoTrust_Global_CA':
+source  = 'puppet:///modules/base/ca/GeoTrust_Global_CA.crt',
+}
+sslcert::ca { 'DigiCert_High_Assurance_CA-3':
+source  = 
'puppet:///modules/base/ca/DigiCert_High_Assurance_CA-3.crt',
+}
+sslcert::ca { 'DigiCert_SHA2_High_Assurance_Server_CA':
+source = 
'puppet:///modules/base/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt',
+}
+sslcert::ca { 'GlobalSign_Organization_Validation_CA_-_SHA256_-_G2':
+source  = 
'puppet:///modules/base/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt',
+}
+
+# FIXME: remove after a while
+sslcert::ca { 'GlobalSign_CA':
+ensure  = absent,
+require = 
Sslcert::Ca['GlobalSign_Organization_Validation_CA_-_SHA256_-_G2'],
+}
 sslcert::ca { 'DigiCertHighAssuranceCA-3':
-source  = 'puppet:///modules/base/ca/DigiCertHighAssuranceCA-3.crt',
+ensure  = absent,
+require = Sslcert::Ca['DigiCert_High_Assurance_CA-3'],
 }
 sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
-source = 
'puppet:///modules/base/ca/DigiCertSHA2HighAssuranceServerCA.crt',
+ensure  = absent,
+require = Sslcert::Ca['DigiCert_SHA2_High_Assurance_Server_CA'],
 }
-sslcert::ca { 'GlobalSign_CA':
-source  = 'puppet:///modules/base/ca/GlobalSign_CA.crt',
+sslcert::ca { 'RapidSSL_CA_2':
+ensure  = absent,
+require = Sslcert::Ca['GeoTrust_Global_CA'],
 }
 }
diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index c01406c..974d31e 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,9 +78,6 @@
 [commentlink bugzilla]
 match =  \\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b
 link = https://bugzilla.wikimedia.org/$1
-[commentlink phabricator]
-match = \\b[bB][uU][gG]\\:?\\s+#?(T\\d+)\\b
-link = https://phabricator.wikimedia.org/$1
 [commentlink codereview]
 match = \\br(\\d+)\\b
 link = https://phabricator.wikimedia.org/rSVN$1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43087d26985b82eed787ae6fbdd9078e8857eff9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] tools: Don't include killed labsdb client /etc/hosts class - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: tools: Don't include killed labsdb client /etc/hosts class
..


tools: Don't include killed labsdb client /etc/hosts class

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

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index f0dbb91..0859ebf 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -21,8 +21,6 @@
 include ::mediawiki::packages::fonts
 include ::redis::client::python
 
-include role::labs::db::client
-
 package { [
 # Please keep all packages in each group sorted in alphabetical order
 

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

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

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

[MediaWiki-commits] [Gerrit] Move Title null check in Special:RevisionDelete - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Move Title null check in Special:RevisionDelete
..

Move Title null check in Special:RevisionDelete

The property $this-targetObj was used before null check in
SpecialRevisionDelete::getList

Move up the existing null check to avoid the fatal:

Catchable fatal error: Argument 3 passed to
RevisionDeleter::createList() must be an instance of Title, null given,
called in \includes\specials\SpecialRevisiondelete.php on line 354 and
defined in \includes\revisiondelete\RevisionDeleter.php on line 83

On request with an unknown rev id

Follow-Up: Ic078af5417798db1b2900057dbf7514112e94b46
Bug: T96538
Change-Id: I0c7913ecb11ffce844add7b1f3b810d54c367519
---
M includes/specials/SpecialRevisiondelete.php
1 file changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/includes/specials/SpecialRevisiondelete.php 
b/includes/specials/SpecialRevisiondelete.php
index 5bd3a29..7e842d5 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -158,6 +158,13 @@
$this-ids
);
 
+   # We need a target page!
+   if ( $this-targetObj === null ) {
+   $output-addWikiMsg( 'undelete-header' );
+
+   return;
+   }
+
$this-typeLabels = self::$UILabels[$this-typeName];
$list = $this-getList();
$list-reset();
@@ -169,12 +176,6 @@
$this-mIsAllowed = $this-mIsAllowed  !( 
$canViewSuppressedOnly  $pageIsSuppressed );
 
$this-otherReason = $request-getVal( 'wpReason' );
-   # We need a target page!
-   if ( is_null( $this-targetObj ) ) {
-   $output-addWikiMsg( 'undelete-header' );
-
-   return;
-   }
# Give a link to the logs/hist for this page
$this-showConvenienceLinks();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c7913ecb11ffce844add7b1f3b810d54c367519
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de

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

[MediaWiki-commits] [Gerrit] Fix-up for I7bc734b58: use rsyslog 5 syntax for declaring te... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Fix-up for I7bc734b58: use rsyslog 5 syntax for declaring 
template
..

Fix-up for I7bc734b58: use rsyslog 5 syntax for declaring template

Change-Id: Ibe0db92289ab8122c3b7caf02282de62ef7d47de
---
M templates/memcached/rsyslog.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/215696/1

diff --git a/templates/memcached/rsyslog.conf.erb 
b/templates/memcached/rsyslog.conf.erb
index 58c36a5..00cc7a4 100644
--- a/templates/memcached/rsyslog.conf.erb
+++ b/templates/memcached/rsyslog.conf.erb
@@ -2,7 +2,7 @@
 # log aggregator.
 
 # Emulate MediaWiki's wfDebugLog / wfErrorLog format
-template(name=MediaWiki type=string string=%programname% %timegenerated% 
%HOSTNAME%: %msg%\n)
+$template MediaWiki,%programname% %timegenerated% %HOSTNAME%: %msg%\n
 
 # Forward memkeys-snapshot data to the MediaWiki log aggregator.
 :syslogtag, isequal, memcached-keys: @udplog:8420;MediaWiki

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

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

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

[MediaWiki-commits] [Gerrit] graphite: hotname is a fact, qualify - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: graphite: hotname is a fact, qualify
..

graphite: hotname is a fact, qualify

bug: T97251
Change-Id: I892aea3ed63ec6eb41058dcd4b9d25ab09e84ef8
---
M modules/graphite/templates/initscripts/frontend-relay.upstart.erb
M modules/graphite/templates/initscripts/local-relay.upstart.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/215700/1

diff --git a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb 
b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
index fde487e..48a6a32 100644
--- a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
@@ -12,4 +12,4 @@
 
 # it is possible there's another carbon-c-relay running on the same host, so
 # change the hostname
-exec /usr/bin/carbon-c-relay -H %= #{hostname}_frontend -% -p 2003 -f 
/etc/carbon/frontend-relay.conf
+exec /usr/bin/carbon-c-relay -H %= #{@hostname}_frontend -% -p 2003 -f 
/etc/carbon/frontend-relay.conf
diff --git a/modules/graphite/templates/initscripts/local-relay.upstart.erb 
b/modules/graphite/templates/initscripts/local-relay.upstart.erb
index 3ca5694..3575bb9 100644
--- a/modules/graphite/templates/initscripts/local-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/local-relay.upstart.erb
@@ -12,4 +12,4 @@
 
 # it is possible there's another carbon-c-relay running on the same host, so
 # change the hostname
-exec /usr/bin/carbon-c-relay -H %= #{hostname}_local -% -p 1903 -f 
/etc/carbon/local-relay.conf
+exec /usr/bin/carbon-c-relay -H %= #{@hostname}_local -% -p 1903 -f 
/etc/carbon/local-relay.conf

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I892aea3ed63ec6eb41058dcd4b9d25ab09e84ef8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] site.pp for cp20xx - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: site.pp for cp20xx
..


site.pp for cp20xx

Bug: T101204
Change-Id: I75b4fbcb0708d39895703ed21948da52e6dd37e2
---
M manifests/site.pp
1 file changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a43db1d..d529778 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -418,6 +418,31 @@
 role cache::bits
 }
 
+node /^cp20(0[147]|1[0369]|23)\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::text
+}
+
+node /^cp20(0[258]|1[147]|2[04])\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::upload
+}
+
+node /^cp20(0[39]|15|21)\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::mobile
+}
+
+node /^cp20(06|1[28]|25)\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::bits
+}
+
+node /^cp202[26]\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::parsoid
+}
+
 node /^cp30(0[3-9]|1[0-4])\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75b4fbcb0708d39895703ed21948da52e6dd37e2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Move Title null check in Special:RevisionDelete - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Move Title null check in Special:RevisionDelete
..


Move Title null check in Special:RevisionDelete

The property $this-targetObj was used before null check in
SpecialRevisionDelete::getList

Move up the existing null check to avoid the fatal:

Catchable fatal error: Argument 3 passed to
RevisionDeleter::createList() must be an instance of Title, null given,
called in \includes\specials\SpecialRevisiondelete.php on line 354 and
defined in \includes\revisiondelete\RevisionDeleter.php on line 83

On request with an unknown rev id

Follow-Up: Ic078af5417798db1b2900057dbf7514112e94b46
Bug: T96538
Change-Id: I0c7913ecb11ffce844add7b1f3b810d54c367519
---
M includes/specials/SpecialRevisiondelete.php
1 file changed, 7 insertions(+), 6 deletions(-)

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



diff --git a/includes/specials/SpecialRevisiondelete.php 
b/includes/specials/SpecialRevisiondelete.php
index 5bd3a29..7e842d5 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -158,6 +158,13 @@
$this-ids
);
 
+   # We need a target page!
+   if ( $this-targetObj === null ) {
+   $output-addWikiMsg( 'undelete-header' );
+
+   return;
+   }
+
$this-typeLabels = self::$UILabels[$this-typeName];
$list = $this-getList();
$list-reset();
@@ -169,12 +176,6 @@
$this-mIsAllowed = $this-mIsAllowed  !( 
$canViewSuppressedOnly  $pageIsSuppressed );
 
$this-otherReason = $request-getVal( 'wpReason' );
-   # We need a target page!
-   if ( is_null( $this-targetObj ) ) {
-   $output-addWikiMsg( 'undelete-header' );
-
-   return;
-   }
# Give a link to the logs/hist for this page
$this-showConvenienceLinks();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c7913ecb11ffce844add7b1f3b810d54c367519
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: TTO at.li...@live.com.au
Gerrit-Reviewer: Ybura yb...@umich.edu
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] nove: qualify vars - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: nove: qualify vars
..

nove: qualify vars

bug: T97251
Change-Id: I9dfeaf75548a8b6105e02ed8f879c0a4f46326dd
---
M modules/openstack/templates/icehouse/nova/nova.conf.erb
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/modules/openstack/templates/icehouse/nova/nova.conf.erb 
b/modules/openstack/templates/icehouse/nova/nova.conf.erb
index 9f70da1..a3d6516 100644
--- a/modules/openstack/templates/icehouse/nova/nova.conf.erb
+++ b/modules/openstack/templates/icehouse/nova/nova.conf.erb
@@ -99,13 +99,13 @@
 notification_driver=wikistatus
 notify_on_state_change=vm_state
 
-wiki_host=%= instance_status_wiki_host %
-wiki_domain=%= instance_status_wiki_domain %
-wiki_page_prefix=%= instance_status_wiki_page_prefix %
-wiki_instance_region=%= instance_status_wiki_region %
-wiki_login=%= instance_status_wiki_user %
-wiki_password=%= instance_status_wiki_pass %
-wiki_instance_dns_domain=%= instance_status_dns_domain %
+wiki_host=%= @instance_status_wiki_host %
+wiki_domain=%= @instance_status_wiki_domain %
+wiki_page_prefix=%= @instance_status_wiki_page_prefix %
+wiki_instance_region=%= @instance_status_wiki_region %
+wiki_login=%= @instance_status_wiki_user %
+wiki_password=%= @instance_status_wiki_pass %
+wiki_instance_dns_domain=%= @instance_status_dns_domain %
 wiki_use_keystone=False
 
 # Designate things:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dfeaf75548a8b6105e02ed8f879c0a4f46326dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] ganalia_new: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ganalia_new: qualify var
..

ganalia_new: qualify var

bug: T97251
Change-Id: Ieda5883ed0ad27c2c30c0a9f88e9e4ae530b61bf
---
M modules/ganglia_new/templates/ganglia_view.json.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ganglia_new/templates/ganglia_view.json.erb 
b/modules/ganglia_new/templates/ganglia_view.json.erb
index 7e52b9f..f5717c1 100644
--- a/modules/ganglia_new/templates/ganglia_view.json.erb
+++ b/modules/ganglia_new/templates/ganglia_view.json.erb
@@ -22,7 +22,7 @@
  view_type:%= @view_type %,
  default_size:%= @default_size %,
 
- items:%= JSON.pretty_generate(items) %
+ items:%= JSON.pretty_generate(@items) %
 }
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieda5883ed0ad27c2c30c0a9f88e9e4ae530b61bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Implemented getAllAcquiredJobs in JobQueueDB - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Implemented getAllAcquiredJobs in JobQueueDB
..

Implemented getAllAcquiredJobs in JobQueueDB

Change-Id: Ie9f0b9357b365f8bddd1f2fdcac11dec29aec876
---
M includes/jobqueue/JobQueueDB.php
1 file changed, 20 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/215711/1

diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index e094850..4aba433 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -557,18 +557,34 @@
 * @return Iterator
 */
public function getAllQueuedJobs() {
+   return $this-getJobIterator( array( 'job_cmd' = 
$this-getType(), 'job_token' = '' ) );
+   }
+
+   /**
+* @see JobQueue::getAllAcquiredJobs()
+* @return Iterator
+*/
+   public function getAllAcquiredJobs() {
+   return $this-getJobIterator( array( 'job_cmd' = 
$this-getType(), job_token  '' ) );
+   }
+
+   /**
+* @param array $conds Query conditions
+* @return Iterator
+*/
+   public function getJobIterator( array $conds ) {
$dbr = $this-getSlaveDB();
try {
return new MappedIterator(
-   $dbr-select( 'job', self::selectFields(),
-   array( 'job_cmd' = $this-getType(), 
'job_token' = '' ) ),
-   function ( $row ) use ( $dbr ) {
+   $dbr-select( 'job', self::selectFields(), 
$conds ),
+   function ( $row ) {
$job = Job::factory(
$row-job_cmd,
Title::makeTitle( 
$row-job_namespace, $row-job_title ),
-   strlen( $row-job_params ) ? 
unserialize( $row-job_params ) : false
+   strlen( $row-job_params ) ? 
unserialize( $row-job_params ) : array()
);
$job-metadata['id'] = $row-job_id;
+
return $job;
}
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9f0b9357b365f8bddd1f2fdcac11dec29aec876
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Push commits to 0.4 by default - change (mediawiki/selenium)

[Dduvall (Code Review)]

Dduvall has uploaded a new change for review.

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

Change subject: Push commits to 0.4 by default
..

Push commits to 0.4 by default

Change-Id: I7075f2e8fc26f2b961fa50ec03d8bb00ddf880c8
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/60/215760/1

diff --git a/.gitreview b/.gitreview
index b47216f..1042d32 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/selenium.git
-defaultbranch=master
+defaultbranch=0.4
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7075f2e8fc26f2b961fa50ec03d8bb00ddf880c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: 0.4
Gerrit-Owner: Dduvall dduv...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 08af973..c488e96 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 08af973..c488e96
..

Syncronize VisualEditor: 08af973..c488e96

Change-Id: I19725945e2cfbda9bbec5adb6c2f08c4a97ae201
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/64/215764/1

diff --git a/VisualEditor b/VisualEditor
index 08af973..c488e96 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 08af973d3254da155c026d5c215c411fac04aa06
+Subproject commit c488e96a8fe5d8cdf5828dbbfc0813971182939d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19725945e2cfbda9bbec5adb6c2f08c4a97ae201
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 08af973..c488e96 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 08af973..c488e96
..


Syncronize VisualEditor: 08af973..c488e96

Change-Id: I19725945e2cfbda9bbec5adb6c2f08c4a97ae201
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 08af973..c488e96 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 08af973d3254da155c026d5c215c411fac04aa06
+Subproject commit c488e96a8fe5d8cdf5828dbbfc0813971182939d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19725945e2cfbda9bbec5adb6c2f08c4a97ae201
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] memorysize is a fact, qualify - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: memorysize is a fact, qualify
..


memorysize is a fact, qualify

bug: T97251
Change-Id: Ia6dc30b89da104f6c3212c935bb86754841554ec
---
M manifests/role/redisdb.pp
M modules/mysql_wmf/templates/prod.my.cnf.erb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index cd0299c..ca121dc 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -11,7 +11,7 @@
 }
 
 class role::db::redis (
-$maxmemory = inline_template(%= (Float(memorysize.split[0]) * 
0.82).round %Gb),
+$maxmemory = inline_template(%= (Float(@memorysize.split[0]) * 
0.82).round %Gb),
 $redis_replication = undef,
 $dir   = '/srv/redis'
 ) {
diff --git a/modules/mysql_wmf/templates/prod.my.cnf.erb 
b/modules/mysql_wmf/templates/prod.my.cnf.erb
index feb9b93..1ffee5a 100644
--- a/modules/mysql_wmf/templates/prod.my.cnf.erb
+++ b/modules/mysql_wmf/templates/prod.my.cnf.erb
@@ -77,7 +77,7 @@
 innodb-thread-lifo=1
 % end -%
 
-% ram = memorysize.split[0]; ram = Float(ram) * 0.75; 
+% ram = @memorysize.split[0]; ram = Float(ram) * 0.75;
 ram = ram.round; ram = String(ram) + G; %
 
 innodb-adaptive-flushing=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6dc30b89da104f6c3212c935bb86754841554ec
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Introduce RadioSelectInputWidget - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Introduce RadioSelectInputWidget
..


Introduce RadioSelectInputWidget

Multiple radio buttons input widget.

Bug: T97867
Change-Id: I2816b5e30913acc173bd2d4a372d1bf5ff82cab9
---
M bin/testsuitegenerator.rb
M build/modules.json
M demos/pages/widgets.js
M demos/widgets.php
A php/widgets/RadioSelectInputWidget.php
M src/styles/core.less
M src/styles/theme.less
A src/styles/widgets/RadioSelectInputWidget.less
M src/themes/apex/widgets.less
M src/themes/blank/widgets.less
M src/themes/mediawiki/widgets.less
M src/widgets/DropdownInputWidget.js
M src/widgets/DropdownWidget.js
A src/widgets/RadioSelectInputWidget.js
M src/widgets/RadioSelectWidget.js
15 files changed, 325 insertions(+), 6 deletions(-)

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



diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb
index ce3a757..9246323 100644
--- a/bin/testsuitegenerator.rb
+++ b/bin/testsuitegenerator.rb
@@ -18,7 +18,7 @@
.reject{|c| c[:abstract] } # can't test abstract classes
.reject{|c| !c[:parent] || c[:parent] == 'ElementMixin' || 
c[:parent] == 'Theme' } # can't test abstract
.reject{|c| %w[Element Widget Layout Theme].include? c[:name] } 
# no toplevel
-   .reject{|c| c[:name] == 'DropdownInputWidget' } # different PHP 
and JS implementations
+   .reject{|c| %w[DropdownInputWidget 
RadioSelectInputWidget].include? c[:name] } # different PHP and JS 
implementations
 
# values to test for each type
expandos = {
diff --git a/build/modules.json b/build/modules.json
index cc3a226..3554876 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -79,6 +79,7 @@
src/widgets/CheckboxInputWidget.js,
src/widgets/DropdownInputWidget.js,
src/widgets/RadioInputWidget.js,
+   src/widgets/RadioSelectInputWidget.js,
src/widgets/TextInputWidget.js,
src/widgets/ComboBoxWidget.js,
src/widgets/LabelWidget.js,
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index a272dd0..805e52a 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -656,15 +656,15 @@
new OO.ui.RadioSelectWidget( {
items: [
new 
OO.ui.RadioOptionWidget( {
-   data: 'Cat',
+   data: 'cat',
label: 'Cat'
} ),
new 
OO.ui.RadioOptionWidget( {
-   data: 'Dog',
+   data: 'dog',
label: 'Dog'
} ),
new 
OO.ui.RadioOptionWidget( {
-   data: 
'Goldfish',
+   data: 
'goldfish',
label: 
'Goldfish',
disabled: true
} )
@@ -676,6 +676,29 @@
}
),
new OO.ui.FieldLayout(
+   new OO.ui.RadioSelectInputWidget( {
+   value: 'dog',
+   options: [
+   {
+   data: 'cat',
+   label: 'Cat'
+   },
+   {
+   data: 'dog',
+   label: 'Dog'
+   },
+   {
+   data: 
'goldfish',
+   label: 
'Goldfish'
+  

[MediaWiki-commits] [Gerrit] Fix-up for I7bc734b58: use rsyslog 5 syntax for declaring te... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Fix-up for I7bc734b58: use rsyslog 5 syntax for declaring 
template
..


Fix-up for I7bc734b58: use rsyslog 5 syntax for declaring template

Change-Id: Ibe0db92289ab8122c3b7caf02282de62ef7d47de
---
M templates/memcached/rsyslog.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/templates/memcached/rsyslog.conf.erb 
b/templates/memcached/rsyslog.conf.erb
index 58c36a5..00cc7a4 100644
--- a/templates/memcached/rsyslog.conf.erb
+++ b/templates/memcached/rsyslog.conf.erb
@@ -2,7 +2,7 @@
 # log aggregator.
 
 # Emulate MediaWiki's wfDebugLog / wfErrorLog format
-template(name=MediaWiki type=string string=%programname% %timegenerated% 
%HOSTNAME%: %msg%\n)
+$template MediaWiki,%programname% %timegenerated% %HOSTNAME%: %msg%\n
 
 # Forward memkeys-snapshot data to the MediaWiki log aggregator.
 :syslogtag, isequal, memcached-keys: @udplog:8420;MediaWiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe0db92289ab8122c3b7caf02282de62ef7d47de
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Alpha, Beta: Center align the contents of Special:History - change (mediawiki...MobileFrontend)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Alpha, Beta: Center align the contents of Special:History
..

Alpha, Beta: Center align the contents of Special:History

Bug: T101149
Change-Id: Ied3c75fbb0bc47cce868fe9f620ea24ff4eb826e
---
M includes/Resources.php
M includes/specials/SpecialMobileHistory.php
A resources/mobile.special.history.beta.styles/default.less
3 files changed, 33 insertions(+), 0 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index d04dd24..f617fd9 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1593,6 +1593,12 @@
),
),
 
+   'mobile.special.history.beta.styles' = 
$wgMFMobileSpecialPageResourceBoilerplate + array(
+   'styles' = array(
+   
'resources/mobile.special.history.beta.styles/default.less',
+   ),
+   'position' = 'top',
+   ),
// These are NOT empty see $wgResourceModuleSkinStyles.
'mobile.special.history.styles' = 
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' = 'top',
diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index e7d5f35..911c205 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -96,15 +96,25 @@
$out = $this-getOutput();
$out-setPageTitle( $this-msg( 'history' ) );
$out-addModuleStyles( 'mobile.pagelist.styles' );
+   // add beta styles
+   if ( MobileContext::singleton()-isBetaGroupMember() ) {
+   $out-addModuleStyles( 
'mobile.special.history.beta.styles' );
+   }
$this-offset = $this-getRequest()-getVal( 'offset', false );
if ( $par ) {
// enter article history view
$this-title = Title::newFromText( $par );
if ( $this-title  $this-title-exists() ) {
$this-addModules();
+   $this-getOutput()-addHtml(
+   Html::openElement( 'div', array( 
'class' = 'history' ) )
+   );
$this-renderHeaderBar( $this-title );
$res = $this-doQuery();
$this-showHistory( $res );
+   $this-getOutput()-addHtml(
+   Html::closeElement( 'div' )
+   );
return;
}
}
diff --git a/resources/mobile.special.history.beta.styles/default.less 
b/resources/mobile.special.history.beta.styles/default.less
new file mode 100644
index 000..a4f9d88
--- /dev/null
+++ b/resources/mobile.special.history.beta.styles/default.less
@@ -0,0 +1,17 @@
+@import minerva.variables;
+@import minerva.mixins;
+
+@media all and (min-width: @wgMFDeviceWidthTablet) {
+   // We need to be this specific in order to override other rules.
+   .alpha.mw-mf-special,
+   .beta.mw-mf-special {
+   #content_wrapper {
+.pre-content,
+.history {
+   max-width: @contentMaxWidthTablet;
+   margin: 0 auto;
+   padding: 0 @contentPaddingTablet;
+   }
+   }
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied3c75fbb0bc47cce868fe9f620ea24ff4eb826e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] ldap-groups: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ldap-groups: qualify var
..

ldap-groups: qualify var

bug: T97251
Change-Id: I73adb814edfd74a65533d283cee4b49c5d3aecc0
---
M modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
M modules/tendril/templates/apache/tendril.wikimedia.org.erb
M templates/graphite/apache-auth-ldap.erb
M templates/kibana/apache-auth-ldap.erb
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/215712/1

diff --git a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb 
b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
index b9ed142..a3cf674 100644
--- a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
+++ b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
@@ -26,7 +26,7 @@
 AuthLDAPBindDN %= @ldap_binddn %
 AuthLDAPBindPassword %= @proxypass %
 AuthLDAPURL %= @ldap_authurl %
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%
 /Directory
diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb 
b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
index dd72cec..334afbc 100644
--- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
+++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
@@ -27,7 +27,7 @@
 AuthLDAPBindDN %= @ldap_binddn %
 AuthLDAPBindPassword %= @proxypass %
 AuthLDAPURL %= @ldap_authurl %
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%
 /Directory
diff --git a/templates/graphite/apache-auth-ldap.erb 
b/templates/graphite/apache-auth-ldap.erb
index ebfa2ea..bdf4caf 100644
--- a/templates/graphite/apache-auth-ldap.erb
+++ b/templates/graphite/apache-auth-ldap.erb
@@ -7,7 +7,7 @@
 AuthLDAPURL %= @ldap_authurl %
 
 LimitExcept OPTIONS
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%
 /LimitExcept
diff --git a/templates/kibana/apache-auth-ldap.erb 
b/templates/kibana/apache-auth-ldap.erb
index 758a64e..adaca27 100644
--- a/templates/kibana/apache-auth-ldap.erb
+++ b/templates/kibana/apache-auth-ldap.erb
@@ -4,6 +4,6 @@
 AuthLDAPBindDN %= @ldap_binddn %
 AuthLDAPBindPassword %= @ldap_bindpass %
 AuthLDAPURL %= @ldap_authurl %
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73adb814edfd74a65533d283cee4b49c5d3aecc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] multicast: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: multicast: qualify var
..

multicast: qualify var

bug: T97251
Change-Id: I8c36dfe12b29a05fce993954fcb0b6961dec7f29
---
M templates/udp2log/udp2log.init.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/215767/1

diff --git a/templates/udp2log/udp2log.init.erb 
b/templates/udp2log/udp2log.init.erb
index 6030762..8c3e5ec 100644
--- a/templates/udp2log/udp2log.init.erb
+++ b/templates/udp2log/udp2log.init.erb
@@ -23,7 +23,7 @@
 NAME=udp2log-%= @name %
 DAEMON=/usr/bin/udp2log
 PIDFILE=/var/run/$NAME.pid
-DAEMON_ARGS=--daemon --pid-file $PIDFILE -p %= @port %% if multicast then 
-% --multicast %= (multicast.class == String) ? multicast : '233.58.59.1' 
%% end %
+DAEMON_ARGS=--daemon --pid-file $PIDFILE -p %= @port %% if multicast then 
-% --multicast %= (@multicast.class == String) ? multicast : '233.58.59.1' 
%% end %
 SCRIPTNAME=/etc/init.d/$NAME
 CONFFILE=/etc/udp2log/%= @name %
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c36dfe12b29a05fce993954fcb0b6961dec7f29
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] ResourceLoader::filter: use APC when running under HHVM - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: ResourceLoader::filter: use APC when running under HHVM
..


ResourceLoader::filter: use APC when running under HHVM

On HHVM, (a) the cost of a ResourceLoader::filter cache miss is smaller, and
(b) APC is faster and more resilient than PHP's. These two things tilt the
scales in favor of using APC rather than Memcached.

Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index bebdf2d..ba13bc3 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -195,9 +195,8 @@
if ( !$options['cache'] ) {
$result = $this-applyFilter( $filter, $data );
} else {
-   // Use CACHE_ANYTHING since filtering is very slow 
compared to DB queries
$key = wfMemcKey( 'resourceloader', 'filter', $filter, 
self::$filterCacheVersion, md5( $data ) );
-   $cache = wfGetCache( CACHE_ANYTHING );
+   $cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : 
CACHE_ANYTHING );
$cacheEntry = $cache-get( $key );
if ( is_string( $cacheEntry ) ) {
wfIncrStats( rl-$filter-cache-hits );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix i18n setting - change (mediawiki...ConfirmAccount)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Fix i18n setting
..

Fix i18n setting

Bug: T73300
Change-Id: Ifcc692e14e76ba3c551b3c32cd040213f253db3f
---
M ConfirmAccount.php
M ConfirmAccount.setup.php
2 files changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/ConfirmAccount.php b/ConfirmAccount.php
index 608ef35..476e9bc 100644
--- a/ConfirmAccount.php
+++ b/ConfirmAccount.php
@@ -36,7 +36,7 @@
 
 # Define were PHP files and i18n files are located
 require( dirname( __FILE__ ) . '/ConfirmAccount.setup.php' );
-ConfirmAccountSetup::defineSourcePaths( $wgAutoloadClasses, 
$wgExtensionMessagesFiles );
+ConfirmAccountSetup::defineSourcePaths( $wgAutoloadClasses, $wgMessagesDirs, 
$wgExtensionMessagesFiles );
 
 # Define JS/CSS modules and file locations
 ConfirmAccountUISetup::defineResourceModules( $wgResourceModules );
diff --git a/ConfirmAccount.setup.php b/ConfirmAccount.setup.php
index c4f0af5..946dc24 100644
--- a/ConfirmAccount.setup.php
+++ b/ConfirmAccount.setup.php
@@ -8,10 +8,11 @@
 * This function must NOT depend on any config vars.
 *
 * @param $classes Array $classes
+* @param $messagesDirs Array $messagesDirs
 * @param $messagesFiles Array $messagesFiles
 * @return void
 */
-   public static function defineSourcePaths( array $classes, array 
$messagesFiles ) {
+   public static function defineSourcePaths( array $classes, array 
$messagesDirs, array $messagesFiles ) {
$dir = dirname( __FILE__ );
 
# Basic directory layout
@@ -23,7 +24,7 @@
$spActionDir  = $dir/frontend/specialpages/actions;
 
# Main i18n file and special page alias file
-   $wgMessagesDirs['ConfirmAccount'] = __DIR__ . '/i18n/core';
+   $messagesDirs['ConfirmAccount'] = __DIR__ . '/i18n/core';
$messagesFiles['ConfirmAccount'] = 
$langDir/ConfirmAccount.i18n.php;
$messagesFiles['ConfirmAccountAliases'] = 
$langDir/ConfirmAccount.alias.php;
 
@@ -34,15 +35,15 @@
 
# UI to request an account
$classes['RequestAccountPage'] = 
$spActionDir/RequestAccount_body.php;
-   $wgMessagesDirs['RequestAccountPage'] = __DIR__ . 
'/i18n/requestaccount';
+   $messagesDirs['RequestAccountPage'] = __DIR__ . 
'/i18n/requestaccount';
$messagesFiles['RequestAccountPage'] = 
$langDir/RequestAccountPage.i18n.php;
# UI to confirm accounts
$classes['ConfirmAccountsPage'] = 
$spActionDir/ConfirmAccount_body.php;
-   $wgMessagesDirs['ConfirmAccountPage'] = __DIR__ . 
'/i18n/confirmaccount';
+   $messagesDirs['ConfirmAccountPage'] = __DIR__ . 
'/i18n/confirmaccount';
$messagesFiles['ConfirmAccountPage'] = 
$langDir/ConfirmAccountPage.i18n.php;
# UI to see account credentials
$classes['UserCredentialsPage'] = 
$spActionDir/UserCredentials_body.php;
-   $wgMessagesDirs['UserCredentialsPage'] = __DIR__ . 
'/i18n/usercredentials';
+   $messagesDirs['UserCredentialsPage'] = __DIR__ . 
'/i18n/usercredentials';
$messagesFiles['UserCredentialsPage'] = 
$langDir/UserCredentialsPage.i18n.php;
 
# Utility functions

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcc692e14e76ba3c551b3c32cd040213f253db3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Use Dygraphs in Vital Signs - change (analytics/dashiki)

[Mforns (Code Review)]

Mforns has submitted this change and it was merged.

Change subject: Use Dygraphs in Vital Signs
..


Use Dygraphs in Vital Signs

Bug: T96339
Change-Id: If20a496a7dbee13b73a013cd36213f4e55cded0c
---
M .jshintrc
M src/app/apis/annotations-api.js
A src/app/data-converters/annotations-data.js
M src/app/require.config.js
M src/components/a-b-compare/compare-sunburst.html
M src/components/breakdown-toggle/breakdown-toggle.js
M src/components/compare-layout/compare-layout.js
M src/components/visualizers/dygraphs-timeseries/bindings.js
M src/components/visualizers/dygraphs-timeseries/dygraphs-timeseries.html
M src/components/wikimetrics-layout/wikimetrics-layout.html
M src/components/wikimetrics-visualizer/wikimetrics-visualizer.html
M src/components/wikimetrics-visualizer/wikimetrics-visualizer.js
M src/layouts/metrics-by-project/01_styles.css
M test/components/wikimetrics-visualizer.js
14 files changed, 242 insertions(+), 63 deletions(-)

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



diff --git a/.jshintrc b/.jshintrc
index adb4994..8c65e7a 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -9,7 +9,6 @@
 undef: true,
 unused: true,
 esnext: false,
-moz: true,
 boss: true,
 node: true,
 validthis: true,
diff --git a/src/app/apis/annotations-api.js b/src/app/apis/annotations-api.js
index d853d1e..481869b 100644
--- a/src/app/apis/annotations-api.js
+++ b/src/app/apis/annotations-api.js
@@ -2,13 +2,65 @@
  * This module gets metric annotations that reside in Mediawiki.
  * To get them, it uses mediawiki-storage library.
  */
-define(['mediawiki-storage', 'moment', 'logger'], function (mediawikiStorage, 
moment) {
+define(function (require) {
 'use strict';
+
+var mediawikiStorage = require('mediawiki-storage'),
+moment = require('moment'),
+logger = require('logger'),
+converter = require('converters.annotations'),
+TimeseriesData = require('converters.timeseries');
 
 function AnnotationsApi () {}
 
 /**
- * Retrieves the annotations for the given metric.
+ * Gets the annotations in a TimeseriesData format.  Important notes:
+ *   1. range annotations (from date A to date B) come in as separate 
rows, prefixed
+ *  with Start: [the note] and End: [the note]
+ *   2. if duplicate dates are present, duplicateDates is set to true on 
the returned
+ *  object.  Callers should keep this in mind since it disallows merges
+ *
+ * Parameters
+ *   metric  : Metric object that has an annotations object:
+ * {
+ * ...
+ * annotations: {
+ * host: 'mediawiki.host',
+ * pageName: 'PageName'
+ * },
+ * ...
+ * }
+ *
+ * Returns
+ *   A promise to a TimeseriesData instance with the annotations
+ */
+AnnotationsApi.prototype.getTimeseriesData = function (metric) {
+
+var params = metric.annotations,
+deferred = new $.Deferred();
+
+if (!this.checkParams(params)) {
+deferred.resolve(new TimeseriesData());
+
+} else {
+mediawikiStorage.get({
+host: params.host,
+pageName: params.pageName
+}).done(function (data) {
+deferred.resolve(converter()({}, data));
+
+}).fail(function (error) {
+// resolve as done with empty results and log the error
+deferred.resolve(new TimeseriesData());
+logger.error(error);
+});
+}
+return deferred;
+};
+
+/**
+ * Retrieves the annotations for the given metric, as written on the wiki
+ *   but verified to be in the correct format
  *
  * Parameters
  *
@@ -51,10 +103,10 @@
 }
 
 var params = metric.annotations,
-deferred = $.Deferred(),
-that = this;
+that = this,
+deferred = new $.Deferred();
 
-if (!this._checkParams(params)) {
+if (!this.checkParams(params)) {
 // accept metrics without annotation params
 // and just return an empty array
 deferred.resolve([]);
@@ -66,7 +118,7 @@
 })
 .fail(deferred.reject)
 .done(function (data) {
-that._checkAnnotations(data, deferred, params);
+that.checkAnnotations(data, deferred, params);
 });
 }
 
@@ -75,7 +127,7 @@
 return deferred.promise();
 };
 
-AnnotationsApi.prototype._checkParams = function (params) {
+AnnotationsApi.prototype.checkParams = function (params) {
 return (
 typeof params === 'object' 
 typeof params.host === 'string' 
@@ -83,7 +135,7 @@
 );
 };
 
-

[MediaWiki-commits] [Gerrit] ganglia: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ganglia: qualify var
..

ganglia: qualify var

bug: T97251
Change-Id: I74a8d3a6ce9918ce47325bd3517cfcd8346ea7a1
---
M templates/ganglia/gmetad.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/templates/ganglia/gmetad.conf.erb 
b/templates/ganglia/gmetad.conf.erb
index 4709b67..94b3c8e 100644
--- a/templates/ganglia/gmetad.conf.erb
+++ b/templates/ganglia/gmetad.conf.erb
@@ -1,4 +1,4 @@
-# Ganglia Meta Daemon for %= gridname %
+# Ganglia Meta Daemon for %= @gridname %
 #
 # This file is managed by Puppet!
 #
@@ -76,7 +76,7 @@
 # gridname MyGrid
 
 % if has_variable?(gridname) then %
-gridname %= gridname %
+gridname %= @gridname %
 % end %
 
 #

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74a8d3a6ce9918ce47325bd3517cfcd8346ea7a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] glance: qualify vars - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: glance: qualify vars
..


glance: qualify vars

bug: T97251
Change-Id: I7c12148e3d7a4152afe58a3e32922c9405a54516
---
M modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
1 file changed, 9 insertions(+), 9 deletions(-)

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



diff --git 
a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
index 700f429..1f9dfb0 100644
--- a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
@@ -6,7 +6,7 @@
 debug = False
 
 # Address to bind the registry server
-bind_host = %= glanceconfig[bind_ip] %
+bind_host = %= @glanceconfig[bind_ip] %
 
 # Port the bind the registry server to
 bind_port = 9191
@@ -64,14 +64,14 @@
 #ca_file = /path/to/cafile
 
 [keystone_authtoken]
-service_protocol = %= glanceconfig[keystone_auth_protocol] %
-service_host = %= glanceconfig[keystone_auth_host] %
+service_protocol = %= @glanceconfig[keystone_auth_protocol] %
+service_host = %= @glanceconfig[keystone_auth_host] %
 service_port = 5000
-auth_host = %= glanceconfig[keystone_auth_host] %
-auth_port = %= glanceconfig[keystone_auth_port] %
-auth_protocol = %= glanceconfig[keystone_auth_protocol] %
-admin_token = %= glanceconfig[keystone_admin_token] %
-auth_uri = %= glanceconfig[auth_uri] %
+auth_host = %= @glanceconfig[keystone_auth_host] %
+auth_port = %= @glanceconfig[keystone_auth_port] %
+auth_protocol = %= @glanceconfig[keystone_auth_protocol] %
+admin_token = %= @glanceconfig[keystone_admin_token] %
+auth_uri = %= @glanceconfig[auth_uri] %
 
 [paste_deploy]
 # Name of the paste configuration file that defines the available pipelines
@@ -88,4 +88,4 @@
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
 # See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-connection = mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
+connection = mysql://%= @glanceconfig[db_user] %:%= 
@glanceconfig[db_pass] %@%= @glanceconfig[db_host] %/%= 
@glanceconfig[db_name] %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c12148e3d7a4152afe58a3e32922c9405a54516
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] graphite: hotname is a fact, qualify - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: graphite: hotname is a fact, qualify
..


graphite: hotname is a fact, qualify

bug: T97251
Change-Id: I892aea3ed63ec6eb41058dcd4b9d25ab09e84ef8
---
M modules/graphite/templates/initscripts/frontend-relay.upstart.erb
M modules/graphite/templates/initscripts/local-relay.upstart.erb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb 
b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
index fde487e..48a6a32 100644
--- a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
@@ -12,4 +12,4 @@
 
 # it is possible there's another carbon-c-relay running on the same host, so
 # change the hostname
-exec /usr/bin/carbon-c-relay -H %= #{hostname}_frontend -% -p 2003 -f 
/etc/carbon/frontend-relay.conf
+exec /usr/bin/carbon-c-relay -H %= #{@hostname}_frontend -% -p 2003 -f 
/etc/carbon/frontend-relay.conf
diff --git a/modules/graphite/templates/initscripts/local-relay.upstart.erb 
b/modules/graphite/templates/initscripts/local-relay.upstart.erb
index 3ca5694..3575bb9 100644
--- a/modules/graphite/templates/initscripts/local-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/local-relay.upstart.erb
@@ -12,4 +12,4 @@
 
 # it is possible there's another carbon-c-relay running on the same host, so
 # change the hostname
-exec /usr/bin/carbon-c-relay -H %= #{hostname}_local -% -p 1903 -f 
/etc/carbon/local-relay.conf
+exec /usr/bin/carbon-c-relay -H %= #{@hostname}_local -% -p 1903 -f 
/etc/carbon/local-relay.conf

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I892aea3ed63ec6eb41058dcd4b9d25ab09e84ef8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Add extra namespace aliases for Italian Wikipedia - change (operations/mediawiki-config)

[Odder (Code Review)]

Odder has uploaded a new change for review.

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

Change subject: Add extra namespace aliases for Italian Wikipedia
..

Add extra namespace aliases for Italian Wikipedia

This patch adds four extra namespace aliases for
the Italian Wikipedia, as requested by the project's
community:

  * one for NS_CATEGORY;
  * one for NS_TEMPLATE;
  * one for NS_PROJECT_TALK;
  * one for project-specific namespace 103
(Discussioni_progetto).

See Phabricator task for URL with on-wiki consensus.

Bug: T101274
Change-Id: I914f02692d31d2f85f4312de7342ab41a126f3b4
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 54d7c7e..71b477a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3062,6 +3062,10 @@
),
'+itwiki' = array(
'WP' = NS_PROJECT, // 15116
+   'CAT' = NS_CATEGORY, // T101274
+   'DP' = 103, // T101274
+   'DW' = NS_PROJECT_TALK, // T101274
+   'T' = NS_TEMPLATE, // T101274
),
'+itwikibooks' = array(
'Portale' = 100,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I914f02692d31d2f85f4312de7342ab41a126f3b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder twkozlow...@gmail.com

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

[MediaWiki-commits] [Gerrit] demo: Add 'layout' variable to the consoles - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: demo: Add 'layout' variable to the consoles
..

demo: Add 'layout' variable to the consoles

I needed a way to exercise ActionFieldLayout.

Change-Id: I991f6f78fae936fe277b685ee0b2c0e29effdc1f
---
M demos/demo.js
M demos/pages/widgets.js
2 files changed, 11 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/37/215737/1

diff --git a/demos/demo.js b/demos/demo.js
index e910472..9e67c99 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -394,12 +394,12 @@
 /**
  * Build a console for interacting with an element.
  *
- * @param {OO.ui.Element} item
- * @param {string} key Variable name for item
- * @param {string} [item.label=]
+ * @param {OO.ui.Layout} item
+ * @param {string} layout Variable name for layout
+ * @param {string} widget Variable name for layout's field widget
  * @return {jQuery} Console interface element
  */
-OO.ui.Demo.prototype.buildConsole = function ( item, key ) {
+OO.ui.Demo.prototype.buildConsole = function ( item, layout, widget ) {
var $toggle, $log, $label, $input, $submit, $console, $form,
console = window.console;
 
@@ -410,8 +410,8 @@
str = 'return ' + str;
}
try {
-   func = new Function( key, 'item', str );
-   ret = { value: func( item, item ) };
+   func = new Function( layout, widget, 'item', str );
+   ret = { value: func( item, item.fieldWidget, 
item.fieldWidget ) };
} catch ( error ) {
ret = {
value: undefined,
@@ -471,8 +471,9 @@
if ( $input.is( ':visible' ) ) {
$input[ 0 ].focus();
if ( console  console.log ) {
-   window[ key ] = item;
-   console.log( '[demo]', 'Global ' + key 
+ ' has been set' );
+   window[ layout ] = item;
+   window[ widget ] = item.fieldWidget;
+   console.log( '[demo]', 'Globals ' + 
layout + ', ' + widget + ' have been set' );
console.log( '[demo]', item );
}
}
@@ -486,7 +487,7 @@
 
$input = $( 'input' )
.addClass( 'oo-ui-demo-console-input' )
-   .prop( 'placeholder', '... (predefined: ' + key + ')' );
+   .prop( 'placeholder', '... (predefined: ' + layout + ', ' + 
widget + ')' );
 
$submit = $( 'div' )
.addClass( 'oo-ui-demo-console-submit' )
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index a272dd0..9f18652 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1429,7 +1429,7 @@
$.each( fieldsets, function ( i, fieldsetLayout ) {
$.each( fieldsetLayout.getItems(), function ( j, fieldLayout ) {
fieldLayout.$element.append(
-   demo.buildConsole( fieldLayout.fieldWidget, 
'widget' )
+   demo.buildConsole( fieldLayout, 'layout', 
'widget' )
);
} );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I991f6f78fae936fe277b685ee0b2c0e29effdc1f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] Add PHP version of ActionFieldLayout - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Add PHP version of ActionFieldLayout
..

Add PHP version of ActionFieldLayout

Change-Id: Ifd3f41d266e462275a6146f0bf486b7bfe3b82de
---
M demos/widgets.php
A php/layouts/ActionFieldLayout.php
M php/layouts/FieldLayout.php
3 files changed, 119 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/39/215739/1

diff --git a/demos/widgets.php b/demos/widgets.php
index 2b7d141..bfc421c 100644
--- a/demos/widgets.php
+++ b/demos/widgets.php
@@ -765,6 +765,68 @@
in, 
duo ex inimicus perpetua complectitur, mel periculis similique at.\xE2\x80\x8E,
'align' = 'top'
)
+   ),
+   new OOUI\ActionFieldLayout(
+   new 
OOUI\TextInputWidget(),
+   new OOUI\ButtonWidget( 
array(
+   'label' = 
'Button'
+   ) ),
+   array(
+   'label' = 
'ActionFieldLayout aligned left',
+   'align' = 
'left'
+   )
+   ),
+   new OOUI\ActionFieldLayout(
+   new 
OOUI\TextInputWidget(),
+   new OOUI\ButtonWidget( 
array(
+   'label' = 
'Button'
+   ) ),
+   array(
+   'label' = 
'ActionFieldLayout aligned inline',
+   'align' = 
'inline'
+   )
+   ),
+   new OOUI\ActionFieldLayout(
+   new 
OOUI\TextInputWidget(),
+   new OOUI\ButtonWidget( 
array(
+   'label' = 
'Button'
+   ) ),
+   array(
+   'label' = 
'ActionFieldLayout aligned right',
+   'align' = 
'right'
+   )
+   ),
+   new OOUI\ActionFieldLayout(
+   new 
OOUI\TextInputWidget(),
+   new OOUI\ButtonWidget( 
array(
+   'label' = 
'Button'
+   ) ),
+   array(
+   'label' = 
'ActionFieldLayout aligned top',
+   'align' = 'top'
+   )
+   ),
+   new OOUI\ActionFieldLayout(
+   new 
OOUI\TextInputWidget(),
+   new OOUI\ButtonWidget( 
array(
+   'label' = 
'Button'
+   ) ),
+   array(
+   'label' = 
'ActionFieldLayout aligned top with help',
+   'help' = 'I am 
an additional, helpful information. Lorem ipsum dolor sit amet, cibo pri ' .
+   in, 
duo ex inimicus perpetua complectitur, mel periculis similique at.\xE2\x80\x8E,
+

[MediaWiki-commits] [Gerrit] ActionFieldLayout: Dead code removal and cleanup - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: ActionFieldLayout: Dead code removal and cleanup
..

ActionFieldLayout: Dead code removal and cleanup

* Remove documentation comments duplicated from FieldLayout.
* Remove properties duplicated from FieldLayout.
* Split off 'Initialization' section from 'Properties'.
* Add .oo-ui-actionFieldLayout class to this.$element, not this.$field.
* Remove styles for .oo-ui-actionFieldLayout-field which never existed.

Change-Id: I2bc2efa9272cb389d92cf3691057e4c2e3e089c8
---
M demos/pages/widgets.js
M src/layouts/ActionFieldLayout.js
M src/styles/layouts/ActionFieldLayout.less
3 files changed, 14 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/38/215738/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 9f18652..2030dbe 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1308,7 +1308,7 @@
}
),
new OO.ui.ActionFieldLayout(
-   new OO.ui.TextInputWidget( {} ),
+   new OO.ui.TextInputWidget(),
new OO.ui.ButtonWidget( {
label: 'Button'
} ),
@@ -1318,7 +1318,7 @@
}
),
new OO.ui.ActionFieldLayout(
-   new OO.ui.TextInputWidget( {} ),
+   new OO.ui.TextInputWidget(),
new OO.ui.ButtonWidget( {
label: 'Button'
} ),
@@ -1328,7 +1328,7 @@
}
),
new OO.ui.ActionFieldLayout(
-   new OO.ui.TextInputWidget( {} ),
+   new OO.ui.TextInputWidget(),
new OO.ui.ButtonWidget( {
label: 'Button'
} ),
@@ -1338,7 +1338,7 @@
}
),
new OO.ui.ActionFieldLayout(
-   new OO.ui.TextInputWidget( {} ),
+   new OO.ui.TextInputWidget(),
new OO.ui.ButtonWidget( {
label: 'Button'
} ),
@@ -1348,7 +1348,7 @@
}
),
new OO.ui.ActionFieldLayout(
-   new OO.ui.TextInputWidget( {} ),
+   new OO.ui.TextInputWidget(),
new OO.ui.ButtonWidget( {
label: 'Button'
} ),
@@ -1360,7 +1360,7 @@
}
),
new OO.ui.ActionFieldLayout(
-   new OO.ui.TextInputWidget( {} ),
+   new OO.ui.TextInputWidget(),
new OO.ui.ButtonWidget( {
label: 'Button'
} ),
diff --git a/src/layouts/ActionFieldLayout.js b/src/layouts/ActionFieldLayout.js
index 59640ed..91eb912 100644
--- a/src/layouts/ActionFieldLayout.js
+++ b/src/layouts/ActionFieldLayout.js
@@ -43,10 +43,6 @@
  * @constructor
  * @param {OO.ui.Widget} fieldWidget Field widget
  * @param {OO.ui.ButtonWidget} buttonWidget Button widget
- * @param {Object} [config] Configuration options
- * @cfg {string} [align='left'] Alignment of the label: 'left', 'right', 'top' 
or 'inline'
- * @cfg {string} [help] Help text. When help text is specified, a help icon 
will appear in the
- *  upper-right corner of the rendered field.
  */
 OO.ui.ActionFieldLayout = function OoUiActionFieldLayout( fieldWidget, 
buttonWidget, config ) {
// Allow passing positional parameters inside the config object
@@ -56,23 +52,24 @@
buttonWidget = config.buttonWidget;
}
 
-   // Configuration initialization
-   config = $.extend( { align: 'left' }, config );
-
// Parent constructor
OO.ui.ActionFieldLayout.super.call( this, fieldWidget, config );
 
// 

[MediaWiki-commits] [Gerrit] sslcert: remove ::certificate's $content parameter - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sslcert: remove ::certificate's $content parameter
..


sslcert: remove ::certificate's $content parameter

We weren't using $content anywhere, so remove for now. Also cleanup some
leftover TODOs about $private and provide a more elaborate rationale
about the future use of content-only private keys.

Change-Id: I0b689d79e9d7ae7890a7fe0b01b788b59711f25e
---
M manifests/certs.pp
M modules/sslcert/manifests/certificate.pp
2 files changed, 15 insertions(+), 29 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/manifests/certs.pp b/manifests/certs.pp
index a7ec956..af09b3a 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -12,7 +12,6 @@
 
 if ( $privatekey == true ) {
 Sslcert::Certificate[$name] {
-# private = file(puppet:///private/ssl/${name}.key), # cf this 
commit in certificate.pp
 private = puppet:///private/ssl/${name}.key,
 }
 }
diff --git a/modules/sslcert/manifests/certificate.pp 
b/modules/sslcert/manifests/certificate.pp
index 779e2ef..23ed889 100644
--- a/modules/sslcert/manifests/certificate.pp
+++ b/modules/sslcert/manifests/certificate.pp
@@ -23,13 +23,8 @@
 #   If true, create also a chained version of the certificate, by calling into
 #   sslcert::chainedcert. The default is true.
 #
-# [*content*]
-#   If defined, will be used as the content of the X.509 certificate file.
-#   Undefined by default. Mutually exclusive with 'source'.
-#
 # [*source*]
 #   Path to file containing the X.509 certificate file. Undefined by default.
-#   Mutually exclusive with 'content'.
 #
 # [*private*]
 #   The content of the private key to the certificate. Undefined by default.
@@ -43,41 +38,33 @@
 #
 
 define sslcert::certificate(
+  $source,
   $ensure=present,
   $group='ssl-cert',
   $chain=true,
-  $source=undef,
-  $content=undef,
   $private=undef,
 ) {
 require sslcert
 
-if $source == undef and $content == undef  {
-fail('you must provide either source or content')
-}
-
-if $source != undef and $content != undef  {
-fail('source and content are mutually exclusive')
-}
-
 file { /etc/ssl/localcerts/${title}.crt:
-ensure  = $ensure,
-owner   = 'root',
-group   = 'root',
-mode= '0444',
-source  = $source,
-content = $content,
+ensure = $ensure,
+owner  = 'root',
+group  = 'root',
+mode   = '0444',
+source = $source,
 }
 
 if $private {
-# only support content; serving sensitive material over the puppet
-# fileserver isn't a very good security practice
+# Ideally, we'd pass content, not source, and use the file()
+# function, as well as a deny all fileserver rule to not allow anyone
+# to reach key material out of their scope via the fileserver. However,
+# file() is not very sane before Puppet 3.7.0, requiring the full
+# absolute path to files. We should revisit once we get to 3.7+.
 file { /etc/ssl/private/${name}.key:
-ensure  = $ensure,
-owner   = 'root',
-group   = $group,
-mode= '0440',
-# content = $private, # content variant is broken, fixing the 
easy way for now...
+ensure = $ensure,
+owner  = 'root',
+group  = $group,
+mode   = '0440',
 source = $private,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b689d79e9d7ae7890a7fe0b01b788b59711f25e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] rra_sizes: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: rra_sizes: qualify var
..

rra_sizes: qualify var

bug: T97251
Change-Id: Ifda7ab0332ce947ed2719977be688e3f539ed97c
---
M templates/ganglia/gmetad.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/templates/ganglia/gmetad.conf.erb 
b/templates/ganglia/gmetad.conf.erb
index 94b3c8e..9bfafa1 100644
--- a/templates/ganglia/gmetad.conf.erb
+++ b/templates/ganglia/gmetad.conf.erb
@@ -56,7 +56,7 @@
 
 # Custom RRA sizes, see 
http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=119
 % if has_variable?(rra_sizes) then %
-RRAs %= rra_sizes %
+RRAs %= @rra_sizes %
 % end %
 
 #

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda7ab0332ce947ed2719977be688e3f539ed97c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] admin: add aklapper to bastion-only group - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: admin: add aklapper to bastion-only group
..


admin: add aklapper to bastion-only group

He needs this in addition to the phab-admin group to be able
to jump via bast1001 to iridium.

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

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 151d91b..072f157 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -71,7 +71,7 @@
   bmansurov, west1, jhernandez, smalyshev, ananthrk, tbayer, 
zfilipin,
   joal, thcipriani, daisy, ashwinpp, mvolz, jhobs, tomasz, 
lpintscher,
   pcoombe, mholloway-shell, madhuvishy, niedzielski, 
neilpquinn-wmf,
-  gpaumier, moushira]
+  gpaumier, moushira, aklapper]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8031d4d781496f2cc51fa1b5cdcdf5f56f7817b9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] toollabs: Source hosts file as template, not file - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: toollabs: Source hosts file as template, not file
..

toollabs: Source hosts file as template, not file

Change-Id: I5e07e1691125f5b31f12072da13411e258c2fc31
---
M modules/toollabs/manifests/init.pp
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6cbf9ad..3f26bc3 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -193,10 +193,10 @@
 
 # puppetized until we can setup proper DNS for .labsdb entries
 file { '/etc/hosts':
-source = 'puppet:///modules/toollabs/hosts',
-owner  = 'root',
-group  = 'root',
-mode   = '0644'
+content = template('toollabs/hosts.erb'),
+owner   = 'root',
+group   = 'root',
+mode= '0644'
 }
 
 # Silence e-mails sent when regular users try to sudo (T95882)

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

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

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

[MediaWiki-commits] [Gerrit] ganglia: qualify var - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: ganglia: qualify var
..


ganglia: qualify var

bug: T97251
Change-Id: I74a8d3a6ce9918ce47325bd3517cfcd8346ea7a1
---
M templates/ganglia/gmetad.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/ganglia/gmetad.conf.erb 
b/templates/ganglia/gmetad.conf.erb
index 4709b67..94b3c8e 100644
--- a/templates/ganglia/gmetad.conf.erb
+++ b/templates/ganglia/gmetad.conf.erb
@@ -1,4 +1,4 @@
-# Ganglia Meta Daemon for %= gridname %
+# Ganglia Meta Daemon for %= @gridname %
 #
 # This file is managed by Puppet!
 #
@@ -76,7 +76,7 @@
 # gridname MyGrid
 
 % if has_variable?(gridname) then %
-gridname %= gridname %
+gridname %= @gridname %
 % end %
 
 #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74a8d3a6ce9918ce47325bd3517cfcd8346ea7a1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] jobqueue: Record stats on how long it takes before a job is run - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: jobqueue: Record stats on how long it takes before a job is run
..

jobqueue: Record stats on how long it takes before a job is run

Bug: T101054
Change-Id: I5dc13d79a5ec2e8cb6679e3ff2535b5cb031ca30
(cherry picked from commit f138447de154a7f6a3a872e2890bde9bf213d26c)
---
M includes/jobqueue/Job.php
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobQueueRedis.php
M includes/jobqueue/JobRunner.php
4 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/215748/1

diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php
index f8de0b5..df89f2a 100644
--- a/includes/jobqueue/Job.php
+++ b/includes/jobqueue/Job.php
@@ -135,6 +135,16 @@
}
 
/**
+* @return int|null UNIX timestamp of when the job was queued, or null
+* @since 1.26
+*/
+   public function getQueuedTimestamp() {
+   return isset( $this-metadata['timestamp'] )
+   ? wfTimestampOrNull( TS_UNIX, 
$this-metadata['timestamp'] )
+   : null;
+   }
+
+   /**
 * Whether the queue should reject insertion of this job if a duplicate 
exists
 *
 * This can be used to avoid duplicated effort or combined with delayed 
jobs to
diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index 491092a..9f4e6b8 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -299,6 +299,7 @@
$job = Job::factory( $row-job_cmd, $title,
self::extractBlob( $row-job_params ), 
$row-job_id );
$job-metadata['id'] = $row-job_id;
+   $job-metadata['timestamp'] = 
$row-job_timestamp;
break; // done
} while ( true );
 
@@ -569,6 +570,7 @@
strlen( $row-job_params ) ? 
unserialize( $row-job_params ) : false
);
$job-metadata['id'] = $row-job_id;
+   $job-metadata['timestamp'] = 
$row-job_timestamp;
return $job;
}
);
diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index 7edb6ad..a6f5319 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -606,6 +606,7 @@
$title = Title::makeTitle( $item['namespace'], 
$item['title'] );
$job = Job::factory( $item['type'], $title, 
$item['params'] );
$job-metadata['uuid'] = $item['uuid'];
+   $job-metadata['timestamp'] = $item['timestamp'];
 
return $job;
} catch ( RedisException $e ) {
@@ -643,6 +644,7 @@
$title = Title::makeTitle( $fields['namespace'], 
$fields['title'] );
$job = Job::factory( $fields['type'], $title, $fields['params'] 
);
$job-metadata['uuid'] = $fields['uuid'];
+   $job-metadata['timestamp'] = $fields['timestamp'];
 
return $job;
}
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index b04ab28..498d816 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -135,6 +135,7 @@
$backoffDeltas = array(); // map of (type = seconds)
$wait = 'wait'; // block to read backoffs the first time
 
+   $stats = RequestContext::getMain()-getStats();
$jobsRun = 0;
$timeMsTotal = 0;
$flags = JobQueueGroup::USE_CACHE;
@@ -172,12 +173,17 @@
$msg = $job-toString() .  STARTING;
$this-logger-debug( $msg );
$this-debugCallback( $msg );
+   $timeToRun = false;
 
// Run the job...
$psection = $profiler-scopedProfileIn( 
__METHOD__ . '-' . $jType );
$jobStartTime = microtime( true );
try {
++$jobsRun;
+   $queuedTime = 
$job-getQueuedTimestamp();
+   if ( $queuedTime !== null ) {
+   $timeToRun = time() - 
$queuedTime;
+   }
$status = $job-run();

[MediaWiki-commits] [Gerrit] sslcert: whitespace comment cleanups - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: sslcert: whitespace  comment cleanups
..

sslcert: whitespace  comment cleanups

Change-Id: I778f330cfc7d7751015c0321aa667b295233b0ae
---
M modules/sslcert/manifests/ca.pp
M modules/sslcert/manifests/certificate.pp
M modules/sslcert/manifests/chainedcert.pp
M modules/sslcert/manifests/init.pp
4 files changed, 27 insertions(+), 24 deletions(-)


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

diff --git a/modules/sslcert/manifests/ca.pp b/modules/sslcert/manifests/ca.pp
index 438e558..540e736 100644
--- a/modules/sslcert/manifests/ca.pp
+++ b/modules/sslcert/manifests/ca.pp
@@ -23,9 +23,9 @@
 #
 # === Examples
 #
-#  sslcert::ca { 'GlobalSign_CA':
-#ensure = present,
-#source = 'puppet:///files/ssl/GlobalSign_CA.crt',
+#  sslcert::ca { 'RapidSSL_CA':
+#  ensure = present,
+#  source = 'puppet:///modules/base/ca/RapidSSL_CA.crt',
 #  }
 #
 
diff --git a/modules/sslcert/manifests/certificate.pp 
b/modules/sslcert/manifests/certificate.pp
index 23ed889..228dc6b 100644
--- a/modules/sslcert/manifests/certificate.pp
+++ b/modules/sslcert/manifests/certificate.pp
@@ -7,33 +7,31 @@
 # rather than /etc/ssl/certs, as the latter is used often as the CA path in
 # many default configurations and examples on the web.
 #
-# NOTE: while both 'source' and 'content' are provided for the certificate,
-# only the equivalent of 'content' is provided for the private key. This is
-# done purposefully, as serving sensitive key material using the puppet
-# fileserver is dangerous and should be avoided. Use puppet's file() function
-# to serve files on the puppetmaster's filesystem.
-#
 # === Parameters
+#
+# [*source*]
+#   Path to file containing the X.509 certificate file.
 #
 # [*ensure*]
 #   If 'present', the certificate will be installed; if 'absent', it will be
 #   removed. The default is 'present'.
 #
+# [*group*]
+#   The group name the resulting certificate file will be owned by. Defaults to
+#   the well-known 'ssl-cert'.
+#
 # [*chain*]
 #   If true, create also a chained version of the certificate, by calling into
 #   sslcert::chainedcert. The default is true.
 #
-# [*source*]
-#   Path to file containing the X.509 certificate file. Undefined by default.
-#
 # [*private*]
-#   The content of the private key to the certificate. Undefined by default.
+#   The content of the private key to the certificate. Optional.
 #
 # === Examples
 #
-#  sslcert::certificate { 'pinkunicorn.wikimedia.org':
-#ensure = present,
-#source = 'puppet:///files/ssl/pinkunicorn.wikimedia.org.crt',
+#  sslcert::certificate { 'www.example.org':
+#  ensure = present,
+#  source = 'puppet:///modules/mysite/www.example.org.crt',
 #  }
 #
 
diff --git a/modules/sslcert/manifests/chainedcert.pp 
b/modules/sslcert/manifests/chainedcert.pp
index e2e7a15..92c64c0 100644
--- a/modules/sslcert/manifests/chainedcert.pp
+++ b/modules/sslcert/manifests/chainedcert.pp
@@ -1,7 +1,7 @@
 # == Define: sslcert::chainedcert
 #
 # Creates a X.509 certificate chain based on an existing certificate on the
-# system. Implicitly depends on sslcert::certificate.
+# system.
 #
 # The chained certificate is written to /etc/ssl/localcerts as
 # ${title}.chained.crt. The chain is constructed automatically, up to a
@@ -10,6 +10,7 @@
 # shortest path is picked. The top-most certificate (root CA) is NOT included,
 # to minimize the size's chain for performance reasons, with no loss of
 # usability.
+
 #
 # === Parameters
 #
@@ -17,10 +18,14 @@
 #   If 'present', the certificate chain will be installed; if 'absent', it
 #   will be removed. The default is 'present'.
 #
+# [*group*]
+#   The group name the resulting certificate file will be owned by. Defaults to
+#   the well-known 'ssl-cert'.
+#
 # === Examples
 #
-#  sslcert::chainedcert { 'pinkunicorn.wikimedia.org':
-#ensure = present,
+#  sslcert::chainedcert { 'www.example.org':
+#  ensure = present,
 #  }
 #
 
@@ -37,7 +42,7 @@
 if $ensure == 'present' {
 exec { x509-bundle ${title}:
 refreshonly = true,
-command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o $chainfile,
+command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o ${chainfile},
 cwd = '/etc/ssl/localcerts',
 require = File[/etc/ssl/localcerts/${title}.crt],
 subscribe   = [
diff --git a/modules/sslcert/manifests/init.pp 
b/modules/sslcert/manifests/init.pp
index 46051f3..cc144ad 100644
--- a/modules/sslcert/manifests/init.pp
+++ b/modules/sslcert/manifests/init.pp
@@ -32,10 +32,10 @@
 
 # generic script for fetching the OCSP file for a given cert
 file { '/usr/local/sbin/update-ocsp':
-mode= '0555',
-owner   = 'root',
-group   = 

[MediaWiki-commits] [Gerrit] Stage email first, use staged for dependent values - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Stage email first, use staged for dependent values
..


Stage email first, use staged for dependent values

So as not to crash when default hasn't been set.  Also make
Astropay customer ID more unique

Bug: T101114
Change-Id: I38291aee25e2532861c83862980392051aa10715
---
M astropay_gateway/astropay.adapter.php
M gateway_common/gateway.adapter.php
M tests/Adapter/Astropay/AstropayTest.php
M worldpay_gateway/worldpay.adapter.php
4 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/astropay_gateway/astropay.adapter.php 
b/astropay_gateway/astropay.adapter.php
index aba0076..fcd46e9 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -416,7 +416,7 @@
 * the donor's email address.
 */
protected function stage_donor_id() {
-   $hashed = sha1( $this-unstaged_data['email'] );
+   $hashed = sha1( $this-getData_Staged( 'email' ) . 
$this-getData_Staged( 'order_id' ) );
$this-staged_data['donor_id'] = substr( $hashed, 0, 20 );
}
 
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index eedcc25..f809cc3 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1992,8 +1992,8 @@
// This allows transactions to each stage different data.
$this-defineStagedVars();
 
-   // Always stage email address
-   $this-staged_vars[] = 'email';
+   // Always stage email address first, to set default if missing
+   array_unshift( $this-staged_vars, 'email' );
 
foreach ( $this-staged_vars as $field ) {
$function_name = 'stage_' . $field;
diff --git a/tests/Adapter/Astropay/AstropayTest.php 
b/tests/Adapter/Astropay/AstropayTest.php
index a5dfb0c..969bc24 100644
--- a/tests/Adapter/Astropay/AstropayTest.php
+++ b/tests/Adapter/Astropay/AstropayTest.php
@@ -87,7 +87,7 @@
'x_bank' = 'TE',
'x_country' = 'BR',
'x_description' = wfMessage( 
'donate_interface-donation-description' )-inLanguage( $init['language'] 
)-text(),
-   'x_iduser' = '802004aeec17f9544784',
+   'x_iduser' = 'e08fa5e37586ae0fcef3',
'x_cpf' = '3456789',
'x_name' = 'Nome Apelido',
'x_email' = 'nob...@example.org',
@@ -95,7 +95,7 @@
// 'x_zip' = '01110-111',
// 'x_city' = 'São Paulo',
// 'x_state' = 'SP',
-   'control' = 
'22A9DE18CB924AED05C6D8194BB38F5300F9B77CB00DC5342FF754146FF13250',
+   'control' = 
'5F6DB223AFA42022BE8D955C7BAA7C63EF1D4386CABAC0CE665959AC59B9EDF6',
'type' = 'json',
);
$this-assertEquals( $expected, $actual, 'NewInvoice is not 
including the right parameters' );
diff --git a/worldpay_gateway/worldpay.adapter.php 
b/worldpay_gateway/worldpay.adapter.php
index bc34f6f..76b2ccd 100644
--- a/worldpay_gateway/worldpay.adapter.php
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -996,7 +996,7 @@
}
 
protected function stage_merchant_reference_2() {
-   $email = $this-getData_Unstaged_Escaped( 'email' );
+   $email = $this-getData_Staged( 'email' );
$alphanumeric = preg_replace('/[^0-9a-zA-Z]/', ' ', $email);
$this-staged_data['merchant_reference_2'] = $alphanumeric;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38291aee25e2532861c83862980392051aa10715
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] sslcert: whitespace comment cleanups - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sslcert: whitespace  comment cleanups
..


sslcert: whitespace  comment cleanups

Change-Id: I778f330cfc7d7751015c0321aa667b295233b0ae
---
M modules/sslcert/manifests/ca.pp
M modules/sslcert/manifests/certificate.pp
M modules/sslcert/manifests/chainedcert.pp
M modules/sslcert/manifests/init.pp
4 files changed, 27 insertions(+), 24 deletions(-)

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



diff --git a/modules/sslcert/manifests/ca.pp b/modules/sslcert/manifests/ca.pp
index 438e558..540e736 100644
--- a/modules/sslcert/manifests/ca.pp
+++ b/modules/sslcert/manifests/ca.pp
@@ -23,9 +23,9 @@
 #
 # === Examples
 #
-#  sslcert::ca { 'GlobalSign_CA':
-#ensure = present,
-#source = 'puppet:///files/ssl/GlobalSign_CA.crt',
+#  sslcert::ca { 'RapidSSL_CA':
+#  ensure = present,
+#  source = 'puppet:///modules/base/ca/RapidSSL_CA.crt',
 #  }
 #
 
diff --git a/modules/sslcert/manifests/certificate.pp 
b/modules/sslcert/manifests/certificate.pp
index 23ed889..228dc6b 100644
--- a/modules/sslcert/manifests/certificate.pp
+++ b/modules/sslcert/manifests/certificate.pp
@@ -7,33 +7,31 @@
 # rather than /etc/ssl/certs, as the latter is used often as the CA path in
 # many default configurations and examples on the web.
 #
-# NOTE: while both 'source' and 'content' are provided for the certificate,
-# only the equivalent of 'content' is provided for the private key. This is
-# done purposefully, as serving sensitive key material using the puppet
-# fileserver is dangerous and should be avoided. Use puppet's file() function
-# to serve files on the puppetmaster's filesystem.
-#
 # === Parameters
+#
+# [*source*]
+#   Path to file containing the X.509 certificate file.
 #
 # [*ensure*]
 #   If 'present', the certificate will be installed; if 'absent', it will be
 #   removed. The default is 'present'.
 #
+# [*group*]
+#   The group name the resulting certificate file will be owned by. Defaults to
+#   the well-known 'ssl-cert'.
+#
 # [*chain*]
 #   If true, create also a chained version of the certificate, by calling into
 #   sslcert::chainedcert. The default is true.
 #
-# [*source*]
-#   Path to file containing the X.509 certificate file. Undefined by default.
-#
 # [*private*]
-#   The content of the private key to the certificate. Undefined by default.
+#   The content of the private key to the certificate. Optional.
 #
 # === Examples
 #
-#  sslcert::certificate { 'pinkunicorn.wikimedia.org':
-#ensure = present,
-#source = 'puppet:///files/ssl/pinkunicorn.wikimedia.org.crt',
+#  sslcert::certificate { 'www.example.org':
+#  ensure = present,
+#  source = 'puppet:///modules/mysite/www.example.org.crt',
 #  }
 #
 
diff --git a/modules/sslcert/manifests/chainedcert.pp 
b/modules/sslcert/manifests/chainedcert.pp
index e2e7a15..92c64c0 100644
--- a/modules/sslcert/manifests/chainedcert.pp
+++ b/modules/sslcert/manifests/chainedcert.pp
@@ -1,7 +1,7 @@
 # == Define: sslcert::chainedcert
 #
 # Creates a X.509 certificate chain based on an existing certificate on the
-# system. Implicitly depends on sslcert::certificate.
+# system.
 #
 # The chained certificate is written to /etc/ssl/localcerts as
 # ${title}.chained.crt. The chain is constructed automatically, up to a
@@ -10,6 +10,7 @@
 # shortest path is picked. The top-most certificate (root CA) is NOT included,
 # to minimize the size's chain for performance reasons, with no loss of
 # usability.
+
 #
 # === Parameters
 #
@@ -17,10 +18,14 @@
 #   If 'present', the certificate chain will be installed; if 'absent', it
 #   will be removed. The default is 'present'.
 #
+# [*group*]
+#   The group name the resulting certificate file will be owned by. Defaults to
+#   the well-known 'ssl-cert'.
+#
 # === Examples
 #
-#  sslcert::chainedcert { 'pinkunicorn.wikimedia.org':
-#ensure = present,
+#  sslcert::chainedcert { 'www.example.org':
+#  ensure = present,
 #  }
 #
 
@@ -37,7 +42,7 @@
 if $ensure == 'present' {
 exec { x509-bundle ${title}:
 refreshonly = true,
-command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o $chainfile,
+command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o ${chainfile},
 cwd = '/etc/ssl/localcerts',
 require = File[/etc/ssl/localcerts/${title}.crt],
 subscribe   = [
diff --git a/modules/sslcert/manifests/init.pp 
b/modules/sslcert/manifests/init.pp
index 46051f3..cc144ad 100644
--- a/modules/sslcert/manifests/init.pp
+++ b/modules/sslcert/manifests/init.pp
@@ -32,10 +32,10 @@
 
 # generic script for fetching the OCSP file for a given cert
 file { '/usr/local/sbin/update-ocsp':
-mode= '0555',
-owner   = 'root',
-group   = 'root',
-source  = 

[MediaWiki-commits] [Gerrit] ClippableElement: Fix behavior of long clippables - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: ClippableElement: Fix behavior of long clippables
..


ClippableElement: Fix behavior of long clippables

Revert misguided bit of code from f5823566 which caused funny
behavior when the clippable was higher than the screen.

I am sincerely hoping that we will never need clipping with the top
edge of the screen (or: popups that pop up upwards), because it will
not work. (Conversely, clippables wider than the screen do not work
correctly now, but they can be clipped with either right or left
edge.)

If we ever decide we need that, then ClippableElement will need to
know to which edge the clippable is anchored to be able to
reasonably decide how to clip it.

Bug: T98506
Change-Id: I3b5925999e0ee5f46f3865abf17f184a5b7d0a55
---
M src/elements/ClippableElement.js
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  Anomie: Looks good to me, but someone else must approve
  Trevor Parscal: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/elements/ClippableElement.js b/src/elements/ClippableElement.js
index 33b0b23..8c9f2e1 100644
--- a/src/elements/ClippableElement.js
+++ b/src/elements/ClippableElement.js
@@ -167,16 +167,13 @@
ccOffset = $container.offset() || { top: 0, left: 0 },
ccHeight = $container.innerHeight() - buffer,
ccWidth = $container.innerWidth() - buffer,
-   cHeight = this.$clippable.outerHeight() + buffer,
cWidth = this.$clippable.outerWidth() + buffer,
scrollTop = this.$clippableScroller.scrollTop(),
scrollLeft = this.$clippableScroller.scrollLeft(),
desiredWidth = cOffset.left  0 ?
cWidth + cOffset.left :
( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left,
-   desiredHeight = cOffset.top  0 ?
-   cHeight + cOffset.top :
-   ( ccOffset.top + scrollTop + ccHeight ) - cOffset.top,
+   desiredHeight = ( ccOffset.top + scrollTop + ccHeight ) - 
cOffset.top,
naturalWidth = this.$clippable.prop( 'scrollWidth' ),
naturalHeight = this.$clippable.prop( 'scrollHeight' ),
clipWidth = desiredWidth  naturalWidth,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b5925999e0ee5f46f3865abf17f184a5b7d0a55
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] ClippableElement: Fix behavior of clippables in nested scrol... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: ClippableElement: Fix behavior of clippables in nested 
scrollables
..


ClippableElement: Fix behavior of clippables in nested scrollables

Apparently 'cOffset' already includes the 'scrollTop' when the
scrollable container is not the window, which is kind of reasonable in
a sick way, since it's supposed to be position relative to document,
and that position changes when the scrollable parent is scrolled.

The issue wasn't affecting VisualEditor because our nested scrollables
(dialogs) are always using fixed positioning and thus their position
doesn't change.

Bug: T98506
Change-Id: I756d1eafa8b9e0fdfa34906f76bac5998ebc6abc
---
M src/elements/ClippableElement.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Anomie: Looks good to me, but someone else must approve
  Trevor Parscal: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/elements/ClippableElement.js b/src/elements/ClippableElement.js
index 8c9f2e1..10d4191 100644
--- a/src/elements/ClippableElement.js
+++ b/src/elements/ClippableElement.js
@@ -168,7 +168,7 @@
ccHeight = $container.innerHeight() - buffer,
ccWidth = $container.innerWidth() - buffer,
cWidth = this.$clippable.outerWidth() + buffer,
-   scrollTop = this.$clippableScroller.scrollTop(),
+   scrollTop = this.$clippableScroller[0] === 
this.$clippableWindow[0] ? this.$clippableScroller.scrollTop() : 0,
scrollLeft = this.$clippableScroller.scrollLeft(),
desiredWidth = cOffset.left  0 ?
cWidth + cOffset.left :

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I756d1eafa8b9e0fdfa34906f76bac5998ebc6abc
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] glance: qualify vars - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: glance: qualify vars
..

glance: qualify vars

bug: T97251
Change-Id: I7c12148e3d7a4152afe58a3e32922c9405a54516
---
M modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
1 file changed, 9 insertions(+), 9 deletions(-)


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

diff --git 
a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
index 700f429..1f9dfb0 100644
--- a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
@@ -6,7 +6,7 @@
 debug = False
 
 # Address to bind the registry server
-bind_host = %= glanceconfig[bind_ip] %
+bind_host = %= @glanceconfig[bind_ip] %
 
 # Port the bind the registry server to
 bind_port = 9191
@@ -64,14 +64,14 @@
 #ca_file = /path/to/cafile
 
 [keystone_authtoken]
-service_protocol = %= glanceconfig[keystone_auth_protocol] %
-service_host = %= glanceconfig[keystone_auth_host] %
+service_protocol = %= @glanceconfig[keystone_auth_protocol] %
+service_host = %= @glanceconfig[keystone_auth_host] %
 service_port = 5000
-auth_host = %= glanceconfig[keystone_auth_host] %
-auth_port = %= glanceconfig[keystone_auth_port] %
-auth_protocol = %= glanceconfig[keystone_auth_protocol] %
-admin_token = %= glanceconfig[keystone_admin_token] %
-auth_uri = %= glanceconfig[auth_uri] %
+auth_host = %= @glanceconfig[keystone_auth_host] %
+auth_port = %= @glanceconfig[keystone_auth_port] %
+auth_protocol = %= @glanceconfig[keystone_auth_protocol] %
+admin_token = %= @glanceconfig[keystone_admin_token] %
+auth_uri = %= @glanceconfig[auth_uri] %
 
 [paste_deploy]
 # Name of the paste configuration file that defines the available pipelines
@@ -88,4 +88,4 @@
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
 # See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-connection = mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
+connection = mysql://%= @glanceconfig[db_user] %:%= 
@glanceconfig[db_pass] %@%= @glanceconfig[db_host] %/%= 
@glanceconfig[db_name] %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c12148e3d7a4152afe58a3e32922c9405a54516
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] toollabs: Source hosts file as template, not file - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: toollabs: Source hosts file as template, not file
..


toollabs: Source hosts file as template, not file

Change-Id: I5e07e1691125f5b31f12072da13411e258c2fc31
---
M modules/toollabs/manifests/init.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6cbf9ad..3f26bc3 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -193,10 +193,10 @@
 
 # puppetized until we can setup proper DNS for .labsdb entries
 file { '/etc/hosts':
-source = 'puppet:///modules/toollabs/hosts',
-owner  = 'root',
-group  = 'root',
-mode   = '0644'
+content = template('toollabs/hosts.erb'),
+owner   = 'root',
+group   = 'root',
+mode= '0644'
 }
 
 # Silence e-mails sent when regular users try to sudo (T95882)

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

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

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

[MediaWiki-commits] [Gerrit] glance: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: glance: qualify var
..

glance: qualify var

bug: T97251
Change-Id: Ie393723a68e078f683645e3838d4f586d75c2b09
---
M modules/openstack/templates/icehouse/keystone/keystone.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb 
b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
index f436f11..eb182a8 100644
--- a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
@@ -9,7 +9,7 @@
 # public_port = 5000
 
 # The port number which the public admin listens on
-admin_port = %= glanceconfig[keystone_auth_port] %
+admin_port = %= @glanceconfig[keystone_auth_port] %
 
 # The port number which the OpenStack Compute service listens on
 # compute_port = 8774

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie393723a68e078f683645e3838d4f586d75c2b09
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] site.pp for cp20xx - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: site.pp for cp20xx
..

site.pp for cp20xx

Bug: T101204
Change-Id: I75b4fbcb0708d39895703ed21948da52e6dd37e2
---
M manifests/site.pp
1 file changed, 25 insertions(+), 0 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index a43db1d..d529778 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -418,6 +418,31 @@
 role cache::bits
 }
 
+node /^cp20(0[147]|1[0369]|23)\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::text
+}
+
+node /^cp20(0[258]|1[147]|2[04])\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::upload
+}
+
+node /^cp20(0[39]|15|21)\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::mobile
+}
+
+node /^cp20(06|1[28]|25)\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::bits
+}
+
+node /^cp202[26]\.codfw\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::parsoid
+}
+
 node /^cp30(0[3-9]|1[0-4])\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75b4fbcb0708d39895703ed21948da52e6dd37e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] glance: qualify vars - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: glance: qualify vars
..


glance: qualify vars

bug: T97251
Change-Id: I6746a5b5615937bea9210e469e12de93f1885167
---
M modules/openstack/templates/icehouse/glance/glance-api.conf.erb
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
index ea444d5..3199376 100644
--- a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
@@ -27,7 +27,7 @@
 #image_size_cap = 1099511627776
 
 # Address to bind the API server
-bind_host = %= glanceconfig[bind_ip] %
+bind_host = %= @glanceconfig[bind_ip] %
 
 # Port the bind the API server to
 bind_port = 9292
@@ -102,7 +102,7 @@
 #  Registry Options ===
 
 # Address to find the registry server
-registry_host = %= glanceconfig[bind_ip] %
+registry_host = %= @glanceconfig[bind_ip] %
 
 # Port the registry server is listening on
 registry_port = 9191
@@ -140,8 +140,8 @@
 rabbit_host = localhost
 rabbit_port = 5672
 rabbit_use_ssl = false
-rabbit_userid = %= glanceconfig[rabbit_user] %
-rabbit_password = %= glanceconfig[rabbit_pass] %
+rabbit_userid = %= @glanceconfig[rabbit_user] %
+rabbit_password = %= @glanceconfig[rabbit_pass] %
 rabbit_virtual_host = /
 rabbit_notification_exchange = glance
 rabbit_notification_topic = glance_notifications
@@ -304,15 +304,15 @@
 image_cache_dir = /var/lib/glance/image-cache/
 
 [keystone_authtoken]
-service_protocol = %= glanceconfig[keystone_auth_protocol] %
-service_host = %= glanceconfig[keystone_auth_host] %
+service_protocol = %= @glanceconfig[keystone_auth_protocol] %
+service_host = %= @glanceconfig[keystone_auth_host] %
 service_port = 5000
-auth_host = %= glanceconfig[keystone_auth_host] %
-auth_port = %= glanceconfig[keystone_auth_port] %
-auth_protocol = %= glanceconfig[keystone_auth_protocol] %
+auth_host = %= @glanceconfig[keystone_auth_host] %
+auth_port = %= @glanceconfig[keystone_auth_port] %
+auth_protocol = %= @glanceconfig[keystone_auth_protocol] %
 admin_token = ADMIN
-admin_token = %= glanceconfig[keystone_admin_token] %
-auth_uri = %= glanceconfig[auth_uri] %
+admin_token = %= @glanceconfig[keystone_admin_token] %
+auth_uri = %= @glanceconfig[auth_uri] %
 
 [paste_deploy]
 # Name of the paste configuration file that defines the available pipelines
@@ -328,5 +328,5 @@
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
 # See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-connection =  mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
+connection =  mysql://%= @glanceconfig[db_user] %:%= 
@glanceconfig[db_pass] %@%= @glanceconfig[db_host] %/%= 
@glanceconfig[db_name] %
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6746a5b5615937bea9210e469e12de93f1885167
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Hygiene: Rename resources folders to reflect modules - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Rename resources folders to reflect modules
..

Hygiene: Rename resources folders to reflect modules

Change-Id: I298e7b1df1c60bd665db67605c71f2a0f7635bf8
---
M includes/Resources.php
R resources/mobile.microAutoSize/externals/micro.autosize.js
R resources/skins.minerva.special.watchlist.beta.styles/specialWatchlist.less
3 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index d04dd24..a177ab7 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -330,7 +330,7 @@
 
'mobile.microAutoSize' = $wgMFResourceFileModuleBoilerplate + array(
'scripts' = array(
-   
'resources/mobile.microAutosize/externals/micro.autosize.js',
+   
'resources/mobile.microAutoSize/externals/micro.autosize.js',
),
),
 
@@ -1694,7 +1694,7 @@
'skins.minerva.special.watchlist.beta.styles' = 
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' = 'top',
'styles' = array(
-   
'resources/mobile.special.watchlist.beta.styles/specialWatchlist.less',
+   
'resources/skins.minerva.special.watchlist.beta.styles/specialWatchlist.less',
),
),
 
diff --git a/resources/mobile.microAutosize/externals/micro.autosize.js 
b/resources/mobile.microAutoSize/externals/micro.autosize.js
similarity index 100%
rename from resources/mobile.microAutosize/externals/micro.autosize.js
rename to resources/mobile.microAutoSize/externals/micro.autosize.js
diff --git 
a/resources/mobile.special.watchlist.beta.styles/specialWatchlist.less 
b/resources/skins.minerva.special.watchlist.beta.styles/specialWatchlist.less
similarity index 100%
rename from resources/mobile.special.watchlist.beta.styles/specialWatchlist.less
rename to 
resources/skins.minerva.special.watchlist.beta.styles/specialWatchlist.less

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I298e7b1df1c60bd665db67605c71f2a0f7635bf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] ResourceLoader::filter: use APC when running under HHVM - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: ResourceLoader::filter: use APC when running under HHVM
..


ResourceLoader::filter: use APC when running under HHVM

On HHVM, (a) the cost of a ResourceLoader::filter cache miss is smaller, and
(b) APC is faster and more resilient than PHP's. These two things tilt the
scales in favor of using APC rather than Memcached.

Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index b4b5a2e..ccc7a17 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -195,9 +195,8 @@
if ( !$options['cache'] ) {
$result = $this-applyFilter( $filter, $data );
} else {
-   // Use CACHE_ANYTHING since filtering is very slow 
compared to DB queries
$key = wfMemcKey( 'resourceloader', 'filter', $filter, 
self::$filterCacheVersion, md5( $data ) );
-   $cache = wfGetCache( CACHE_ANYTHING );
+   $cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : 
CACHE_ANYTHING );
$cacheEntry = $cache-get( $key );
if ( is_string( $cacheEntry ) ) {
wfIncrStats( rl-$filter-cache-hits );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Avoid 'Potentially unsafe href attribute value' exceptions... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Avoid 'Potentially unsafe href attribute value' exceptions 
for more URLs
..


Avoid 'Potentially unsafe href attribute value' exceptions for more URLs

Follow-up to 9ff89da79131e17b04827aac878645fa3bbad3e2. That change
accidentally disallowed 'null' scheme, which is generated for some
relative links. This broke the PHP demo.

Change-Id: I931255032724539a624b9dbf3b7e67b972808c13
---
M php/Tag.php
M tests/phpunit/TagTest.php
2 files changed, 15 insertions(+), 4 deletions(-)

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



diff --git a/php/Tag.php b/php/Tag.php
index 4ec88cc..3d3ad6f 100644
--- a/php/Tag.php
+++ b/php/Tag.php
@@ -310,7 +310,7 @@
// @codingStandardsIgnoreStart
$scheme = @parse_url( $value, 
PHP_URL_SCHEME );
// @codingStandardsIgnoreEnd
-   if ( !$scheme  substr( $value, 0, 1 ) 
=== '/' ) {
+   if ( $scheme === null || ( !$scheme  
substr( $value, 0, 1 ) === '/' ) ) {
$scheme = '(relative)';
}
}
diff --git a/tests/phpunit/TagTest.php b/tests/phpunit/TagTest.php
index 5301cde..d4e9cbd 100644
--- a/tests/phpunit/TagTest.php
+++ b/tests/phpunit/TagTest.php
@@ -101,9 +101,8 @@
'Exception'
);
$tests[] = array(
-   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'vague' ) ),
-   '',
-   'Exception'
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'relative.html' ) ),
+   a href='relative.html'/a
);
$tests[] = array(
id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'http://example.com/' ) ),
@@ -118,6 +117,18 @@
a href='/'/a
);
$tests[] = array(
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'..' ) ),
+   a href='..'/a
+   );
+   $tests[] = array(
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'?foo=bar' ) ),
+   a href='?foo=bar'/a
+   );
+   $tests[] = array(
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'#top' ) ),
+   a href='#top'/a
+   );
+   $tests[] = array(
id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'/relative' ) ),
a href='/relative'/a
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I931255032724539a624b9dbf3b7e67b972808c13
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] sslcert: include ::chainedcert from ::certificate - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sslcert: include ::chainedcert from ::certificate
..


sslcert: include ::chainedcert from ::certificate

Since all of our current users of ::certificate/::chainedcert happen
together, avoid the extra call and call ::chainedcert from certificate
(but provide an option to disable that).

Change-Id: I8d97435aba9f6b2657d15ca6b48a39de2f5208ba
---
M manifests/certs.pp
M modules/sslcert/manifests/certificate.pp
M modules/sslcert/manifests/chainedcert.pp
3 files changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/manifests/certs.pp b/manifests/certs.pp
index 73cd4fa..a7ec956 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -16,8 +16,4 @@
 private = puppet:///private/ssl/${name}.key,
 }
 }
-
-sslcert::chainedcert { $name:
-group = $group,
-}
 }
diff --git a/modules/sslcert/manifests/certificate.pp 
b/modules/sslcert/manifests/certificate.pp
index ab48270..779e2ef 100644
--- a/modules/sslcert/manifests/certificate.pp
+++ b/modules/sslcert/manifests/certificate.pp
@@ -19,6 +19,10 @@
 #   If 'present', the certificate will be installed; if 'absent', it will be
 #   removed. The default is 'present'.
 #
+# [*chain*]
+#   If true, create also a chained version of the certificate, by calling into
+#   sslcert::chainedcert. The default is true.
+#
 # [*content*]
 #   If defined, will be used as the content of the X.509 certificate file.
 #   Undefined by default. Mutually exclusive with 'source'.
@@ -41,6 +45,7 @@
 define sslcert::certificate(
   $ensure=present,
   $group='ssl-cert',
+  $chain=true,
   $source=undef,
   $content=undef,
   $private=undef,
@@ -76,4 +81,11 @@
 source = $private,
 }
 }
+
+if $chain {
+sslcert::chainedcert { $name:
+ensure = $ensure,
+group  = $group,
+}
+}
 }
diff --git a/modules/sslcert/manifests/chainedcert.pp 
b/modules/sslcert/manifests/chainedcert.pp
index cc75b26..2f0e3b3 100644
--- a/modules/sslcert/manifests/chainedcert.pp
+++ b/modules/sslcert/manifests/chainedcert.pp
@@ -39,7 +39,7 @@
 creates = $chainfile,
 command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o $chainfile,
 cwd = '/etc/ssl/localcerts',
-require = Sslcert::Certificate[$title],
+require = File[/etc/ssl/localcerts/${title}.crt]
 }
 
 # set owner/group/permissions on the chained file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d97435aba9f6b2657d15ca6b48a39de2f5208ba
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix i18n setting - change (mediawiki...ConfirmAccount)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Fix i18n setting
..

Fix i18n setting

Bug: T73300
Change-Id: Ifcc692e14e76ba3c551b3c32cd040213f253db3f
---
M ConfirmAccount.php
M ConfirmAccount.setup.php
M backend/schema/ConfirmAccountUpdater.hooks.php
M backend/schema/mysql/ConfirmAccount.sql
A backend/schema/mysql/patch-alter-acr_email-index.sql
M backend/schema/mysql/patch-email-index.sql
6 files changed, 14 insertions(+), 10 deletions(-)


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

diff --git a/ConfirmAccount.php b/ConfirmAccount.php
index 608ef35..476e9bc 100644
--- a/ConfirmAccount.php
+++ b/ConfirmAccount.php
@@ -36,7 +36,7 @@
 
 # Define were PHP files and i18n files are located
 require( dirname( __FILE__ ) . '/ConfirmAccount.setup.php' );
-ConfirmAccountSetup::defineSourcePaths( $wgAutoloadClasses, 
$wgExtensionMessagesFiles );
+ConfirmAccountSetup::defineSourcePaths( $wgAutoloadClasses, $wgMessagesDirs, 
$wgExtensionMessagesFiles );
 
 # Define JS/CSS modules and file locations
 ConfirmAccountUISetup::defineResourceModules( $wgResourceModules );
diff --git a/ConfirmAccount.setup.php b/ConfirmAccount.setup.php
index c4f0af5..946dc24 100644
--- a/ConfirmAccount.setup.php
+++ b/ConfirmAccount.setup.php
@@ -8,10 +8,11 @@
 * This function must NOT depend on any config vars.
 *
 * @param $classes Array $classes
+* @param $messagesDirs Array $messagesDirs
 * @param $messagesFiles Array $messagesFiles
 * @return void
 */
-   public static function defineSourcePaths( array $classes, array 
$messagesFiles ) {
+   public static function defineSourcePaths( array $classes, array 
$messagesDirs, array $messagesFiles ) {
$dir = dirname( __FILE__ );
 
# Basic directory layout
@@ -23,7 +24,7 @@
$spActionDir  = $dir/frontend/specialpages/actions;
 
# Main i18n file and special page alias file
-   $wgMessagesDirs['ConfirmAccount'] = __DIR__ . '/i18n/core';
+   $messagesDirs['ConfirmAccount'] = __DIR__ . '/i18n/core';
$messagesFiles['ConfirmAccount'] = 
$langDir/ConfirmAccount.i18n.php;
$messagesFiles['ConfirmAccountAliases'] = 
$langDir/ConfirmAccount.alias.php;
 
@@ -34,15 +35,15 @@
 
# UI to request an account
$classes['RequestAccountPage'] = 
$spActionDir/RequestAccount_body.php;
-   $wgMessagesDirs['RequestAccountPage'] = __DIR__ . 
'/i18n/requestaccount';
+   $messagesDirs['RequestAccountPage'] = __DIR__ . 
'/i18n/requestaccount';
$messagesFiles['RequestAccountPage'] = 
$langDir/RequestAccountPage.i18n.php;
# UI to confirm accounts
$classes['ConfirmAccountsPage'] = 
$spActionDir/ConfirmAccount_body.php;
-   $wgMessagesDirs['ConfirmAccountPage'] = __DIR__ . 
'/i18n/confirmaccount';
+   $messagesDirs['ConfirmAccountPage'] = __DIR__ . 
'/i18n/confirmaccount';
$messagesFiles['ConfirmAccountPage'] = 
$langDir/ConfirmAccountPage.i18n.php;
# UI to see account credentials
$classes['UserCredentialsPage'] = 
$spActionDir/UserCredentials_body.php;
-   $wgMessagesDirs['UserCredentialsPage'] = __DIR__ . 
'/i18n/usercredentials';
+   $messagesDirs['UserCredentialsPage'] = __DIR__ . 
'/i18n/usercredentials';
$messagesFiles['UserCredentialsPage'] = 
$langDir/UserCredentialsPage.i18n.php;
 
# Utility functions
diff --git a/backend/schema/ConfirmAccountUpdater.hooks.php 
b/backend/schema/ConfirmAccountUpdater.hooks.php
index f747029..8bfbbb5 100644
--- a/backend/schema/ConfirmAccountUpdater.hooks.php
+++ b/backend/schema/ConfirmAccountUpdater.hooks.php
@@ -17,6 +17,7 @@
$updater-addExtensionField( 'account_requests', 
'acr_filename', $base/patch-acr_filename.sql );
$updater-addExtensionTable( 'account_credentials', 
$base/patch-account_credentials.sql );
$updater-addExtensionField( 'account_requests', 
'acr_areas', $base/patch-acr_areas.sql );
+   $updater-modifyExtensionField( 'account_requests', 
'acr_email', $base/patch-alter-acr_email-index.sql );
$updater-addExtensionIndex( 'account_requests', 
'acr_email', $base/patch-email-index.sql );
$updater-addExtensionField( 'account_requests', 
'acr_agent', $base/patch-acr_agent.sql );
$updater-dropExtensionIndex( 'account_requests', 
'acr_deleted_reg', $base/patch-drop-acr_deleted_reg-index.sql );
diff --git a/backend/schema/mysql/ConfirmAccount.sql 
b/backend/schema/mysql/ConfirmAccount.sql
index f393339..fec81fd 100644

[MediaWiki-commits] [Gerrit] sslcert: automatically regenerate chained cert on changes - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sslcert: automatically regenerate chained cert on changes
..


sslcert: automatically regenerate chained cert on changes

This doesn't handle CA changes yet (sslcert::ca or otherwise) but it
should be more than enough for now.

Change-Id: Iafcce2ad465fad953acaff1b36fa993117e12d04
---
M modules/sslcert/manifests/chainedcert.pp
1 file changed, 8 insertions(+), 4 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/sslcert/manifests/chainedcert.pp 
b/modules/sslcert/manifests/chainedcert.pp
index 2f0e3b3..e2e7a15 100644
--- a/modules/sslcert/manifests/chainedcert.pp
+++ b/modules/sslcert/manifests/chainedcert.pp
@@ -36,10 +36,14 @@
 
 if $ensure == 'present' {
 exec { x509-bundle ${title}:
-creates = $chainfile,
-command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o $chainfile,
-cwd = '/etc/ssl/localcerts',
-require = File[/etc/ssl/localcerts/${title}.crt]
+refreshonly = true,
+command = /usr/local/sbin/x509-bundle --skip-root -c 
${title}.crt -o $chainfile,
+cwd = '/etc/ssl/localcerts',
+require = File[/etc/ssl/localcerts/${title}.crt],
+subscribe   = [
+File[/etc/ssl/localcerts/${title}.crt],
+File['/usr/local/sbin/x509-bundle'],
+],
 }
 
 # set owner/group/permissions on the chained file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafcce2ad465fad953acaff1b36fa993117e12d04
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] base::certs: rename CA filenames to their CNs - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: base::certs: rename CA filenames to their CNs
..


base::certs: rename CA filenames to their CNs

A few of our CAs were not named with their CN, creating confusion in the
process (e.g. GlobalSign_CA was not actually the GlobalSign root CA but
the OV intermediate CA).

Rename them to be consistent and clear.

Change-Id: Ia4c41213166d8a227e9cae08a011f9d63338c22f
---
R modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
R modules/base/files/ca/GeoTrust_Global_CA.crt
R modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
M modules/base/manifests/certificates.pp
4 files changed, 25 insertions(+), 7 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/base/files/ca/DigiCertHighAssuranceCA-3.crt 
b/modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
similarity index 100%
rename from modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
rename to modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
diff --git a/modules/base/files/ca/RapidSSL_CA_2.crt 
b/modules/base/files/ca/GeoTrust_Global_CA.crt
similarity index 100%
rename from modules/base/files/ca/RapidSSL_CA_2.crt
rename to modules/base/files/ca/GeoTrust_Global_CA.crt
diff --git a/modules/base/files/ca/GlobalSign_CA.crt 
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
similarity index 100%
rename from modules/base/files/ca/GlobalSign_CA.crt
rename to 
modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 879880d..84ee219 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -10,19 +10,37 @@
 sslcert::ca { 'RapidSSL_CA':
 source  = 'puppet:///modules/base/ca/RapidSSL_CA.crt',
 }
-sslcert::ca { 'RapidSSL_CA_2':
-source  = 'puppet:///modules/base/ca/RapidSSL_CA_2.crt',
-}
 sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
 source  = 'puppet:///modules/base/ca/RapidSSL_SHA256_CA_-_G3.crt',
 }
+sslcert::ca { 'GeoTrust_Global_CA':
+source  = 'puppet:///modules/base/ca/GeoTrust_Global_CA.crt',
+}
+sslcert::ca { 'DigiCert_High_Assurance_CA-3':
+source  = 
'puppet:///modules/base/ca/DigiCert_High_Assurance_CA-3.crt',
+}
+sslcert::ca { 'DigiCert_SHA2_High_Assurance_Server_CA':
+source = 
'puppet:///modules/base/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt',
+}
+sslcert::ca { 'GlobalSign_Organization_Validation_CA_-_SHA256_-_G2':
+source  = 
'puppet:///modules/base/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt',
+}
+
+# FIXME: remove after a while
+sslcert::ca { 'GlobalSign_CA':
+ensure  = absent,
+require = 
Sslcert::Ca['GlobalSign_Organization_Validation_CA_-_SHA256_-_G2'],
+}
 sslcert::ca { 'DigiCertHighAssuranceCA-3':
-source  = 'puppet:///modules/base/ca/DigiCertHighAssuranceCA-3.crt',
+ensure  = absent,
+require = Sslcert::Ca['DigiCert_High_Assurance_CA-3'],
 }
 sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
-source = 
'puppet:///modules/base/ca/DigiCertSHA2HighAssuranceServerCA.crt',
+ensure  = absent,
+require = Sslcert::Ca['DigiCert_SHA2_High_Assurance_Server_CA'],
 }
-sslcert::ca { 'GlobalSign_CA':
-source  = 'puppet:///modules/base/ca/GlobalSign_CA.crt',
+sslcert::ca { 'RapidSSL_CA_2':
+ensure  = absent,
+require = Sslcert::Ca['GeoTrust_Global_CA'],
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4c41213166d8a227e9cae08a011f9d63338c22f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] remote_cert_cleaner: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: remote_cert_cleaner: qualify var
..

remote_cert_cleaner: qualify var

bug: T97251
Change-Id: I7f6b90df0c7b853cfe6af68c3aaab9c95001ea10
---
M modules/puppetmaster/templates/puppet_cert_manager.pub.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/puppetmaster/templates/puppet_cert_manager.pub.erb 
b/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
index fcab503..bfead7f 100644
--- a/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
+++ b/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
@@ -1 +1 @@
-from=%= scope.function_ipresolve([remote_cert_cleaner, 4]) % ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC58c3tShWchHSCEGp4LeJ3hcKhfgNMSF3FFmblVbp5ZUQ7EyL23q2hBr6Wdo2WoWAiiZN7BvQRjoykMvCEJoUVr2Kot8T84pyzR+U1l7ASuuGMQF5z4ftyWT34icEzbTCPdsPx+yPOHfPn9N5i7B55+5D2/R2xgeZ6J0/ab+ZS6vZ+oNnMEvD29RmfwCYdOcVZH6O66Pi4e44kd78rhhLlws0G2XVRvng1Urte75KuBq57G6axFHq7oQyjOQ+yLLlYvr35nDruXZ5ggW2+i9x/6KbybSURWQpXOy8I4e0Uv7K+4fqC1XPwVGexsnmWcMeqbIPpijL+jKe8kq2Q89C9
 labs_certs
+from=%= scope.function_ipresolve([@remote_cert_cleaner, 4]) % ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC58c3tShWchHSCEGp4LeJ3hcKhfgNMSF3FFmblVbp5ZUQ7EyL23q2hBr6Wdo2WoWAiiZN7BvQRjoykMvCEJoUVr2Kot8T84pyzR+U1l7ASuuGMQF5z4ftyWT34icEzbTCPdsPx+yPOHfPn9N5i7B55+5D2/R2xgeZ6J0/ab+ZS6vZ+oNnMEvD29RmfwCYdOcVZH6O66Pi4e44kd78rhhLlws0G2XVRvng1Urte75KuBq57G6axFHq7oQyjOQ+yLLlYvr35nDruXZ5ggW2+i9x/6KbybSURWQpXOy8I4e0Uv7K+4fqC1XPwVGexsnmWcMeqbIPpijL+jKe8kq2Q89C9
 labs_certs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f6b90df0c7b853cfe6af68c3aaab9c95001ea10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Enable Wikibase usage tracking on kowiki and rowiki - change (operations/mediawiki-config)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Enable Wikibase usage tracking on kowiki and rowiki
..

Enable Wikibase usage tracking on kowiki and rowiki

Bug: T100659
Change-Id: I566e9b45cbff515090ca0283e124fbe4b706c731
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 54d7c7e..1daff4e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14925,7 +14925,9 @@
'hewiki' = false, // Bug T98237
'huwiki' = false,
'itwiki' = false, // Bug T98303
+   'kowiki' = false,
'nlwiki' = false, // Bug T96683
+   'rowiki' = false,
'testwiki' = false,
'wikidata' = false,
'wikiquote' = false, // Bug T98247

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I566e9b45cbff515090ca0283e124fbe4b706c731
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] phab public dump include story points v2 - change (phabricator/tools)

[Rush (Code Review)]

Rush has submitted this change and it was merged.

Change subject: phab public dump include story points v2
..


phab public dump include story points v2

Change-Id: I57e0d863db1a4234f5e323caf62a7c6e407f0b61
---
M public_task_dump.py
M wmfphablib/phabdb.py
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/public_task_dump.py b/public_task_dump.py
index d00bfae..d5f6dcf 100755
--- a/public_task_dump.py
+++ b/public_task_dump.py
@@ -18,6 +18,8 @@
 id = task[0]
 taskdata[id] = {}
 
+taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1]) or ''
+
 taskdata[id]['transactions'] = {}
 for t in transactions:
 taskdata[id]['transactions'][t] = 
phabdb.get_transactionbytype(task[1], t)
@@ -32,13 +34,10 @@
 and phabdb.get_projectpolicy(edge[2]) == 'public']
 taskdata[id]['edge'] = filter(bool, edge_allowed)
 
-taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1])
-
-
 data['task'] = taskdata
 data['project'] = {}
 data['project']['projects'] = phabdb.get_projectbypolicy(policy='public')
 data['project']['columns'] = phabdb.get_projectcolumns()
 
-with open('phabricator_public.dump', 'w') as f:
+with open('/srv/dumps/phabricator_public.dump', 'w') as f:
 f.write(json.dumps(data))
diff --git a/wmfphablib/phabdb.py b/wmfphablib/phabdb.py
index 8cc1d8c..999e62f 100755
--- a/wmfphablib/phabdb.py
+++ b/wmfphablib/phabdb.py
@@ -82,7 +82,8 @@
 WHERE indexKey=%s AND  objectPHID=%s,
 ('yERhvoZPNPtM', taskPHID), limit=None)
 p.close()
-return _
+if _ is not None and len(_[0])  0:
+return _[0]
 
 def get_edgebysrc(src):
 p = phdb(db='phabricator_maniphest',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57e0d863db1a4234f5e323caf62a7c6e407f0b61
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/tools
Gerrit-Branch: master
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] admin: add aklapper to bastion-only group - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: add aklapper to bastion-only group
..

admin: add aklapper to bastion-only group

He needs this in addition to the phab-admin group to be able
to jump via bast1001 to iridium.

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


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 54f646d..45573e6 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -69,7 +69,7 @@
   bmansurov, west1, jhernandez, smalyshev, ananthrk, tbayer, 
zfilipin,
   joal, thcipriani, daisy, ashwinpp, mvolz, jhobs, tomasz, 
lpintscher,
   pcoombe, mholloway-shell, madhuvishy, niedzielski, 
neilpquinn-wmf,
-  gpaumier, moushira]
+  gpaumier, moushira, aklapper]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8031d4d781496f2cc51fa1b5cdcdf5f56f7817b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] strongswan: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: strongswan: qualify var
..

strongswan: qualify var

bug: T97251
Change-Id: I98ed213674e354839c72a842a27cf8ae6e799ad7
---
M modules/strongswan/templates/ipsec.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/strongswan/templates/ipsec.conf.erb 
b/modules/strongswan/templates/ipsec.conf.erb
index d132335..0318311 100644
--- a/modules/strongswan/templates/ipsec.conf.erb
+++ b/modules/strongswan/templates/ipsec.conf.erb
@@ -46,6 +46,6 @@
auto=start
 
 # Connections
-% hosts.each do |node| -%
+% @hosts.each do |node| -%
 %= individual_node(node).join(\n) %
 % end -%

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ed213674e354839c72a842a27cf8ae6e799ad7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Alpha, Beta: Center align the contents of Special:History - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Alpha, Beta: Center align the contents of Special:History
..


Alpha, Beta: Center align the contents of Special:History

Bug: T101149
Change-Id: Ied3c75fbb0bc47cce868fe9f620ea24ff4eb826e
---
M includes/Resources.php
M includes/specials/SpecialMobileHistory.php
A resources/mobile.special.history.beta.styles/default.less
3 files changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index d04dd24..f617fd9 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1593,6 +1593,12 @@
),
),
 
+   'mobile.special.history.beta.styles' = 
$wgMFMobileSpecialPageResourceBoilerplate + array(
+   'styles' = array(
+   
'resources/mobile.special.history.beta.styles/default.less',
+   ),
+   'position' = 'top',
+   ),
// These are NOT empty see $wgResourceModuleSkinStyles.
'mobile.special.history.styles' = 
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' = 'top',
diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index e7d5f35..911c205 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -96,15 +96,25 @@
$out = $this-getOutput();
$out-setPageTitle( $this-msg( 'history' ) );
$out-addModuleStyles( 'mobile.pagelist.styles' );
+   // add beta styles
+   if ( MobileContext::singleton()-isBetaGroupMember() ) {
+   $out-addModuleStyles( 
'mobile.special.history.beta.styles' );
+   }
$this-offset = $this-getRequest()-getVal( 'offset', false );
if ( $par ) {
// enter article history view
$this-title = Title::newFromText( $par );
if ( $this-title  $this-title-exists() ) {
$this-addModules();
+   $this-getOutput()-addHtml(
+   Html::openElement( 'div', array( 
'class' = 'history' ) )
+   );
$this-renderHeaderBar( $this-title );
$res = $this-doQuery();
$this-showHistory( $res );
+   $this-getOutput()-addHtml(
+   Html::closeElement( 'div' )
+   );
return;
}
}
diff --git a/resources/mobile.special.history.beta.styles/default.less 
b/resources/mobile.special.history.beta.styles/default.less
new file mode 100644
index 000..a4f9d88
--- /dev/null
+++ b/resources/mobile.special.history.beta.styles/default.less
@@ -0,0 +1,17 @@
+@import minerva.variables;
+@import minerva.mixins;
+
+@media all and (min-width: @wgMFDeviceWidthTablet) {
+   // We need to be this specific in order to override other rules.
+   .alpha.mw-mf-special,
+   .beta.mw-mf-special {
+   #content_wrapper {
+.pre-content,
+.history {
+   max-width: @contentMaxWidthTablet;
+   margin: 0 auto;
+   padding: 0 @contentPaddingTablet;
+   }
+   }
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied3c75fbb0bc47cce868fe9f620ea24ff4eb826e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] ResourceLoader::filter: use APC when running under HHVM - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: ResourceLoader::filter: use APC when running under HHVM
..

ResourceLoader::filter: use APC when running under HHVM

On HHVM, (a) the cost of a ResourceLoader::filter cache miss is smaller, and
(b) APC is faster and more resilient than PHP's. These two things tilt the
scales in favor of using APC rather than Memcached.

Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index bebdf2d..ba13bc3 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -195,9 +195,8 @@
if ( !$options['cache'] ) {
$result = $this-applyFilter( $filter, $data );
} else {
-   // Use CACHE_ANYTHING since filtering is very slow 
compared to DB queries
$key = wfMemcKey( 'resourceloader', 'filter', $filter, 
self::$filterCacheVersion, md5( $data ) );
-   $cache = wfGetCache( CACHE_ANYTHING );
+   $cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : 
CACHE_ANYTHING );
$cacheEntry = $cache-get( $key );
if ( is_string( $cacheEntry ) ) {
wfIncrStats( rl-$filter-cache-hits );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] ldap-groups: qualify var - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: ldap-groups: qualify var
..


ldap-groups: qualify var

bug: T97251
Change-Id: I73adb814edfd74a65533d283cee4b49c5d3aecc0
---
M modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
M modules/tendril/templates/apache/tendril.wikimedia.org.erb
M templates/graphite/apache-auth-ldap.erb
M templates/kibana/apache-auth-ldap.erb
4 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb 
b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
index b9ed142..a3cf674 100644
--- a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
+++ b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
@@ -26,7 +26,7 @@
 AuthLDAPBindDN %= @ldap_binddn %
 AuthLDAPBindPassword %= @proxypass %
 AuthLDAPURL %= @ldap_authurl %
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%
 /Directory
diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb 
b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
index dd72cec..334afbc 100644
--- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
+++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
@@ -27,7 +27,7 @@
 AuthLDAPBindDN %= @ldap_binddn %
 AuthLDAPBindPassword %= @proxypass %
 AuthLDAPURL %= @ldap_authurl %
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%
 /Directory
diff --git a/templates/graphite/apache-auth-ldap.erb 
b/templates/graphite/apache-auth-ldap.erb
index ebfa2ea..bdf4caf 100644
--- a/templates/graphite/apache-auth-ldap.erb
+++ b/templates/graphite/apache-auth-ldap.erb
@@ -7,7 +7,7 @@
 AuthLDAPURL %= @ldap_authurl %
 
 LimitExcept OPTIONS
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%
 /LimitExcept
diff --git a/templates/kibana/apache-auth-ldap.erb 
b/templates/kibana/apache-auth-ldap.erb
index 758a64e..adaca27 100644
--- a/templates/kibana/apache-auth-ldap.erb
+++ b/templates/kibana/apache-auth-ldap.erb
@@ -4,6 +4,6 @@
 AuthLDAPBindDN %= @ldap_binddn %
 AuthLDAPBindPassword %= @ldap_bindpass %
 AuthLDAPURL %= @ldap_authurl %
-% ldap_groups.each do |group| -%
+% @ldap_groups.each do |group| -%
 Require ldap-group %= group %
 % end -%

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73adb814edfd74a65533d283cee4b49c5d3aecc0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] memorysize is a fact, qualify - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: memorysize is a fact, qualify
..

memorysize is a fact, qualify

bug: T97251
Change-Id: Ia6dc30b89da104f6c3212c935bb86754841554ec
---
M manifests/role/redisdb.pp
M modules/mysql_wmf/templates/prod.my.cnf.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/215763/1

diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index cd0299c..ca121dc 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -11,7 +11,7 @@
 }
 
 class role::db::redis (
-$maxmemory = inline_template(%= (Float(memorysize.split[0]) * 
0.82).round %Gb),
+$maxmemory = inline_template(%= (Float(@memorysize.split[0]) * 
0.82).round %Gb),
 $redis_replication = undef,
 $dir   = '/srv/redis'
 ) {
diff --git a/modules/mysql_wmf/templates/prod.my.cnf.erb 
b/modules/mysql_wmf/templates/prod.my.cnf.erb
index feb9b93..de2d0dc 100644
--- a/modules/mysql_wmf/templates/prod.my.cnf.erb
+++ b/modules/mysql_wmf/templates/prod.my.cnf.erb
@@ -77,7 +77,7 @@
 innodb-thread-lifo=1
 % end -%
 
-% ram = memorysize.split[0]; ram = Float(ram) * 0.75; 
+% ram = @memorysize.split[0]; ram = Float(ram) * 0.75; 
 ram = ram.round; ram = String(ram) + G; %
 
 innodb-adaptive-flushing=1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6dc30b89da104f6c3212c935bb86754841554ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Fix to makefile so it pulls same upstream css as before. - change (apps...wikipedia)

[Mhurd (Code Review)]

Mhurd has uploaded a new change for review.

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

Change subject: Fix to makefile so it pulls same upstream css as before.
..

Fix to makefile so it pulls same upstream css as before.

The mobile app extension css handling changed:
https://gerrit.wikimedia.org/r/#/c/213431

This means we needed to tweak the url the make file was using to
retrieve css so we get the same css as before.

Change-Id: I8c91b06cb15d69b8ff367ba84cc61ee55acd4e5e
---
M Makefile
M Wikipedia/assets/abusefilter.css
M Wikipedia/assets/preview.css
M Wikipedia/assets/styles.css
4 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/71/215771/1

diff --git a/Makefile b/Makefile
index 8a20fb4..2caa142 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@
 web: ##Make web assets
 web: css grunt
 
-CSS_ORIGIN = 
http://bits.wikimedia.org/en.wikipedia.org/load.php?debug=falselang=enonly=stylesskin=vectormodules=
+CSS_ORIGIN = 
http://bits.wikimedia.org/en.wikipedia.org/load.php?debug=falselang=enonly=stylesskin=vectormodules=skins.minerva.base.reset|skins.minerva.content.styles|
 WEB_ASSETS_DIR = Wikipedia/assets
 
 define get_css_module
diff --git a/Wikipedia/assets/abusefilter.css b/Wikipedia/assets/abusefilter.css
index 5044b68..4e43e3e 100644
--- a/Wikipedia/assets/abusefilter.css
+++ b/Wikipedia/assets/abusefilter.css
@@ -1,2 +1,2 @@
-html,body,div,span,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,ins,em,img,small,strike,strong,sub,sup,tt,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,input,textarea,button,select,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;background:none}table,caption,tbody,tfoot,thead,tr,th,td{font-size:100%}button{border:none;background-color:transparent}body{line-height:1;-webkit-tap-highlight-color:transparent}input{line-height:normal}ol,ul{list-style:none}table{border-collapse:collapse}html{-webkit-text-size-adjust:none;font-size:100%}body{font-family:Helvetica
 Neue,Helvetica,Nimbus Sans L,Arial,Liberation 
Sans,sans-serif;line-height:1.4;color:#252525;background:#fff}.content{line-height:1.65;margin:.8em
 16px 0;word-wrap:break-word}@media all and 
(max-width:280px){body{font-size:.8em}.content{margin:0 
12px}}.nomobile{display:none !important}.content .thumb{margin:.6em 0}.content 
.thumb .thumbinner{margin:0 auto;max-width:100% !important}.content .thumb 
.thumbinner  div{float:none !important;width:auto !important;clear:both 
!important}.content .thumb .noresize{width:100%;overflow-x:auto}.content .thumb 
.noresize img{max-width:none !important}.content .thumbcaption{margin:.5em 0 
0;font-size:.8em;line-height:1.5;padding:0 !important;color:#555;width:auto 
!important}.content .thumbborder{border:1px solid #CCC}.content 
img{vertical-align:middle}.content .floatright{clear:right;float:right;margin:0 
0 .6em .6em}.content .floatleft{clear:left;float:left;margin:0 .6em .6em 
0}.content a  img{max-width:100% !important;height:auto !important}.content 
div.magnify{display:none}ul.gallery{list-style:none;max-width:100%}ul.gallery 
.gallerybox{display:inline-block;vertical-align:top;max-width:100%}ul.gallery 
.gallerybox .thumb img{display:block}ul.gallery .gallerybox  
div{max-width:100%}ul.gallery .gallerybox  div  
.thumb{max-width:100%}ul.gallery .gallerybox 
.gallerytext{overflow:hidden;padding:2px 
4px;word-wrap:break-word;font-size:.8em}#section_0{line-height:1.3}.content 
h1,.content h2,.content h3,.content h4,.content h5,.content 
h6{line-height:1.3;font-family:Linux 
Libertine,Georgia,Times,serif;padding:.5em 0}.pre-content h1,.content 
h1{-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;font-family:Linux
 
Libertine,Georgia,Times,serif;font-size:1.7em;-ms-word-break:normal;word-break:normal;word-wrap:break-word}h2{font-size:1.5em}h3{font-size:1.2em;font-weight:bold}h4{font-weight:bold}blockquote{font-family:Linux
 Libertine,Georgia,Times,serif;font-size:1.1em;quotes:\201C 
\201D;padding:1em 25px 1em 
30px;position:relative;overflow:hidden}blockquote:before{content:open-quote;font-size:3em;position:absolute;left:0;top:0}blockquote:after{content:close-quote;font-size:3em;line-height:1;position:absolute;right:0;bottom:0}.content
 ol ol,.content ol ul,.content ul ol,.content ul ul{margin-left:1em}.content ol 
li,.content ul li{margin-bottom:10px}.content ol li:last-child,.content ul 
li:last-child{margin-bottom:inherit}.content ul{list-style:square 
inside}.content ulliul{list-style-type:disc}.content 
ulliulliul{list-style-type:circle}.content ol{list-style:decimal 
inside}dl{margin-left:1em}dl dt{font-weight:bold}.hlist  ul li,ul.hlist 

[MediaWiki-commits] [Gerrit] Add link in gitblit for phabricator - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Add link in gitblit for phabricator
..


Add link in gitblit for phabricator

Gerrit now highlights bug: when also using phabricator now.

Note: this has been tested and works for me.

Change-Id: I54124646c16f7f97621abdc6fe3347349d266ff1
---
M modules/gerrit/templates/gerrit.config.erb
M modules/gitblit/files/gitblit.properties
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index c142bdd..c01406c 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,6 +78,9 @@
 [commentlink bugzilla]
 match =  \\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b
 link = https://bugzilla.wikimedia.org/$1
+[commentlink phabricator]
+match = \\b[bB][uU][gG]\\:?\\s+#?(T\\d+)\\b
+link = https://phabricator.wikimedia.org/$1
 [commentlink codereview]
 match = \\br(\\d+)\\b
 link = https://phabricator.wikimedia.org/rSVN$1
@@ -138,6 +141,10 @@
 footer = Bug:
 match = \\#?\\d{1,6}
 system = Bugzilla
+[trackingid phabricator]
+footer = Bug:
+match = \\#?\\d{1,6}
+system = Phabricator
 [changeMerge]
 test = true
 checkFrequency = 0
diff --git a/modules/gitblit/files/gitblit.properties 
b/modules/gitblit/files/gitblit.properties
index a6e1cf9..080fc5b 100644
--- a/modules/gitblit/files/gitblit.properties
+++ b/modules/gitblit/files/gitblit.properties
@@ -1005,6 +1005,7 @@
 regex.global.changeid = \\b(I[0-9a-f]{7,40})\\b!!!a 
href=https://gerrit.wikimedia.org/r/#q,$1,n,z;$1/a
 regex.global.commit = \\b([0-9a-f]{7,40})\\b!!!a 
href=https://gerrit.wikimedia.org/r/#q,$1,n,z;$1/a
 regex.global.bugzilla = \\b([bB][uU][gG]\\:?\\s+#?(\\d+))\\b!!!a 
href=https://bugzilla.wikimedia.org/$2;$1/a
+regex.global.phabricator = \\b([bB][uU][gG]\\:?\\s+#?(T\\d+))\\b!!!a 
href=https://phabricator.wikimedia.org/$2;$1/a
 regex.global.codereview = \\br(\\d+)\\b!!!a 
href=https://www.mediawiki.org/wiki/Special:CodeReview/MediaWiki/$1;$1/a
 regex.global.rt = \\b([rR][tT]\\:?\\s+#?(\\d+))\\b!!!a 
href=https://rt.wikimedia.org/Ticket/Display.html?id=$2;$1/a
 regex.global.cve = \\b(CVE\\-\\d{4}\\-\\d+)\\b!!!a 
href=https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1;$1/a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54124646c16f7f97621abdc6fe3347349d266ff1
Gerrit-PatchSet: 21
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix to makefile so it pulls same upstream css as before. - change (apps...wikipedia)

[Bgerstle (Code Review)]

Bgerstle has submitted this change and it was merged.

Change subject: Fix to makefile so it pulls same upstream css as before.
..


Fix to makefile so it pulls same upstream css as before.

The mobile app extension css handling changed:
https://gerrit.wikimedia.org/r/#/c/213431

This means we needed to tweak the url the make file was using to
retrieve css so we get the same css as before.

Change-Id: I8c91b06cb15d69b8ff367ba84cc61ee55acd4e5e
---
M Makefile
M Wikipedia/assets/abusefilter.css
M Wikipedia/assets/preview.css
M Wikipedia/assets/styles.css
4 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/Makefile b/Makefile
index 8a20fb4..2caa142 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@
 web: ##Make web assets
 web: css grunt
 
-CSS_ORIGIN = 
http://bits.wikimedia.org/en.wikipedia.org/load.php?debug=falselang=enonly=stylesskin=vectormodules=
+CSS_ORIGIN = 
http://bits.wikimedia.org/en.wikipedia.org/load.php?debug=falselang=enonly=stylesskin=vectormodules=skins.minerva.base.reset|skins.minerva.content.styles|
 WEB_ASSETS_DIR = Wikipedia/assets
 
 define get_css_module
diff --git a/Wikipedia/assets/abusefilter.css b/Wikipedia/assets/abusefilter.css
index 5044b68..4e43e3e 100644
--- a/Wikipedia/assets/abusefilter.css
+++ b/Wikipedia/assets/abusefilter.css
@@ -1,2 +1,2 @@
-html,body,div,span,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,ins,em,img,small,strike,strong,sub,sup,tt,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,input,textarea,button,select,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;background:none}table,caption,tbody,tfoot,thead,tr,th,td{font-size:100%}button{border:none;background-color:transparent}body{line-height:1;-webkit-tap-highlight-color:transparent}input{line-height:normal}ol,ul{list-style:none}table{border-collapse:collapse}html{-webkit-text-size-adjust:none;font-size:100%}body{font-family:Helvetica
 Neue,Helvetica,Nimbus Sans L,Arial,Liberation 
Sans,sans-serif;line-height:1.4;color:#252525;background:#fff}.content{line-height:1.65;margin:.8em
 16px 0;word-wrap:break-word}@media all and 
(max-width:280px){body{font-size:.8em}.content{margin:0 
12px}}.nomobile{display:none !important}.content .thumb{margin:.6em 0}.content 
.thumb .thumbinner{margin:0 auto;max-width:100% !important}.content .thumb 
.thumbinner  div{float:none !important;width:auto !important;clear:both 
!important}.content .thumb .noresize{width:100%;overflow-x:auto}.content .thumb 
.noresize img{max-width:none !important}.content .thumbcaption{margin:.5em 0 
0;font-size:.8em;line-height:1.5;padding:0 !important;color:#555;width:auto 
!important}.content .thumbborder{border:1px solid #CCC}.content 
img{vertical-align:middle}.content .floatright{clear:right;float:right;margin:0 
0 .6em .6em}.content .floatleft{clear:left;float:left;margin:0 .6em .6em 
0}.content a  img{max-width:100% !important;height:auto !important}.content 
div.magnify{display:none}ul.gallery{list-style:none;max-width:100%}ul.gallery 
.gallerybox{display:inline-block;vertical-align:top;max-width:100%}ul.gallery 
.gallerybox .thumb img{display:block}ul.gallery .gallerybox  
div{max-width:100%}ul.gallery .gallerybox  div  
.thumb{max-width:100%}ul.gallery .gallerybox 
.gallerytext{overflow:hidden;padding:2px 
4px;word-wrap:break-word;font-size:.8em}#section_0{line-height:1.3}.content 
h1,.content h2,.content h3,.content h4,.content h5,.content 
h6{line-height:1.3;font-family:Linux 
Libertine,Georgia,Times,serif;padding:.5em 0}.pre-content h1,.content 
h1{-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;font-family:Linux
 
Libertine,Georgia,Times,serif;font-size:1.7em;-ms-word-break:normal;word-break:normal;word-wrap:break-word}h2{font-size:1.5em}h3{font-size:1.2em;font-weight:bold}h4{font-weight:bold}blockquote{font-family:Linux
 Libertine,Georgia,Times,serif;font-size:1.1em;quotes:\201C 
\201D;padding:1em 25px 1em 
30px;position:relative;overflow:hidden}blockquote:before{content:open-quote;font-size:3em;position:absolute;left:0;top:0}blockquote:after{content:close-quote;font-size:3em;line-height:1;position:absolute;right:0;bottom:0}.content
 ol ol,.content ol ul,.content ul ol,.content ul ul{margin-left:1em}.content ol 
li,.content ul li{margin-bottom:10px}.content ol li:last-child,.content ul 
li:last-child{margin-bottom:inherit}.content ul{list-style:square 
inside}.content ulliul{list-style-type:disc}.content 
ulliulliul{list-style-type:circle}.content ol{list-style:decimal 
inside}dl{margin-left:1em}dl dt{font-weight:bold}.hlist  ul li,ul.hlist 

[MediaWiki-commits] [Gerrit] phab public dump include story points v2 - change (phabricator/tools)

[Rush (Code Review)]

Rush has uploaded a new change for review.

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

Change subject: phab public dump include story points v2
..

phab public dump include story points v2

Change-Id: I57e0d863db1a4234f5e323caf62a7c6e407f0b61
---
M public_task_dump.py
M wmfphablib/phabdb.py
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/phabricator/tools 
refs/changes/88/215688/1

diff --git a/public_task_dump.py b/public_task_dump.py
index d00bfae..d5f6dcf 100755
--- a/public_task_dump.py
+++ b/public_task_dump.py
@@ -18,6 +18,8 @@
 id = task[0]
 taskdata[id] = {}
 
+taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1]) or ''
+
 taskdata[id]['transactions'] = {}
 for t in transactions:
 taskdata[id]['transactions'][t] = 
phabdb.get_transactionbytype(task[1], t)
@@ -32,13 +34,10 @@
 and phabdb.get_projectpolicy(edge[2]) == 'public']
 taskdata[id]['edge'] = filter(bool, edge_allowed)
 
-taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1])
-
-
 data['task'] = taskdata
 data['project'] = {}
 data['project']['projects'] = phabdb.get_projectbypolicy(policy='public')
 data['project']['columns'] = phabdb.get_projectcolumns()
 
-with open('phabricator_public.dump', 'w') as f:
+with open('/srv/dumps/phabricator_public.dump', 'w') as f:
 f.write(json.dumps(data))
diff --git a/wmfphablib/phabdb.py b/wmfphablib/phabdb.py
index 8cc1d8c..999e62f 100755
--- a/wmfphablib/phabdb.py
+++ b/wmfphablib/phabdb.py
@@ -82,7 +82,8 @@
 WHERE indexKey=%s AND  objectPHID=%s,
 ('yERhvoZPNPtM', taskPHID), limit=None)
 p.close()
-return _
+if _ is not None and len(_[0])  0:
+return _[0]
 
 def get_edgebysrc(src):
 p = phdb(db='phabricator_maniphest',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57e0d863db1a4234f5e323caf62a7c6e407f0b61
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/tools
Gerrit-Branch: master
Gerrit-Owner: Rush r...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] ganalia_new: qualify var - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: ganalia_new: qualify var
..


ganalia_new: qualify var

bug: T97251
Change-Id: Ieda5883ed0ad27c2c30c0a9f88e9e4ae530b61bf
---
M modules/ganglia_new/templates/ganglia_view.json.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ganglia_new/templates/ganglia_view.json.erb 
b/modules/ganglia_new/templates/ganglia_view.json.erb
index 7e52b9f..f5717c1 100644
--- a/modules/ganglia_new/templates/ganglia_view.json.erb
+++ b/modules/ganglia_new/templates/ganglia_view.json.erb
@@ -22,7 +22,7 @@
  view_type:%= @view_type %,
  default_size:%= @default_size %,
 
- items:%= JSON.pretty_generate(items) %
+ items:%= JSON.pretty_generate(@items) %
 }
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieda5883ed0ad27c2c30c0a9f88e9e4ae530b61bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] jobqueue: Record stats on how long it takes before a job is run - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: jobqueue: Record stats on how long it takes before a job is run
..


jobqueue: Record stats on how long it takes before a job is run

Bug: T101054
Change-Id: I5dc13d79a5ec2e8cb6679e3ff2535b5cb031ca30
---
M includes/jobqueue/Job.php
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobQueueRedis.php
M includes/jobqueue/JobRunner.php
4 files changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php
index 87bd836..b971bd5 100644
--- a/includes/jobqueue/Job.php
+++ b/includes/jobqueue/Job.php
@@ -135,6 +135,16 @@
}
 
/**
+* @return int|null UNIX timestamp of when the job was queued, or null
+* @since 1.26
+*/
+   public function getQueuedTimestamp() {
+   return isset( $this-metadata['timestamp'] )
+   ? wfTimestampOrNull( TS_UNIX, 
$this-metadata['timestamp'] )
+   : null;
+   }
+
+   /**
 * Whether the queue should reject insertion of this job if a duplicate 
exists
 *
 * This can be used to avoid duplicated effort or combined with delayed 
jobs to
diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index e094850..74edef3 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -299,6 +299,7 @@
$job = Job::factory( $row-job_cmd, $title,
self::extractBlob( $row-job_params ), 
$row-job_id );
$job-metadata['id'] = $row-job_id;
+   $job-metadata['timestamp'] = 
$row-job_timestamp;
break; // done
} while ( true );
 
@@ -569,6 +570,7 @@
strlen( $row-job_params ) ? 
unserialize( $row-job_params ) : false
);
$job-metadata['id'] = $row-job_id;
+   $job-metadata['timestamp'] = 
$row-job_timestamp;
return $job;
}
);
diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index ea94226..0f7ab19 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -610,6 +610,7 @@
$title = Title::makeTitle( $item['namespace'], 
$item['title'] );
$job = Job::factory( $item['type'], $title, 
$item['params'] );
$job-metadata['uuid'] = $item['uuid'];
+   $job-metadata['timestamp'] = $item['timestamp'];
 
return $job;
} catch ( RedisException $e ) {
@@ -647,6 +648,7 @@
$title = Title::makeTitle( $fields['namespace'], 
$fields['title'] );
$job = Job::factory( $fields['type'], $title, $fields['params'] 
);
$job-metadata['uuid'] = $fields['uuid'];
+   $job-metadata['timestamp'] = $fields['timestamp'];
 
return $job;
}
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index bb12298..f4cff3c 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -135,6 +135,7 @@
$backoffDeltas = array(); // map of (type = seconds)
$wait = 'wait'; // block to read backoffs the first time
 
+   $stats = RequestContext::getMain()-getStats();
$jobsRun = 0;
$timeMsTotal = 0;
$flags = JobQueueGroup::USE_CACHE;
@@ -172,12 +173,17 @@
$msg = $job-toString() .  STARTING;
$this-logger-debug( $msg );
$this-debugCallback( $msg );
+   $timeToRun = false;
 
// Run the job...
$psection = $profiler-scopedProfileIn( 
__METHOD__ . '-' . $jType );
$jobStartTime = microtime( true );
try {
++$jobsRun;
+   $queuedTime = 
$job-getQueuedTimestamp();
+   if ( $queuedTime !== null ) {
+   $timeToRun = time() - 
$queuedTime;
+   }
$status = $job-run();
$error = $job-getLastError();

[MediaWiki-commits] [Gerrit] base: certificates::base - base::certificates - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: base: certificates::base - base::certificates
..


base: certificates::base - base::certificates

Our CA configuration really belongs to base, move it there.

Change-Id: If02035349b654058361de83ff40ba5f3fbfeee12
---
M manifests/certs.pp
R modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
R modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt
R modules/base/files/ca/GlobalSign_CA.crt
R modules/base/files/ca/RapidSSL_CA.crt
R modules/base/files/ca/RapidSSL_CA_2.crt
R modules/base/files/ca/RapidSSL_SHA256_CA_-_G3.crt
R modules/base/files/ca/wmf-ca.crt
R modules/base/files/ca/wmf-labs.crt
R modules/base/files/ca/wmf_ca_2014_2017.crt
A modules/base/manifests/certificates.pp
M modules/base/manifests/init.pp
12 files changed, 30 insertions(+), 30 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/certs.pp b/manifests/certs.pp
index ffe071b..73cd4fa 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -3,7 +3,7 @@
 $privatekey=true,
 ) {
 
-require certificates::base
+require base::certificates
 
 sslcert::certificate { $name:
 group  = $group,
@@ -19,34 +19,5 @@
 
 sslcert::chainedcert { $name:
 group = $group,
-}
-}
-
-class certificates::base {
-include ::sslcert
-
-sslcert::ca { 'wmf-ca':
-source  = 'puppet:///files/ssl/wmf-ca.crt',
-}
-sslcert::ca { 'wmf_ca_2014_2017':
-source  = puppet:///files/ssl/wmf_ca_2014_2017.crt,
-}
-sslcert::ca { 'RapidSSL_CA':
-source  = 'puppet:///files/ssl/RapidSSL_CA.crt',
-}
-sslcert::ca { 'RapidSSL_CA_2':
-source  = 'puppet:///files/ssl/RapidSSL_CA_2.crt',
-}
-sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
-source  = 'puppet:///files/ssl/RapidSSL_SHA256_CA_-_G3.crt',
-}
-sslcert::ca { 'DigiCertHighAssuranceCA-3':
-source  = 'puppet:///files/ssl/DigiCertHighAssuranceCA-3.crt',
-}
-sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
-source = 'puppet:///files/ssl/DigiCertSHA2HighAssuranceServerCA.crt',
-}
-sslcert::ca { 'GlobalSign_CA':
-source  = 'puppet:///files/ssl/GlobalSign_CA.crt',
 }
 }
diff --git a/files/ssl/DigiCertHighAssuranceCA-3.crt 
b/modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
similarity index 100%
rename from files/ssl/DigiCertHighAssuranceCA-3.crt
rename to modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
diff --git a/files/ssl/DigiCertSHA2HighAssuranceServerCA.crt 
b/modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt
similarity index 100%
rename from files/ssl/DigiCertSHA2HighAssuranceServerCA.crt
rename to modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt
diff --git a/files/ssl/GlobalSign_CA.crt 
b/modules/base/files/ca/GlobalSign_CA.crt
similarity index 100%
rename from files/ssl/GlobalSign_CA.crt
rename to modules/base/files/ca/GlobalSign_CA.crt
diff --git a/files/ssl/RapidSSL_CA.crt b/modules/base/files/ca/RapidSSL_CA.crt
similarity index 100%
rename from files/ssl/RapidSSL_CA.crt
rename to modules/base/files/ca/RapidSSL_CA.crt
diff --git a/files/ssl/RapidSSL_CA_2.crt 
b/modules/base/files/ca/RapidSSL_CA_2.crt
similarity index 100%
rename from files/ssl/RapidSSL_CA_2.crt
rename to modules/base/files/ca/RapidSSL_CA_2.crt
diff --git a/files/ssl/RapidSSL_SHA256_CA_-_G3.crt 
b/modules/base/files/ca/RapidSSL_SHA256_CA_-_G3.crt
similarity index 100%
rename from files/ssl/RapidSSL_SHA256_CA_-_G3.crt
rename to modules/base/files/ca/RapidSSL_SHA256_CA_-_G3.crt
diff --git a/files/ssl/wmf-ca.crt b/modules/base/files/ca/wmf-ca.crt
similarity index 100%
rename from files/ssl/wmf-ca.crt
rename to modules/base/files/ca/wmf-ca.crt
diff --git a/files/ssl/wmf-labs.crt b/modules/base/files/ca/wmf-labs.crt
similarity index 100%
rename from files/ssl/wmf-labs.crt
rename to modules/base/files/ca/wmf-labs.crt
diff --git a/files/ssl/wmf_ca_2014_2017.crt 
b/modules/base/files/ca/wmf_ca_2014_2017.crt
similarity index 100%
rename from files/ssl/wmf_ca_2014_2017.crt
rename to modules/base/files/ca/wmf_ca_2014_2017.crt
diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
new file mode 100644
index 000..879880d
--- /dev/null
+++ b/modules/base/manifests/certificates.pp
@@ -0,0 +1,28 @@
+class base::certificates {
+include ::sslcert
+
+sslcert::ca { 'wmf-ca':
+source  = 'puppet:///modules/base/ca/wmf-ca.crt',
+}
+sslcert::ca { 'wmf_ca_2014_2017':
+source  = puppet:///modules/base/ca/wmf_ca_2014_2017.crt,
+}
+sslcert::ca { 'RapidSSL_CA':
+source  = 'puppet:///modules/base/ca/RapidSSL_CA.crt',
+}
+sslcert::ca { 'RapidSSL_CA_2':
+source  = 'puppet:///modules/base/ca/RapidSSL_CA_2.crt',
+}
+

[MediaWiki-commits] [Gerrit] realm: qualify var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: realm: qualify var
..

realm: qualify var

bug: T97251
Change-Id: I3a75d669bbb9f18c3b1d580b9263e7060cc81ec9
---
M templates/apache/sites/wikitech.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/215776/1

diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index d820b43..4519235 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -103,7 +103,7 @@
 Alias /w /srv/mediawiki/docroot/wikimedia.org/w
 Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
 Alias /dumps /a/backup/public
-% if realm == labs %
+% if @realm == labs %
 # Add additional wikis for development
 Alias /w2 /srv/org/wikimedia/controller/wikis/w2
 Alias /wiki2 /srv/org/wikimedia/controller/wikis/w2/index.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a75d669bbb9f18c3b1d580b9263e7060cc81ec9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Reverting a test to see if gerrit irc bots start working again - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Reverting a test to see if gerrit irc bots start working again
..


Reverting a test to see if gerrit irc bots start working again

Change-Id: I43087d26985b82eed787ae6fbdd9078e8857eff9
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index c01406c..974d31e 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,9 +78,6 @@
 [commentlink bugzilla]
 match =  \\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b
 link = https://bugzilla.wikimedia.org/$1
-[commentlink phabricator]
-match = \\b[bB][uU][gG]\\:?\\s+#?(T\\d+)\\b
-link = https://phabricator.wikimedia.org/$1
 [commentlink codereview]
 match = \\br(\\d+)\\b
 link = https://phabricator.wikimedia.org/rSVN$1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43087d26985b82eed787ae6fbdd9078e8857eff9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert Add link in gitblit for phabricator - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: Revert Add link in gitblit for phabricator
..

Revert Add link in gitblit for phabricator

This reverts commit a513ef5e12da17fb6efed4d9357706c33c14ee81.

Change-Id: Idebf1be46ceeaab7480622d391a8607b7c851382
---
M modules/gerrit/templates/gerrit.config.erb
M modules/gitblit/files/gitblit.properties
2 files changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index c01406c..c142bdd 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,9 +78,6 @@
 [commentlink bugzilla]
 match =  \\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b
 link = https://bugzilla.wikimedia.org/$1
-[commentlink phabricator]
-match = \\b[bB][uU][gG]\\:?\\s+#?(T\\d+)\\b
-link = https://phabricator.wikimedia.org/$1
 [commentlink codereview]
 match = \\br(\\d+)\\b
 link = https://phabricator.wikimedia.org/rSVN$1
@@ -141,10 +138,6 @@
 footer = Bug:
 match = \\#?\\d{1,6}
 system = Bugzilla
-[trackingid phabricator]
-footer = Bug:
-match = \\#?\\d{1,6}
-system = Phabricator
 [changeMerge]
 test = true
 checkFrequency = 0
diff --git a/modules/gitblit/files/gitblit.properties 
b/modules/gitblit/files/gitblit.properties
index 080fc5b..a6e1cf9 100644
--- a/modules/gitblit/files/gitblit.properties
+++ b/modules/gitblit/files/gitblit.properties
@@ -1005,7 +1005,6 @@
 regex.global.changeid = \\b(I[0-9a-f]{7,40})\\b!!!a 
href=https://gerrit.wikimedia.org/r/#q,$1,n,z;$1/a
 regex.global.commit = \\b([0-9a-f]{7,40})\\b!!!a 
href=https://gerrit.wikimedia.org/r/#q,$1,n,z;$1/a
 regex.global.bugzilla = \\b([bB][uU][gG]\\:?\\s+#?(\\d+))\\b!!!a 
href=https://bugzilla.wikimedia.org/$2;$1/a
-regex.global.phabricator = \\b([bB][uU][gG]\\:?\\s+#?(T\\d+))\\b!!!a 
href=https://phabricator.wikimedia.org/$2;$1/a
 regex.global.codereview = \\br(\\d+)\\b!!!a 
href=https://www.mediawiki.org/wiki/Special:CodeReview/MediaWiki/$1;$1/a
 regex.global.rt = \\b([rR][tT]\\:?\\s+#?(\\d+))\\b!!!a 
href=https://rt.wikimedia.org/Ticket/Display.html?id=$2;$1/a
 regex.global.cve = \\b(CVE\\-\\d{4}\\-\\d+)\\b!!!a 
href=https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1;$1/a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idebf1be46ceeaab7480622d391a8607b7c851382
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use the Apex OOjs UI theme - change (mediawiki...MonoBook)

[jenkins-bot (Code Review)]

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

Change subject: Use the Apex OOjs UI theme
..


Use the Apex OOjs UI theme

Change-Id: I0b18b9990795467059dc86ccb8632f9bd529800e
---
M skin.json
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/skin.json b/skin.json
index 406f7c9..89c8084 100644
--- a/skin.json
+++ b/skin.json
@@ -12,6 +12,9 @@
ValidSkinNames: {
monobook: MonoBook
},
+   SkinOOUIThemes: {
+   monobook: apex
+   },
MessagesDirs: {
MonoBook: [
i18n

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b18b9990795467059dc86ccb8632f9bd529800e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] phab public dump include some task details - change (phabricator/tools)

[Rush (Code Review)]

Rush has uploaded a new change for review.

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

Change subject: phab public dump include some task details
..

phab public dump include some task details

Change-Id: I74592323a28c1d2c6aa211c800cd643714d0222b
---
M public_task_dump.py
M wmfphablib/phabdb.py
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/phabricator/tools 
refs/changes/83/215783/1

diff --git a/public_task_dump.py b/public_task_dump.py
index d5f6dcf..94b2271 100755
--- a/public_task_dump.py
+++ b/public_task_dump.py
@@ -17,6 +17,7 @@
 for task in phabdb.get_taskbypolicy():
 id = task[0]
 taskdata[id] = {}
+taskdata[id]['info'] = task
 
 taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1]) or ''
 
diff --git a/wmfphablib/phabdb.py b/wmfphablib/phabdb.py
index 999e62f..d98897a 100755
--- a/wmfphablib/phabdb.py
+++ b/wmfphablib/phabdb.py
@@ -135,7 +135,6 @@
 status, \
 priority, \
 title, \
-description, \
 dateCreated, \
 dateModified, \
 projectPHIDs, \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74592323a28c1d2c6aa211c800cd643714d0222b
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/tools
Gerrit-Branch: master
Gerrit-Owner: Rush r...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add OO.ui.SelectFileWidget - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Add OO.ui.SelectFileWidget
..


Add OO.ui.SelectFileWidget

Bug: T91146
Change-Id: Ic4db04daf11f3ab461a16ed3a1e9561e82351bc5
---
M build/modules.json
M demos/pages/widgets.js
M i18n/en.json
M i18n/qqq.json
M jsduck.json
M src/core.js
M src/styles/core.less
M src/styles/theme.less
A src/styles/widgets/SelectFileWidget.less
M src/themes/apex/widgets.less
M src/themes/blank/widgets.less
M src/themes/mediawiki/widgets.less
A src/widgets/SelectFileWidget.js
13 files changed, 732 insertions(+), 4 deletions(-)

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



diff --git a/build/modules.json b/build/modules.json
index 5aa773f..c83dc3d 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -72,6 +72,7 @@
src/widgets/PopupButtonWidget.js,
src/widgets/ToggleButtonWidget.js,
src/widgets/DropdownWidget.js,
+   src/widgets/SelectFileWidget.js,
src/widgets/IconWidget.js,
src/widgets/IndicatorWidget.js,
src/widgets/InputWidget.js,
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 52c6ee8..93f4cf1 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -817,6 +817,41 @@
}
),
new OO.ui.FieldLayout(
+   new OO.ui.SelectFileWidget( {} ),
+   {
+   label: 'SelectFileWidget\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.SelectFileWidget( { accept: [ 
'image/png', 'image/jpeg' ] } ),
+   {
+   label: 'SelectFileWidget 
(accept PNG and JPEG)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.SelectFileWidget( {
+   icon: 'tag',
+   indicator: 'required'
+   } ),
+   {
+   label: 'SelectFileWidget (icon, 
indicator)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.SelectFileWidget( {
+   icon: 'tag',
+   indicator: 'required',
+   disabled: true
+   } ),
+   {
+   label: 'SelectFileWidget 
(disabled)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
new OO.ui.DropdownWidget( {
label: 'Select one',
menu: {
diff --git a/i18n/en.json b/i18n/en.json
index 1db3fd8..9812ec6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,5 +27,8 @@
ooui-dialog-process-error: Something went wrong,
ooui-dialog-process-dismiss: Dismiss,
ooui-dialog-process-retry: Try again,
-   ooui-dialog-process-continue: Continue
+   ooui-dialog-process-continue: Continue,
+   ooui-selectfile-not-supported: File selection is not supported,
+   ooui-selectfile-placeholder: No file is selected,
+   ooui-semicolon-separator: ; 
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c1b794a..bef65ed 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -31,5 +31,8 @@
ooui-dialog-process-error: Title for process dialog error 
description,
ooui-dialog-process-dismiss: Label for process dialog dismiss error 
button, visible when describing errors\n{{Identical|Dismiss}},
ooui-dialog-process-retry: Label for process dialog retry action 
button, visible when describing recoverable errors\n{{Identical|Try again}},
-   ooui-dialog-process-continue: Label for process dialog retry action 
button, visible when describing 

[MediaWiki-commits] [Gerrit] Revert tools: Puppetize database aliases as host resources - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Revert tools: Puppetize database aliases as host resources
..


Revert tools: Puppetize database aliases as host resources

The super long lines in /etc/hosts is causing problems for
gridengine, causing it to fail in fun ways now and then. Since
we have designate now we can actually move to actual DNS
entries soon enough, so can revert this.

Also sets tools-redis to be set as a template in the hosts file
instead of a host {} resource

This reverts commit 99ac180dc3252a9fee750b876200bbcd61265d91.

Change-Id: Iff9b796ff5d03b5d27d340ec2ecfa6732d5856b2
---
M manifests/role/labsdb.pp
M modules/toollabs/manifests/init.pp
A modules/toollabs/templates/hosts.erb
3 files changed, 257 insertions(+), 252 deletions(-)

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



diff --git a/manifests/role/labsdb.pp b/manifests/role/labsdb.pp
index 92c69ca..ee460ad 100644
--- a/manifests/role/labsdb.pp
+++ b/manifests/role/labsdb.pp
@@ -20,243 +20,3 @@
 }
 
 }
-
-class role::labs::db::client {
-# There are three replica servers (c1, c2, c3).  The mapping of
-# shards (s1, etc.) and databases (enwiki, etc.) to these is
-# arbitrary and can be adjusted to depool a server or redistribute
-# load.
-$c1_dbs = ['s1', 'enwiki']
-$c2_dbs = ['s2', 's4', 's5', 'bgwiki', 'bgwiktionary',
-'commonswiki', 'cswiki', 'dewiki', 'enwikiquote',
-'enwiktionary', 'eowiki', 'fiwiki', 'idwiki', 'itwiki',
-'nlwiki', 'nowiki', 'plwiki', 'ptwiki', 'svwiki', 'thwiki',
-'trwiki', 'wikidatawiki', 'zhwiki']
-$c3_dbs = ['s3', 's6', 's7', 'aawiki', 'aawikibooks',
-'aawiktionary', 'abwiki', 'abwiktionary', 'acewiki',
-'advisorywiki', 'afwiki', 'afwikibooks', 'afwikiquote',
-'afwiktionary', 'akwiki', 'akwikibooks', 'akwiktionary',
-'alswiki', 'alswikibooks', 'alswikiquote', 'alswiktionary',
-'amwiki', 'amwikiquote', 'amwiktionary', 'angwiki',
-'angwikibooks', 'angwikiquote', 'angwikisource',
-'angwiktionary', 'anwiki', 'anwiktionary', 'arcwiki',
-'arwiki', 'arwikibooks', 'arwikimedia', 'arwikinews',
-'arwikiquote', 'arwikisource', 'arwikiversity',
-'arwiktionary', 'arzwiki', 'astwiki', 'astwikibooks',
-'astwikiquote', 'astwiktionary', 'aswiki', 'aswikibooks',
-'aswikisource', 'aswiktionary', 'avwiki', 'avwiktionary',
-'aywiki', 'aywikibooks', 'aywiktionary', 'azwiki',
-'azwikibooks', 'azwikiquote', 'azwikisource', 'azwiktionary',
-'barwiki', 'bat_smgwiki', 'bawiki', 'bawikibooks', 'bclwiki',
-'bdwikimedia', 'be_x_oldwiki', 'betawikiversity', 'bewiki',
-'bewikibooks', 'bewikimedia', 'bewikiquote', 'bewikisource',
-'bewiktionary', 'bgwikibooks', 'bgwikinews', 'bgwikiquote',
-'bgwikisource', 'bhwiki', 'bhwiktionary', 'biwiki',
-'biwikibooks', 'biwiktionary', 'bjnwiki', 'bmwiki',
-'bmwikibooks', 'bmwikiquote', 'bmwiktionary', 'bnwiki',
-'bnwikibooks', 'bnwikisource', 'bnwiktionary', 'bowiki',
-'bowikibooks', 'bowiktionary', 'bpywiki', 'brwiki',
-'brwikimedia', 'brwikiquote', 'brwikisource', 'brwiktionary',
-'bswiki', 'bswikibooks', 'bswikinews', 'bswikiquote',
-'bswikisource', 'bswiktionary', 'bugwiki', 'bxrwiki',
-'cawiki', 'cawikibooks', 'cawikimedia', 'cawikinews',
-'cawikiquote', 'cawikisource', 'cawiktionary', 'cbk_zamwiki',
-'cdowiki', 'cebwiki', 'centralauth', 'cewiki', 'chowiki',
-'chrwiki', 'chrwiktionary', 'chwiki', 'chwikibooks',
-'chwiktionary', 'chywiki', 'ckbwiki', 'cowiki', 'cowikibooks',
-'cowikimedia', 'cowikiquote', 'cowiktionary', 'crhwiki',
-'crwiki', 'crwikiquote', 'crwiktionary', 'csbwiki',
-'csbwiktionary', 'cswikibooks', 'cswikinews', 'cswikiquote',
-'cswikisource', 'cswikiversity', 'cswiktionary', 'cuwiki',
-'cvwiki', 'cvwikibooks', 'cywiki', 'cywikibooks',
-'cywikiquote', 'cywikisource', 'cywiktionary', 'dawiki',
-'dawikibooks', 'dawikiquote', 'dawikisource', 'dawiktionary',
-'dewikibooks', 'dewikinews', 'dewikiquote', 'dewikisource',
-'dewikiversity', 'dewikivoyage', 'dewiktionary', 'diqwiki',
-'dkwikimedia', 'donatewiki', 'dsbwiki', 'dvwiki',
-'dvwiktionary', 'dzwiki', 'dzwiktionary', 'eewiki', 'elwiki',
-'elwikibooks', 'elwikinews', 'elwikiquote', 'elwikisource',
-'elwikiversity', 'elwikivoyage', 'elwiktionary', 'emlwiki',
-'enwikibooks', 'enwikinews', 'enwikisource', 'enwikiversity',
-'enwikivoyage', 'eowikibooks', 'eowikinews', 'eowikiquote',
-'eowikisource', 'eowiktionary', 'eswiki', 'eswikibooks',
-'eswikinews', 'eswikiquote', 'eswikisource', 'eswikiversity',
-'eswikivoyage', 'eswiktionary', 'etwiki', 'etwikibooks',
-

[MediaWiki-commits] [Gerrit] T98810: add specific types for extended values - change (mediawiki...Wikibase)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: T98810: add specific types for extended values
..

T98810: add specific types for extended values

Change-Id: I0850de272bcca5bc070a47ac8ec969bfd4510f1d
---
M repo/includes/rdf/ComplexValueRdfBuilder.php
M repo/includes/rdf/RdfVocabulary.php
M repo/includes/rdf/SimpleValueRdfBuilder.php
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
M repo/tests/phpunit/data/rdf/Q4_claims.nt
M repo/tests/phpunit/data/rdf/Q4_values.nt
M repo/tests/phpunit/data/rdf/Q6_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
M repo/tests/phpunit/data/rdf/Q7_references.nt
M repo/tests/phpunit/data/rdf/Q8_baddates.nt
11 files changed, 51 insertions(+), 3 deletions(-)


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

diff --git a/repo/includes/rdf/ComplexValueRdfBuilder.php 
b/repo/includes/rdf/ComplexValueRdfBuilder.php
index 0cffe98..9ca12ba 100644
--- a/repo/includes/rdf/ComplexValueRdfBuilder.php
+++ b/repo/includes/rdf/ComplexValueRdfBuilder.php
@@ -123,6 +123,8 @@
 
$this-valueWriter-about( RdfVocabulary::NS_VALUE, $valueLName 
)-a( RdfVocabulary::NS_ONTOLOGY, 'Value' );
 
+   $this-valueWriter-a( RdfVocabulary::NS_ONTOLOGY, 
$this-vocabulary-getValueTypeName( $value ) );
+
foreach ( $props as $prop = $type ) {
$propLName = $prefix . ucfirst( $prop );
$getter = get . $prop;
diff --git a/repo/includes/rdf/RdfVocabulary.php 
b/repo/includes/rdf/RdfVocabulary.php
index 4966af5..7ed998d 100644
--- a/repo/includes/rdf/RdfVocabulary.php
+++ b/repo/includes/rdf/RdfVocabulary.php
@@ -5,6 +5,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Statement\Statement;
+use DataValues\DataValue;
 
 /**
  * RDF vocabulary for use in mapping for wikibase data model.
@@ -193,6 +194,17 @@
}
 
/**
+* Get Wikibase value type name for ontology
+*
+* @param DataValue $prop
+*
+* @return string
+*/
+   public function getValueTypeName( DataValue $val ) {
+   return ucfirst( $val-getType() ) . 'Value';
+   }
+
+   /**
 * Create Commons URL from filename value
 *
 * @param string $file
diff --git a/repo/includes/rdf/SimpleValueRdfBuilder.php 
b/repo/includes/rdf/SimpleValueRdfBuilder.php
index 16b4782..a5de19a 100644
--- a/repo/includes/rdf/SimpleValueRdfBuilder.php
+++ b/repo/includes/rdf/SimpleValueRdfBuilder.php
@@ -34,7 +34,7 @@
/**
 * @var RdfVocabulary
 */
-   private $vocabulary;
+   protected $vocabulary;
 
/**
 * @var PropertyDataTypeLookup
diff --git a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt 
b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
index df32a96..db992de 100644
--- a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
+++ b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
@@ -73,4 +73,7 @@
 http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 
http://wikiba.se/ontology-beta#timeCalendarModel 
http://www.wikidata.org/entity/Q1985727 .
 http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 
http://wikiba.se/ontology-beta#timePrecision 
9^^http://www.w3.org/2001/XMLSchema#integer .
 http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 
http://wikiba.se/ontology-beta#timeValue 
-0200-01-01T00:00:00Z^^http://www.w3.org/2001/XMLSchema#dateTime .
-http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 
http://wikiba.se/ontology-beta#timeTimezone 
0^^http://www.w3.org/2001/XMLSchema#integer .
\ No newline at end of file
+http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 
http://wikiba.se/ontology-beta#timeTimezone 
0^^http://www.w3.org/2001/XMLSchema#integer .
+http://acme.test/value/1e09d673624819aacd170165aae555a1 
http://www.w3.org/1999/02/22-rdf-syntax-ns#type 
http://wikiba.se/ontology-beta#QuantityValue .
+http://acme.test/value/974afffbe8c12ab5579f4b521ae2bd5d 
http://www.w3.org/1999/02/22-rdf-syntax-ns#type 
http://wikiba.se/ontology-beta#GlobecoordinateValue .
+http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 
http://www.w3.org/1999/02/22-rdf-syntax-ns#type 
http://wikiba.se/ontology-beta#TimeValue .
\ No newline at end of file
diff --git a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt 
b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
index df32a96..8201647 100644
--- a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
+++ b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
@@ -73,4 +73,7 @@
 http://acme.test/value/ba4fa68a0979e663277b08d93f93705c 

[MediaWiki-commits] [Gerrit] tools: Don't include killed labsdb client /etc/hosts class - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Don't include killed labsdb client /etc/hosts class
..

tools: Don't include killed labsdb client /etc/hosts class

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/215691/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index f0dbb91..0859ebf 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -21,8 +21,6 @@
 include ::mediawiki::packages::fonts
 include ::redis::client::python
 
-include role::labs::db::client
-
 package { [
 # Please keep all packages in each group sorted in alphabetical order
 

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

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

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

[MediaWiki-commits] [Gerrit] openstack : qualify designateconfig - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: openstack : qualify designateconfig
..


openstack : qualify designateconfig

bug: T97251
Change-Id: I7738521cfe1d5a53d669f4e4d3f56c2ba149a20a
---
M modules/openstack/templates/icehouse/designate/designate.conf.erb
1 file changed, 13 insertions(+), 13 deletions(-)

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



diff --git a/modules/openstack/templates/icehouse/designate/designate.conf.erb 
b/modules/openstack/templates/icehouse/designate/designate.conf.erb
index 7ee51ce..a9d09f0 100644
--- a/modules/openstack/templates/icehouse/designate/designate.conf.erb
+++ b/modules/openstack/templates/icehouse/designate/designate.conf.erb
@@ -35,10 +35,10 @@
 #network_api = neutron
 
 # RabbitMQ Config
-rabbit_userid = %= designateconfig[rabbit_user] %
-rabbit_password = %= designateconfig[rabbit_pass] %
+rabbit_userid = %= @designateconfig[rabbit_user] %
+rabbit_password = %= @designateconfig[rabbit_pass] %
 rabbit_use_ssl = False
-rabbit_hosts = %= designateconfig[rabbit_host] %
+rabbit_hosts = %= @designateconfig[rabbit_host] %
 rabbit_port = 5672
 
 # we have a lot of instances, so raise quotas:
@@ -107,12 +107,12 @@
 # Keystone Middleware
 #---
 [keystone_authtoken]
-auth_host = %= designateconfig[keystone_auth_host] %
-auth_port = %= designateconfig[keystone_auth_port] %
-auth_protocol = %= designateconfig[keystone_auth_protocol] %
+auth_host = %= @designateconfig[keystone_auth_host] %
+auth_port = %= @designateconfig[keystone_auth_port] %
+auth_protocol = %= @designateconfig[keystone_auth_protocol] %
 admin_token = ADMIN
-admin_token = %= designateconfig[keystone_admin_token] %
-auth_uri = %= designateconfig[auth_uri] %
+admin_token = %= @designateconfig[keystone_admin_token] %
+auth_uri = %= @designateconfig[auth_uri] %
 
 #---
 # Sink Service
@@ -187,7 +187,7 @@
 [storage:sqlalchemy]
 # Database connection string - to configure options for a given implementation
 # like sqlalchemy or other see below
-database_connection = mysql://%= designateconfig[db_user] %:%= 
designateconfig[db_pass] %@%= designateconfig[db_host] %/%= 
designateconfig[db_name] %
+database_connection = mysql://%= @designateconfig[db_user] %:%= 
@designateconfig[db_pass] %@%= @designateconfig[db_host] %/%= 
@designateconfig[db_name] %
 connection_debug = 100
 connection_trace = True
 idle_timeout = 3600
@@ -228,9 +228,9 @@
 
 certmanager_user = certmanager
 puppet_key_format = '%(hostname)s.%(tenant_id)s.%(domain)s'
-puppet_master_host = %= designateconfig['controller_hostname'] %
+puppet_master_host = %= @designateconfig['controller_hostname'] %
 salt_key_format = '%(hostname)s.%(tenant_id)s.%(domain)s'
-salt_master_host = %= designateconfig['controller_hostname'] %
+salt_master_host = %= @designateconfig['controller_hostname'] %
 
 #
 # Neutron Floating Handler
@@ -268,7 +268,7 @@
 idle_timeout = 3600
 max_retries = 10
 retry_interval = 10
-database_connection = mysql://%= designateconfig[pdns_db_user] %:%= 
designateconfig[pdns_db_pass] %@%= designateconfig[db_host] %/%= 
designateconfig[pdns_db_name] %
+database_connection = mysql://%= @designateconfig[pdns_db_user] %:%= 
@designateconfig[pdns_db_pass] %@%= @designateconfig[db_host] %/%= 
@designateconfig[pdns_db_name] %
 # This is an alternate db account with more rights -- this setting should
 #  be used when running the db-sync command and the like during upgrades.
-#database_connection = mysql://%= designateconfig[pdns_db_admin_user] 
%:%= designateconfig[pdns_db_admin_pass] %@%= designateconfig[db_host] 
%/%= designateconfig[pdns_db_name] %
+#database_connection = mysql://%= @designateconfig[pdns_db_admin_user] 
%:%= @designateconfig[pdns_db_admin_pass] %@%= 
@designateconfig[db_host] %/%= @designateconfig[pdns_db_name] %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7738521cfe1d5a53d669f4e4d3f56c2ba149a20a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [IMPROV] redirect: Have a more specific doc - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: [IMPROV] redirect: Have a more specific doc
..


[IMPROV] redirect: Have a more specific doc

Bug: T101255
Change-Id: I1b80a0383d028ef3f4e88f3cbdf5956cb6529352
---
M scripts/redirect.py
1 file changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/scripts/redirect.py b/scripts/redirect.py
index e007146..c8ba68b 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -15,11 +15,12 @@
 double Fix redirects which point to other redirects.
 do Shortcut action command is do.
 
-broken Tries to fix broken redirect to the last moved target of the
-br destination page. If this fails and -delete option is given
-   it deletes redirects where targets don't exist if bot has
-   admin rights otherwise it marks the page with a speedy deletion
-   template if available. Shortcut action command is br.
+broken Tries to fix redirect which point to nowhere by using the last
+br moved target of the destination page. If this fails and the
+   -delete option is set, it either deletes the page or marks it 
for
+   deletion depending on whether the account has admin rights. It
+   will mark the redirect not for deletion if there is no speedy
+   deletion template available. Shortcut action command is br.
 
 both   Both of the above. Retrieves redirect pages from live wiki,
not from a special page.
@@ -60,7 +61,9 @@
 -total:n   The maximum count of redirects to work upon. If omitted, there
is no limit.
 
--deleteEnables deletion of broken redirects.
+-deletePrompt the user whether broken redirects should be deleted (or
+   marked for deletion if the account has no admin rights) instead
+   of just skipping them.
 
 -alwaysDon't prompt you for each replacement.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b80a0383d028ef3f4e88f3cbdf5956cb6529352
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Stage email first, use staged for dependent values - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Stage email first, use staged for dependent values
..

Stage email first, use staged for dependent values

So as not to crash when default hasn't been set

Bug: T101114
Change-Id: I38291aee25e2532861c83862980392051aa10715
---
M astropay_gateway/astropay.adapter.php
M gateway_common/gateway.adapter.php
M worldpay_gateway/worldpay.adapter.php
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/10/215710/1

diff --git a/astropay_gateway/astropay.adapter.php 
b/astropay_gateway/astropay.adapter.php
index aba0076..862c07a 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -416,7 +416,7 @@
 * the donor's email address.
 */
protected function stage_donor_id() {
-   $hashed = sha1( $this-unstaged_data['email'] );
+   $hashed = sha1( $this-getData_Staged( 'email' ) );
$this-staged_data['donor_id'] = substr( $hashed, 0, 20 );
}
 
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index eedcc25..f809cc3 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1992,8 +1992,8 @@
// This allows transactions to each stage different data.
$this-defineStagedVars();
 
-   // Always stage email address
-   $this-staged_vars[] = 'email';
+   // Always stage email address first, to set default if missing
+   array_unshift( $this-staged_vars, 'email' );
 
foreach ( $this-staged_vars as $field ) {
$function_name = 'stage_' . $field;
diff --git a/worldpay_gateway/worldpay.adapter.php 
b/worldpay_gateway/worldpay.adapter.php
index bc34f6f..76b2ccd 100644
--- a/worldpay_gateway/worldpay.adapter.php
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -996,7 +996,7 @@
}
 
protected function stage_merchant_reference_2() {
-   $email = $this-getData_Unstaged_Escaped( 'email' );
+   $email = $this-getData_Staged( 'email' );
$alphanumeric = preg_replace('/[^0-9a-zA-Z]/', ' ', $email);
$this-staged_data['merchant_reference_2'] = $alphanumeric;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38291aee25e2532861c83862980392051aa10715
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] nove: qualify vars - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: nove: qualify vars
..


nove: qualify vars

bug: T97251
Change-Id: I9dfeaf75548a8b6105e02ed8f879c0a4f46326dd
---
M modules/openstack/templates/icehouse/nova/nova.conf.erb
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/modules/openstack/templates/icehouse/nova/nova.conf.erb 
b/modules/openstack/templates/icehouse/nova/nova.conf.erb
index 9f70da1..a3d6516 100644
--- a/modules/openstack/templates/icehouse/nova/nova.conf.erb
+++ b/modules/openstack/templates/icehouse/nova/nova.conf.erb
@@ -99,13 +99,13 @@
 notification_driver=wikistatus
 notify_on_state_change=vm_state
 
-wiki_host=%= instance_status_wiki_host %
-wiki_domain=%= instance_status_wiki_domain %
-wiki_page_prefix=%= instance_status_wiki_page_prefix %
-wiki_instance_region=%= instance_status_wiki_region %
-wiki_login=%= instance_status_wiki_user %
-wiki_password=%= instance_status_wiki_pass %
-wiki_instance_dns_domain=%= instance_status_dns_domain %
+wiki_host=%= @instance_status_wiki_host %
+wiki_domain=%= @instance_status_wiki_domain %
+wiki_page_prefix=%= @instance_status_wiki_page_prefix %
+wiki_instance_region=%= @instance_status_wiki_region %
+wiki_login=%= @instance_status_wiki_user %
+wiki_password=%= @instance_status_wiki_pass %
+wiki_instance_dns_domain=%= @instance_status_dns_domain %
 wiki_use_keystone=False
 
 # Designate things:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9dfeaf75548a8b6105e02ed8f879c0a4f46326dd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Avoid 'Potentially unsafe href attribute value' exceptions... - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Avoid 'Potentially unsafe href attribute value' exceptions 
for more URLs
..

Avoid 'Potentially unsafe href attribute value' exceptions for more URLs

Follow-up to 9ff89da79131e17b04827aac878645fa3bbad3e2. That change
accidentally disallowed 'null' scheme, which is generated for some
relative links. This broke the PHP demo.

Change-Id: I931255032724539a624b9dbf3b7e67b972808c13
---
M php/Tag.php
M tests/phpunit/TagTest.php
2 files changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/13/215713/1

diff --git a/php/Tag.php b/php/Tag.php
index 4ec88cc..3d3ad6f 100644
--- a/php/Tag.php
+++ b/php/Tag.php
@@ -310,7 +310,7 @@
// @codingStandardsIgnoreStart
$scheme = @parse_url( $value, 
PHP_URL_SCHEME );
// @codingStandardsIgnoreEnd
-   if ( !$scheme  substr( $value, 0, 1 ) 
=== '/' ) {
+   if ( $scheme === null || ( !$scheme  
substr( $value, 0, 1 ) === '/' ) ) {
$scheme = '(relative)';
}
}
diff --git a/tests/phpunit/TagTest.php b/tests/phpunit/TagTest.php
index 5301cde..70caec1 100644
--- a/tests/phpunit/TagTest.php
+++ b/tests/phpunit/TagTest.php
@@ -118,6 +118,18 @@
a href='/'/a
);
$tests[] = array(
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'..' ) ),
+   a href='..'/a
+   );
+   $tests[] = array(
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'?foo=bar' ) ),
+   a href='?foo=bar'/a
+   );
+   $tests[] = array(
+   id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'#top' ) ),
+   a href='#top'/a
+   );
+   $tests[] = array(
id( new Tag( 'a' ) )-setAttributes( array( 'href' = 
'/relative' ) ),
a href='/relative'/a
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I931255032724539a624b9dbf3b7e67b972808c13
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] certs: remove random certificates::* includes - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: certs: remove random certificates::* includes
..


certs: remove random certificates::* includes

These are all require()d from install_certificate, so external callers
are redundant. The exception to this is the GlobalSign CA, which was not
required by install_certificate before, so this was added now.

Change-Id: I84ed8671b363371993731a3fb709bfb0aec76a04
---
M manifests/certs.pp
M manifests/role/icinga.pp
M manifests/role/protoproxy.pp
M modules/base/manifests/init.pp
M modules/ldap/manifests/client.pp
M modules/ldap/manifests/role/client.pp
M modules/role/manifests/cache/ssl/misc.pp
M modules/role/manifests/cache/ssl/sni.pp
8 files changed, 4 insertions(+), 25 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/certs.pp b/manifests/certs.pp
index e817233..980aeac 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -6,11 +6,12 @@
 require certificates::base
 require certificates::rapidssl_ca
 require certificates::rapidssl_ca_2
+require certificates::rapidssl_sha256_ca_G3
 require certificates::digicert_ca
 require certificates::digicert_sha2_ca
+require certificates::globalsign_ca
 require certificates::wmf_ca
 require certificates::wmf_ca_2014_2017
-require certificates::rapidssl_sha256_ca_G3
 
 sslcert::certificate { $name:
 group  = $group,
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index ae1002b..1ebaa94 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -25,7 +25,6 @@
 include mysql
 include icinga::gsbmonitoring
 include nrpe
-include certificates::globalsign_ca
 
 if $ircbot {
 include icinga::ircbot
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index f92f916..e18414a 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -39,9 +39,8 @@
 
 class role::protoproxy::ssl::beta::common {
 
-include standard,
-certificates::wmf_labs_ca,
-role::protoproxy::ssl::common
+include standard
+include role::protoproxy::ssl::common
 
 install_certificate { 'star.wmflabs.org':
 privatekey = false,
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 9a85398..6e06399 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -73,7 +73,6 @@
 include role::trebuchet
 include nrpe
 
-
 # include base::monitor::host.
 # if $nagios_contact_group is set, then use it
 # as the monitor host's contact group.
@@ -86,11 +85,4 @@
 class { 'base::monitoring::host':
 contact_group = $group_contact,
 }
-
-# CA for the new ldap-eqiad/ldap-codfw ldap servers, among
-# other things.
-include certificates::globalsign_ca
-# TODO: Kill the old wmf_ca
-include certificates::wmf_ca
-include certificates::wmf_ca_2014_2017
 }
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 6069033..7708f3f 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -78,7 +78,6 @@
 file { '/etc/ldap.conf':
 notify  = Service['nscd'],
 content = template('ldap/nss_ldap.erb'),
-require = Class['certificates::wmf_ca', 
'certificates::globalsign_ca'],
 }
 
 file { '/etc/nslcd.conf':
@@ -286,7 +285,6 @@
 group   = 'root',
 mode= '0444',
 content = template('ldap/open_ldap.erb'),
-require = Class['certificates::wmf_ca', 
'certificates::globalsign_ca'],
 }
 }
 
diff --git a/modules/ldap/manifests/role/client.pp 
b/modules/ldap/manifests/role/client.pp
index a5708e6..4f6a52c 100644
--- a/modules/ldap/manifests/role/client.pp
+++ b/modules/ldap/manifests/role/client.pp
@@ -3,10 +3,6 @@
 
 if ( $::realm == 'labs' ) {
 $includes = ['openldap', 'pam', 'nss', 'sudo', 'utils', 'access']
-
-# Cert for the old virt1000/virt0 ldap servers:
-include certificates::wmf_labs_ca
-
 } else {
 $includes = $ldapincludes
 }
diff --git a/modules/role/manifests/cache/ssl/misc.pp 
b/modules/role/manifests/cache/ssl/misc.pp
index 92945ce..cba2b3f 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -1,8 +1,5 @@
 # As above, but for misc instead of generic prod
 class role::cache::ssl::misc {
-#TODO: kill the old wmf_ca
-include certificates::wmf_ca
-include certificates::wmf_ca_2014_2017
 include role::protoproxy::ssl::common
 
 role::cache::ssl::local { 'wikimedia.org':
diff --git a/modules/role/manifests/cache/ssl/sni.pp 
b/modules/role/manifests/cache/ssl/sni.pp
index 734b1b9..7c24a6a 100644
--- 

[MediaWiki-commits] [Gerrit] certs: kill a bunch of Labs classes - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: certs: kill a bunch of Labs classes
..


certs: kill a bunch of Labs classes

Confirmed that they are not being included in Labs via the LDAP
terminus.

Change-Id: I5af8de506f1c66673cc8b5922eec371236b57230
---
M manifests/certs.pp
1 file changed, 0 insertions(+), 18 deletions(-)

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



diff --git a/manifests/certs.pp b/manifests/certs.pp
index 980aeac..0b72e94 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -34,18 +34,6 @@
 include ::sslcert
 }
 
-class certificates::star_wmflabs_org {
-
-install_certificate{ 'star.wmflabs.org': }
-
-}
-
-class certificates::star_wmflabs {
-
-install_certificate{ 'star.wmflabs': }
-
-}
-
 class certificates::wmf_ca {
 sslcert::ca { 'wmf-ca':
 source  = 'puppet:///files/ssl/wmf-ca.crt',
@@ -55,12 +43,6 @@
 class certificates::wmf_ca_2014_2017 {
 sslcert::ca { 'wmf_ca_2014_2017':
 source  = puppet:///files/ssl/wmf_ca_2014_2017.crt,
-}
-}
-
-class certificates::wmf_labs_ca {
-sslcert::ca { 'wmf-labs':
-source  = 'puppet:///files/ssl/wmf-labs.crt',
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5af8de506f1c66673cc8b5922eec371236b57230
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] certs: inline certificate::ca classes to ::base - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: certs: inline certificate::ca classes to ::base
..


certs: inline certificate::ca classes to ::base

We don't really need all those different classes anymore.

Change-Id: I8a1cecfed4b26be189defa5a2316740a94127ff2
---
M manifests/certs.pp
1 file changed, 0 insertions(+), 31 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/certs.pp b/manifests/certs.pp
index 0b72e94..ffe071b 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -4,14 +4,6 @@
 ) {
 
 require certificates::base
-require certificates::rapidssl_ca
-require certificates::rapidssl_ca_2
-require certificates::rapidssl_sha256_ca_G3
-require certificates::digicert_ca
-require certificates::digicert_sha2_ca
-require certificates::globalsign_ca
-require certificates::wmf_ca
-require certificates::wmf_ca_2014_2017
 
 sslcert::certificate { $name:
 group  = $group,
@@ -32,51 +24,28 @@
 
 class certificates::base {
 include ::sslcert
-}
 
-class certificates::wmf_ca {
 sslcert::ca { 'wmf-ca':
 source  = 'puppet:///files/ssl/wmf-ca.crt',
 }
-}
-
-class certificates::wmf_ca_2014_2017 {
 sslcert::ca { 'wmf_ca_2014_2017':
 source  = puppet:///files/ssl/wmf_ca_2014_2017.crt,
 }
-}
-
-class certificates::rapidssl_ca {
 sslcert::ca { 'RapidSSL_CA':
 source  = 'puppet:///files/ssl/RapidSSL_CA.crt',
 }
-}
-
-class certificates::rapidssl_ca_2 {
 sslcert::ca { 'RapidSSL_CA_2':
 source  = 'puppet:///files/ssl/RapidSSL_CA_2.crt',
 }
-}
-
-class certificates::rapidssl_sha256_ca_G3 {
 sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
 source  = 'puppet:///files/ssl/RapidSSL_SHA256_CA_-_G3.crt',
 }
-}
-
-class certificates::digicert_ca {
 sslcert::ca { 'DigiCertHighAssuranceCA-3':
 source  = 'puppet:///files/ssl/DigiCertHighAssuranceCA-3.crt',
 }
-}
-
-class certificates::digicert_sha2_ca {
 sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
 source = 'puppet:///files/ssl/DigiCertSHA2HighAssuranceServerCA.crt',
 }
-}
-
-class certificates::globalsign_ca {
 sslcert::ca { 'GlobalSign_CA':
 source  = 'puppet:///files/ssl/GlobalSign_CA.crt',
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a1cecfed4b26be189defa5a2316740a94127ff2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Implemented getAllAcquiredJobs in JobQueueDB - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Implemented getAllAcquiredJobs in JobQueueDB
..


Implemented getAllAcquiredJobs in JobQueueDB

Change-Id: Ie9f0b9357b365f8bddd1f2fdcac11dec29aec876
---
M includes/jobqueue/JobQueueDB.php
1 file changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index 74edef3..3dc36bd 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -558,19 +558,35 @@
 * @return Iterator
 */
public function getAllQueuedJobs() {
+   return $this-getJobIterator( array( 'job_cmd' = 
$this-getType(), 'job_token' = '' ) );
+   }
+
+   /**
+* @see JobQueue::getAllAcquiredJobs()
+* @return Iterator
+*/
+   public function getAllAcquiredJobs() {
+   return $this-getJobIterator( array( 'job_cmd' = 
$this-getType(), job_token  '' ) );
+   }
+
+   /**
+* @param array $conds Query conditions
+* @return Iterator
+*/
+   protected function getJobIterator( array $conds ) {
$dbr = $this-getSlaveDB();
try {
return new MappedIterator(
-   $dbr-select( 'job', self::selectFields(),
-   array( 'job_cmd' = $this-getType(), 
'job_token' = '' ) ),
-   function ( $row ) use ( $dbr ) {
+   $dbr-select( 'job', self::selectFields(), 
$conds ),
+   function ( $row ) {
$job = Job::factory(
$row-job_cmd,
Title::makeTitle( 
$row-job_namespace, $row-job_title ),
-   strlen( $row-job_params ) ? 
unserialize( $row-job_params ) : false
+   strlen( $row-job_params ) ? 
unserialize( $row-job_params ) : array()
);
$job-metadata['id'] = $row-job_id;
$job-metadata['timestamp'] = 
$row-job_timestamp;
+
return $job;
}
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9f0b9357b365f8bddd1f2fdcac11dec29aec876
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] sslcert: brown paper bag fix - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: sslcert: brown paper bag fix
..


sslcert: brown paper bag fix

Actually rename DigiCertSHA2HighAssuranceServerCA.crt.

Change-Id: If9fe73e6c223356a3eae8e0ac57921b1fea2f1d7
---
R modules/base/files/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt 
b/modules/base/files/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt
similarity index 100%
rename from modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt
rename to modules/base/files/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9fe73e6c223356a3eae8e0ac57921b1fea2f1d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] sslcert: brown paper bag fix - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: sslcert: brown paper bag fix
..

sslcert: brown paper bag fix

Actually rename DigiCertSHA2HighAssuranceServerCA.crt.

Change-Id: If9fe73e6c223356a3eae8e0ac57921b1fea2f1d7
---
R modules/base/files/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt 
b/modules/base/files/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt
similarity index 100%
rename from modules/base/files/ca/DigiCertSHA2HighAssuranceServerCA.crt
rename to modules/base/files/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9fe73e6c223356a3eae8e0ac57921b1fea2f1d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Preserve scroll position in OO.ui.Element.static.reconsiderS... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Preserve scroll position in 
OO.ui.Element.static.reconsiderScrollbars
..


Preserve scroll position in OO.ui.Element.static.reconsiderScrollbars

The saga continues.

Bug: T98847
Bug: T98506
Change-Id: I2a5b73f6b6f4af53b37d5d2536b0e8c0641d336e
---
M src/Element.js
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Anomie: Looks good to me, but someone else must approve
  Trevor Parscal: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/Element.js b/src/Element.js
index 127eb50..360f1a5 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -567,7 +567,10 @@
  * @param {HTMLElement} el Element to reconsider the scrollbars on
  */
 OO.ui.Element.static.reconsiderScrollbars = function ( el ) {
-   var i, len, nodes = [];
+   var i, len, scrollLeft, scrollTop, nodes = [];
+   // Save scroll position
+   scrollLeft = el.scrollLeft;
+   scrollTop = el.scrollTop;
// Detach all children
while ( el.firstChild ) {
nodes.push( el.firstChild );
@@ -579,6 +582,9 @@
for ( i = 0, len = nodes.length; i  len; i++ ) {
el.appendChild( nodes[ i ] );
}
+   // Restore scroll position (no-op if scrollbars disappeared)
+   el.scrollLeft = scrollLeft;
+   el.scrollTop = scrollTop;
 };
 
 /* Methods */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a5b73f6b6f4af53b37d5d2536b0e8c0641d336e
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] phab public dump include some task details - change (phabricator/tools)

[Rush (Code Review)]

Rush has submitted this change and it was merged.

Change subject: phab public dump include some task details
..


phab public dump include some task details

Change-Id: I74592323a28c1d2c6aa211c800cd643714d0222b
---
M public_task_dump.py
M wmfphablib/phabdb.py
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/public_task_dump.py b/public_task_dump.py
index d5f6dcf..94b2271 100755
--- a/public_task_dump.py
+++ b/public_task_dump.py
@@ -17,6 +17,7 @@
 for task in phabdb.get_taskbypolicy():
 id = task[0]
 taskdata[id] = {}
+taskdata[id]['info'] = task
 
 taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1]) or ''
 
diff --git a/wmfphablib/phabdb.py b/wmfphablib/phabdb.py
index 999e62f..d98897a 100755
--- a/wmfphablib/phabdb.py
+++ b/wmfphablib/phabdb.py
@@ -135,7 +135,6 @@
 status, \
 priority, \
 title, \
-description, \
 dateCreated, \
 dateModified, \
 projectPHIDs, \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74592323a28c1d2c6aa211c800cd643714d0222b
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/tools
Gerrit-Branch: master
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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