[MediaWiki-commits] [Gerrit] ipv6 token stuff: re-enable cp1008 testing - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214335
Change subject: ipv6 token stuff: re-enable cp1008 testing
..
ipv6 token stuff: re-enable cp1008 testing
Change-Id: I324ebde7b3935ba180bba94f34430e1308619e33
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/214335/1
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index b0d625d..6d72bc4 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -29,7 +29,7 @@
}
# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp' {
+if $::hostname == 'cp1008' {
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
--
To view, visit https://gerrit.wikimedia.org/r/214335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I324ebde7b3935ba180bba94f34430e1308619e33
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] update mw version - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: update mw version
..
update mw version
Change-Id: I854b319e3a6184f53952a47b808f0ae61b341ada
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index b978cc6..cf6496d 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1258,7 +1258,7 @@
Use L{pywikibot.tools.MediaWikiVersion} to compare version strings.
# Here we return the latest mw release for downloading
-return '1.24.2'
+return '1.25.1'
def force_version(self, code):
--
To view, visit https://gerrit.wikimedia.org/r/214337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I854b319e3a6184f53952a47b808f0ae61b341ada
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
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] admin: clean up removed/revoked SSH keys - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: admin: clean up removed/revoked SSH keys
..
admin: clean up removed/revoked SSH keys
This removes the ssh::userkey definition with an empty content for users
with no SSH keys defined. The output of join() may or may not be undef
and if it is, the included File will just ignore the file's content
instead of setting it to ''.
This ensures that those stale SSH authorized keys will be removed, as
/etc/ssh/userkeys is recursively managed and purged.
Change-Id: I1ae4712e26c88395ac3315e5fd932ae3843a317e
---
M modules/admin/manifests/user.pp
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/admin/manifests/user.pp b/modules/admin/manifests/user.pp
index 19362fb..310d8f1 100644
--- a/modules/admin/manifests/user.pp
+++ b/modules/admin/manifests/user.pp
@@ -82,7 +82,6 @@
owner= $name,
group= $gid,
force= true,
-tag = 'user-home',
require = User[$name],
}
}
@@ -91,10 +90,12 @@
fail(${name} is not a valid ssh_keys array: ${ssh_keys})
}
-ssh::userkey { $name:
-ensure = $ensure,
-content = join($ssh_keys, \n),
-tag = 'user-ssh',
+# recursively-managed, automatically purged
+if !empty($ssh_keys) {
+ssh::userkey { $name:
+ensure = $ensure,
+content = join($ssh_keys, \n),
+}
}
if !empty($privileges) {
--
To view, visit https://gerrit.wikimedia.org/r/214343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ae4712e26c88395ac3315e5fd932ae3843a317e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@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] deploy v6 token approach to all jessie/trusty - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214345
Change subject: deploy v6 token approach to all jessie/trusty
..
deploy v6 token approach to all jessie/trusty
Change-Id: I60440c0f888eb2fb7d1573aeda970d55ebce2811
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/214345/1
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 4ff8bd2..9880c97 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -28,9 +28,6 @@
prefixlen = '64'
}
-# XXX Temporary: testing on jessie/trusty hostnames ending in the
digit 1
-if $::hostname =~ /1$/ {
-
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
# in the present if not configured.
@@ -69,7 +66,5 @@
unless = $v6_token_check_cmd,
}
}
-
-} # XXX end cp1008 testing block
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60440c0f888eb2fb7d1573aeda970d55ebce2811
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] sudo: fix sudo::user/group's ensure = absent - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214346
Change subject: sudo: fix sudo::user/group's ensure = absent
..
sudo: fix sudo::user/group's ensure = absent
We don't currently use ensure = absent for sudo::user or sudo::group
anywhere yet, but it was broken (the template gets evaluated anyway and
borks if there are no privileges defined) and needed fixing anyway.
Change-Id: I706e891c8ce7d858d8ef59a1fabbc03a84ac2858
---
M modules/sudo/manifests/group.pp
M modules/sudo/manifests/user.pp
2 files changed, 24 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/214346/1
diff --git a/modules/sudo/manifests/group.pp b/modules/sudo/manifests/group.pp
index 2ee2118..7c234f4 100644
--- a/modules/sudo/manifests/group.pp
+++ b/modules/sudo/manifests/group.pp
@@ -32,20 +32,24 @@
$title_safe = regsubst($title, '\W', '-', 'G')
$filename = /etc/sudoers.d/${title_safe}
-file { $filename:
-ensure = $ensure,
-owner = 'root',
-group = 'root',
-mode= '0440',
-content = template('sudo/sudoers.erb'),
-}
-
if $ensure == 'present' {
+file { $filename:
+ensure = $ensure,
+owner = 'root',
+group = 'root',
+mode= '0440',
+content = template('sudo/sudoers.erb'),
+}
+
exec { sudo_group_${title}_linting:
command = /bin/rm -f ${filename} /bin/false,
unless = /usr/sbin/visudo -cqf ${filename},
refreshonly = true,
subscribe = File[$filename],
}
+} else {
+file { $filename:
+ensure = $ensure,
+}
}
}
diff --git a/modules/sudo/manifests/user.pp b/modules/sudo/manifests/user.pp
index 6a64fdc..424491f 100644
--- a/modules/sudo/manifests/user.pp
+++ b/modules/sudo/manifests/user.pp
@@ -32,20 +32,24 @@
$title_safe = regsubst($title, '\W', '-', 'G')
$filename = /etc/sudoers.d/${title_safe}
-file { $filename:
-ensure = $ensure,
-owner = 'root',
-group = 'root',
-mode= '0440',
-content = template('sudo/sudoers.erb'),
-}
-
if $ensure == 'present' {
+file { $filename:
+ensure = $ensure,
+owner = 'root',
+group = 'root',
+mode= '0440',
+content = template('sudo/sudoers.erb'),
+}
+
exec { sudo_user_${title}_linting:
command = /bin/rm -f ${filename} /bin/false,
unless = /usr/sbin/visudo -cqf ${filename},
refreshonly = true,
subscribe = File[$filename],
}
+} else {
+file { $filename:
+ensure = $ensure,
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I706e891c8ce7d858d8ef59a1fabbc03a84ac2858
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] update mw version - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214337
Change subject: update mw version
..
update mw version
Change-Id: I854b319e3a6184f53952a47b808f0ae61b341ada
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/37/214337/1
diff --git a/pywikibot/family.py b/pywikibot/family.py
index b978cc6..cf6496d 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1258,7 +1258,7 @@
Use L{pywikibot.tools.MediaWikiVersion} to compare version strings.
# Here we return the latest mw release for downloading
-return '1.24.2'
+return '1.25.1'
def force_version(self, code):
--
To view, visit https://gerrit.wikimedia.org/r/214337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I854b319e3a6184f53952a47b808f0ae61b341ada
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Remove exec_environ from gridengine master - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Remove exec_environ from gridengine master
..
tools: Remove exec_environ from gridengine master
Not sure why it was added in the first place. master just runs
the gridengine master, exec_environ shouldn't be present
Change-Id: I7fd3f44e6f74a52818fe7c4f7e57d12a7f68ef22
---
M modules/toollabs/manifests/master.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index 9628023..dbfe014 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -13,7 +13,6 @@
class toollabs::master inherits toollabs {
include gridengine::master,
toollabs::infrastructure,
-toollabs::exec_environ,
toollabs::queue::task,
toollabs::queue::continuous
--
To view, visit https://gerrit.wikimedia.org/r/214339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd3f44e6f74a52818fe7c4f7e57d12a7f68ef22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deploy v6 token approach to some jessie/trusty hosts - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214341
Change subject: Deploy v6 token approach to some jessie/trusty hosts
..
Deploy v6 token approach to some jessie/trusty hosts
Change-Id: I3cb9332962335fad248c027790c8a13646406a8e
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/214341/1
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 6d72bc4..4ff8bd2 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -28,8 +28,8 @@
prefixlen = '64'
}
-# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp1008' {
+# XXX Temporary: testing on jessie/trusty hostnames ending in the
digit 1
+if $::hostname =~ /1$/ {
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
--
To view, visit https://gerrit.wikimedia.org/r/214341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cb9332962335fad248c027790c8a13646406a8e
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] Don't log exception when missing permissions, just ignore it - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214342
Change subject: Don't log exception when missing permissions, just ignore it
..
Don't log exception when missing permissions, just ignore it
formatApi() fails on a couple of occasions, one of which being when
a user has insufficient permissions. That's an acceptable error:
we shouldn't log it, just ignore that row.
Some places already counter this by first checking permissions, then
passing it off to formatApi() - if that one fails, it's not a
permission issue we should log the failure.
Let's just throw an exception right away if it's a real error case,
and return false if it's a this is no error but we can't show you
the data case. Makes dealing with this simpler.
One potential regression: this formatApi function is not just called
from RC, Contribs, ... formatters, but also in other places
(everywhere...), so adding a new exception in there might break
those other places.
The first check was already being logged if it was being hit, and I
couldn't find it in the logs; so pretty sure we won't see it happen.
Change-Id: Icb26b999f16e591fccadb9dce2913e55d50bb7a2
---
M Hooks.php
M includes/Formatter/Contributions.php
M includes/Formatter/FeedItemFormatter.php
M includes/Formatter/IRCLineUrlFormatter.php
M includes/Formatter/RecentChanges.php
M includes/Formatter/RevisionFormatter.php
6 files changed, 51 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/42/214342/1
diff --git a/Hooks.php b/Hooks.php
index 245bca3..31f53fc 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -391,7 +391,7 @@
/** @var Flow\Formatter\RecentChanges $formatter */
$formatter = Container::get( 'formatter.recentchanges'
);
- $links = $formatter-getLogTextLinks( $row,
$changesList, $block, $links );
+ $logTextLinks = $formatter-getLogTextLinks( $row,
$changesList, $block, $links );
} catch ( Exception $e ) {
wfDebugLog( 'Flow', __METHOD__ . ': Exception
formatting rc logtext ' . $rc-getAttribute( 'rc_id' ) . ' ' . $e );
MWExceptionHandler::logException( $e );
@@ -400,6 +400,11 @@
}
restore_error_handler();
+ if ( $logTextLinks === false ) {
+ return false;
+ }
+
+ $links = $logTextLinks;
return true;
}
@@ -623,6 +628,7 @@
$formatter = Container::get( 'formatter.contributions'
);
$line = $formatter-format( $row, $pager );
} catch ( Exception $e ) {
+ wfDebugLog( 'Flow', __METHOD__ . ': Failed formatting
contribution ' . json_encode( $row ) . ': ' . $e-getMessage() );
MWExceptionHandler::logException( $e );
$line = false;
}
@@ -677,9 +683,15 @@
}
set_error_handler( new Flow\RecoverableErrorHandler, -1 );
- /** @var Flow\Formatter\Contributions $formatter */
- $formatter = Container::get( 'formatter.contributions.feeditem'
);
- $result = $formatter-format( $row, $ctx );
+ try {
+ /** @var Flow\Formatter\FeedItemFormatter $formatter */
+ $formatter = Container::get(
'formatter.contributions.feeditem' );
+ $result = $formatter-format( $row, $ctx );
+ } catch ( Exception $e ) {
+ wfDebugLog( 'Flow', __METHOD__ . ': Failed formatting
contribution ' . json_encode( $row ) . ': ' . $e-getMessage() );
+ MWExceptionHandler::logException( $e );
+ return false;
+ }
restore_error_handler();
if ( $result instanceof FeedItem ) {
@@ -908,8 +920,8 @@
$formatter = Container::get( 'formatter.irclineurl' );
$result = $formatter-format( $rc );
} catch ( Exception $e ) {
- wfDebugLog( 'Flow', __METHOD__ . ': Failed formatting
rc ' . $rc-getAttribute( 'rc_id' )
- . ': ' . $e-getMessage() );
+ $result = null;
+ wfDebugLog( 'Flow', __METHOD__ . ': Failed formatting
rc ' . $rc-getAttribute( 'rc_id' ) . ': ' . $e-getMessage() );
MWExceptionHandler::logException( $e );
}
restore_error_handler();
diff --git a/includes/Formatter/Contributions.php
b/includes/Formatter/Contributions.php
index bd98466..b38cab1 100644
--- a/includes/Formatter/Contributions.php
+++ b/includes/Formatter/Contributions.php
@@ -19,34 +19,13 @@
[MediaWiki-commits] [Gerrit] sudo: fix sudo::user/group's ensure = absent - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: sudo: fix sudo::user/group's ensure = absent
..
sudo: fix sudo::user/group's ensure = absent
We don't currently use ensure = absent for sudo::user or sudo::group
anywhere yet, but it was broken (the template gets evaluated anyway and
borks if there are no privileges defined) and needed fixing anyway.
Change-Id: I706e891c8ce7d858d8ef59a1fabbc03a84ac2858
---
M modules/sudo/manifests/group.pp
M modules/sudo/manifests/user.pp
2 files changed, 24 insertions(+), 16 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/sudo/manifests/group.pp b/modules/sudo/manifests/group.pp
index 2ee2118..7c234f4 100644
--- a/modules/sudo/manifests/group.pp
+++ b/modules/sudo/manifests/group.pp
@@ -32,20 +32,24 @@
$title_safe = regsubst($title, '\W', '-', 'G')
$filename = /etc/sudoers.d/${title_safe}
-file { $filename:
-ensure = $ensure,
-owner = 'root',
-group = 'root',
-mode= '0440',
-content = template('sudo/sudoers.erb'),
-}
-
if $ensure == 'present' {
+file { $filename:
+ensure = $ensure,
+owner = 'root',
+group = 'root',
+mode= '0440',
+content = template('sudo/sudoers.erb'),
+}
+
exec { sudo_group_${title}_linting:
command = /bin/rm -f ${filename} /bin/false,
unless = /usr/sbin/visudo -cqf ${filename},
refreshonly = true,
subscribe = File[$filename],
}
+} else {
+file { $filename:
+ensure = $ensure,
+}
}
}
diff --git a/modules/sudo/manifests/user.pp b/modules/sudo/manifests/user.pp
index 6a64fdc..424491f 100644
--- a/modules/sudo/manifests/user.pp
+++ b/modules/sudo/manifests/user.pp
@@ -32,20 +32,24 @@
$title_safe = regsubst($title, '\W', '-', 'G')
$filename = /etc/sudoers.d/${title_safe}
-file { $filename:
-ensure = $ensure,
-owner = 'root',
-group = 'root',
-mode= '0440',
-content = template('sudo/sudoers.erb'),
-}
-
if $ensure == 'present' {
+file { $filename:
+ensure = $ensure,
+owner = 'root',
+group = 'root',
+mode= '0440',
+content = template('sudo/sudoers.erb'),
+}
+
exec { sudo_user_${title}_linting:
command = /bin/rm -f ${filename} /bin/false,
unless = /usr/sbin/visudo -cqf ${filename},
refreshonly = true,
subscribe = File[$filename],
}
+} else {
+file { $filename:
+ensure = $ensure,
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I706e891c8ce7d858d8ef59a1fabbc03a84ac2858
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@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] ssh: fix completely broken host key collection - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: ssh: fix completely broken host key collection
..
ssh: fix completely broken host key collection
SSH host key collection basically exhibits the Naginator problem: it's
extremely slow, due to needing to parse the whole file N+1 times. Thus,
we are only supposed to collect on every run only on bastions, and on
the rest of the fleet a few times a day (the infamous position of the
moon).
I say supposed because:
- This seems to be only enabled on every run for tin and bast1001, not
other bastions.
- It does does not in fact run at all on *any* other host (and thus the
potm logic is unused), as the class is never included. Many hosts have
their ssh_known_hosts with a Oct 18, 2013 mtime, which is when
36c7f7d90c551755fee90234ad1c4abf8e32cb4e got merged and broke this.
This patch adds an sshknowngen, copied over from naggen2 and
modified extensively. It then replaces the ssh_known_hosts generation
with a File resource and a generate() statement. Finally, it
(re-)enables it for every host on the fleet, unconditionally (no potm,
should be fast enough by now).
A diff between bast1001's ssh_known_hosts and sshknowngen's output
showed no functional differences and the current logic is quite broken
already, so this should be safe.
Change-Id: Ieaede0c9356c46661ddb3c236da4c5f0c3ce350a
---
M manifests/site.pp
A modules/puppetmaster/files/sshknowngen
A modules/puppetmaster/manifests/generators.pp
D modules/puppetmaster/manifests/naggen2.pp
M modules/puppetmaster/manifests/scripts.pp
M modules/ssh/manifests/client.pp
D modules/ssh/manifests/hostkeys-collect.pp
7 files changed, 150 insertions(+), 34 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index cb9e514..ef5e079 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -246,7 +246,6 @@
include standard
include subversion::client
include dsh
-include ssh::hostkeys-collect
class { 'nfs::netapp::home':
mountpoint = '/srv/home_pmtpa',
mount_site = 'pmtpa',
@@ -2359,7 +2358,6 @@
include role::deployment::server
include mysql
include role::labsdb::manager
-include ssh::hostkeys-collect
include role::releases::upload
interface::add_ip6_mapped { 'main':
diff --git a/modules/puppetmaster/files/sshknowngen
b/modules/puppetmaster/files/sshknowngen
new file mode 100755
index 000..915f0dc
--- /dev/null
+++ b/modules/puppetmaster/files/sshknowngen
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import sys
+# python 3 compatibility
+try:
+import ConfigParser as configparser
+except ImportError:
+import configparser
+
+import sqlalchemy
+from collections import defaultdict
+import argparse
+import logging
+from logging.handlers import SysLogHandler
+
+
+class SshKnownHostsGen(object):
+query =
+SELECT resources.title as title,
+ GROUP_CONCAT(CONCAT(param_names.name, \t, param_values.value)
+ SEPARATOR \n) AS service_content
+FROM param_values
+ JOIN param_names ON param_names.id = param_values.param_name_id
+ JOIN resources ON param_values.resource_id = resources.id
+WHERE restype = 'Sshkey'
+GROUP BY resources.id ORDER BY resources.title ASC
+
+def load_config(self, configfile):
+self.config = configparser.SafeConfigParser()
+self.config.read(configfile)
+self.dsn = {}://{}:{}@{}:3306/puppet.format(
+self.config.get('master', 'dbadapter'),
+self.config.get('master', 'dbuser'),
+self.config.get('master', 'dbpassword'),
+self.config.get('master', 'dbserver')
+)
+
+def __init__(self, configfile, debug):
+self.log = logging.getLogger('sshknowngen')
+self.log.debug('Loading configfile %s', configfile)
+self.load_config(configfile)
+self.db_engine = sqlalchemy.create_engine(
+self.dsn,
+echo=debug
+)
+
+def _query(self):
+connection = self.db_engine.connect()
+connection.execute('set group_concat_max_len = @@max_allowed_packet')
+res = connection.execute(self.query)
+connection.close()
+return res
+
+def render(self):
+try:
+for entity in self._query():
+self.log.debug('Working on resource %s', entity['title'])
+attrs = defaultdict(list)
+for restuple in entity['service_content'].split(\n):
+(k, v) = restuple.split(\t)
+attrs[k].append(v)
+
+if attrs['ensure'][0] != 'present':
+continue
+
+hostname = entity['title']
+aliases = [
+a
+for a in attrs['host_aliases']
+if not
[MediaWiki-commits] [Gerrit] update mw and wm versions - change (pywikibot/compat)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214336
Change subject: update mw and wm versions
..
update mw and wm versions
Change-Id: I4374aec3c87fd1f9bb2757481dd42c7ba00159e6
---
M family.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/36/214336/1
diff --git a/family.py b/family.py
index f3ec8b1..7a1d320 100644
--- a/family.py
+++ b/family.py
@@ -4331,7 +4331,7 @@
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
# Here we return the latest mw release for downloading
-return '1.24.2'
+return '1.25.1'
def versionnumber(self, code, version=None):
Return an int identifying MediaWiki version.
@@ -4967,7 +4967,7 @@
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
# Here we return the latest mw release of wikimedia projects
-return '1.26wmf5'
+return '1.26wmf7'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/214336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4374aec3c87fd1f9bb2757481dd42c7ba00159e6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ipv6 token stuff: re-enable cp1008 testing - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: ipv6 token stuff: re-enable cp1008 testing
..
ipv6 token stuff: re-enable cp1008 testing
Change-Id: I324ebde7b3935ba180bba94f34430e1308619e33
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index b0d625d..6d72bc4 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -29,7 +29,7 @@
}
# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp' {
+if $::hostname == 'cp1008' {
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
--
To view, visit https://gerrit.wikimedia.org/r/214335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I324ebde7b3935ba180bba94f34430e1308619e33
Gerrit-PatchSet: 1
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] Deploy v6 token approach to some jessie/trusty hosts - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Deploy v6 token approach to some jessie/trusty hosts
..
Deploy v6 token approach to some jessie/trusty hosts
Change-Id: I3cb9332962335fad248c027790c8a13646406a8e
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 6d72bc4..4ff8bd2 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -28,8 +28,8 @@
prefixlen = '64'
}
-# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp1008' {
+# XXX Temporary: testing on jessie/trusty hostnames ending in the
digit 1
+if $::hostname =~ /1$/ {
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
--
To view, visit https://gerrit.wikimedia.org/r/214341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cb9332962335fad248c027790c8a13646406a8e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@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] Consistency tweaks: xml - XML, Href - href - change (mediawiki/core)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/214344 Change subject: Consistency tweaks: xml - XML, Href - href .. Consistency tweaks: xml - XML, Href - href Change-Id: I6dff4f42d1075c434a4f5d5f3a9ba36843231cc3 --- M languages/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/214344/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 26c4b1b..b8284ad 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1354,11 +1354,11 @@ uploaddisabledtext: File uploads are disabled., php-uploaddisabledtext: File uploads are disabled in PHP.\nPlease check the file_uploads setting., uploadscripted: This file contains HTML or script code that may be erroneously interpreted by a web browser., - upload-scripted-pi-callback: Cannot upload a file that contains xml-stylesheet processing instruction., + upload-scripted-pi-callback: Cannot upload a file that contains XML-stylesheet processing instruction., uploaded-script-svg: Found scriptable element \$1\ in the uploaded SVG file., uploaded-hostile-svg: Found unsafe CSS in the style element of uploaded SVG file., uploaded-event-handler-on-svg: Setting event-handler attributes code$1=\$2\/code is not allowed in SVG files., - uploaded-href-attribute-svg: Href attributes codelt;$1 $2=\$3\gt;/code with non-local target (e.g. http://, javascript:, etc) are not allowed in SVG files., + uploaded-href-attribute-svg: href attributes codelt;$1 $2=\$3\gt;/code with non-local target (e.g. http://, javascript:, etc) are not allowed in SVG files., uploaded-href-unsafe-target-svg: Found href to unsafe target codelt;$1 $2=\$3\gt;/code in the uploaded SVG file., uploaded-animate-svg: Found \animate\ tag that might be changing href, using the \from\ attribute codelt;$1 $2=\$3\gt;/code in the uploaded SVG file., uploaded-setting-event-handler-svg: Setting event-handler attributes is blocked, found codelt;$1 $2=\$3\gt;/code in the uploaded SVG file., -- To view, visit https://gerrit.wikimedia.org/r/214344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dff4f42d1075c434a4f5d5f3a9ba36843231cc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ipv6 token stuff: add flush on first set, update comments - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: ipv6 token stuff: add flush on first set, update comments
..
ipv6 token stuff: add flush on first set, update comments
Change-Id: Ie3a0c781318f856af7b89cd5b37aab895f0afd3d
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 14 insertions(+), 7 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 194c181..b0d625d 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -40,15 +40,22 @@
# used with any autoconf address, as opposed to one derived from the
# macaddr. This aligns the autoconf-assigned address with the fixed
# one set above, and can do so as a pre-up command to avoid ever
-# having another address even temporarily. We could probably rely on
-# this exclusively and drop the static address above, but the
-# redundancy doesn't hurt (the autoconf simply won't end up appearing
-# on the list at all when it duplicates the static address), and this
-# allays any fears about relying on router advertisments. As above,
-# this also executes itself in the present when first configured.
+# having another address even temporarily, when this is all set up
+# before boot.
+# We can't rely on the token part exclusively, though, or we'd face
+# race conditions: daemons would expect to be able to bind this
+# address for listening immediately after network-up, but the address
+# wouldn't exist until the next RA arrives on the interface, which can
+# be 1-2s in practice.
+# By keeping both the static config from above and the token command,
+# we get the best of all worlds: no race, and no conflicting
+# macaddr-based assignment on the interface either. When this is
+# first applied at runtime it will execute the token command as well,
+# but any previous macaddr-based address will be flushed.
if os_version('debian = jessie || ubuntu = trusty') {
$v6_token_cmd = /sbin/ip token set $v6_mapped_lower64 dev ${intf}
+$v6_flush_dyn_cmd = /sbin/ip -6 addr flush dev ${intf} dynamic
$v6_token_check_cmd = /sbin/ip token get dev $intf | grep -qw
$v6_mapped_lower64
$v6_token_preup_cmd = set iface[. = '${intf}']/pre-up
'${v6_token_cmd}'
@@ -58,7 +65,7 @@
}
exec { ${intf}_v6_token:
-command = $v6_token_cmd,
+command = $v6_token_cmd $v6_flush_dyn_cmd,
unless = $v6_token_check_cmd,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3a0c781318f856af7b89cd5b37aab895f0afd3d
Gerrit-PatchSet: 1
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] update mw and wm versions - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: update mw and wm versions
..
update mw and wm versions
Change-Id: I4374aec3c87fd1f9bb2757481dd42c7ba00159e6
---
M family.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/family.py b/family.py
index f3ec8b1..7a1d320 100644
--- a/family.py
+++ b/family.py
@@ -4331,7 +4331,7 @@
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
# Here we return the latest mw release for downloading
-return '1.24.2'
+return '1.25.1'
def versionnumber(self, code, version=None):
Return an int identifying MediaWiki version.
@@ -4967,7 +4967,7 @@
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
# Here we return the latest mw release of wikimedia projects
-return '1.26wmf5'
+return '1.26wmf7'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/214336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4374aec3c87fd1f9bb2757481dd42c7ba00159e6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
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] tools: Include labsdb aliases only in exec hosts - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214338
Change subject: tools: Include labsdb aliases only in exec hosts
..
tools: Include labsdb aliases only in exec hosts
These were on the gridengine master as well and gridengine-master
falls over and dies intermittetnly if the hosts file is too big.
We only really need this on the bastions and the exec hosts,
so let's include those only there.
Bug: T100554
Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/214338/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index ef3e6d7..bc2a4aa 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -5,8 +5,6 @@
$gridmaster = ${::instanceproject}-master.${::site}.wmflabs
class { 'gridengine': gridmaster = $gridmaster }
-
-include role::labs::db::client
}
class bastion inherits role::labs::tools::common {
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 0859ebf..f0dbb91 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -21,6 +21,8 @@
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/214338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
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] tools: Include labsdb aliases only in exec hosts - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Include labsdb aliases only in exec hosts
..
tools: Include labsdb aliases only in exec hosts
These were on the gridengine master as well and gridengine-master
falls over and dies intermittetnly if the hosts file is too big.
We only really need this on the bastions and the exec hosts,
so let's include those only there.
Bug: T100554
Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index ef3e6d7..bc2a4aa 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -5,8 +5,6 @@
$gridmaster = ${::instanceproject}-master.${::site}.wmflabs
class { 'gridengine': gridmaster = $gridmaster }
-
-include role::labs::db::client
}
class bastion inherits role::labs::tools::common {
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 0859ebf..f0dbb91 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -21,6 +21,8 @@
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/214338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: 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] tools: Remove exec_environ from gridengine master - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214339
Change subject: tools: Remove exec_environ from gridengine master
..
tools: Remove exec_environ from gridengine master
Not sure why it was added in the first place. master just runs
the gridengine master, exec_environ shouldn't be present
Change-Id: I7fd3f44e6f74a52818fe7c4f7e57d12a7f68ef22
---
M modules/toollabs/manifests/master.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/214339/1
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index 9628023..dbfe014 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -13,7 +13,6 @@
class toollabs::master inherits toollabs {
include gridengine::master,
toollabs::infrastructure,
-toollabs::exec_environ,
toollabs::queue::task,
toollabs::queue::continuous
--
To view, visit https://gerrit.wikimedia.org/r/214339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fd3f44e6f74a52818fe7c4f7e57d12a7f68ef22
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] Check templateField type - change (mediawiki...Citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214340
Change subject: Check templateField type
..
Check templateField type
Previously, didn't check templateField type for type
Array when citoidField was also an array and would
attempt to add arrays as a template parameter.
If there is a type mismatch, it ignores the field and
no longer tries to add it as a template parameter.
Bug: T100651
Change-Id: I0b897cace77ce47d952f4b53007404b13ea312d9
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 24 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/40/214340/1
diff --git a/modules/ve.ui.CiteFromIdInspector.js
b/modules/ve.ui.CiteFromIdInspector.js
index b961c80..fa7d977 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -599,22 +599,38 @@
for ( citoidField in map ) {
templateField = map[ citoidField ];
// Construct parameters
- if ( typeof templateField === 'string' citation[ citoidField
] !== undefined ) {
+ if ( typeof templateField === 'string'
+ citation[ citoidField ] typeof citation[ citoidField
] === 'string') {
// Case: Citoid parameter directly equivalent to
TemplateData parameter
- template.addParameter( new ve.dm.MWParameterModel(
template, templateField, citation[citoidField ] ) );
- } else if ( Array.isArray( citation[ citoidField ] ) ) {
+ template.addParameter( new ve.dm.MWParameterModel(
+ template, templateField, citation[ citoidField
] )
+ );
+ // Check that both typeof citoidField and templateField match
+ } else if ( Array.isArray( citation[ citoidField ] )
Array.isArray( templateField ) ) {
// Case: Citoid parameter equivalent to 1 or 2D Array
of TD parameters
for ( i = 0; i citation[ citoidField ].length; i++ ) {
// Iterate through first dimension of array
- if ( typeof citation[ citoidField ][ i ] ===
'string' templateField[ i ] !== undefined ) {
+ if ( typeof citation[ citoidField ][ i ] ===
'string'
+ typeof templateField[ i ] === 'string')
{
// Case: Citoid parameter equivalent to
1D Array of TD parameters
- template.addParameter( new
ve.dm.MWParameterModel( template, templateField[ i ], citation[ citoidField ][
i ] ) );
- } else if ( Array.isArray( citation[
citoidField ][ i ] ) ) {
+ template.addParameter(
+ new ve.dm.MWParameterModel(
+ template,
templateField[ i ], citation[ citoidField ][ i ]
+ )
+ );
+ // Check that both typeof citoidField and
templateField match
+ } else if ( Array.isArray( citation[
citoidField ][ i ] )
+ Array.isArray( templateField[ i ] )) {
// Case: Citoid parameter equivalent to
2D Array of TD parameters
for ( j = 0; j citation[ citoidField
][ i ].length; j++ ) {
// Iterate through 2nd
dimension of Array
- if ( typeof citation[
citoidField ][ i ][ j ] === 'string' templateField[ i ] !== undefined
templateField[ i ][ j ] !== undefined ) {
- template.addParameter(
new ve.dm.MWParameterModel( template, templateField[ i ][ j ], citation[
citoidField ][ i ][ j ] ) );
+ if ( typeof citation[
citoidField ][ i ][ j ] === 'string'
+ templateField[ i ]
templateField[ i ][ j ] ) {
+ template.addParameter(
+ new
ve.dm.MWParameterModel(
+
template, templateField[ i ][ j ], citation[ citoidField ][ i ][ j ]
+ )
+ );
}
}
}
--
To
[MediaWiki-commits] [Gerrit] admin: clean up removed/revoked SSH keys - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214343
Change subject: admin: clean up removed/revoked SSH keys
..
admin: clean up removed/revoked SSH keys
This removes the ssh::userkey definition with an empty content for users
with no SSH keys. The output of join may or may not be undef and if it
is, the included File will just ignore the file's content instead of
setting it to ''.
This ensures that those stale SSH authorized keys will be removed, as
/etc/ssh/userkeys is recursively managed and purged.
Change-Id: I1ae4712e26c88395ac3315e5fd932ae3843a317e
---
M modules/admin/manifests/user.pp
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/214343/1
diff --git a/modules/admin/manifests/user.pp b/modules/admin/manifests/user.pp
index 19362fb..4b279ee 100644
--- a/modules/admin/manifests/user.pp
+++ b/modules/admin/manifests/user.pp
@@ -82,7 +82,6 @@
owner= $name,
group= $gid,
force= true,
-tag = 'user-home',
require = User[$name],
}
}
@@ -91,10 +90,12 @@
fail(${name} is not a valid ssh_keys array: ${ssh_keys})
}
-ssh::userkey { $name:
-ensure = $ensure,
-content = join($ssh_keys, \n),
-tag = 'user-ssh',
+# recursively-managed, automatically purges
+if !empty($ssh_keys) {
+ssh::userkey { $name:
+ensure = $ensure,
+content = join($ssh_keys, \n),
+}
}
if !empty($privileges) {
--
To view, visit https://gerrit.wikimedia.org/r/214343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ae4712e26c88395ac3315e5fd932ae3843a317e
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] CX: Add languages for deployment on 20150528 - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: CX: Add languages for deployment on 20150528 .. CX: Add languages for deployment on 20150528 Bug: T99535 Bug: T100386 Bug: T100387 Bug: T100388 Bug: T100389 Bug: T100390 Bug: T100394 Bug: T100395 Bug: T100396 Bug: T100397 Change-Id: I42d29cd015508a09248becf0288f5c3e0b9d787a --- M hieradata/common/cxserver.yaml 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index e583b9d..21bffa9 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -299,12 +299,14 @@ - 'ay' - 'az' - 'ba' +- 'bat-smg' - 'be' - 'be-tarask' - 'bcl' - 'bg' - 'bho' - 'bm' +- 'bs' - 'ca' - 'cbk-zam' - 'ceb' @@ -317,15 +319,20 @@ - 'el' - 'eo' - 'es' +- 'et' - 'eu' - 'ext' - 'ff' +- 'fi' - 'fr' +- 'fy' - 'gag' - 'gl' - 'gn' - 'gu' - 'hi' +- 'hr' +- 'hu' - 'hy' - 'id' - 'ig' @@ -355,6 +362,8 @@ - 'mt' - 'mwl' - 'nah' +- 'nds-nl' +- 'nl' - 'nn' - 'no' - 'nso' @@ -371,20 +380,25 @@ - 'qu' - 'rmy' - 'rn' +- 'ro' - 'rup' - 'rue' - 'sah' +- 'se' - 'sg' - 'sh' - 'simple' +- 'sk' - 'sl' - 'sn' - 'so' +- 'sr' - 'sq' - 'ss' - 'st' - 'sv' - 'sw' +- 'szl' - 'ti' - 'tlw' - 'tn' @@ -398,7 +412,9 @@ - 'uk' - 'uz' - 've' +- 'vep' - 'vi' +- 'vro' - 'war' - 'wo' - 'xh' -- To view, visit https://gerrit.wikimedia.org/r/214071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42d29cd015508a09248becf0288f5c3e0b9d787a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@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 language Konkani in Devanagari script (gom-deva) - change (mediawiki/core)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/214350 Change subject: Add language Konkani in Devanagari script (gom-deva) .. Add language Konkani in Devanagari script (gom-deva) First export with Ibfc0b3b833ef6389f5ca73a0f276da2e58929152 Needed for new Wikipedia in Konkani (T96468) Change-Id: I384b3a14b232b346096066d678d84f7742b6d4c2 --- M RELEASE-NOTES-1.26 M languages/Names.php 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/214350/1 diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26 index 588dc56..2c78683 100644 --- a/RELEASE-NOTES-1.26 +++ b/RELEASE-NOTES-1.26 @@ -37,6 +37,10 @@ regularly. Below only new and removed languages are listed, as well as changes to languages because of Bugzilla reports. +* Languages added: +** gom-deva (कोंकणी/Konkani), thanks to translators Amire80, AshLin, Darshan kandolkar, + Konknni mogi 24, Pooja tople, Sanket.prabhu26, Santhosh.thottingal, Supriya kankumbikar + Vaishali Parab === Other changes in 1.26 === * ChangeTags::tagDescription() will return false if the interface message diff --git a/languages/Names.php b/languages/Names.php index ddd40f1..f3c4f17 100644 --- a/languages/Names.php +++ b/languages/Names.php @@ -158,6 +158,7 @@ 'gl' = 'galego', # Galician 'glk' = 'گیلکی', # Gilaki 'gn' = 'Avañe\'ẽ', # Guaraní, Paraguayan + 'gom-deva' = 'कोंकणी', # Goan Konkani (Devanāgarī script) 'gom-latn' = 'Konknni',# Goan Konkani (Latin script) 'got' = '̲̹̺̿̈́̓', # Gothic 'grc' = 'Ἀρχαία ἑλληνικὴ', # Ancient Greek -- To view, visit https://gerrit.wikimedia.org/r/214350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I384b3a14b232b346096066d678d84f7742b6d4c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for followlive.py and piper.py - change (translatewiki)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/214358 Change subject: Add support for followlive.py and piper.py .. Add support for followlive.py and piper.py Change-Id: I46a4819050579c6f4aacaa0ba45683bf140c80d1 --- M groups/Pywikibot/Pywikibot.yaml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/58/214358/1 diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml index f9d14a5..b044844 100644 --- a/groups/Pywikibot/Pywikibot.yaml +++ b/groups/Pywikibot/Pywikibot.yaml @@ -213,6 +213,13 @@ sourcePattern: %GROUPROOT%/pywikibot/fixing_redirects/%CODE%.json --- BASIC: + id: out-pywikipedia-followlive + label: Pywikibot Follow Live + +FILES: + sourcePattern: %GROUPROOT%/pywikibot/followlive/%CODE%.json +--- +BASIC: id: out-pywikipedia-interwiki label: Pywikibot Interwiki @@ -280,6 +287,13 @@ sourcePattern: %GROUPROOT%/pywikibot/pagefromfile/%CODE%.json --- BASIC: + id: out-pywikipedia-piper + label: Pywikibot Piper + +FILES: + sourcePattern: %GROUPROOT%/pywikibot/piper/%CODE%.json +--- +BASIC: id: out-pywikipedia-protect label: Pywikibot Protect -- To view, visit https://gerrit.wikimedia.org/r/214358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46a4819050579c6f4aacaa0ba45683bf140c80d1 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Extension:NewUserMessage on ta.wikipedia - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable Extension:NewUserMessage on ta.wikipedia .. Enable Extension:NewUserMessage on ta.wikipedia Bug: T100431 Change-Id: I4da71bb433eaa43aa04c054c4eb9cc706fb36ade --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved Mjbmr: Looks good to me, but someone else must approve Dereckson: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 6c20baa..de65e14 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11079,6 +11079,7 @@ 'rowikisource' = true, // Bug T30307 'ruwikiversity' = true, 'strategywiki' = true, + 'tawiki' = true, // Bug T100431 'thwiki' = true, // Bug T30689 'thwiktionary' = true, // Bug T33600 'thwikisource' = true, // Bug T33600 @@ -2,6 +3,7 @@ 'ndswiki' = true, 'pawiki' = true, // T99331 'rowiki' = true, + 'tawiki' = true, // Bug T100431 'thwiki' = true, 'thwiktionary' = true, // Bug T33600 'thwikisource' = true, // Bug T33600 -- To view, visit https://gerrit.wikimedia.org/r/213841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4da71bb433eaa43aa04c054c4eb9cc706fb36ade Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Shanmugamp7 shanmuga...@gmail.com Gerrit-Reviewer: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Mjbmr mjb...@gmail.com Gerrit-Reviewer: Thcipriani tcipri...@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 languages to be deployed on 20150528 - change (analytics/limn-language-data)
jenkins-bot has submitted this change and it was merged. Change subject: Add languages to be deployed on 20150528 .. Add languages to be deployed on 20150528 Change-Id: I149370f917bbd0e07e4931c29186b225430756ba --- M language/content_translation_beta.sql M language/content_translation_beta_manual.sql M reportgenerator/config/config.json 3 files changed, 109 insertions(+), 3 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/language/content_translation_beta.sql b/language/content_translation_beta.sql index 5daf825..74ee885 100644 --- a/language/content_translation_beta.sql +++ b/language/content_translation_beta.sql @@ -119,7 +119,23 @@ gnwiki, extwiki, papwiki, -ltwiki +ltwiki, +bat-smgwiki, +bswiki, +etwiki, +fiwiki, +fiu-vrowiki, +fywiki, +hrwiki, +huwiki, +nds-nlwiki, +nlwiki, +rowiki, +sewiki, +skwiki, +srwiki, +szlwiki, +vepwiki from (select * from ( select count(*) as cawiki from cawiki.user_properties where up_property = 'cx' and up_value = 1 ) ca @@ -184,7 +200,9 @@ left join ( select count(*) as koiwiki from koiwiki.user_properties where up_property = 'cx' and up_value = 1 ) koi on 1=1 ) first30 + cross join + (select * from ( select count(*) as kvwiki from kvwiki.user_properties where up_property = 'cx' and up_value = 1 ) kv left join @@ -361,6 +379,42 @@ ( select count(*) as papwiki from papwiki.user_properties where up_property = 'cx' and up_value = 1 ) pap on 1=1 left join ( select count(*) as ltwiki from ltwiki.user_properties where up_property = 'cx' and up_value = 1 ) lt on 1=1 +left join +( select count(*) as bat-smgwiki from bat-smgwiki.user_properties where up_property = 'cx' and up_value = 1 ) bat-smg on 1=1 +left join +( select count(*) as bswiki from bswiki.user_properties where up_property = 'cx' and up_value = 1 ) bs on 1=1 +left join +( select count(*) as etwiki from etwiki.user_properties where up_property = 'cx' and up_value = 1 ) et on 1=1 +left join +( select count(*) as fiwiki from fiwiki.user_properties where up_property = 'cx' and up_value = 1 ) fi on 1=1 +left join +( select count(*) as fiu-vrowiki from fiu-vrowiki.user_properties where up_property = 'cx' and up_value = 1 ) fiu-vro on 1=1 +left join +( select count(*) as fywiki from fywiki.user_properties where up_property = 'cx' and up_value = 1 ) fy on 1=1 +left join +( select count(*) as hrwiki from hrwiki.user_properties where up_property = 'cx' and up_value = 1 ) hr on 1=1 +left join +( select count(*) as huwiki from huwiki.user_properties where up_property = 'cx' and up_value = 1 ) hu on 1=1 ) forth30 +cross join + +(select * + from ( select count(*) as nds-nlwiki from nds-nlwiki.user_properties where up_property = 'cx' and up_value = 1 ) nds-nl +left join +( select count(*) as nlwiki from nlwiki.user_properties where up_property = 'cx' and up_value = 1 ) nl on 1=1 +left join +( select count(*) as rowiki from rowiki.user_properties where up_property = 'cx' and up_value = 1 ) ro on 1=1 +left join +( select count(*) as sewiki from sewiki.user_properties where up_property = 'cx' and up_value = 1 ) se on 1=1 +left join +( select count(*) as skwiki from skwiki.user_properties where up_property = 'cx' and up_value = 1 ) sk on 1=1 +left join +( select count(*) as srwiki from srwiki.user_properties where up_property = 'cx' and up_value = 1 ) sr on 1=1 +left join +( select count(*) as szlwiki from szlwiki.user_properties where up_property = 'cx' and up_value = 1 ) szl on 1=1 +left join +( select count(*) as vepwiki from vepwiki.user_properties where up_property = 'cx' and up_value = 1 ) vep on 1=1 +) fifth30 + ; diff --git a/language/content_translation_beta_manual.sql b/language/content_translation_beta_manual.sql index ac09c7f..3b29827 100644 --- a/language/content_translation_beta_manual.sql +++ b/language/content_translation_beta_manual.sql @@ -119,7 +119,23 @@ gnwiki, extwiki, papwiki, -ltwiki +ltwiki, +bat-smgwiki, +bswiki, +etwiki, +fiwiki
[MediaWiki-commits] [Gerrit] Update ContentTranslation to 67163e1 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update ContentTranslation to 67163e1 .. Update ContentTranslation to 67163e1 Change-Id: I5452a88e772d49ff9448a5fba842c14524cf54a7 --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index 72a30fa..67163e1 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit 72a30fa0feb8fe3d4b8e64a50a728ad91693fc2b +Subproject commit 67163e18442a5205b8246ee2c75477e6b73b9f03 -- To view, visit https://gerrit.wikimedia.org/r/214356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5452a88e772d49ff9448a5fba842c14524cf54a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf8 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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] ApiOpenSearch: Ignore any other unexpected keys in json output - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214347
Change subject: ApiOpenSearch: Ignore any other unexpected keys in json output
..
ApiOpenSearch: Ignore any other unexpected keys in json output
Iad295d2f fixed warnings to not break the opensearch json output. But
other stuff like $wgDebugToolbar can do the same thing, so let's strip
all unrecognized keys to avoid that problem.
Bug: T100635
Change-Id: I20b6502482af537ccb703f400508960038213a91
---
M includes/api/ApiOpenSearch.php
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/214347/1
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index a93b7cc..0adb464 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -384,13 +384,25 @@
public function execute() {
if ( !$this-getResult()-getResultData( 'error' ) ) {
- $warnings = $this-getResult()-removeValue(
'warnings', null );
+ $result = $this-getResult();
+
+ // Ignore warnings or treat as errors, as requested
+ $warnings = $result-removeValue( 'warnings', null );
if ( $this-warningsAsError $warnings ) {
$this-dieUsage(
'Warnings cannot be represented in
OpenSearch JSON format', 'warnings', 0,
array( 'warnings' = $warnings )
);
}
+
+ // Ignore any other unexpected keys (e.g. from
$wgDebugToolbar)
+ $remove = array_keys( array_diff_key(
+ $result-getResultData(),
+ array( 0 = 'search', 1 = 'terms', 2 =
'descriptions', 3 = 'urls' )
+ ) );
+ foreach ( $remove as $key ) {
+ $result-removeValue( $key, null );
+ }
}
parent::execute();
--
To view, visit https://gerrit.wikimedia.org/r/214347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20b6502482af537ccb703f400508960038213a91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] salt: small increase of workers on the master - change (operations/puppet)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/214348 Change subject: salt: small increase of workers on the master .. salt: small increase of workers on the master Change-Id: I6cdbac460ce77b606c4fb7e3170e2bfe7dcb4204 --- M manifests/role/salt.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/214348/1 diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp index 9300cf9..b0b4d3a 100644 --- a/manifests/role/salt.pp +++ b/manifests/role/salt.pp @@ -14,7 +14,7 @@ }, salt_file_roots = $salt_file_roots, salt_pillar_roots = $salt_pillar_roots, -salt_worker_threads = '25', +salt_worker_threads = '30', salt_state_roots= $salt_state_roots, salt_module_roots = $salt_module_roots, salt_returner_roots = $salt_returner_roots, -- To view, visit https://gerrit.wikimedia.org/r/214348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cdbac460ce77b606c4fb7e3170e2bfe7dcb4204 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ar...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add get pageview_info udf and underlying functions - change (analytics...source)
Joal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214349
Change subject: Add get pageview_info udf and underlying functions
..
Add get pageview_info udf and underlying functions
Update getProjectFromHost function in PageviewDefinition
Add getDialectFromPath and getArticleFromUri in PageviewDefinition
Modify test data to test new functions
Adapt existing test functions to modified test data
Change-Id: Ieed48b6c520c09e62d3bc05085e67f11ed3a96b7
---
M
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
M
refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestLegacyPageviewDefinition.java
M
refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestPageview.java
M refinery-core/src/test/resources/pageview_test_data.csv
A
refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetPageviewInfoUDF.java
D
refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetProjectUDF.java
A
refinery-hive/src/test/java/org/wikimedia/analytics/refinery/hive/TestGetPageviewInfoUDF.java
D
refinery-hive/src/test/java/org/wikimedia/analytics/refinery/hive/TestGetProjectUDF.java
M
refinery-hive/src/test/java/org/wikimedia/analytics/refinery/hive/TestIsAppPageviewUDF.java
M
refinery-hive/src/test/java/org/wikimedia/analytics/refinery/hive/TestIsLegacyPageviewUDF.java
M
refinery-hive/src/test/java/org/wikimedia/analytics/refinery/hive/TestIsPageviewUDF.java
11 files changed, 530 insertions(+), 164 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/49/214349/1
diff --git
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
index 808c857..e9df39c 100644
---
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
+++
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
@@ -16,6 +16,8 @@
package org.wikimedia.analytics.refinery.core;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.regex.Pattern;
import java.util.HashSet;
import java.util.Arrays;
@@ -105,6 +107,12 @@
www,
download
));
+
+public static final String UNKNOWN_PROJECT_VALUE = -;
+public static final String UNKNOWN_DIALECT_VALUE = -;
+public static final String UNKNOWN_ARTICLE_VALUE = -;
+
+public static final String DEFAULT_DIALECT_VALUE = default;
/**
* All API request uriPaths will contain this
@@ -212,7 +220,7 @@
* @return The project identifier in format [xxx.] (en.wikipedia or
wikisource for instance)
*/
public String getProjectFromHost(String uriHost) {
-if (uriHost == null) return -;
+if (uriHost == null) return UNKNOWN_PROJECT_VALUE;
String[] uri_parts = uriHost.toLowerCase().split(\\.);
switch (uri_parts.length) {
// case wikixxx.org
@@ -237,7 +245,134 @@
else
return uri_parts[0] + . + uri_parts[3];
default:
-return -;
+return UNKNOWN_PROJECT_VALUE;
}
}
+
+/**
+ * Identifies the dialect from a pageview uriPath
+ * NOTE: Provides correct result only if used with is_pageview = true
+ *
+ * @param uriPath The url's path
+ * @return The dialect name (if any)
+ */
+public String getDialectFromPath(String uriPath) {
+if (uriPath == null) return UNKNOWN_DIALECT_VALUE;
+
+// In case of api, unknown dialect
+if (uriPath.startsWith(/w/api.php))
+return UNKNOWN_DIALECT_VALUE;
+
+// Default wiki urls, default dialect
+if (uriPath.equals(/) || uriPath.equals(/wiki) ||
uriPath.equals(/w)
+|| uriPath.startsWith(/wiki/) || uriPath.startsWith(/w/))
+return DEFAULT_DIALECT_VALUE;
+
+// Special dialect case,
+// Extract dialect if it contains a -
+// or default dialect otherwise
+int startIdx = uriPath.indexOf(/);
+startIdx = (startIdx = 0)?(startIdx + 1):startIdx;
+int middleIdx = uriPath.indexOf(-, startIdx);
+int endIdx = uriPath.indexOf(/, startIdx);
+endIdx = (endIdx 0)?endIdx:(uriPath.length());
+if ((startIdx = 0) (startIdx endIdx)) {
+if ((middleIdx 0) (middleIdx endIdx))
+return uriPath.substring(startIdx, endIdx);
+else
+return DEFAULT_DIALECT_VALUE;
+}
+
+// extraction failed, unknown dialect
+return UNKNOWN_DIALECT_VALUE;
+
+}
+
+/**
+ * Extracts an article name from uriPath
+ * NOTE: Assumes that the page is not index.*
+ *
+ * @param path The url's path
+ *
[MediaWiki-commits] [Gerrit] WIP: Use Parsoid v2 API. - change (mediawiki/core)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214351
Change subject: WIP: Use Parsoid v2 API.
..
WIP: Use Parsoid v2 API.
Update the ParsoidVirtualRESTService and the RestbaseVirtualRESTService
to use Parsoid's v2 API, instead of the deprecated v1 API. Since
Visual Editor still issues requests using the v1 API, convert v1 API
requests into v2 API requests when needed for a smooth transition.
The next step will be to convert Visual Editor to issue v2 API requests,
and then the v1-v2 conversion code added here can be removed.
TO DO:
x Test Parsoid v1-v2 conversion [done]
. Test Parsoid v1-Restbase conversion
. Update VE to use Parsoid v2 API
. Test Parsoid v2 (no conversion)
. Test Parsoid v2-Restbase conversion
Change-Id: I07ac60cdec7a52ef93187d40099325a069e3239a
---
M includes/libs/virtualrest/ParsoidVirtualRESTService.php
M includes/libs/virtualrest/RestbaseVirtualRESTService.php
2 files changed, 348 insertions(+), 127 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/214351/1
diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index 32a27f7..7c5670f 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -25,17 +25,21 @@
class ParsoidVirtualRESTService extends VirtualRESTService {
/**
* Example requests:
-* GET /local/v1/page/$title/html/$oldid
-* * $oldid is optional
-* POST /local/v1/transform/html/to/wikitext/$title/$oldid
+* GET /v2/local/html/$title/{$revision}
+* * $revision is optional
+* POST /v2/local/wt/{$title}/{$revision}
* * body: array( 'html' = ... )
-* * $title and $oldid are optional
-* POST /local/v1/transform/wikitext/to/html/$title
+* * $title and $revision are optional
+* POST /v2/local/html/{$title}/{$revision}
* * body: array( 'wikitext' = ... ) or array( 'wikitext' = ...,
'body' = true/false )
* * $title is optional
+* * $revision is optional
+* There are also deprecated v1 requests; see onParsoid1Request
+* for details.
* @param array $params Key/value map
* - url: Parsoid server URL
-* - prefix : Parsoid prefix for this wiki
+* - prefix : Parsoid prefix for this wiki (v1 requests only)
+* - domain : Wiki domain to use (v2 requests only)
* - timeout: Parsoid timeout (optional)
* - forwardCookies : Cookies to forward to Parsoid, or false.
(optional)
* - HTTPProxy : Parsoid HTTP proxy (optional)
@@ -46,7 +50,27 @@
$params['url'] = $params['URL'];
unset( $params['URL'] );
}
- parent::__construct( $params );
+ // set up defaults and merge them with the given params
+ $mparams = array_merge( array(
+ 'url' = 'http://localhost:8000/',
+ 'prefix' = 'localhost',
+ 'domain' = 'localhost',
+ 'forwardCookies' = false,
+ 'HTTPProxy' = null,
+ ), $params );
+ // Ensure the correct url format.
+ $mparams['url'] = preg_replace(
+ '#/?$#',
+ '/',
+ $mparams['url']
+ );
+ // Ensure the correct domain format.
+ $mparams['domain'] = preg_replace(
+ '/^(https?:\/\/)?([^\/:]+?)(\/|:\d+\/?)?$/',
+ '$2',
+ $mparams['domain']
+ );
+ parent::__construct( $mparams );
}
public function onRequests( array $reqs, Closure $idGeneratorFunc ) {
@@ -55,70 +79,155 @@
$parts = explode( '/', $req['url'] );
list(
+ $version, // 'v1' or 'v2'
$targetWiki, // 'local'
- $version, // 'v1'
- $reqType // 'page' or 'transform'
+ $format, // 'html' or 'wt'
+ // $title (optional)
+ // $revision (optional)
) = $parts;
+ if ( $version !== 'v2' ) {
+ $result[$key] = $this-onParsoid1Request( $req,
$idGeneratorFunc );
+ continue;
+ }
if ( $targetWiki !== 'local' ) {
+
throw new Exception( Only 'local' target wiki
is
[MediaWiki-commits] [Gerrit] rename deledpimage to remove_edp_images.py - change (pywikibot/i18n)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/214354 Change subject: rename deledpimage to remove_edp_images.py .. rename deledpimage to remove_edp_images.py The new name is proposed inI3c43958e14d87a81ad047c1821fe43f30ce575c8 Change-Id: I9dfea27bb9bf5c1b1812d1d4b8e5f3fce2b4bb5b --- R remove_edp_images.py R remove_edp_images/ar.json R remove_edp_images/en.json R remove_edp_images/qqq.json R remove_edp_images/zh.json 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n refs/changes/54/214354/1 diff --git a/deledpimage.py b/remove_edp_images.py similarity index 100% rename from deledpimage.py rename to remove_edp_images.py diff --git a/deledpimage/ar.json b/remove_edp_images/ar.json similarity index 100% rename from deledpimage/ar.json rename to remove_edp_images/ar.json diff --git a/deledpimage/en.json b/remove_edp_images/en.json similarity index 100% rename from deledpimage/en.json rename to remove_edp_images/en.json diff --git a/deledpimage/qqq.json b/remove_edp_images/qqq.json similarity index 100% rename from deledpimage/qqq.json rename to remove_edp_images/qqq.json diff --git a/deledpimage/zh.json b/remove_edp_images/zh.json similarity index 100% rename from deledpimage/zh.json rename to remove_edp_images/zh.json -- To view, visit https://gerrit.wikimedia.org/r/214354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dfea27bb9bf5c1b1812d1d4b8e5f3fce2b4bb5b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ContentTranslation to 67163e1 - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/214355 Change subject: Update ContentTranslation to 67163e1 .. Update ContentTranslation to 67163e1 Change-Id: I3e37459db62060fd10635482234769ba042dfd1f --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/55/214355/1 diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index fb2eb74..67163e1 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit fb2eb7401511d3b422afcffd87bcd5e38fedf87e +Subproject commit 67163e18442a5205b8246ee2c75477e6b73b9f03 -- To view, visit https://gerrit.wikimedia.org/r/214355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e37459db62060fd10635482234769ba042dfd1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf7 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deploy v6 token approach to all jessie/trusty - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: deploy v6 token approach to all jessie/trusty
..
deploy v6 token approach to all jessie/trusty
Change-Id: I60440c0f888eb2fb7d1573aeda970d55ebce2811
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 4ff8bd2..9880c97 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -28,9 +28,6 @@
prefixlen = '64'
}
-# XXX Temporary: testing on jessie/trusty hostnames ending in the
digit 1
-if $::hostname =~ /1$/ {
-
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
# in the present if not configured.
@@ -69,7 +66,5 @@
unless = $v6_token_check_cmd,
}
}
-
-} # XXX end cp1008 testing block
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60440c0f888eb2fb7d1573aeda970d55ebce2811
Gerrit-PatchSet: 2
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] CX: Add wikis for CX deployment on 20150528 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: CX: Add wikis for CX deployment on 20150528 .. CX: Add wikis for CX deployment on 20150528 Bug: T99535 Bug: T100386 Bug: T100387 Bug: T100388 Bug: T100389 Bug: T100390 Bug: T100394 Bug: T100395 Bug: T100396 Bug: T100397 Change-Id: I26404c822786295046479724320d997ec221498d --- M wmf-config/InitialiseSettings.php 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: Thcipriani: Verified; Looks good to me, approved Mjbmr: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 31afc82..1df22ef 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14623,6 +14623,7 @@ 'avwiki' = true, 'aywiki' = true, 'azwiki' = true, + 'bat_smgwiki' = true, 'bawiki' = true, 'be_x_oldwiki' = true, 'bewiki' = true, @@ -14630,6 +14631,7 @@ 'bgwiki' = true, 'bhwiki' = true, 'bmwiki' = true, + 'bswiki' = true, 'cawiki' = true, 'cbk_zamwiki' = true, 'cebwiki' = true, @@ -14642,15 +14644,21 @@ 'elwiki' = true, 'eowiki' = true, 'eswiki' = true, + 'etwiki' = true, 'euwiki' = true, 'extwiki' = true, 'ffwiki' = true, + 'fiu_vro' = true, + 'fiwiki' = true, 'frwiki' = true, + 'fywiki' = true, 'gagwiki' = true, 'glwiki' = true, 'gnwiki' = true, 'guwiki' = true, 'hiwiki' = true, + 'huwiki' = true, + 'hrwiki' = true, 'hywiki' = true, 'idwiki' = true, 'igwiki' = true, @@ -14680,6 +14688,8 @@ 'mtwiki' = true, 'mwlwiki' = true, 'nahwiki' = true, + 'nds_nlwiki' = true, + 'nlwiki' = true, 'nnwiki' = true, 'nowiki' = true, 'nsowiki' = true, @@ -14695,21 +14705,26 @@ 'ptwiki' = true, 'quwiki' = true, 'rmywiki' = true, + 'rowiki' = true, 'roa_rupwiki' = true, 'rnwiki' = true, 'ruewiki' = true, 'sahwiki' = true, + 'sewiki' = true, 'sgwiki' = true, 'shwiki' = true, - 'sowiki' = true, - 'swwiki' = true, 'simplewiki' = true, 'slwiki' = true, + 'skwiki' = true, 'snwiki' = true, + 'sowiki' = true, 'sqwiki' = true, + 'srwiki' = true, 'sswiki' = true, 'stwiki' = true, 'svwiki' = true, + 'swwiki' = true, + 'szlwiki' = true, 'tiwiki' = true, 'tlwiki' = true, 'tnwiki' = true, @@ -14723,6 +14738,7 @@ 'ukwiki' = true, 'uzwiki' = true, 'vewiki' = true, + 'vepwiki' = true, 'viwiki' = true, 'warwiki' = true, 'wowiki' = true, -- To view, visit https://gerrit.wikimedia.org/r/213992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26404c822786295046479724320d997ec221498d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Mjbmr mjb...@gmail.com Gerrit-Reviewer: Thcipriani tcipri...@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 determine if a license message should be printed o... - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214357
Change subject: Correctly determine if a license message should be printed or
not
..
Correctly determine if a license message should be printed or not
Bug: T100663
Change-Id: I756e0bc8d43b4237b613ba305a937226bb996d25
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/57/214357/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index ffade0f..c37074b 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1159,7 +1159,7 @@
// Generate the licensing text displayed in the footer of each
page.
// See Skin::getCopyright for desktop equivalent.
$license = self::getLicense( 'footer' );
- if ( $license ) {
+ if ( $license['link'] ) {
$licenseText = $this-msg( 'mobile-frontend-copyright'
)-rawParams( $license['link'] )-text();
} else {
$licenseText = '';
--
To view, visit https://gerrit.wikimedia.org/r/214357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I756e0bc8d43b4237b613ba305a937226bb996d25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in dhcpd.conf - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Fix typo in dhcpd.conf
..
Fix typo in dhcpd.conf
Jessie is debian, not ubuntu.
Change-Id: I2dc6a4a0b593ecd6642818e1d44852d8b0558d99
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index a2ed680..c935b60 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -43,7 +43,7 @@
hardware ethernet AA:00:00:EE:AD:01;
fixed-address etherpad1001.eqiad.wmnet;
option pxelinux.pathprefix jessie-installer/;
- filename jessie-installer/ubuntu-installer/amd64/pxelinux.0;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host pc1001 {
--
To view, visit https://gerrit.wikimedia.org/r/214359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2dc6a4a0b593ecd6642818e1d44852d8b0558d99
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@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] Update ContentTranslation to 67163e1 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update ContentTranslation to 67163e1 .. Update ContentTranslation to 67163e1 Change-Id: I3e37459db62060fd10635482234769ba042dfd1f --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index fb2eb74..67163e1 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit fb2eb7401511d3b422afcffd87bcd5e38fedf87e +Subproject commit 67163e18442a5205b8246ee2c75477e6b73b9f03 -- To view, visit https://gerrit.wikimedia.org/r/214355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e37459db62060fd10635482234769ba042dfd1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf7 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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] salt: small increase of workers on the master - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: salt: small increase of workers on the master .. salt: small increase of workers on the master Change-Id: I6cdbac460ce77b606c4fb7e3170e2bfe7dcb4204 --- M manifests/role/salt.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp index 9300cf9..b0b4d3a 100644 --- a/manifests/role/salt.pp +++ b/manifests/role/salt.pp @@ -14,7 +14,7 @@ }, salt_file_roots = $salt_file_roots, salt_pillar_roots = $salt_pillar_roots, -salt_worker_threads = '25', +salt_worker_threads = '30', salt_state_roots= $salt_state_roots, salt_module_roots = $salt_module_roots, salt_returner_roots = $salt_returner_roots, -- To view, visit https://gerrit.wikimedia.org/r/214348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cdbac460ce77b606c4fb7e3170e2bfe7dcb4204 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite1002: include only standard - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite1002: include only standard
..
graphite1002: include only standard
graphite isn't jessie-ready yet, revert to standard only
Bug: T88994
Change-Id: I1adcedf0e45626618ff2dff38afe49c836e971c3
---
M manifests/site.pp
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index ef5e079..83dadaa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1133,9 +1133,6 @@
# graphite test machine, currently with SSD caching + spinning disks
node 'graphite1002.eqiad.wmnet' {
include standard
-include role::graphite::production
-include role::statsdlb
-include role::gdash
}
# Primary graphite machines, replacing tungsten
--
To view, visit https://gerrit.wikimedia.org/r/214352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1adcedf0e45626618ff2dff38afe49c836e971c3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite1002: include only standard - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214352
Change subject: graphite1002: include only standard
..
graphite1002: include only standard
graphite isn't jessie-ready yet, revert to standard only
Bug: T88994
Change-Id: I1adcedf0e45626618ff2dff38afe49c836e971c3
---
M manifests/site.pp
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/214352/1
diff --git a/manifests/site.pp b/manifests/site.pp
index ef5e079..83dadaa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1133,9 +1133,6 @@
# graphite test machine, currently with SSD caching + spinning disks
node 'graphite1002.eqiad.wmnet' {
include standard
-include role::graphite::production
-include role::statsdlb
-include role::gdash
}
# Primary graphite machines, replacing tungsten
--
To view, visit https://gerrit.wikimedia.org/r/214352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1adcedf0e45626618ff2dff38afe49c836e971c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ssh: guard ssh_known_hosts generation behind $::realm - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214353
Change subject: ssh: guard ssh_known_hosts generation behind $::realm
..
ssh: guard ssh_known_hosts generation behind $::realm
An if $::realm makes me sad but this needs to be fixed ASAP.
Change-Id: I4d36e86559d45c7f7406008ac9acfe44eb92c4db
---
M modules/ssh/manifests/client.pp
1 file changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/214353/1
diff --git a/modules/ssh/manifests/client.pp b/modules/ssh/manifests/client.pp
index 87f3582..1f91c07 100644
--- a/modules/ssh/manifests/client.pp
+++ b/modules/ssh/manifests/client.pp
@@ -3,12 +3,14 @@
ensure = latest,
}
-file { '/etc/ssh/ssh_known_hosts':
-content = generate('/usr/local/bin/sshknowngen'),
-backup = false,
-owner = 'root',
-group = 'root',
-mode= '0644',
+# no exported resources on Labs == no sshknowngen
+if $::realm == 'production' {
+file { '/etc/ssh/ssh_known_hosts':
+content = generate('/usr/local/bin/sshknowngen'),
+backup = false,
+owner = 'root',
+group = 'root',
+mode= '0644',
+}
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/214353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d36e86559d45c7f7406008ac9acfe44eb92c4db
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] ssh: guard ssh_known_hosts generation behind $::realm - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: ssh: guard ssh_known_hosts generation behind $::realm
..
ssh: guard ssh_known_hosts generation behind $::realm
An if $::realm makes me sad but this needs to be fixed ASAP.
Change-Id: I4d36e86559d45c7f7406008ac9acfe44eb92c4db
---
M modules/ssh/manifests/client.pp
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ssh/manifests/client.pp b/modules/ssh/manifests/client.pp
index 87f3582..1f91c07 100644
--- a/modules/ssh/manifests/client.pp
+++ b/modules/ssh/manifests/client.pp
@@ -3,12 +3,14 @@
ensure = latest,
}
-file { '/etc/ssh/ssh_known_hosts':
-content = generate('/usr/local/bin/sshknowngen'),
-backup = false,
-owner = 'root',
-group = 'root',
-mode= '0644',
+# no exported resources on Labs == no sshknowngen
+if $::realm == 'production' {
+file { '/etc/ssh/ssh_known_hosts':
+content = generate('/usr/local/bin/sshknowngen'),
+backup = false,
+owner = 'root',
+group = 'root',
+mode= '0644',
+}
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/214353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d36e86559d45c7f7406008ac9acfe44eb92c4db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@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] Update ContentTranslation to 67163e1 - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/214356 Change subject: Update ContentTranslation to 67163e1 .. Update ContentTranslation to 67163e1 Change-Id: I5452a88e772d49ff9448a5fba842c14524cf54a7 --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/56/214356/1 diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index 72a30fa..67163e1 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit 72a30fa0feb8fe3d4b8e64a50a728ad91693fc2b +Subproject commit 67163e18442a5205b8246ee2c75477e6b73b9f03 -- To view, visit https://gerrit.wikimedia.org/r/214356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5452a88e772d49ff9448a5fba842c14524cf54a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf8 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable SandboxLink for cswiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable SandboxLink for cswiki .. Enable SandboxLink for cswiki Bug: T100513 Change-Id: Ic9abacc702a47d8fa213ed3f46d27f3a6796986b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index be5f801..c83b34b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11569,6 +11569,7 @@ 'cawiki' = true, 'cawikibooks' = true, 'ckbwiki' = true, + 'cswiki' = true, // T100513 'dawiki' = true, 'elwiki' = true, 'elwikivoyage' = true, -- To view, visit https://gerrit.wikimedia.org/r/214247 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9abacc702a47d8fa213ed3f46d27f3a6796986b Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mjbmr mjb...@gmail.com Gerrit-Reviewer: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Thcipriani tcipri...@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] install-server: Accomodate virtualization - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214377
Change subject: install-server: Accomodate virtualization
..
install-server: Accomodate virtualization
Make grub-installer/bootdev conditional based on the detection of
virtualization technology. The check is rather simple. Detect QEMU
enabled CPUs. This means the -cpu must not be passed to qemu-system
since it will mask the model name. Ganeti does not pass that argument
unless instructed to. We will reiterate on the check later on should the
need arise
Change-Id: I7a50cfabb74a1431225c4e6ac1e441eb95563204
---
M modules/install-server/files/autoinstall/common.cfg
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/flat-virtual.cfg
A modules/install-server/files/autoinstall/sda.cfg
A modules/install-server/files/autoinstall/vda.cfg
5 files changed, 42 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/214377/1
diff --git a/modules/install-server/files/autoinstall/common.cfg
b/modules/install-server/files/autoinstall/common.cfg
index 7ddb838..7835f7d 100644
--- a/modules/install-server/files/autoinstall/common.cfg
+++ b/modules/install-server/files/autoinstall/common.cfg
@@ -19,7 +19,6 @@
d-igrub-installer/only_debian boolean true
d-igrub-installer/with_other_osboolean true
-d-igrub-installer/bootdev string /dev/sda
d-idebian-installer/add-kernel-optsstring elevator=deadline
d-igrub-pc grub-pc/hidden_timeout boolean false
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 338666e..a8cf4cb 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
eeden|hooft|maerlant|multatuli|nescio) echo
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch.cfg ;; \
- etherpad[12]001) echo partman/flat.cfg ;; \
+ etherpad[12]001) echo partman/flat-virtual.cfg ;; \
iodine) echo partman/raid1-1partition.cfg ;; \
# sodium) echo partman/mailserver.cfg ;; \
mc[1-9]*) echo partman/mc.cfg ;; \
@@ -105,4 +105,11 @@
wtp[1-2]0[0-2][0-9]|hafnium) echo partman/raid1-lvm.cfg ;; \
carbon|stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
hydrogen|krypton) echo partman/raid1-1partition.cfg ;; \
- esac
+ esac; \
+ \
+ if $(grep -q 'QEMU Virtual CPU' /proc/cpuinfo) ; \
+then \
+ echo vda.cfg ; \
+ else \
+ echo sda.cfg ; \
+ fi
diff --git a/modules/install-server/files/autoinstall/partman/flat-virtual.cfg
b/modules/install-server/files/autoinstall/partman/flat-virtual.cfg
new file mode 100644
index 000..4b273bc
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/flat-virtual.cfg
@@ -0,0 +1,31 @@
+# Flat profile (single disk or HW RAID). Creates:
+# * no RAID (either single disk or hardware raid presenting a single device)
+# * no LVM
+# * 1G swap on the end of the disk
+# * the rest formatted with ext4 for /
+
+d-ipartman-auto/method string regular
+d-ipartman-auto/disk string /dev/vda
+
+d-ipartman-auto/expert_recipe string \
+ 1disk ::\
+ 500 1 100 ext4 \
+ $primary{ } \
+ $bootable{ }\
+ method{ format }\
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ / } \
+ . \
+ 1024 1024 1024 linux-swap \
+ method{ swap } \
+ format{ } \
+ .
+
+d-ipartman-auto/choose_recipe 1disk
+
+d-ipartman/choose_partitionselect finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+d-ipartman/confirm_write_new_label boolean true
diff --git a/modules/install-server/files/autoinstall/sda.cfg
b/modules/install-server/files/autoinstall/sda.cfg
new file mode 100644
index 000..d1d8008
--- /dev/null
+++ b/modules/install-server/files/autoinstall/sda.cfg
@@ -0,0 +1 @@
+d-igrub-installer/bootdev string /dev/sda
diff
[MediaWiki-commits] [Gerrit] Fix Style-position warnings - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Fix Style-position warnings .. Fix Style-position warnings Bug: T100664 Change-Id: If5e2485af54aa8e9db5b2f5d61a44f7ed3868fa2 --- M includes/Resources.php 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 96d16cc..bfe980b 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1518,12 +1518,14 @@ ), 'skinStyles' = array( 'vector' = 'resources/mobile.special.mobilemenu.styles/mobilemenu.less', - ) + ), + 'position' = 'top', ), 'mobile.special.mobileoptions.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'styles' = array( 'resources/mobile.special.mobileoptions.styles/mobileoptions.less', ), + 'position' = 'top', ), 'mobile.special.mobileoptions.scripts' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'position' = 'top', @@ -1556,12 +1558,14 @@ 'vector' = 'resources/mobile.special.nearby.styles/specialNearbyDesktop.less', 'monobook' = 'resources/mobile.special.nearby.styles/specialNearbyDesktop.less', ), + 'position' = 'top', ), 'mobile.special.nearby.beta.styles' = $wgMFResourceFileModuleBoilerplate + array( 'styles' = array( 'resources/mobile.special.nearby.beta.styles/specialNearby.less', ), + 'position' = 'top', ), 'mobile.special.userlogin.scripts' = $wgMFResourceFileModuleBoilerplate + array( @@ -1612,7 +1616,9 @@ 'mobile.special.history.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'position' = 'top', ), - 'mobile.special.userprofile.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array(), + 'mobile.special.userprofile.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( + 'position' = 'top', + ), 'mobile.special.uploads.scripts' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( @@ -1637,6 +1643,7 @@ 'skinStyles' = array( 'default' = 'resources/mobile.special.uploads.styles/default.less', ), + 'position' = 'top', ), 'mobile.special.pagefeed.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( @@ -1651,6 +1658,7 @@ 'resources/mobile.special.mobilediff.styles/icons.less', 'resources/mobile.special.mobilediff.styles/mobilediff.less', ), + 'position' = 'top', ), // Note that this module is declared as a dependency in the Thanks extension (for the @@ -1668,6 +1676,7 @@ 'styles' = array( 'resources/mobile.browse/special/topicTag.less', ), + 'position' = 'top', ), 'mobile.special.browse.topicTag.scripts' = $wgMFMobileSpecialPageResourceBoilerplate + array( -- To view, visit https://gerrit.wikimedia.org/r/214371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5e2485af54aa8e9db5b2f5d61a44f7ed3868fa2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de 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] Support links to Sauce jobs in Raita logging - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged.
Change subject: Support links to Sauce jobs in Raita logging
..
Support links to Sauce jobs in Raita logging
Also fixed indexing to include a consistent routing between
Elasticsearch documents. This is important when dealing with
parent-child-grandchild relationships that will require complex queries
and filtering.
Change-Id: Ia4b7e91b2fb6dae9373cb15581eea8bc5cf97bab
---
M lib/mediawiki_selenium/raita/formatter.rb
M lib/mediawiki_selenium/raita/logger.rb
M lib/mediawiki_selenium/support/hooks.rb
3 files changed, 22 insertions(+), 8 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki_selenium/raita/formatter.rb
b/lib/mediawiki_selenium/raita/formatter.rb
index 0f530e3..312b7a6 100644
--- a/lib/mediawiki_selenium/raita/formatter.rb
+++ b/lib/mediawiki_selenium/raita/formatter.rb
@@ -8,6 +8,14 @@
def initialize
super(NullIO.new)
end
+
+ # Allows for simple embeddings without base64 encoding.
+ #
+ def embedding(mime_type, data)
+return unless mime_type.start_with?('text/')
+
+embeddings { 'mime_type' = mime_type, 'data' = data }
+ end
end
end
end
diff --git a/lib/mediawiki_selenium/raita/logger.rb
b/lib/mediawiki_selenium/raita/logger.rb
index b28e4b7..c5d8f15 100644
--- a/lib/mediawiki_selenium/raita/logger.rb
+++ b/lib/mediawiki_selenium/raita/logger.rb
@@ -13,13 +13,13 @@
# Log everything at once to Raita's Elasticsearch DB.
#
def after_features(*)
-build_id = create('build', @build)['_id']
+@build_id = create('build', @build)['_id']
@gf.feature_hashes.each do |feature|
amend_feature(feature)
elements = feature.delete('elements')
- feature_id = create('feature', feature, build_id)['_id']
+ feature_id = create('feature', feature, @build_id)['_id']
bulk('feature-element', elements, feature_id)
@build[:result][:status] = change_status(
@@ -29,12 +29,12 @@
@build[:result][:duration] += feature['result']['duration']
end
-update('build', build_id, @build)
+update('build', @build_id, @build)
end
private
- # Add status and duration at the feature and background/scenario level
+ # Add status and duration at the feature and background/scenario level.
#
# @param feature {Hash}
#
@@ -78,15 +78,15 @@
def bulk(type, objects, parent = nil)
data = objects.reduce('') do |d, obj|
- d JSON.dump({ create: { _type: type, _parent: parent } }) + \n
+ d JSON.dump({ create: { _type: type, _parent: parent, _routing:
@build_id } }) + \n
d JSON.dump(obj) + \n\n
end
-request(Net::HTTP::Post, ['_bulk'], data, parent: parent)
+request(Net::HTTP::Post, ['_bulk'], data)
end
def create(type, object, parent = nil)
-request(Net::HTTP::Post, [type], object, parent: parent)
+request(Net::HTTP::Post, [type], object, parent: parent, routing:
@build_id)
end
def request(klass, paths, data, query = {})
@@ -94,7 +94,7 @@
uri = @db_url.clone
uri.path = Pathname.new(uri.path).join(*paths.map(:to_s)).to_s
-uri.query = query.map { |pair| pair.join('=') }.join('')
+uri.query = query.map { |pair| pair.join('=') unless pair.last.nil?
}.compact.join('')
data = JSON.dump(data) unless data.is_a?(String)
response = db.request(klass.new(uri), data)
diff --git a/lib/mediawiki_selenium/support/hooks.rb
b/lib/mediawiki_selenium/support/hooks.rb
index e194cdc..a36d975 100644
--- a/lib/mediawiki_selenium/support/hooks.rb
+++ b/lib/mediawiki_selenium/support/hooks.rb
@@ -83,6 +83,12 @@
require 'fileutils'
teardown(scenario.status) do |browser|
+ # Embed remote session URLs
+ if remote? browser.driver.respond_to?(:session_id)
+embed(http://saucelabs.com/jobs/#{browser.driver.session_id};,
'text/url')
+ end
+
+ # Take screenshots
if scenario.failed? lookup(:screenshot_failures, default: false) ==
'true'
screen_dir = lookup(:screenshot_failures_path, default: 'screenshots')
FileUtils.mkdir_p screen_dir
--
To view, visit https://gerrit.wikimedia.org/r/214274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4b7e91b2fb6dae9373cb15581eea8bc5cf97bab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] i18n: Fix category message texts. - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: i18n: Fix category message texts. .. i18n: Fix category message texts. See also: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Mobile-frontend-categories-add-heading/en Change-Id: Iee35255af89d9feae3fff9b9e6a870c8d2d4a31e --- M i18n/en.json 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index eef6594..6805d10 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -23,6 +23,7 @@ Max Semenik, Patrick Reilly, Peter Collingbourne, + Purodha Blissenbach, Raimond Spekking, Ryan Kaldari, Sam Reed, @@ -48,12 +49,12 @@ mobile-frontend-categories-heading: strongCategories/strong, mobile-frontend-categories-subheading: The page belongs to the following categories:, mobile-frontend-categories-nocat: This page doesn't belong to any category, yet., - mobile-frontend-categories-add: Add category, + mobile-frontend-categories-add: Add to category, mobile-frontend-categories-search: Search categories, mobile-frontend-categories-nomatch: No category found for your query. You should try another one., mobile-frontend-categories-nodata: There was an error. Have you added some categories to save?, - mobile-frontend-categories-summary: Added categories, - mobile-frontend-categories-add-heading: strongAdd new categories to/strongspan $1/span, + mobile-frontend-categories-summary: Added to categories, + mobile-frontend-categories-add-heading: strongAddspan $1/span to new categories/strong, mobile-frontend-categories-add-wait: Saving categories, please wait., mobile-frontend-categories-normal: Content based, mobile-frontend-categories-hidden: Organizational, -- To view, visit https://gerrit.wikimedia.org/r/214316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee35255af89d9feae3fff9b9e6a870c8d2d4a31e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ForeignApi: Allow posting for anonymous users - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: ForeignApi: Allow posting for anonymous users
..
ForeignApi: Allow posting for anonymous users
When a user is logged out, get a CSRF token from the remote wiki and
make a POST request using it.
Bug: T95960
Change-Id: Ic5afa3a78c91fd374278aa28296e5560db29f85a
---
M resources/mobile.foreignApi/ForeignApi.js
A tests/qunit/modules/test_ForeignApi.js
2 files changed, 76 insertions(+), 10 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.foreignApi/ForeignApi.js
b/resources/mobile.foreignApi/ForeignApi.js
index 62a7680..2e762b3 100644
--- a/resources/mobile.foreignApi/ForeignApi.js
+++ b/resources/mobile.foreignApi/ForeignApi.js
@@ -46,6 +46,7 @@
},
/**
* Post to API with support for central auth tokens
+* If the user is anonymous, then post using the csrftoken
received from the remote wiki.
* @param {String} tokenType Ignored. `'csrf'` is always used
* @param {Object} data Data to be preprocessed and added to
options
* @param {Object} options Parameters passed to $.ajax()
@@ -56,27 +57,51 @@
d = $.Deferred();
options = options || {};
+ options.xhrFields = {
+ withCredentials: true
+ };
+ // In case it is a file upload we need to append origin
to query string.
+ options.url = self.apiUrl + '?origin=' +
self.getOrigin();
+
+ data.origin = self.getOrigin();
+
// first let's sort out the token
self.getCentralAuthToken().done( function (
centralAuthTokenOne ) {
self.getToken( tokenType, centralAuthTokenOne
).done( function ( token ) {
self.getCentralAuthToken().done(
function ( centralAuthTokenTwo ) {
- data.format = 'json';
data.centralauthtoken =
centralAuthTokenTwo;
data.token = token;
- data.origin = self.getOrigin();
-
- options.xhrFields = {
- withCredentials: true
- };
- // In case it is a file upload
we need to append origin to query string.
- options.url = self.apiUrl +
'?origin=' + self.getOrigin();
-
Api.prototype.post.call( self,
data, options ).done( function ( resp ) {
d.resolve( resp );
} ).fail( $.proxy( d, 'reject'
) );
} ).fail( $.proxy( d, 'reject' ) );
} ).fail( $.proxy( d, 'reject' ) );
- } ).fail( $.proxy( d, 'reject' ) );
+ } ).fail( function ( code ) {
+ if ( code !== 'notloggedin' ) {
+ d.reject();
+ return;
+ }
+ // So the user is not logged in locally.
+ // Get the remote CSRF token
+ Api.prototype.ajax.call(
+ self, {
+ action: 'query',
+ meta: 'tokens',
+ type: 'csrf'
+ }, {
+ url: options.url
+ }
+ ).done( function ( resp ) {
+ if ( resp.query resp.query.tokens
resp.query.tokens.csrftoken ) {
+ data.token =
resp.query.tokens.csrftoken;
+ Api.prototype.post.call( self,
data, options ).done( function ( resp ) {
+ d.resolve( resp );
+ } ).fail( $.proxy( d, 'reject'
) );
+ } else {
+ d.reject();
+ }
+ } ).fail( $.proxy( d, 'reject' ) );
[MediaWiki-commits] [Gerrit] Remove commented-out frack list from site.pp - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/214378 Change subject: Remove commented-out frack list from site.pp .. Remove commented-out frack list from site.pp These lines are a few months old, not up to date and with limited usefulness. Change-Id: I1f22560cac3220c140ccba7b3a1caf2f83b6aa58 --- M manifests/site.pp 1 file changed, 0 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/78/214378/1 diff --git a/manifests/site.pp b/manifests/site.pp index 11bcabe..959a95f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2485,23 +2485,3 @@ include standard } } - -# as of 2014-08-12 these fundraising servers use frack puppet -# -# aluminium.frack.eqiad.wmnet -# barium.frack.eqiad.wmnet -# boron.frack.eqiad.wmnet -# db1008.frack.eqiad.wmnet -# db1025.frack.eqiad.wmnet -# indium.frack.eqiad.wmnet -# lutetium.frack.eqiad.wmnet -# pay-lvs1001.frack.eqiad.wmnet -# pay-lvs1002.frack.eqiad.wmnet -# payments1001.frack.eqiad.wmnet -# payments1002.frack.eqiad.wmnet -# payments1003.frack.eqiad.wmnet -# payments1004.frack.eqiad.wmnet -# samarium.frack.eqiad.wmnet -# silicon.frack.eqiad.wmnet -# tellurium.frack.eqiad.wmnet -# thulium.frack.eqiad.wmnet -- To view, visit https://gerrit.wikimedia.org/r/214378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f22560cac3220c140ccba7b3a1caf2f83b6aa58 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] Remove commented-out frack list from site.pp - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Remove commented-out frack list from site.pp .. Remove commented-out frack list from site.pp These lines are a few months old, not up to date and with limited usefulness. Change-Id: I1f22560cac3220c140ccba7b3a1caf2f83b6aa58 --- M manifests/site.pp 1 file changed, 0 insertions(+), 20 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 11bcabe..959a95f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2485,23 +2485,3 @@ include standard } } - -# as of 2014-08-12 these fundraising servers use frack puppet -# -# aluminium.frack.eqiad.wmnet -# barium.frack.eqiad.wmnet -# boron.frack.eqiad.wmnet -# db1008.frack.eqiad.wmnet -# db1025.frack.eqiad.wmnet -# indium.frack.eqiad.wmnet -# lutetium.frack.eqiad.wmnet -# pay-lvs1001.frack.eqiad.wmnet -# pay-lvs1002.frack.eqiad.wmnet -# payments1001.frack.eqiad.wmnet -# payments1002.frack.eqiad.wmnet -# payments1003.frack.eqiad.wmnet -# payments1004.frack.eqiad.wmnet -# samarium.frack.eqiad.wmnet -# silicon.frack.eqiad.wmnet -# tellurium.frack.eqiad.wmnet -# thulium.frack.eqiad.wmnet -- To view, visit https://gerrit.wikimedia.org/r/214378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f22560cac3220c140ccba7b3a1caf2f83b6aa58 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@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] npm: set description and repo - change (pywikibot/i18n)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214376
Change subject: npm: set description and repo
..
npm: set description and repo
Get rid of two npm warnings by setting a lame description for the
package as well as pointing to the Gerrit anonymous/https URL.
Change-Id: Ibdb399e2966373a0cf6b092d412142a96a511067
---
M package.json
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n
refs/changes/76/214376/1
diff --git a/package.json b/package.json
index 35344ab..3a4aa07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,11 @@
{
name: pywikibot-i18n,
version: 0.0.0,
+ description: Internationalization files for Pywikibot,
+ repository: {
+ type: git,
+ url: https://gerrit.wikimedia.org/r/p/pywikibot/core.git;
+ },
scripts: {
test: grunt test
},
--
To view, visit https://gerrit.wikimedia.org/r/214376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdb399e2966373a0cf6b092d412142a96a511067
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in dhcpd.conf - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214359
Change subject: Fix typo in dhcpd.conf
..
Fix typo in dhcpd.conf
Jessie is debian, not ubuntu.
Change-Id: I2dc6a4a0b593ecd6642818e1d44852d8b0558d99
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/214359/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index a2ed680..c935b60 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -43,7 +43,7 @@
hardware ethernet AA:00:00:EE:AD:01;
fixed-address etherpad1001.eqiad.wmnet;
option pxelinux.pathprefix jessie-installer/;
- filename jessie-installer/ubuntu-installer/amd64/pxelinux.0;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host pc1001 {
--
To view, visit https://gerrit.wikimedia.org/r/214359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dc6a4a0b593ecd6642818e1d44852d8b0558d99
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Message box standardisation (step 1) - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214362
Change subject: Message box standardisation (step 1)
..
Message box standardisation (step 1)
Drop our alert class in favour of the classes used in core
(warningbox, errorbox, successbox).
Drop mw-dismissable-notice which does not exist anywhere in the core code or
MobileFrontend code so purpose is unknown and probably dead code.
On history and contributions page show a warningbox rather than an errorbox
since they are not errors just information.
Refactor message boxes to give a consistent experience on:
* viewing diffs with warnings
* viewing old revisions
* MobileEditor with js disabled
* history/contributions page when no items found
* special uploads page when bad username given
* saving preferences
* warning box on special pages that are not available in stable
(currently none)
* user profile when bad username given
Change-Id: I0fed10d45285a48fbc6af50dd3a3be9940ffc186
---
M i18n/en.json
M includes/MobileUI.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
M includes/specials/MobileSpecialPage.php
M includes/specials/SpecialMobileContributions.php
M includes/specials/SpecialMobileDiff.php
M includes/specials/SpecialMobileEditor.php
M includes/specials/SpecialMobileHistory.php
M includes/specials/SpecialMobileLanguages.php
M includes/specials/SpecialMobilePreferences.php
M includes/specials/SpecialNearby.php
M includes/specials/SpecialUploads.php
M includes/specials/SpecialUserProfile.php
M resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
M resources/mobile.special.uploads.scripts/uploads.js
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.special.styles/common.less
18 files changed, 114 insertions(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/62/214362/1
diff --git a/i18n/en.json b/i18n/en.json
index eef6594..d87fce5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -132,7 +132,6 @@
mobile-frontend-editor-tutorial-confirm: Start editing,
mobile-frontend-editor-tutorial-summary: Try improving the $1
page.br /Don't be scared of markup.,
mobile-frontend-editor-unavailable: Mobile editing is not currently
available on your browser. Please try a different browser.,
- mobile-frontend-editor-unavailable-header: Editor unavailable,
mobile-frontend-editor-undo-unsupported: Undo is not currently
supported on mobile devices.,
mobile-frontend-editor-uploadenable: Please upload a photo first to
enable editing.,
mobile-frontend-editor-viewing-source-page: strongViewing source
of/strongspan $1/span,
diff --git a/includes/MobileUI.php b/includes/MobileUI.php
index 81e7f1d..7461c8f 100644
--- a/includes/MobileUI.php
+++ b/includes/MobileUI.php
@@ -59,4 +59,54 @@
public static function anchorClass( $modifier = '',
$additionalClassNames = '' ) {
return self::semanticClass( 'mw-ui-anchor', $modifier,
$additionalClassNames );
}
+
+ /**
+* Return a warning box.
+* @param string $html of contents of box
+* @param string className corresponding to box
+* @return string of html representing a box.
+*/
+ public static function messageBox( $html, $className ) {
+ return Html::openElement( 'div', array( 'class' = $className )
) .
+ $html . Html::closeElement( 'div' );
+ }
+
+ /**
+* Return a warning box.
+* @param string $html of contents of box
+* @return string of html representing a warning box.
+*/
+ public static function warningBox( $html ) {
+ return self::messageBox( $html, 'warningbox' );
+ }
+
+ /**
+* Return an error box.
+* @param string $html of contents of error box
+* @return string of html representing an error box.
+*/
+ public static function errorBox( $html ) {
+ return self::messageBox( $html, 'errorbox' );
+ }
+
+ /**
+* Return a success box.
+* @param string $html of contents of box
+* @return string of html representing a success box.
+*/
+ public static function successBox( $html ) {
+ return self::messageBox( $html, 'successbox' );
+ }
+
+ /**
+* Mark some html as being content
+* @param string $html
+* @param string $className additional class names
+* @return string of html
+*/
+ public static function contentElement( $html, $className = '' ) {
+ $className .= ' content ';
+ return Html::openElement( 'div', array( 'class' = $className )
) . $html .
+ Html::closeElement( 'div' );
+ }
}
diff --git a/includes/skins/SkinMinerva.php
[MediaWiki-commits] [Gerrit] Ensure collection items are rendered correctly in rtl languages - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214369
Change subject: Ensure collection items are rendered correctly in rtl languages
..
Ensure collection items are rendered correctly in rtl languages
The template data passed in needs to be passed along
Other changes:
Change function visibility - public function being called by protected
function is strange.
Bug: T99362
Change-Id: I30f7ee76902cf16351d35ff1df62206156c12bf3
---
M includes/views/Collection.php
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/69/214369/1
diff --git a/includes/views/Collection.php b/includes/views/Collection.php
index 8cdc131..39896eb 100644
--- a/includes/views/Collection.php
+++ b/includes/views/Collection.php
@@ -158,14 +158,15 @@
/**
* Returns the html for the items of a collection
* @param models\Collection
+* @param Array data passed to initial template rendering
*
* @return string HTML
*/
- public function getCollectionItems( models\Collection $collection ) {
+ protected function getCollectionItems( models\Collection $collection,
$data = array() ) {
$html = Html::openElement( 'div', array( 'class' =
'collection-cards' ) );
foreach ( $collection as $item ) {
$view = new CollectionItemCard( $item );
- $html .= $view-getHtml();
+ $html .= $view-getHtml( $data );
}
$html .= Html::closeElement( 'div' );
return $html;
@@ -188,7 +189,7 @@
$this-getHeaderHtml( $collection );
if ( $collection-getCount() 0 ) {
- $html .= $this-getCollectionItems( $collection );
+ $html .= $this-getCollectionItems( $collection, $data
);
$url = $collection-getContinueUrl();
if ( $url ) {
$html .= Pagination::more( $url, wfMessage(
'gather-collection-more' )-text() );
--
To view, visit https://gerrit.wikimedia.org/r/214369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f7ee76902cf16351d35ff1df62206156c12bf3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Reflect upstream infrastructure change - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214370
Change subject: Reflect upstream infrastructure change
..
Reflect upstream infrastructure change
View now supports enhance mode.
Bug: T98175
Change-Id: I8aa71d7b5d0389b1ac4d7c6861cc84f14486f4d0
---
M resources/ext.gather.collections.list/CollectionsList.js
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/70/214370/1
diff --git a/resources/ext.gather.collections.list/CollectionsList.js
b/resources/ext.gather.collections.list/CollectionsList.js
index e0eca0f..0beba97 100644
--- a/resources/ext.gather.collections.list/CollectionsList.js
+++ b/resources/ext.gather.collections.list/CollectionsList.js
@@ -9,8 +9,8 @@
CreateCollectionButton = M.require(
'ext.gather.collections.list/CreateCollectionButton' );
CollectionsList = View.extend( {
+ /** @inheritdoc */
defaults: {
- enhance: false,
collections: []
},
template: mw.template.get( 'ext.gather.collections.list',
'CollectionsList.hogan' ),
@@ -20,9 +20,6 @@
},
/** @inheritdoc */
initialize: function ( options ) {
- if ( options.enhance ) {
- this.template = false;
- }
View.prototype.initialize.apply( this, arguments );
// After the initial render initialize the infinite
scrolling.
this.$pagination = this.$el.find(
'.collections-pagination' );
--
To view, visit https://gerrit.wikimedia.org/r/214370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa71d7b5d0389b1ac4d7c6861cc84f14486f4d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Load message box styles only when needed - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214365
Change subject: Load message box styles only when needed
..
Load message box styles only when needed
Load on special pages and old revisions
Load with JavaScript otherwise.
Bug: T98877
Change-Id: I8cfbefd88a1c6dccbacf8abfca030cd5bb5e
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
A resources/mobile.messageBox/messageBox.less
M resources/skins.minerva.base.styles/ui.less
4 files changed, 40 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/65/214365/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 0b6aa5a..86fe287 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -306,6 +306,9 @@
'mobile.view',
),
'position' = 'top',
+ 'styles' = array(
+ 'resources/mobile.messageBox/messageBox.less',
+ ),
'templates' = array(
'MessageBox.hogan' =
'resources/mobile.messageBox/messagebox.mustache',
),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7abb2ad..f7b8b18 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1043,8 +1043,12 @@
'skins.minerva.icons.images',
);
if ( $title-isSpecialPage() ) {
+ $styles[] = 'mobile.messageBox';
$styles['special'] = 'skins.minerva.special.styles';
}
+ if ( $this-getOutput()-getRequest()-getText( 'oldid' ) ) {
+ $styles[] = 'mobile.messageBox';
+ }
return $styles;
}
diff --git a/resources/mobile.messageBox/messageBox.less
b/resources/mobile.messageBox/messageBox.less
new file mode 100644
index 000..5d3e134
--- /dev/null
+++ b/resources/mobile.messageBox/messageBox.less
@@ -0,0 +1,33 @@
+@import minerva.variables;
+@import minerva.mixins;
+@import mediawiki.mixins;
+
+// Used for messages on login screen (They're more informational than actual
warnings.)
+.warningbox {
+ border: 1px solid @colorGray12;
+ background-color: @colorGray14;
+ color: @grayDark;
+}
+
+.successbox {
+ color: @colorSuccessText;
+ background: @colorSuccessBackground;
+}
+
+.successbox,
+.errorbox,
+.warningbox {
+ padding: 1em @contentMargin;
+ margin: 0 0 1em;
+
+ h2 {
+ font: bold 100% @fontFamily;
+ padding: 0;
+ margin: 0 0 .5em 0;
+ }
+
+ // used e.g. in EditorOverlay
+ a {
+ margin-bottom: 1em;
+ }
+}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index f926d78..96d9396 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -80,36 +80,6 @@
}
}
-// Used for messages on login screen (They're more informational than actual
warnings.)
-.warningbox {
- border: 1px solid @colorGray12;
- background-color: @colorGray14;
- color: @grayDark;
-}
-
-.successbox {
- color: @colorSuccessText;
- background: @colorSuccessBackground;
-}
-
-.successbox,
-.errorbox,
-.warningbox {
- padding: 1em @contentMargin;
- margin: 0 0 1em;
-
- h2 {
- font: bold 100% @fontFamily;
- padding: 0;
- margin: 0 0 .5em 0;
- }
-
- // used e.g. in EditorOverlay
- a {
- margin-bottom: 1em;
- }
-}
-
/* Search */
.client-use-basic-search,
--
To view, visit https://gerrit.wikimedia.org/r/214365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cfbefd88a1c6dccbacf8abfca030cd5bb5e
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] Move special page styles to module only loaded on special pages - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214366
Change subject: Move special page styles to module only loaded on special pages
..
Move special page styles to module only loaded on special pages
Don't serve this to everyone.
Change-Id: I615301bdc120958d3447875e6bacc9ec11b3afbd
---
M resources/skins.minerva.base.styles/common.less
M resources/skins.minerva.special.styles/forms.less
2 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/66/214366/1
diff --git a/resources/skins.minerva.base.styles/common.less
b/resources/skins.minerva.base.styles/common.less
index 7ab389e..7dd627e 100644
--- a/resources/skins.minerva.base.styles/common.less
+++ b/resources/skins.minerva.base.styles/common.less
@@ -51,22 +51,6 @@
resize: none;
}
-// For old style forms
-// Special:MovePage?target=San%20Francisco
-// Special:Import
-// Special:NewPages
-// Special:RecentChanges
-// Special:Prefixindex
-// Special:Contributions
-// Special:ChangePassword
-// Special:ChangeEmail
-// Special:Allpages
-.mw-input [type=submit],
-.mw-submit {
- margin-top: 8px;
- min-width: 80%;
-}
-
// Make sure last modified link has correct font size (it is outside of the
content div)
.last-modified-bar {
font-size: .9em;
diff --git a/resources/skins.minerva.special.styles/forms.less
b/resources/skins.minerva.special.styles/forms.less
index 3bf8252..52846c9 100644
--- a/resources/skins.minerva.special.styles/forms.less
+++ b/resources/skins.minerva.special.styles/forms.less
@@ -33,3 +33,19 @@
}
}
}
+
+// For old style forms
+// Special:MovePage?target=San%20Francisco
+// Special:Import
+// Special:NewPages
+// Special:RecentChanges
+// Special:Prefixindex
+// Special:Contributions
+// Special:ChangePassword
+// Special:ChangeEmail
+// Special:Allpages
+.mw-input [type=submit],
+.mw-submit {
+ margin-top: 8px;
+ min-width: 80%;
+}
--
To view, visit https://gerrit.wikimedia.org/r/214366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I615301bdc120958d3447875e6bacc9ec11b3afbd
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] Client side code should use message boxes rather than alert - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214364
Change subject: Client side code should use message boxes rather than alert
..
Client side code should use message boxes rather than alert
Introduces MessageBox class
Remove all traces of .alert
Change-Id: Id2613f4670c2979832f67b46a23e3853c5e27345
---
M includes/MobileUI.php
M includes/Resources.php
M resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
M resources/mobile.editor.overlay/EditorOverlay.js
A resources/mobile.messageBox/MessageBox.js
A resources/mobile.messageBox/messagebox.mustache
M resources/mobile.nearby/Nearby.js
M resources/mobile.nearby/nearby.hogan
M resources/mobile.pagelist/PageList.hogan
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.special.userlogin.styles/userlogin.less
M tests/browser/features/support/pages/article_page.rb
12 files changed, 92 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/64/214364/1
diff --git a/includes/MobileUI.php b/includes/MobileUI.php
index 7461c8f..2210e8f 100644
--- a/includes/MobileUI.php
+++ b/includes/MobileUI.php
@@ -67,8 +67,12 @@
* @return string of html representing a box.
*/
public static function messageBox( $html, $className ) {
- return Html::openElement( 'div', array( 'class' = $className )
) .
- $html . Html::closeElement( 'div' );
+ $templateParser = new TemplateParser( __DIR__ .
'/../resources/mobile.messageBox/' );
+
+ return $templateParser-processTemplate( 'messageBox', array(
+ 'className' = $className,
+ 'msg' = $html
+ ) );
}
/**
diff --git a/includes/Resources.php b/includes/Resources.php
index 4a71ef0..0b6aa5a 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -301,6 +301,18 @@
'resources/mobile.mainMenu/MainMenu.js',
),
),
+ 'mobile.messageBox' = $wgMFResourceFileModuleBoilerplate + array(
+ 'dependencies' = array(
+ 'mobile.view',
+ ),
+ 'position' = 'top',
+ 'templates' = array(
+ 'MessageBox.hogan' =
'resources/mobile.messageBox/messagebox.mustache',
+ ),
+ 'scripts' = array(
+ 'resources/mobile.messageBox/MessageBox.js',
+ ),
+ ),
'mobile.modifiedBar' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
'mobile.modules',
@@ -587,6 +599,7 @@
'mobile.settings',
'mobile.drawers',
'mobile.toast',
+ 'mobile.messageBox',
'mediawiki.confirmCloseWindow',
),
'scripts' = array(
@@ -1179,6 +1192,7 @@
'mobile.loggingSchemas',
'mobile.pagelist.scripts',
'mobile.foreignApi',
+ 'mobile.messageBox',
),
'messages' = array(
// NearbyApi.js
diff --git a/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
b/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
index 66d20f1..5a116d5 100644
--- a/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
+++ b/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
@@ -1,5 +1,5 @@
div
- p class=anonMsg warningbox{{{anonMsg}}}/p
+ {{#warningOptions}}{{messageBox}}{{/warningOptions}}
div class=actions
{{#anonButton}}{{button}}{{/anonButton}}
{{#loginButton}}{{button}}{{/loginButton}}
diff --git a/resources/mobile.editor.overlay/EditorOverlay.js
b/resources/mobile.editor.overlay/EditorOverlay.js
index f2b5827..c503609 100644
--- a/resources/mobile.editor.overlay/EditorOverlay.js
+++ b/resources/mobile.editor.overlay/EditorOverlay.js
@@ -1,5 +1,6 @@
( function ( M, $ ) {
- var EditorOverlayBase = M.require( 'modules/editor/EditorOverlayBase' ),
+ var EditorOverlay,
+ EditorOverlayBase = M.require(
'modules/editor/EditorOverlayBase' ),
Section = M.require( 'Section' ),
EditorApi = M.require( 'modules/editor/EditorApi' ),
AbuseFilterPanel = M.require( 'modules/editor/AbuseFilterPanel'
),
@@ -8,7 +9,7 @@
browser = M.require( 'browser' ),
overlayManager = M.require( 'overlayManager' ),
toast = M.require( 'toast' ),
- EditorOverlay;
+ MessageBox = M.require( 'mobile.messageBox/MessageBox' );
/**
* Overlay that shows an
[MediaWiki-commits] [Gerrit] qualify hadoop erb variables - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: qualify hadoop erb variables .. qualify hadoop erb variables Change-Id: I0b86e809435ef72d61d3636d20fa534fd2b0b3c5 --- M templates/hadoop/hadoop-yarn-logging-helper.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ottomata: Looks good to me, but someone else must approve Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/hadoop/hadoop-yarn-logging-helper.erb b/templates/hadoop/hadoop-yarn-logging-helper.erb index f1c34ab..d9457ea 100755 --- a/templates/hadoop/hadoop-yarn-logging-helper.erb +++ b/templates/hadoop/hadoop-yarn-logging-helper.erb @@ -94,8 +94,8 @@ +# GELF appender +log4j.appender.gelf=biz.paluch.logging.gelf.log4j.GelfLogAppender +log4j.appender.gelf.Threshold=INFO -+log4j.appender.gelf.Host=%= gelf_logging_host % -+log4j.appender.gelf.Port=%= gelf_logging_port % ++log4j.appender.gelf.Host=%= @gelf_logging_host % ++log4j.appender.gelf.Port=%= @gelf_logging_port % +log4j.appender.gelf.Facility=Hadoop +log4j.appender.gelf.ExtractStackTrace=true +log4j.appender.gelf.FilterStackTrace=false -- To view, visit https://gerrit.wikimedia.org/r/214081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b86e809435ef72d61d3636d20fa534fd2b0b3c5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent indexing of User: namespace on ukwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Prevent indexing of User: namespace on ukwiki .. Prevent indexing of User: namespace on ukwiki Bug: T98926 Change-Id: I64fbefb7077390666d48cbc9d2d335186a498df9 --- M wmf-config/InitialiseSettings.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved Dereckson: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 58826a5..355d073 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10086,6 +10086,9 @@ NS_HELP_TALK = 'noindex,follow', NS_CATEGORY_TALK = 'noindex,follow', ), + 'ukwiki' = array( + NS_USER = 'noindex,follow', // T98926 + ), 'zhwiki' = array( 118 = 'noindex,nofollow', // T91223 119 = 'noindex,nofollow', -- To view, visit https://gerrit.wikimedia.org/r/210680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64fbefb7077390666d48cbc9d2d335186a498df9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Thcipriani tcipri...@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] Modify AbuseFilter block configuration on eswikibooks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Modify AbuseFilter block configuration on eswikibooks .. Modify AbuseFilter block configuration on eswikibooks $wgAbuseFilterBlockDuration = 'indefinite'; $wgAbuseFilterAnonBlockDuration = '31 hours'; Bug: T96669 Change-Id: Ib1cedd4124e1253a219718bec4946b892cddfc82 --- M wmf-config/abusefilter.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Thcipriani: Looks good to me, approved Mjbmr: Looks good to me, but someone else must approve Dereckson: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index b91f466..116e42a 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -135,7 +135,8 @@ $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgAbuseFilterAvailableActions[] = 'block'; - $wgAbuseFilterBlockDuration = '24 hours'; + $wgAbuseFilterBlockDuration = 'indefinite'; // T96669 + $wgAbuseFilterAnonBlockDuration = '31 hours'; // T96669 $wgAbuseFilterNotifications = false; break; case 'eswiktionary': -- To view, visit https://gerrit.wikimedia.org/r/206510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1cedd4124e1253a219718bec4946b892cddfc82 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Mjbmr mjb...@gmail.com Gerrit-Reviewer: Thcipriani tcipri...@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] change i18n key to remove_edp_images-edit-summary - change (pywikibot/i18n)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214374
Change subject: change i18n key to remove_edp_images-edit-summary
..
change i18n key to remove_edp_images-edit-summary
Change-Id: I886a9114c4aee4bab61bb4b64b91ed075eff2cba
---
M remove_edp_images.py
M remove_edp_images/ar.json
M remove_edp_images/en.json
M remove_edp_images/qqq.json
M remove_edp_images/zh.json
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n
refs/changes/74/214374/1
diff --git a/remove_edp_images.py b/remove_edp_images.py
index 0c811fc..9c2ea6a 100644
--- a/remove_edp_images.py
+++ b/remove_edp_images.py
@@ -3,18 +3,18 @@
msg = {
# Author: Shizhao
'en': {
-'deledpimage-edit-summary': u'Robot: Fix EDP image use: [[%s]]',
+'remove_edp_images-edit-summary': u'Robot: Fix EDP image use: [[%s]]',
},
# Author: Priyanka Jayaswal
'qqq': {
-'deledpimage-edit-summary': u'Edit summary when the bot fixes EDP
image use.',
+'remove_edp_images-edit-summary': u'Edit summary when the bot fixes
EDP image use.',
},
# Author: Meno25
'ar': {
-'deledpimage-edit-summary': u'روبوت: إصلاح استخدام صورة EDP: [[%s]]',
+'remove_edp_images-edit-summary': u'روبوت: إصلاح استخدام صورة EDP:
[[%s]]',
},
# Author: Shizhao
'zh': {
-'deledpimage-edit-summary': u'Bot修正EDP图像用法：[[%s]]',
+'remove_edp_images-edit-summary': u'Bot修正EDP图像用法：[[%s]]',
},
};
diff --git a/remove_edp_images/ar.json b/remove_edp_images/ar.json
index 8fdcf8c..fbce729 100644
--- a/remove_edp_images/ar.json
+++ b/remove_edp_images/ar.json
@@ -1,8 +1,8 @@
-{
+{
@metadata: {
authors: [
Meno25
]
},
- deledpimage-edit-summary: روبوت: إصلاح استخدام صورة EDP: [[%s]]
+ remove_edp_images-edit-summary: روبوت: إصلاح استخدام صورة EDP:
[[%s]]
}
diff --git a/remove_edp_images/en.json b/remove_edp_images/en.json
index b9be058..15b19e3 100644
--- a/remove_edp_images/en.json
+++ b/remove_edp_images/en.json
@@ -4,5 +4,5 @@
Shizhao
]
},
- deledpimage-edit-summary: Robot: Fix EDP image use: [[%s]]
+ remove_edp_images-edit-summary: Robot: Fix EDP image use: [[%s]]
}
diff --git a/remove_edp_images/qqq.json b/remove_edp_images/qqq.json
index af1d17b..fe16512 100644
--- a/remove_edp_images/qqq.json
+++ b/remove_edp_images/qqq.json
@@ -4,5 +4,5 @@
Priyanka Jayaswal
]
},
- deledpimage-edit-summary: Edit summary when the bot fixes EDP image
use.
+ remove_edp_images-edit-summary: Edit summary when the bot fixes EDP
image use.
}
diff --git a/remove_edp_images/zh.json b/remove_edp_images/zh.json
index 81b14cb..ffe5996 100644
--- a/remove_edp_images/zh.json
+++ b/remove_edp_images/zh.json
@@ -1,8 +1,8 @@
-{
+{
@metadata: {
authors: [
Shizhao
]
},
- deledpimage-edit-summary: Bot修正EDP图像用法：[[%s]]
+ remove_edp_images-edit-summary: Bot修正EDP图像用法：[[%s]]
}
--
To view, visit https://gerrit.wikimedia.org/r/214374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I886a9114c4aee4bab61bb4b64b91ed075eff2cba
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove dysfunctional wmflabs lookups from prod dns caches - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: remove dysfunctional wmflabs lookups from prod dns caches .. remove dysfunctional wmflabs lookups from prod dns caches Change-Id: Ia5cde002a40672063a8c81148fdbb112a35a81b8 --- M modules/dnsrecursor/templates/recursor.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dnsrecursor/templates/recursor.conf.erb b/modules/dnsrecursor/templates/recursor.conf.erb index c339c76..bd5d70d 100644 --- a/modules/dnsrecursor/templates/recursor.conf.erb +++ b/modules/dnsrecursor/templates/recursor.conf.erb @@ -81,7 +81,7 @@ # forward-zonesZones for which we forward queries, comma separated domain=ip pairs # -forward-zones= wmnet=208.80.154.238;208.80.153.231;91.198.174.239, 10.in-addr.arpa=208.80.154.238;208.80.153.231;91.198.174.239, wmflabs=208.80.152.32 +forward-zones= wmnet=208.80.154.238;208.80.153.231;91.198.174.239, 10.in-addr.arpa=208.80.154.238;208.80.153.231;91.198.174.239 # # hint-fileIf set, load root hints from this file -- To view, visit https://gerrit.wikimedia.org/r/214373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5cde002a40672063a8c81148fdbb112a35a81b8 Gerrit-PatchSet: 1 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] Revert v6 tokens for interface::tagged - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Revert v6 tokens for interface::tagged
..
Revert v6 tokens for interface::tagged
This was only ever deployed/tested on trusty LVS in codfw, and
it's not actually necessary or useful in the real world.
Revert fix quoting in token stuff
This reverts commit 0a77f80decebe260d3500837913d8c3aa5485b95.
Revert use regsubst instead of inline_template
This reverts commit 99a6a1145b4e355e5e13efb73babf9a8d133664b.
Revert perhaps @var will work
This reverts commit ab33cc177c0769d6e6123c9ad3b34c55d5f5198c.
Revert apparently no string interp for inline_template?
This reverts commit 8429169120e31e00d243eeb3e0b7800576c84b8a.
Revert use v6 SLAAC tokens for interface::tagged, optionally
This reverts commit de3aa3d8c54520ec5ae92de4731421641b7d5014.
Change-Id: Idd0fc78566fc9e1330b5d5f2767bc825fda7c10a
---
M manifests/site.pp
M modules/interface/manifests/tagged.pp
2 files changed, 1 insertion(+), 20 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 83dadaa..11bcabe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1507,7 +1507,6 @@
vlan_id= '2001',
address= $ips['public1-a-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
# Row B subnets on eth1
interface::tagged { 'eth1.2002':
@@ -1515,14 +1514,12 @@
vlan_id= '2002',
address= $ips['public1-b-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth1.2018':
base_interface = 'eth1',
vlan_id= '2018',
address= $ips['private1-b-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
}
/^lvs200[4-6]$/: {
@@ -1532,7 +1529,6 @@
vlan_id= '2002',
address= $ips['public1-b-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
# Row A subnets on eth1
interface::tagged { 'eth1.2001':
@@ -1540,14 +1536,12 @@
vlan_id= '2001',
address= $ips['public1-a-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth1.2017':
base_interface = 'eth1',
vlan_id= '2017',
address= $ips['private1-a-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
}
}
@@ -1558,14 +1552,12 @@
vlan_id= '2003',
address= $ips['public1-c-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth2.2019':
base_interface = 'eth2',
vlan_id= '2019',
address= $ips['private1-c-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
# Row D subnets on eth3
@@ -1574,14 +1566,12 @@
vlan_id= '2004',
address= $ips['public1-d-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth3.2020':
base_interface = 'eth3',
vlan_id= '2020',
address= $ips['private1-d-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
lvs::interface-tweaks {
diff --git a/modules/interface/manifests/tagged.pp
b/modules/interface/manifests/tagged.pp
index 4c38756..1ed072d 100644
--- a/modules/interface/manifests/tagged.pp
+++ b/modules/interface/manifests/tagged.pp
@@ -4,7 +4,7 @@
}
}
-define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$v6_token=false, $remove=undef) {
+define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$remove=undef) {
require interface::vlan-tools
$intf = ${base_interface}.${vlan_id}
@@ -32,14 +32,6 @@
$down_cmd = ''
}
-if $v6_token {
-$v6_token_lower64 = regsubst($address, '\.', ':', 'G')
-$v6_token_addr = ::${v6_token_lower64}
-$v6_token_cmd = set iface[. = '${intf}']/up '/sbin/ip token set
${v6_token_addr} dev ${intf}'
[MediaWiki-commits] [Gerrit] Remove IPv6 SLAAC addresses from network.pp etc. - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214360
Change subject: Remove IPv6 SLAAC addresses from network.pp etc.
..
Remove IPv6 SLAAC addresses from network.pp etc.
Those should be gone for good now.
Change-Id: Id957db2dd6babbda0dd4504e8328074aab8b1bcb
---
M manifests/network.pp
M manifests/role/gitblit.pp
M modules/contint/manifests/firewall.pp
3 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/214360/1
diff --git a/manifests/network.pp b/manifests/network.pp
index c8f352b..acdd270 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -30,18 +30,13 @@
'198.35.26.5', # bast4001.wikimedia.org
'208.80.154.151', # iron.wikimedia.org
'2620:0:861:2:208:80:154:149', # bast1001.wikimedia.org
-'2620:0:861:2:7a2b:cbff:fe09:11ba', #
bast1001.wikimedia.org SLAAC
'2620:0:862:1:91:198:174:113', # hooft.esams.wikimedia.org
-'2620:0:862:1:a6ba:dbff:fe30:d770', #
hooft.esams.wikimedia.org SLAAC
'2620:0:863:1:198:35:26:5', # bast4001.wikimedia.org
-'2620:0:863:1:92b1:1cff:fe4d:4249', #
bast4001.wikimedia.org SLAAC
'2620:0:861:2:208:80:154:151', # iron.wikimedia.org
-'2620:0:861:2:7a2b:cbff:fe09:d5c', # iron.wikimedia.org
SLAAC
],
'monitoring_hosts' = [
'208.80.154.14', # neon.wikimedia.org
'2620:0:861:1:208:80:154:14', # neon.wikimedia.org
-'2620:0:861:1:7a2b:cbff:fe08:a42f', #
neon.wikimedia.org SLAAC
'208.80.154.53', # uranium.wikimedia.org (ganglia,
gmetad needs it)
'2620:0:861:1:208:80:154:53', # uranium.wikimedia.org
],
diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
index d5c2711..beb9110 100644
--- a/manifests/role/gitblit.pp
+++ b/manifests/role/gitblit.pp
@@ -32,6 +32,6 @@
# Add ytterbium to ssh exceptions for git replication
ferm::rule { 'ytterbium_ssh_git':
-rule = 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:92b1:1cff:fe2a:e60 2620:0:861:3:208:80:154:80
2620:0:861:3:208:80:154:81) ACCEPT; }'
+rule = 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:208:80:154:80 2620:0:861:3:208:80:154:81) ACCEPT; }'
}
}
diff --git a/modules/contint/manifests/firewall.pp
b/modules/contint/manifests/firewall.pp
index baa7b9f..fb33bb8 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -46,7 +46,7 @@
# Need to grant ytterbium ssh access for git
ferm::rule { 'ytterbium_ssh':
-rule = 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:92b1:1cff:fe2a:e60 2620:0:861:3:208:80:154:80
2620:0:861:3:208:80:154:81) ACCEPT; }'
+rule = 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:208:80:154:80 2620:0:861:3:208:80:154:81) ACCEPT; }'
}
# ALLOWS:
--
To view, visit https://gerrit.wikimedia.org/r/214360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id957db2dd6babbda0dd4504e8328074aab8b1bcb
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] Fix warnings in Gather due to non-explicit position - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214368
Change subject: Fix warnings in Gather due to non-explicit position
..
Fix warnings in Gather due to non-explicit position
Change-Id: I8ae03868491edab13c0d337c426b8c8e44978d4d
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/68/214368/1
diff --git a/extension.json b/extension.json
index 3723251..4875be8 100644
--- a/extension.json
+++ b/extension.json
@@ -115,6 +115,7 @@
mobile,
desktop
],
+ position: top,
class: ResourceLoaderImageModule,
selector: .mw-ui-icon-{name}:before,
images: {
--
To view, visit https://gerrit.wikimedia.org/r/214368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae03868491edab13c0d337c426b8c8e44978d4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] Hygiene: Make special page styles positioning explicit - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/214363 Change subject: Hygiene: Make special page styles positioning explicit .. Hygiene: Make special page styles positioning explicit This suppresses all the warnings you can see on special pages. Change-Id: I006da75a734bb973cb76709ace53f09a999310af --- M includes/Resources.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/63/214363/1 diff --git a/includes/Resources.php b/includes/Resources.php index 96d16cc..4a71ef0 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1513,6 +1513,7 @@ */ $wgMobileSpecialPageModules = array( 'mobile.special.mobilemenu.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( + 'position' = 'top', 'styles' = array( 'resources/mobile.special.mobilemenu.styles/mobilemenu.less', ), @@ -1521,6 +1522,7 @@ ) ), 'mobile.special.mobileoptions.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( + 'position' = 'top', 'styles' = array( 'resources/mobile.special.mobileoptions.styles/mobileoptions.less', ), @@ -1549,6 +1551,7 @@ ), 'mobile.special.nearby.styles' = $wgMFResourceFileModuleBoilerplate + array( + 'position' = 'top', 'styles' = array( 'resources/mobile.special.nearby.styles/specialNearby.less', ), @@ -1559,6 +1562,7 @@ ), 'mobile.special.nearby.beta.styles' = $wgMFResourceFileModuleBoilerplate + array( + 'position' = 'top', 'styles' = array( 'resources/mobile.special.nearby.beta.styles/specialNearby.less', ), @@ -1612,7 +1616,9 @@ 'mobile.special.history.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'position' = 'top', ), - 'mobile.special.userprofile.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array(), + 'mobile.special.userprofile.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( + 'position' = 'top', + ), 'mobile.special.uploads.scripts' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( @@ -1637,6 +1643,7 @@ 'skinStyles' = array( 'default' = 'resources/mobile.special.uploads.styles/default.less', ), + 'position' = 'top', ), 'mobile.special.pagefeed.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( @@ -1647,6 +1654,7 @@ ), 'mobile.special.mobilediff.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( + 'position' = 'top', 'styles' = array( 'resources/mobile.special.mobilediff.styles/icons.less', 'resources/mobile.special.mobilediff.styles/mobilediff.less', -- To view, visit https://gerrit.wikimedia.org/r/214363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I006da75a734bb973cb76709ace53f09a999310af 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] Load main page styles only on main page - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214367
Change subject: Load main page styles only on main page
..
Load main page styles only on main page
Bug: T98401
Change-Id: I1ca56ce6aefbdcd8041b8be584d7e4cd31b43b1b
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
R resources/skins.minerva.mainPage.styles/common.less
M resources/skins.minerva.tablet.styles/common.less
4 files changed, 15 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/67/214367/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 86fe287..6981cda 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -47,7 +47,6 @@
'resources/skins.minerva.base.styles/footer.less',
'resources/skins.minerva.base.styles/common.less',
'resources/skins.minerva.base.styles/icons.less',
- 'resources/skins.minerva.base.styles/mainpage.less',
),
),
'skins.minerva.base.styles' = $wgMFResourceFileModuleBoilerplate +
array(
@@ -58,7 +57,6 @@
'resources/skins.minerva.base.styles/footer.less',
'resources/skins.minerva.base.styles/common.less',
'resources/skins.minerva.base.styles/icons.less',
- 'resources/skins.minerva.base.styles/mainpage.less',
),
),
@@ -176,6 +174,14 @@
),
),
+ 'skins.minerva.mainPage.styles' = $wgMFResourceFileModuleBoilerplate +
array(
+ 'position' = 'top',
+ 'group' = 'other',
+ 'styles' = array(
+ 'resources/skins.minerva.mainPage.styles/common.less',
+ ),
+ ),
+
'skins.minerva.alpha.styles' = $wgMFResourceFileModuleBoilerplate +
array(
'position' = 'top',
'styles' = array(
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index f7b8b18..3e26640 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1042,6 +1042,9 @@
'mediawiki.ui.button',
'skins.minerva.icons.images',
);
+ if ( $title-isMainPage() ) {
+ $styles[] = 'skins.minerva.mainPage.styles';
+ }
if ( $title-isSpecialPage() ) {
$styles[] = 'mobile.messageBox';
$styles['special'] = 'skins.minerva.special.styles';
diff --git a/resources/skins.minerva.base.styles/mainpage.less
b/resources/skins.minerva.mainPage.styles/common.less
similarity index 89%
rename from resources/skins.minerva.base.styles/mainpage.less
rename to resources/skins.minerva.mainPage.styles/common.less
index 6f8e13b..56553d7 100644
--- a/resources/skins.minerva.base.styles/mainpage.less
+++ b/resources/skins.minerva.mainPage.styles/common.less
@@ -28,3 +28,7 @@
}
}
}
+
+#mw-mf-last-modified {
+ padding: 5px 0;
+}
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 0baf557..6905718 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -93,11 +93,6 @@
display: table-row-group;
}
}
-
- // For Main Page
- #mw-mf-last-modified {
- padding: 5px 0;
- }
}
#footer {
--
To view, visit https://gerrit.wikimedia.org/r/214367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ca56ce6aefbdcd8041b8be584d7e4cd31b43b1b
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] Fix Style-position warnings - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/214371 Change subject: Fix Style-position warnings .. Fix Style-position warnings Bug: T100664 Change-Id: If5e2485af54aa8e9db5b2f5d61a44f7ed3868fa2 --- M includes/Resources.php 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/71/214371/1 diff --git a/includes/Resources.php b/includes/Resources.php index 96d16cc..bfe980b 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1518,12 +1518,14 @@ ), 'skinStyles' = array( 'vector' = 'resources/mobile.special.mobilemenu.styles/mobilemenu.less', - ) + ), + 'position' = 'top', ), 'mobile.special.mobileoptions.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'styles' = array( 'resources/mobile.special.mobileoptions.styles/mobileoptions.less', ), + 'position' = 'top', ), 'mobile.special.mobileoptions.scripts' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'position' = 'top', @@ -1556,12 +1558,14 @@ 'vector' = 'resources/mobile.special.nearby.styles/specialNearbyDesktop.less', 'monobook' = 'resources/mobile.special.nearby.styles/specialNearbyDesktop.less', ), + 'position' = 'top', ), 'mobile.special.nearby.beta.styles' = $wgMFResourceFileModuleBoilerplate + array( 'styles' = array( 'resources/mobile.special.nearby.beta.styles/specialNearby.less', ), + 'position' = 'top', ), 'mobile.special.userlogin.scripts' = $wgMFResourceFileModuleBoilerplate + array( @@ -1612,7 +1616,9 @@ 'mobile.special.history.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( 'position' = 'top', ), - 'mobile.special.userprofile.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array(), + 'mobile.special.userprofile.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( + 'position' = 'top', + ), 'mobile.special.uploads.scripts' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( @@ -1637,6 +1643,7 @@ 'skinStyles' = array( 'default' = 'resources/mobile.special.uploads.styles/default.less', ), + 'position' = 'top', ), 'mobile.special.pagefeed.styles' = $wgMFMobileSpecialPageResourceBoilerplate + array( @@ -1651,6 +1658,7 @@ 'resources/mobile.special.mobilediff.styles/icons.less', 'resources/mobile.special.mobilediff.styles/mobilediff.less', ), + 'position' = 'top', ), // Note that this module is declared as a dependency in the Thanks extension (for the @@ -1668,6 +1676,7 @@ 'styles' = array( 'resources/mobile.browse/special/topicTag.less', ), + 'position' = 'top', ), 'mobile.special.browse.topicTag.scripts' = $wgMFMobileSpecialPageResourceBoilerplate + array( -- To view, visit https://gerrit.wikimedia.org/r/214371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5e2485af54aa8e9db5b2f5d61a44f7ed3868fa2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed comma as nick separator for deployment events - change (wikimedia...jouncebot)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/214361 Change subject: Removed comma as nick separator for deployment events .. Removed comma as nick separator for deployment events Some IRC clients like irssi don't highlight out of the box for nickcomma. We'll so increase the notifications' effectiveness, at the expense of the grammar level. Change-Id: Iadb90d347f0d27c64847bb87da7d57ebd328f432 --- M jouncebot.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bots/jouncebot refs/changes/61/214361/1 diff --git a/jouncebot.py b/jouncebot.py index 03e07cf..ca7d58a 100755 --- a/jouncebot.py +++ b/jouncebot.py @@ -139,7 +139,7 @@ if len(next_events) 0: for event in next_events: if len(event.owners) 0: -nicks = %s: % (, .join(event.owners)) +nicks = %s: % ( .join(event.owners)) else: nicks = message = random.choice(self.config['messages']) -- To view, visit https://gerrit.wikimedia.org/r/214361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iadb90d347f0d27c64847bb87da7d57ebd328f432 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bots/jouncebot Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable NewUserMessage on sa.wikipedia - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable NewUserMessage on sa.wikipedia .. Enable NewUserMessage on sa.wikipedia Bug: T99879 Change-Id: I8e7821c22d079ca079bf52c43d7e06a569b7ea34 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a1594de..fffe948 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11078,6 +11078,7 @@ 'rowikinews' = true, 'rowikisource' = true, // Bug T30307 'ruwikiversity' = true, + 'sawiki' = true, // T99879 'strategywiki' = true, 'tawiki' = true, // Bug T100431 'thwiki' = true, // Bug T30689 @@ -3,6 +4,7 @@ 'ndswiki' = true, 'pawiki' = true, // T99331 'rowiki' = true, + 'sawiki' = true, // T99879 'tawiki' = true, // Bug T100431 'thwiki' = true, 'thwiktionary' = true, // Bug T33600 -- To view, visit https://gerrit.wikimedia.org/r/212724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e7821c22d079ca079bf52c43d7e06a569b7ea34 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Mjbmr mjb...@gmail.com Gerrit-Reviewer: Thcipriani tcipri...@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] rename deledpimage to remove_edp_images - change (pywikibot/i18n)
jenkins-bot has submitted this change and it was merged. Change subject: rename deledpimage to remove_edp_images .. rename deledpimage to remove_edp_images The new name is proposed in I3c43958e14d87a81ad047c1821fe43f30ce575c8 Change-Id: I9dfea27bb9bf5c1b1812d1d4b8e5f3fce2b4bb5b --- R remove_edp_images.py R remove_edp_images/ar.json R remove_edp_images/en.json R remove_edp_images/qqq.json R remove_edp_images/zh.json 5 files changed, 0 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/deledpimage.py b/remove_edp_images.py similarity index 100% rename from deledpimage.py rename to remove_edp_images.py diff --git a/deledpimage/ar.json b/remove_edp_images/ar.json similarity index 100% rename from deledpimage/ar.json rename to remove_edp_images/ar.json diff --git a/deledpimage/en.json b/remove_edp_images/en.json similarity index 100% rename from deledpimage/en.json rename to remove_edp_images/en.json diff --git a/deledpimage/qqq.json b/remove_edp_images/qqq.json similarity index 100% rename from deledpimage/qqq.json rename to remove_edp_images/qqq.json diff --git a/deledpimage/zh.json b/remove_edp_images/zh.json similarity index 100% rename from deledpimage/zh.json rename to remove_edp_images/zh.json -- To view, visit https://gerrit.wikimedia.org/r/214354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9dfea27bb9bf5c1b1812d1d4b8e5f3fce2b4bb5b Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Siebrand siebr...@kitano.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] Revert v6 tokens for interface::tagged - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214372
Change subject: Revert v6 tokens for interface::tagged
..
Revert v6 tokens for interface::tagged
This was only ever deployed/tested on trusty LVS in codfw, and
it's not actually necessary or useful in the real world.
Revert fix quoting in token stuff
This reverts commit 0a77f80decebe260d3500837913d8c3aa5485b95.
Revert use regsubst instead of inline_template
This reverts commit 99a6a1145b4e355e5e13efb73babf9a8d133664b.
Revert perhaps @var will work
This reverts commit ab33cc177c0769d6e6123c9ad3b34c55d5f5198c.
Revert apparently no string interp for inline_template?
This reverts commit 8429169120e31e00d243eeb3e0b7800576c84b8a.
Revert use v6 SLAAC tokens for interface::tagged, optionally
This reverts commit de3aa3d8c54520ec5ae92de4731421641b7d5014.
Change-Id: Idd0fc78566fc9e1330b5d5f2767bc825fda7c10a
---
M manifests/site.pp
M modules/interface/manifests/tagged.pp
2 files changed, 1 insertion(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/214372/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 83dadaa..11bcabe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1507,7 +1507,6 @@
vlan_id= '2001',
address= $ips['public1-a-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
# Row B subnets on eth1
interface::tagged { 'eth1.2002':
@@ -1515,14 +1514,12 @@
vlan_id= '2002',
address= $ips['public1-b-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth1.2018':
base_interface = 'eth1',
vlan_id= '2018',
address= $ips['private1-b-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
}
/^lvs200[4-6]$/: {
@@ -1532,7 +1529,6 @@
vlan_id= '2002',
address= $ips['public1-b-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
# Row A subnets on eth1
interface::tagged { 'eth1.2001':
@@ -1540,14 +1536,12 @@
vlan_id= '2001',
address= $ips['public1-a-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth1.2017':
base_interface = 'eth1',
vlan_id= '2017',
address= $ips['private1-a-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
}
}
@@ -1558,14 +1552,12 @@
vlan_id= '2003',
address= $ips['public1-c-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth2.2019':
base_interface = 'eth2',
vlan_id= '2019',
address= $ips['private1-c-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
# Row D subnets on eth3
@@ -1574,14 +1566,12 @@
vlan_id= '2004',
address= $ips['public1-d-codfw'][$::hostname],
netmask= '255.255.255.224',
-v6_token = true,
}
interface::tagged { 'eth3.2020':
base_interface = 'eth3',
vlan_id= '2020',
address= $ips['private1-d-codfw'][$::hostname],
netmask= '255.255.252.0',
-v6_token = true,
}
lvs::interface-tweaks {
diff --git a/modules/interface/manifests/tagged.pp
b/modules/interface/manifests/tagged.pp
index 4c38756..1ed072d 100644
--- a/modules/interface/manifests/tagged.pp
+++ b/modules/interface/manifests/tagged.pp
@@ -4,7 +4,7 @@
}
}
-define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$v6_token=false, $remove=undef) {
+define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$remove=undef) {
require interface::vlan-tools
$intf = ${base_interface}.${vlan_id}
@@ -32,14 +32,6 @@
$down_cmd = ''
}
-if $v6_token {
-$v6_token_lower64 = regsubst($address, '\.', ':', 'G')
-$v6_token_addr = ::${v6_token_lower64}
-$v6_token_cmd = set iface[. = '${intf}']/up
[MediaWiki-commits] [Gerrit] remove dysfunctional wmflabs lookups from prod dns caches - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/214373 Change subject: remove dysfunctional wmflabs lookups from prod dns caches .. remove dysfunctional wmflabs lookups from prod dns caches Change-Id: Ia5cde002a40672063a8c81148fdbb112a35a81b8 --- M modules/dnsrecursor/templates/recursor.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/214373/1 diff --git a/modules/dnsrecursor/templates/recursor.conf.erb b/modules/dnsrecursor/templates/recursor.conf.erb index c339c76..bd5d70d 100644 --- a/modules/dnsrecursor/templates/recursor.conf.erb +++ b/modules/dnsrecursor/templates/recursor.conf.erb @@ -81,7 +81,7 @@ # forward-zonesZones for which we forward queries, comma separated domain=ip pairs # -forward-zones= wmnet=208.80.154.238;208.80.153.231;91.198.174.239, 10.in-addr.arpa=208.80.154.238;208.80.153.231;91.198.174.239, wmflabs=208.80.152.32 +forward-zones= wmnet=208.80.154.238;208.80.153.231;91.198.174.239, 10.in-addr.arpa=208.80.154.238;208.80.153.231;91.198.174.239 # # hint-fileIf set, load root hints from this file -- To view, visit https://gerrit.wikimedia.org/r/214373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5cde002a40672063a8c81148fdbb112a35a81b8 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] Update Gruntfile after rename of deledpimage - change (pywikibot/i18n)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/214375 Change subject: Update Gruntfile after rename of deledpimage .. Update Gruntfile after rename of deledpimage Fixup for 9201da7ba1 Change-Id: I936491f957fcec3573b413180c3941edc8eea707 --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n refs/changes/75/214375/1 diff --git a/Gruntfile.js b/Gruntfile.js index ea8693f..aceef5b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,6 @@ commons_link: 'commons_link/', commons: 'commons/', cosmetic_changes: 'cosmetic_changes/', - deledpimage: 'deledpimage/', delete: 'delete/', djvutext: 'djvutext/', editarticle: 'editarticle/', @@ -43,6 +42,7 @@ protect: 'protect/', redirect: 'redirect/', reflinks: 'reflinks/', + remove_edp_images: 'remove_edp_images/', replace: 'replace/', revertbot: 'revertbot/', selflink: 'selflink/', -- To view, visit https://gerrit.wikimedia.org/r/214375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I936491f957fcec3573b413180c3941edc8eea707 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Releasing minor version 1.2.0 - change (mediawiki/selenium)
Dduvall has uploaded a new change for review. https://gerrit.wikimedia.org/r/214379 Change subject: Releasing minor version 1.2.0 .. Releasing minor version 1.2.0 Change-Id: Icf440c7c1c1b1a1dcd2fd1d508ce28a83a4b61c2 --- M README.md M UPGRADE.md M lib/mediawiki_selenium/version.rb 3 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/79/214379/1 diff --git a/README.md b/README.md index 23f2c8c..5690be5 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ specifies the version of `mediawiki_selenium` you wish to use (typically the latest version). -gem 'mediawiki_selenium', '~ 1.0.2' +gem 'mediawiki_selenium', '~ 1.2.0' Install the gem and its dependencies by running `bundle install`. (If [Bundler](http://bundler.io/) is not yet installed, install it with @@ -199,6 +199,11 @@ ## Release notes +### 1.2.0 2015-05-28 +* Support logging to a [Raita](http://git.wikimedia.org/summary/integration%2Fraita.git) + Elasticsearch database by setting `RAITA_URL` +* Removed deprecated support for `MEDIAWIKI_PASSWORD_VARIABLE` + ### 1.1.0 2015-04-06 * Support for `browser_http_proxy` in Firefox, Chrome, and Phantomjs * Renamed browser factory `bind` method to `configure` diff --git a/UPGRADE.md b/UPGRADE.md index 23f8f5e..70a9f74 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -5,7 +5,7 @@ First, update the `Gemfile` in your project's root directory to specify the new version. -gem 'mediawiki_selenium', '~ 1.0.0' +gem 'mediawiki_selenium', '~ 1.2.0' ## Upgrade gems and dependencies diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 753d822..59770bf 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -1,3 +1,3 @@ module MediawikiSelenium - VERSION = '1.1.0' + VERSION = '1.2.0' end -- To view, visit https://gerrit.wikimedia.org/r/214379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf440c7c1c1b1a1dcd2fd1d508ce28a83a4b61c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium 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] Releasing minor version 1.2.0 - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Releasing minor version 1.2.0 .. Releasing minor version 1.2.0 Change-Id: Icf440c7c1c1b1a1dcd2fd1d508ce28a83a4b61c2 --- M README.md M UPGRADE.md M lib/mediawiki_selenium/version.rb 3 files changed, 8 insertions(+), 3 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 23f2c8c..5690be5 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ specifies the version of `mediawiki_selenium` you wish to use (typically the latest version). -gem 'mediawiki_selenium', '~ 1.0.2' +gem 'mediawiki_selenium', '~ 1.2.0' Install the gem and its dependencies by running `bundle install`. (If [Bundler](http://bundler.io/) is not yet installed, install it with @@ -199,6 +199,11 @@ ## Release notes +### 1.2.0 2015-05-28 +* Support logging to a [Raita](http://git.wikimedia.org/summary/integration%2Fraita.git) + Elasticsearch database by setting `RAITA_URL` +* Removed deprecated support for `MEDIAWIKI_PASSWORD_VARIABLE` + ### 1.1.0 2015-04-06 * Support for `browser_http_proxy` in Firefox, Chrome, and Phantomjs * Renamed browser factory `bind` method to `configure` diff --git a/UPGRADE.md b/UPGRADE.md index 23f8f5e..70a9f74 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -5,7 +5,7 @@ First, update the `Gemfile` in your project's root directory to specify the new version. -gem 'mediawiki_selenium', '~ 1.0.0' +gem 'mediawiki_selenium', '~ 1.2.0' ## Upgrade gems and dependencies diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 753d822..59770bf 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -1,3 +1,3 @@ module MediawikiSelenium - VERSION = '1.1.0' + VERSION = '1.2.0' end -- To view, visit https://gerrit.wikimedia.org/r/214379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf440c7c1c1b1a1dcd2fd1d508ce28a83a4b61c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@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] autoinstall: rubidium/baham to jessie - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214381
Change subject: autoinstall: rubidium/baham to jessie
..
autoinstall: rubidium/baham to jessie
ns0/ns1 soon to be reinstalled with jessie (matching ns2).
Change-Id: Ie625ed531c2e48a277d61eff1bfb8f2f36ff55a4
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/214381/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0c6cc58..7c36bd8 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -196,6 +196,8 @@
host baham {
hardware ethernet D4:AE:52:B3:90:36;
fixed-address baham.wikimedia.org;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host bast1001 {
@@ -5494,6 +5496,8 @@
host rubidium {
hardware ethernet 18:03:73:f1:4f:70;
fixed-address rubidium.wikimedia.org;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host ruthenium {
--
To view, visit https://gerrit.wikimedia.org/r/214381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie625ed531c2e48a277d61eff1bfb8f2f36ff55a4
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] Train deploy, a day later: Group0 to 1.26wmf8, everything el... - change (operations/mediawiki-config)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/214380 Change subject: Train deploy, a day later: Group0 to 1.26wmf8, everything else to 1.26wmf7 .. Train deploy, a day later: Group0 to 1.26wmf8, everything else to 1.26wmf7 Change-Id: Ic1687642108c5de21690f0bda67ef429b273f512 --- M php M w/static/current/extensions M w/static/current/resources M w/static/current/skins M wikiversions.json 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/214380/1 diff --git a/php b/php index d12d518..1879d55 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.26wmf7 \ No newline at end of file +php-1.26wmf8 \ No newline at end of file diff --git a/w/static/current/extensions b/w/static/current/extensions index 57c148d..44981bb 12 --- a/w/static/current/extensions +++ b/w/static/current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file +/srv/mediawiki/php-1.26wmf8/extensions \ No newline at end of file diff --git a/w/static/current/resources b/w/static/current/resources index 4d1994b..1c55f84 12 --- a/w/static/current/resources +++ b/w/static/current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file +/srv/mediawiki/php-1.26wmf8/resources \ No newline at end of file diff --git a/w/static/current/skins b/w/static/current/skins index 313a65c..8a27c4c 12 --- a/w/static/current/skins +++ b/w/static/current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf7/skins \ No newline at end of file +/srv/mediawiki/php-1.26wmf8/skins \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index 711a8ca..4bf505b 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -1 +1 @@
[MediaWiki-commits] [Gerrit] Train deploy, a day later: Group0 to 1.26wmf8, everything el... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Train deploy, a day later: Group0 to 1.26wmf8, everything else to 1.26wmf7 .. Train deploy, a day later: Group0 to 1.26wmf8, everything else to 1.26wmf7 Change-Id: Ic1687642108c5de21690f0bda67ef429b273f512 --- M php M w/static/current/extensions M w/static/current/resources M w/static/current/skins M wikiversions.json 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/php b/php index d12d518..1879d55 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.26wmf7 \ No newline at end of file +php-1.26wmf8 \ No newline at end of file diff --git a/w/static/current/extensions b/w/static/current/extensions index 57c148d..44981bb 12 --- a/w/static/current/extensions +++ b/w/static/current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file +/srv/mediawiki/php-1.26wmf8/extensions \ No newline at end of file diff --git a/w/static/current/resources b/w/static/current/resources index 4d1994b..1c55f84 12 --- a/w/static/current/resources +++ b/w/static/current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file +/srv/mediawiki/php-1.26wmf8/resources \ No newline at end of file diff --git a/w/static/current/skins b/w/static/current/skins index 313a65c..8a27c4c 12 --- a/w/static/current/skins +++ b/w/static/current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf7/skins \ No newline at end of file +/srv/mediawiki/php-1.26wmf8/skins \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index 711a8ca..4bf505b 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -1 +1 @@
[MediaWiki-commits] [Gerrit] autoinstall: rubidium/baham to jessie - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: autoinstall: rubidium/baham to jessie
..
autoinstall: rubidium/baham to jessie
ns0/ns1 soon to be reinstalled with jessie (matching ns2).
Change-Id: Ie625ed531c2e48a277d61eff1bfb8f2f36ff55a4
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0c6cc58..7c36bd8 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -196,6 +196,8 @@
host baham {
hardware ethernet D4:AE:52:B3:90:36;
fixed-address baham.wikimedia.org;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host bast1001 {
@@ -5494,6 +5496,8 @@
host rubidium {
hardware ethernet 18:03:73:f1:4f:70;
fixed-address rubidium.wikimedia.org;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host ruthenium {
--
To view, visit https://gerrit.wikimedia.org/r/214381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie625ed531c2e48a277d61eff1bfb8f2f36ff55a4
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] Added WANObjectCache::resetCheckKey() method - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214382
Change subject: Added WANObjectCache::resetCheckKey() method
..
Added WANObjectCache::resetCheckKey() method
Change-Id: I6f8b97c1f4511534e1ab2656f472adee491f9d9f
---
M includes/libs/objectcache/WANObjectCache.php
M tests/phpunit/includes/objectcache/WANObjectCacheTest.php
2 files changed, 59 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/214382/1
diff --git a/includes/libs/objectcache/WANObjectCache.php
b/includes/libs/objectcache/WANObjectCache.php
index 5d9557a..72f1360 100755
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -318,6 +318,36 @@
}
/**
+* Delete a check key from all clusters, invalidating keys that use it
+*
+* This is similar to touchCheckKey() in that keys using it via
+* getWithSetCallback() will be invalidated. The differences are:
+* a) The timestamp will be deleted from all caches and lazily
+* re-initialized when accessed (rather than set everywhere)
+* b) Thus, dependent keys will be known to be invalid, but not
+* for how long (they are treated as just purged), which
+* effects any lockTSE logic in getWithSetCallback()
+* The advantage is that this does not place high TTL keys on every
cache
+* server, making it better for code that will cache many different keys
+* and either does not use lockTSE or uses a low enough TTL anyway.
+*
+* Note that check keys won't collide with other regular keys
+*
+* @see WANObjectCache::touchCheckKey()
+* @see WANObjectCache::get()
+*
+* @param string $key Cache key
+* @return bool True if the item was purged or not found, false on
failure
+*/
+ final public function resetCheckKey( $key ) {
+ $key = self::TIME_KEY_PREFIX . $key;
+ // Update the local cluster immediately
+ $ok = $this-cache-delete( $key );
+ // Publish the purge to all clusters
+ return $this-relayDelete( $key ) $ok;
+ }
+
+ /**
* Method to fetch/regenerate cache keys
*
* On cache miss, the key will be set to the callback result,
@@ -527,6 +557,26 @@
}
/**
+* Do the actual async bus delete of a key
+*
+* @param string $key Cache key
+* @return bool Success
+*/
+ protected function relayDelete( $key ) {
+ $event = $this-cache-modifySimpleRelayEvent( array(
+ 'cmd' = 'delete',
+ 'key' = $key,
+ ) );
+
+ $ok = $this-relayer-notify( {$this-pool}:purge, $event );
+ if ( !$ok ) {
+ $this-lastRelayError = self::ERR_RELAY;
+ }
+
+ return $ok;
+ }
+
+ /**
* Check if a key should be regenerated (using random probability)
*
* This returns false if $curTTL = $lowTTL. Otherwise, the chance
diff --git a/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
b/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
index 3e284c8..1afd607 100644
--- a/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
@@ -224,6 +224,7 @@
/**
* @covers WANObjectCache::touchCheckKey()
+* @covers WANObjectCache::resetCheckKey()
* @covers WANObjectCache::getCheckKeyTime()
*/
public function testTouchKeys() {
@@ -248,5 +249,13 @@
$t4 = $this-cache-getCheckKeyTime( $key );
$this-assertEquals( $t3, $t4, 'Check key time did not change'
);
+
+ usleep( 1 );
+ $this-cache-resetCheckKey( $key );
+ $t5 = $this-cache-getCheckKeyTime( $key );
+ $this-assertGreaterThan( $t4, $t5, 'Check key time increased'
);
+
+ $t6 = $this-cache-getCheckKeyTime( $key );
+ $this-assertEquals( $t5, $t6, 'Check key time did not change'
);
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/214382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f8b97c1f4511534e1ab2656f472adee491f9d9f
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
