[MediaWiki-commits] [Gerrit] Move Special:MyLanguage aliases to a separate file - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Move Special:MyLanguage aliases to a separate file .. Move Special:MyLanguage aliases to a separate file The Bashkir name is the same as English, so it's removed completely. See also Ie6a4d878b87ee030f9c042b43f7b1fb424b54099 . Bug: 69461 Change-Id: I6f84eaf414b6d4239522bad14e90b1cbfc82590f --- A Translate.MyLanguage.alias.php M Translate.alias.php M Translate.php 3 files changed, 319 insertions(+), 69 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Translate.MyLanguage.alias.php b/Translate.MyLanguage.alias.php new file mode 100644 index 000..71e1076 --- /dev/null +++ b/Translate.MyLanguage.alias.php @@ -0,0 +1,309 @@ +?php +/** + * Aliases for the Special:MyLanguage of Translate extension. + * This is a backwards compatibility file that separates the translations + * in the extension from the translations of the same page's name + * in core MediaWiki. For more information see the following bug: + * https://bugzilla.wikimedia.org/show_bug.cgi?id=69461 + * + * @file + * @license GPL-2.0+ + */ +// @codingStandardsIgnoreFile + +$specialPageAliases = array(); + +/** English (English) */ +$specialPageAliases['en'] = array( + 'MyLanguage' = array( 'MyLanguage' ), +); + +/** Afrikaans (Afrikaans) */ +$specialPageAliases['af'] = array( + 'MyLanguage' = array( 'MyTaal' ), +); + +/** Arabic (العربية) */ +$specialPageAliases['ar'] = array( + 'MyLanguage' = array( 'لغتي' ), +); + +/** Aramaic (ܐܪܡܝܐ) */ +$specialPageAliases['arc'] = array( + 'MyLanguage' = array( 'ܠܫܢܐ_ܕܝܠܝ' ), +); + +/** Egyptian Spoken Arabic (مصرى) */ +$specialPageAliases['arz'] = array( + 'MyLanguage' = array( 'اللغة_بتاعتى' ), +); + +/** Assamese (অসমীয়া) */ +$specialPageAliases['as'] = array( + 'MyLanguage' = array( 'মোৰ_ভাষা' ), +); + +/** Banjar (Bahasa Banjar) */ +$specialPageAliases['bjn'] = array( + 'MyLanguage' = array( 'Bahasa_ulun' ), +); + +/** Breton (brezhoneg) */ +$specialPageAliases['br'] = array( + 'MyLanguage' = array( 'MaYezh' ), +); + +/** буряад (буряад) */ +$specialPageAliases['bxr'] = array( + 'MyLanguage' = array( 'Минии_хэлэн' ), +); + +/** Min Dong Chinese (Mìng-dĕ̤ng-ngṳ̄) */ +$specialPageAliases['cdo'] = array( + 'MyLanguage' = array( '我其語言' ), +); + +/** Chechen (нохчийн) */ +$specialPageAliases['ce'] = array( + 'MyLanguage' = array( 'Сан_мотт' ), +); + +/** German (Deutsch) */ +$specialPageAliases['de'] = array( + 'MyLanguage' = array( 'Meine_Sprache' ), +); + +/** Zazaki (Zazaki) */ +$specialPageAliases['diq'] = array( + 'MyLanguage' = array( 'ZıwaneMe' ), +); + +/** Greek (Ελληνικά) */ +$specialPageAliases['el'] = array( + 'MyLanguage' = array( 'ΗΓλώσσαΜου' ), +); + +/** Esperanto (Esperanto) */ +$specialPageAliases['eo'] = array( + 'MyLanguage' = array( 'Mia_lingvo' ), +); + +/** Spanish (español) */ +$specialPageAliases['es'] = array( + 'MyLanguage' = array( 'MiIdioma', 'Mi_idioma' ), +); + +/** Persian (فارسی) */ +$specialPageAliases['fa'] = array( + 'MyLanguage' = array( 'زبانهای_من' ), +); + +/** Finnish (suomi) */ +$specialPageAliases['fi'] = array( + 'MyLanguage' = array( 'Oma_kieli' ), +); + +/** French (français) */ +$specialPageAliases['fr'] = array( + 'MyLanguage' = array( 'MaLangue', 'Ma_langue' ), +); + +/** Swiss German (Alemannisch) */ +$specialPageAliases['gsw'] = array( + 'MyLanguage' = array( 'Myyni_Sprooch' ), +); + +/** Hebrew (עברית) */ +$specialPageAliases['he'] = array( + 'MyLanguage' = array( 'השפה_שלי' ), +); + +/** Upper Sorbian (hornjoserbsce) */ +$specialPageAliases['hsb'] = array( + 'MyLanguage' = array( 'Moja_rěč' ), +); + +/** Haitian (Kreyòl ayisyen) */ +$specialPageAliases['ht'] = array( + 'MyLanguage' = array( 'LangMwen' ), +); + +/** Interlingua (interlingua) */ +$specialPageAliases['ia'] = array( + 'MyLanguage' = array( 'Mi_lingua' ), +); + +/** Indonesian (Bahasa Indonesia) */ +$specialPageAliases['id'] = array( + 'MyLanguage' = array( 'Bahasa_saya' ), +); + +/** Italian (italiano) */ +$specialPageAliases['it'] = array( + 'MyLanguage' = array( 'MiaLingua' ), +); + +/** Japanese (日本語) */ +$specialPageAliases['ja'] = array( + 'MyLanguage' = array( '自分の言語' ), +); + +/** Georgian (ქართული) */ +$specialPageAliases['ka'] = array( + 'MyLanguage' = array( 'ჩემი_ენა' ), +); + +/** Khmer (ភាសាខ្មែរ) */ +$specialPageAliases['km'] = array( + 'MyLanguage' = array( 'ភាសារបស់ខ្ញុំ' ), +); + +/** Korean (한국어) */ +$specialPageAliases['ko'] = array( + 'MyLanguage' = array( '내언어' ), +); + +/** Karachay-Balkar (къарачай-малкъар) */ +$specialPageAliases['krc'] = array( + 'MyLanguage' = array( 'Мени_тилим' ), +); + +/** Kurdish (Latin script) (Kurdî (latînî)) */ +$specialPageAliases['ku-latn'] = array( +
[MediaWiki-commits] [Gerrit] Fix and update SpecialUserlogin.php patch so core still work... - change (mediawiki...MediaWikiAuth)
Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162206
Change subject: Fix and update SpecialUserlogin.php patch so core still works
without the extension installed.
..
Fix and update SpecialUserlogin.php patch so core still works without the
extension installed.
Change-Id: I33093ae33f8b9213cd557e5434ba12242a1f068c
---
R SpecialUserlogin.php-1.23.3.patch
1 file changed, 19 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth
refs/changes/06/162206/1
diff --git a/SpecialUserlogin.php-1.23.patch b/SpecialUserlogin.php-1.23.3.patch
similarity index 73%
rename from SpecialUserlogin.php-1.23.patch
rename to SpecialUserlogin.php-1.23.3.patch
index 7575b6b..1f4425f 100644
--- a/SpecialUserlogin.php-1.23.patch
+++ b/SpecialUserlogin.php-1.23.3.patch
@@ -1,13 +1,23 @@
-Index: SpecialUserlogin.php
-===
SpecialUserlogin.php (revision 2544)
-+++ SpecialUserlogin.php (revision 2545)
-@@ -366,6 +366,12 @@
+diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
+old mode 100644
+new mode 100755
+index 9a2e194..c0b62d9
+--- a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
+@@ -359,13 +359,19 @@ class LoginForm extends SpecialPage {
+*/
+ public function addNewAccountInternal() {
+ global $wgAuth, $wgMemc, $wgAccountCreationThrottle,
+- $wgMinimalPasswordLength, $wgEmailConfirmToEdit;
++ $wgMinimalPasswordLength, $wgEmailConfirmToEdit,
$wgMediaWikiAuthAPIURL;
+
+ // If the user passes an invalid domain, something is fishy
+ if ( !$wgAuth-validDomain( $this-mDomain ) ) {
return Status::newFatal( 'wrongpassword' );
}
+ // Patch for MediaWikiAuth extension
-+ if ( self::checkImportableUser( $this-mUsername ) ) {
++ if ( isset( $wgMediaWikiAuthAPIURL )
self::checkImportableUser( $this-mUsername ) ) {
+ return Status::newFatal( 'userexists' );
+ }
+ // Patch ends here
@@ -15,7 +25,7 @@
// If we are not allowing users to login locally, we should be
checking
// to see if the user is actually able to authenticate to the
authenti-
// cation server before they create an account (otherwise, they
can
-@@ -785,9 +791,13 @@
+@@ -785,9 +791,13 @@ class LoginForm extends SpecialPage {
return self::NOT_EXISTS;
}
@@ -31,7 +41,7 @@
return self::WRONG_PLUGIN_PASS;
}
-@@ -880,8 +890,11 @@
+@@ -880,8 +890,11 @@ class LoginForm extends SpecialPage {
$this-mainLoginForm( $this-msg( $error
)-text() );
break;
case self::WRONG_PLUGIN_PASS:
@@ -43,7 +53,7 @@
break;
case self::NOT_EXISTS:
if ( $this-getUser()-isAllowed(
'createaccount' ) ) {
-@@ -1156,6 +1169,47 @@
+@@ -1156,6 +1169,47 @@ class LoginForm extends SpecialPage {
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/162206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33093ae33f8b9213cd557e5434ba12242a1f068c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiAuth
Gerrit-Branch: master
Gerrit-Owner: Isarra zhoris...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make linker warning useful - change (mediawiki/core)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162207
Change subject: Make linker warning useful
..
Make linker warning useful
Follow-up to I4c397de289ae51bc463b5ae
Change-Id: I4695172b13988fc333707e09fc9d909f20adb7c1
---
M includes/Linker.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/162207/1
diff --git a/includes/Linker.php b/includes/Linker.php
index be850d0..1d327be 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -193,7 +193,7 @@
$target, $html = null, $customAttribs = array(), $query =
array(), $options = array()
) {
if ( !$target instanceof Title ) {
- wfWarn( __METHOD__ . ': Requires $target to be a Title
object.' );
+ wfWarn( __METHOD__ . ': Requires $target to be a Title
object.', 2 );
return !-- ERROR --$html;
}
wfProfileIn( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/162207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4695172b13988fc333707e09fc9d909f20adb7c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make linker warning useful - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Make linker warning useful
..
Make linker warning useful
Follow-up to I4c397de289ae51bc463b5ae
Change-Id: I4695172b13988fc333707e09fc9d909f20adb7c1
---
M includes/Linker.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Linker.php b/includes/Linker.php
index be850d0..1d327be 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -193,7 +193,7 @@
$target, $html = null, $customAttribs = array(), $query =
array(), $options = array()
) {
if ( !$target instanceof Title ) {
- wfWarn( __METHOD__ . ': Requires $target to be a Title
object.' );
+ wfWarn( __METHOD__ . ': Requires $target to be a Title
object.', 2 );
return !-- ERROR --$html;
}
wfProfileIn( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/162207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4695172b13988fc333707e09fc9d909f20adb7c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] compare-puppet-catalogs: use hiera - change (operations/software)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162208
Change subject: compare-puppet-catalogs: use hiera
..
compare-puppet-catalogs: use hiera
Change-Id: I4f46714d19a4e203373c483542e929774aac57d7
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/shell/helper
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/08/162208/1
diff --git a/compare-puppet-catalogs/shell/helper
b/compare-puppet-catalogs/shell/helper
index 874dc9e..319daf6 100755
--- a/compare-puppet-catalogs/shell/helper
+++ b/compare-puppet-catalogs/shell/helper
@@ -7,6 +7,7 @@
echo Usage: $0 [install|cleanup] [CHANGE_ID] [REVISION_ID]
fi;
+# Define defaults based on whether we're acting on a change or not.
if [ ! -z $2 ]; then
CHANGE=$2
REVISION=$3
@@ -20,6 +21,7 @@
PUPPETDIR=${EXTDIR}/puppet
PRIVATEDIR=${PARENT}/external/private
FACTS_ARCHIVE=${PARENT}/puppet-facts.tar.xz
+HIERA_CONFIG_FILE=${PUPPETDIR}/modules/puppetmaster/files/prod.hiera.yaml
function log () {
echo $@
@@ -58,6 +60,15 @@
done;
popd
update_change
+}
+
+function copy_hiera() {
+if [ -f ${HIERA_CONFIG_FILE} ]; then
+HIERADATA_DIR=${PUPPETDIR}/hieradata
+log Patching and copying the hiera config
+sed s,/etc/puppet/hiera,${HIERADATA_DIR}, ${HIERA_CONFIG_FILE} | \
+sed s,/etc/puppet/private/,${PRIVATEDIR}, -
${EXTDIR}/etc/hiera.yaml
+fi;
}
function checkout() {
@@ -144,6 +155,7 @@
log Putting the facts in place.
copy_facts
setup_naggen
+copy_hiera
;;
cleanup)
purge
--
To view, visit https://gerrit.wikimedia.org/r/162208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f46714d19a4e203373c483542e929774aac57d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] compare-puppet-catalogs: use hiera - change (operations/software)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: compare-puppet-catalogs: use hiera
..
compare-puppet-catalogs: use hiera
Change-Id: I4f46714d19a4e203373c483542e929774aac57d7
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/shell/helper
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/compare-puppet-catalogs/shell/helper
b/compare-puppet-catalogs/shell/helper
index 874dc9e..319daf6 100755
--- a/compare-puppet-catalogs/shell/helper
+++ b/compare-puppet-catalogs/shell/helper
@@ -7,6 +7,7 @@
echo Usage: $0 [install|cleanup] [CHANGE_ID] [REVISION_ID]
fi;
+# Define defaults based on whether we're acting on a change or not.
if [ ! -z $2 ]; then
CHANGE=$2
REVISION=$3
@@ -20,6 +21,7 @@
PUPPETDIR=${EXTDIR}/puppet
PRIVATEDIR=${PARENT}/external/private
FACTS_ARCHIVE=${PARENT}/puppet-facts.tar.xz
+HIERA_CONFIG_FILE=${PUPPETDIR}/modules/puppetmaster/files/prod.hiera.yaml
function log () {
echo $@
@@ -58,6 +60,15 @@
done;
popd
update_change
+}
+
+function copy_hiera() {
+if [ -f ${HIERA_CONFIG_FILE} ]; then
+HIERADATA_DIR=${PUPPETDIR}/hieradata
+log Patching and copying the hiera config
+sed s,/etc/puppet/hiera,${HIERADATA_DIR}, ${HIERA_CONFIG_FILE} | \
+sed s,/etc/puppet/private/,${PRIVATEDIR}, -
${EXTDIR}/etc/hiera.yaml
+fi;
}
function checkout() {
@@ -144,6 +155,7 @@
log Putting the facts in place.
copy_facts
setup_naggen
+copy_hiera
;;
cleanup)
purge
--
To view, visit https://gerrit.wikimedia.org/r/162208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f46714d19a4e203373c483542e929774aac57d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] Layout adjustments for page size - change (mediawiki...ContentTranslation)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162209
Change subject: Layout adjustments for page size
..
Layout adjustments for page size
- Page area is extended to the viewport size. That will avoid a jumping effect
when scrolling short articles.
- Additional white space is added to the bottom of the page to avoid text to
end at the bottom edge of the screen.
Change-Id: I73137c6d56d2533aa89c1b8fe7582c129ec2ee88
---
M modules/base/styles/ext.cx.base.less
1 file changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/09/162209/1
diff --git a/modules/base/styles/ext.cx.base.less
b/modules/base/styles/ext.cx.base.less
index 2740dbf..264c09f 100644
--- a/modules/base/styles/ext.cx.base.less
+++ b/modules/base/styles/ext.cx.base.less
@@ -27,6 +27,7 @@
.mw-ui-grid;
color: @gray-darker;
background: white;
+ padding-bottom: 50px;
}
.cx-widget__header {
@@ -38,6 +39,7 @@
.cx-widget__columns {
margin-top: 150px;
+ min-height: 100vh;
}
.cx-column__language-label {
--
To view, visit https://gerrit.wikimedia.org/r/162209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73137c6d56d2533aa89c1b8fe7582c129ec2ee88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement item-centric WikidataBot.run - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Implement item-centric WikidataBot.run
..
Implement item-centric WikidataBot.run
All wikidata scripts need to get the item for a page.
Convert them to using run() and treat() semantics.
Adds 'treat_missing_item' keyword, so newitem.py can
indicate that it wants to perform custom handling of
missing items for a page.
Also fix bug 66523 for all scripts, including category.py.
The bug was introduced by 431cb77.
And fix all pep257 errors except missing docstrings.
Bug: 66523
Change-Id: Iaaaf3fa583a3e299899197ac9c67530f1972a861
---
M pywikibot/bot.py
M scripts/category.py
M scripts/claimit.py
M scripts/coordinate_import.py
M scripts/harvest_template.py
M scripts/illustrate_wikidata.py
M scripts/newitem.py
M tox.ini
8 files changed, 232 insertions(+), 189 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 2be8a2f..941f4b0 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -980,3 +980,38 @@
source = pywikibot.Claim(self.repo, 'P143')
source.setTarget(self.source_values.get(site.family.name).get(site.code))
return source
+
+def run(self):
+Process all pages in generator.
+if not hasattr(self, 'generator'):
+raise NotImplementedError('Variable %s.generator not set.'
+ % self.__class__.__name__)
+
+treat_missing_item = hasattr(self, 'treat_missing_item')
+
+try:
+for page in self.generator:
+if not page.exists():
+pywikibot.output('%s doesn\'t exist.' % page)
+try:
+item = pywikibot.ItemPage.fromPage(page)
+except pywikibot.NoPage:
+item = None
+if not item:
+if not treat_missing_item:
+pywikibot.output(
+'%s doesn\'t have a wikidata item.' % page)
+#TODO FIXME: Add an option to create the item
+continue
+self.treat(page, item)
+except QuitKeyboardInterrupt:
+pywikibot.output('\nUser quit %s bot run...' %
+ self.__class__.__name__)
+except KeyboardInterrupt:
+if config.verbose_output:
+raise
+else:
+pywikibot.output('\nKeyboardInterrupt during %s bot run...' %
+ self.__class__.__name__)
+except Exception as e:
+pywikibot.exception(msg=e, tb=True)
diff --git a/scripts/category.py b/scripts/category.py
index 09f960f..12beae3 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -697,8 +697,11 @@
Do not use this function from outside the class.
if self.oldcat.exists():
-item = pywikibot.ItemPage.fromPage(self.oldcat)
-if item.exists():
+try:
+item = pywikibot.ItemPage.fromPage(self.oldcat)
+except pywikibot.NoPage:
+item = None
+if item and item.exists():
comment = i18n.twtranslate(self.site, 'category-was-moved',
{'newcat': self.newcat.title(),
'title': self.newcat.title()})
diff --git a/scripts/claimit.py b/scripts/claimit.py
index 39fcf11..d389c93 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-This script adds claims to Wikidata items based on categories.
+A script that adds claims to Wikidata items based on categories.
--
@@ -68,11 +68,13 @@
class ClaimRobot(WikidataBot):
-
-A bot to add Wikidata claims
-
+
+A bot to add Wikidata claims.
+
def __init__(self, generator, claims, exists_arg=''):
+Constructor.
+
Arguments:
* generator- A generator that yields Page objects.
* claims - A list of wikidata claims
@@ -84,18 +86,14 @@
self.exists_arg = exists_arg
self.repo = pywikibot.Site().data_repository()
self.cacheSources()
-
-def run(self):
-Starts the robot.
if self.exists_arg:
pywikibot.output('\'exists\' argument set to \'%s\'' %
self.exists_arg)
-for page in self.generator:
-self.current_page = page
-item = pywikibot.ItemPage.fromPage(page)
-if not item.exists():
-# TODO FIXME: We should provide an option to create the page
-pywikibot.output('%s doesn\'t have a wikidata item :(' % page)
-continue
+
+
[MediaWiki-commits] [Gerrit] Resolution of Sauce session ID with custom browser - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged.
Change subject: Resolution of Sauce session ID with custom browser
..
Resolution of Sauce session ID with custom browser
Reimplemented the resolution of the SauceLabs session ID as a world
helper that can be called after custom browser instantiation.
Unfortunately I couldn't remove the use of a global entirely, as the
Sauce formatter makes use of it.
Change-Id: I11fc7f62186e17885a17f1b19e0d3f71db024c7e
---
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
A lib/mediawiki_selenium/support/modules/sauce_helper.rb
3 files changed, 23 insertions(+), 6 deletions(-)
Approvals:
Cmcmahon: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index bb7f751..92bc97d 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -17,9 +17,11 @@
require watir-webdriver
require mediawiki_selenium/support/modules/api_helper
+require mediawiki_selenium/support/modules/sauce_helper
World(PageObject::PageFactory)
World(MediawikiSelenium::ApiHelper)
+World(MediawikiSelenium::SauceHelper)
def browser(test_name, configuration = nil)
if environment == :saucelabs
@@ -76,10 +78,10 @@
set_cookie(browser)
browser
end
-def sauce_api(json)
+def sauce_api(json, session_id)
RestClient::Request.execute(
:method = :put,
- :url =
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id},
+ :url =
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{session_id},
:user = ENV[SAUCE_ONDEMAND_USERNAME],
:password = ENV[SAUCE_ONDEMAND_ACCESS_KEY],
:headers = {:content_type = application/json},
diff --git a/lib/mediawiki_selenium/support/hooks.rb
b/lib/mediawiki_selenium/support/hooks.rb
index 57874c4..4a38d7e 100644
--- a/lib/mediawiki_selenium/support/hooks.rb
+++ b/lib/mediawiki_selenium/support/hooks.rb
@@ -64,8 +64,9 @@
else
@browser = browser(test_name(scenario))
$browser = @browser # CirrusSearch and VisualEditor need this
-$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
+
+ $session_id = sauce_session_id
end
After do |scenario|
@@ -80,9 +81,10 @@
end
if environment == :saucelabs
-sauce_api(%Q{{passed: #{scenario.passed?}}})
-sauce_api(%Q{{public: true}})
-sauce_api(%Q{{build: #{ENV[BUILD_NUMBER]}}}) if ENV[BUILD_NUMBER]
+sid = $session_id || sauce_session_id
+sauce_api(%Q{{passed: #{scenario.passed?}}}, sid)
+sauce_api(%Q{{public: true}}, sid)
+sauce_api(%Q{{build: #{ENV[BUILD_NUMBER]}}}, sid) if
ENV[BUILD_NUMBER]
end
if @browser
diff --git a/lib/mediawiki_selenium/support/modules/sauce_helper.rb
b/lib/mediawiki_selenium/support/modules/sauce_helper.rb
new file mode 100644
index 000..0cb9902
--- /dev/null
+++ b/lib/mediawiki_selenium/support/modules/sauce_helper.rb
@@ -0,0 +1,13 @@
+module MediawikiSelenium
+ module SauceHelper
+# The current Sauce session ID.
+#
+# @return [String]
+#
+def sauce_session_id
+ @session_id ||=
@browser.driver.instance_variable_get(:@bridge).session_id if @browser
+rescue StandardError
+ nil
+end
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/161627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11fc7f62186e17885a17f1b19e0d3f71db024c7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@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] Add Grafana module role - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: Add Grafana module role
..
Add Grafana module role
* Grafana deployed via Trebuchet.
* Provision on zirconium, place behind misc-varnish.
Related DNS change: I6b1ec4aa0.
Change-Id: Ic0433374136ab468441a13a9abeba875fe92be99
---
M manifests/role/deployment.pp
A manifests/role/grafana.pp
M manifests/site.pp
A modules/grafana/manifests/init.pp
A modules/grafana/manifests/web/apache.pp
A modules/grafana/manifests/web/nginx.pp
A modules/grafana/templates/config.js.erb
A modules/grafana/templates/grafana.apache.erb
A modules/grafana/templates/grafana.nginx.erb
M templates/varnish/misc.inc.vcl.erb
10 files changed, 186 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 3949658..2c3c51c 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -38,6 +38,10 @@
'upstream' =
'https://gerrit.wikimedia.org/r/mediawiki/services/jobrunner',
'service_name' = 'jobrunner',
},
+'grafana/grafana'= {
+'grain'= 'grafana',
+'upstream' =
'https://gerrit.wikimedia.org/r/operations/software/grafana',
+},
'parsoid/deploy'= {
'grain' = 'parsoid',
'upstream' =
'https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy',
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
new file mode 100644
index 000..3efc872
--- /dev/null
+++ b/manifests/role/grafana.pp
@@ -0,0 +1,31 @@
+# == Class: role::grafana
+#
+# Grafana is an open-source, feature-rich metrics dashboard and graph
+# editor for Graphite InfluxDB. It powers https://grafana.wikimedia.org.
+#
+class role::grafana {
+$domain_suffix = $::realm ? {
+production = 'wikimedia.org',
+labs = 'wmflabs.org',
+}
+
+class { '::grafana':
+config = {
+datasources = {
+graphite = {
+type = 'graphite',
+url = graphite.${domain_suffix},
+},
+},
+},
+}
+
+class { '::grafana::web::apache':
+site_name = grafana.${domain_suffix},
+}
+
+monitor_service { 'grafana':
+description = grafana.${domain_suffix},
+check_command = check_http_url!grafana.${domain_suffix}!/,
+}
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index abb86d2..ef6a360 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3213,6 +3213,7 @@
include role::wikimania_scholarships
include role::bugzilla
include role::transparency
+include role::grafana
interface::add_ip6_mapped { 'main':
interface = 'eth0',
diff --git a/modules/grafana/manifests/init.pp
b/modules/grafana/manifests/init.pp
new file mode 100644
index 000..be7eeb1
--- /dev/null
+++ b/modules/grafana/manifests/init.pp
@@ -0,0 +1,41 @@
+# == Class: grafana
+#
+# Grafana is an open-source, feature-rich dashboard and graph editor
+# for Graphite and InfluxDB. See http://grafana.org/ for details.
+#
+# Grafana only has one optional external dependency and that is
+# Elasticsearch. Elasticsearch is used to store, load and search for
+# dashboards. But you can use Grafana without it.
+#
+# === Parameters
+#
+# [*config*]
+# A hash of Grafana configuration options.
+# For an annotated example of possible configuration values, see
+# https://github.com/grafana/grafana/blob/master/src/config.sample.js
+#
+# === Examples
+#
+# class { 'grafana':
+#config = {
+# graphiteUrl = 'https://graphite.wikimedia.org',
+# elasticsearch = 'https://elastic.wikimedia.org',
+#},
+# }
+#
+class grafana( $config ) {
+package { 'grafana':
+provider = 'trebuchet',
+}
+
+file { '/etc/grafana':
+ensure = directory,
+}
+
+file { '/etc/grafana/config.js':
+content = template('grafana/config.js.erb'),
+owner = 'www-data',
+group = 'www-data',
+mode= '0444',
+}
+}
diff --git a/modules/grafana/manifests/web/apache.pp
b/modules/grafana/manifests/web/apache.pp
new file mode 100644
index 000..fce41cb
--- /dev/null
+++ b/modules/grafana/manifests/web/apache.pp
@@ -0,0 +1,28 @@
+# == Class: grafana::web::apache
+#
+# Configures a dedicated Apache vhost for Grafana.
+#
+# === Parameters
+#
+# [*server_name*]
+# Name of virtual server.
+#
+# [*listen*]
+# Interface / port to listen on (default: *:80).
+#
+# === Examples
+#
+# class { '::grafana::web::apache':
+#server_name = 'grafana.wikimedia.org',
+# }
+#
+class grafana::web::apache(
+$server_name,
+$ensure = present,
+$listen = '*:80',
+) {
+apache::site { 'grafana':
+ensure = $ensure,
+content =
[MediaWiki-commits] [Gerrit] grafana: pass server_name to grafana::web::apache - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162210
Change subject: grafana: pass server_name to grafana::web::apache
..
grafana: pass server_name to grafana::web::apache
Change-Id: If9a90ba48612953a4eeaad959ea6350bedd0f145
---
M manifests/role/grafana.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/162210/1
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 3efc872..28d8a46 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -21,7 +21,7 @@
}
class { '::grafana::web::apache':
-site_name = grafana.${domain_suffix},
+server_name = grafana.${domain_suffix},
}
monitor_service { 'grafana':
--
To view, visit https://gerrit.wikimedia.org/r/162210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9a90ba48612953a4eeaad959ea6350bedd0f145
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] grafana: pass server_name to grafana::web::apache - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: grafana: pass server_name to grafana::web::apache
..
grafana: pass server_name to grafana::web::apache
Change-Id: If9a90ba48612953a4eeaad959ea6350bedd0f145
---
M manifests/role/grafana.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 3efc872..28d8a46 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -21,7 +21,7 @@
}
class { '::grafana::web::apache':
-site_name = grafana.${domain_suffix},
+server_name = grafana.${domain_suffix},
}
monitor_service { 'grafana':
--
To view, visit https://gerrit.wikimedia.org/r/162210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9a90ba48612953a4eeaad959ea6350bedd0f145
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] puppet: introduce hiera for production - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppet: introduce hiera for production
..
puppet: introduce hiera for production
* Introduce the hieradata dir in the puppet repo
* Install hiera.yaml in production
* Link hieradata dir in /etc/puppet/hiera
After this change is merged, we can start using hiera actively.
Change-Id: I8bd23ba3163b427ff1fd337188fbd28eaad44d3e
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A hieradata/common/.gitignore
A hieradata/hosts/.gitignore
A hieradata/labs/.gitignore
A hieradata/labs/host/.gitignore
A hieradata/mainrole/.gitignore
M modules/puppetmaster/files/prod.hiera.yaml
M modules/puppetmaster/manifests/gitclone.pp
M modules/puppetmaster/manifests/init.pp
8 files changed, 17 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/.gitignore b/hieradata/common/.gitignore
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/hieradata/common/.gitignore
diff --git a/hieradata/hosts/.gitignore b/hieradata/hosts/.gitignore
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/hieradata/hosts/.gitignore
diff --git a/hieradata/labs/.gitignore b/hieradata/labs/.gitignore
new file mode 100644
index 000..7c20c48
--- /dev/null
+++ b/hieradata/labs/.gitignore
@@ -0,0 +1,2 @@
+# Exclude all yaml files here from git, as they should be created on-demand
for any instance.
+*.yaml
diff --git a/hieradata/labs/host/.gitignore b/hieradata/labs/host/.gitignore
new file mode 100644
index 000..7c20c48
--- /dev/null
+++ b/hieradata/labs/host/.gitignore
@@ -0,0 +1,2 @@
+# Exclude all yaml files here from git, as they should be created on-demand
for any instance.
+*.yaml
diff --git a/hieradata/mainrole/.gitignore b/hieradata/mainrole/.gitignore
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/hieradata/mainrole/.gitignore
diff --git a/modules/puppetmaster/files/prod.hiera.yaml
b/modules/puppetmaster/files/prod.hiera.yaml
index a652163..2b82c37 100644
--- a/modules/puppetmaster/files/prod.hiera.yaml
+++ b/modules/puppetmaster/files/prod.hiera.yaml
@@ -8,11 +8,11 @@
- common
- realm
:private:
- :datadir: /etc/puppet/private
+ :datadir: /etc/puppet/private/hiera
:hierarchy:
- host/%{::hostname}
- %{::realm}
- %{::site}
- - private
- - mainrole
- - common
+ - private
+ - mainrole
+ - common
diff --git a/modules/puppetmaster/manifests/gitclone.pp
b/modules/puppetmaster/manifests/gitclone.pp
index aace954..4c23472 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -135,4 +135,9 @@
target = ${puppetmaster::gitdir}/operations/puppet/modules,
force = true,
}
+file { '/etc/puppet/hiera':
+ensure = link,
+target = ${puppetmaster::gitdir}/operations/puppet/hieradata,
+force = true,
+}
}
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 5193839..6f88fce 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -88,8 +88,9 @@
if $is_labs_puppet_master {
include puppetmaster::labs
-class { '::puppetmaster::hiera':
-source = 'puppet:///modules/puppetmaster/labs.hiera.yaml',
-}
+}
+
+class { '::puppetmaster::hiera':
+source = puppet:///modules/puppetmaster/${::realm}.hiera.yaml,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/160924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bd23ba3163b427ff1fd337188fbd28eaad44d3e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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] hiera: fix filename - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/162211 Change subject: hiera: fix filename .. hiera: fix filename Change-Id: Ib0dea5f6b580f1beab6867c303878f98ed14b7d3 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- R modules/puppetmaster/files/production.hiera.yaml 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/11/162211/1 diff --git a/modules/puppetmaster/files/prod.hiera.yaml b/modules/puppetmaster/files/production.hiera.yaml similarity index 100% rename from modules/puppetmaster/files/prod.hiera.yaml rename to modules/puppetmaster/files/production.hiera.yaml -- To view, visit https://gerrit.wikimedia.org/r/162211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0dea5f6b580f1beab6867c303878f98ed14b7d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hiera: fix filename - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: hiera: fix filename .. hiera: fix filename Change-Id: Ib0dea5f6b580f1beab6867c303878f98ed14b7d3 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- R modules/puppetmaster/files/production.hiera.yaml 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/puppetmaster/files/prod.hiera.yaml b/modules/puppetmaster/files/production.hiera.yaml similarity index 100% rename from modules/puppetmaster/files/prod.hiera.yaml rename to modules/puppetmaster/files/production.hiera.yaml -- To view, visit https://gerrit.wikimedia.org/r/162211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0dea5f6b580f1beab6867c303878f98ed14b7d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add grafana.wikimedia.org - change (operations/dns)
Filippo Giunchedi has submitted this change and it was merged. Change subject: Add grafana.wikimedia.org .. Add grafana.wikimedia.org Follows Ic04333741. Change-Id: I6b1ec4aa03faf60392ca75fc110e9e59952054ca --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 9d5378c..cdcd094 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -419,6 +419,7 @@ git 1H IN CNAMEmisc-web-lb.eqiad gdash 1H IN CNAMEmisc-web-lb.eqiad graphite1H IN CNAMEmisc-web-lb.eqiad +grafana 1H IN CNAMEmisc-web-lb.eqiad parsoid-tests 1H IN CNAMEmisc-web-lb.eqiad performance 1H IN CNAMEmisc-web-lb.eqiad -- To view, visit https://gerrit.wikimedia.org/r/133275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b1ec4aa03faf60392ca75fc110e9e59952054ca Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix hiera path - change (operations/software)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162212
Change subject: fix hiera path
..
fix hiera path
Change-Id: I626844d2dc945e8901f790a818db8b38f3004863
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/shell/helper
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/12/162212/1
diff --git a/compare-puppet-catalogs/shell/helper
b/compare-puppet-catalogs/shell/helper
index 319daf6..74675ba 100755
--- a/compare-puppet-catalogs/shell/helper
+++ b/compare-puppet-catalogs/shell/helper
@@ -21,7 +21,7 @@
PUPPETDIR=${EXTDIR}/puppet
PRIVATEDIR=${PARENT}/external/private
FACTS_ARCHIVE=${PARENT}/puppet-facts.tar.xz
-HIERA_CONFIG_FILE=${PUPPETDIR}/modules/puppetmaster/files/prod.hiera.yaml
+HIERA_CONFIG_FILE=${PUPPETDIR}/modules/puppetmaster/files/production.hiera.yaml
function log () {
echo $@
--
To view, visit https://gerrit.wikimedia.org/r/162212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I626844d2dc945e8901f790a818db8b38f3004863
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix hiera path - change (operations/software)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: fix hiera path
..
fix hiera path
Change-Id: I626844d2dc945e8901f790a818db8b38f3004863
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/shell/helper
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/compare-puppet-catalogs/shell/helper
b/compare-puppet-catalogs/shell/helper
index 319daf6..74675ba 100755
--- a/compare-puppet-catalogs/shell/helper
+++ b/compare-puppet-catalogs/shell/helper
@@ -21,7 +21,7 @@
PUPPETDIR=${EXTDIR}/puppet
PRIVATEDIR=${PARENT}/external/private
FACTS_ARCHIVE=${PARENT}/puppet-facts.tar.xz
-HIERA_CONFIG_FILE=${PUPPETDIR}/modules/puppetmaster/files/prod.hiera.yaml
+HIERA_CONFIG_FILE=${PUPPETDIR}/modules/puppetmaster/files/production.hiera.yaml
function log () {
echo $@
--
To view, visit https://gerrit.wikimedia.org/r/162212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I626844d2dc945e8901f790a818db8b38f3004863
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] Stricter pending behavior for falsely passing steps - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Stricter pending behavior for falsely passing steps .. Stricter pending behavior for falsely passing steps Providing a world pending method that fails step definitions containing falsely passing implementation, much like RSpec's version of the method. Bug: 56243 Change-Id: Ibcc614ab6e859a13c3c6d35aa44d18521fa8561f --- M lib/mediawiki_selenium/support/env.rb A lib/mediawiki_selenium/support/modules/strict_pending.rb 2 files changed, 25 insertions(+), 0 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki_selenium/support/env.rb b/lib/mediawiki_selenium/support/env.rb index 92bc97d..cd57d1f 100644 --- a/lib/mediawiki_selenium/support/env.rb +++ b/lib/mediawiki_selenium/support/env.rb @@ -18,10 +18,12 @@ require mediawiki_selenium/support/modules/api_helper require mediawiki_selenium/support/modules/sauce_helper +require mediawiki_selenium/support/modules/strict_pending World(PageObject::PageFactory) World(MediawikiSelenium::ApiHelper) World(MediawikiSelenium::SauceHelper) +World(MediawikiSelenium::StrictPending) def browser(test_name, configuration = nil) if environment == :saucelabs diff --git a/lib/mediawiki_selenium/support/modules/strict_pending.rb b/lib/mediawiki_selenium/support/modules/strict_pending.rb new file mode 100644 index 000..6cc6953 --- /dev/null +++ b/lib/mediawiki_selenium/support/modules/strict_pending.rb @@ -0,0 +1,23 @@ +module MediawikiSelenium + # Implements a stricter version of `pending` that fails when a given block + # of expectations passes, alerting the user that the step definition should + # no longer be pending. + # + module StrictPending +class Pending StandardError +end + +# Delegates to Cucumber's pending but re-raises any `Cucumber::Pending` +# exception as a strict failure. +# +def pending(*args) + super +rescue Cucumber::Pending = e + if block_given? +raise Pending, e.message + else +raise e + end +end + end +end -- To view, visit https://gerrit.wikimedia.org/r/160024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcc614ab6e859a13c3c6d35aa44d18521fa8561f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@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] Add model base class, description model - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Add model base class, description model
..
Add model base class, description model
This was the tiniest, least intrusive model I could think to start with.
Change-Id: Ie1a897b07346cfb43014b7d6f89addf4d25b2fba
---
M UploadWizardHooks.php
M docs/jsduck-config.json
M resources/mw.UploadWizardDescription.js
M resources/mw.UploadWizardDetails.js
M resources/ui/uw.ui.Thanks.js
A resources/uw/model/uw.model.Description.js
A resources/uw/model/uw.model.base.js
R resources/uw/uw.base.js
A tests/qunit/mw.uw.model.Description.test.js
9 files changed, 205 insertions(+), 38 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index cc5d004..0202f06 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -4,11 +4,6 @@
/* We define scripts here for Resource Loader */
public static $modules = array(
- 'uw.base' = array(
- 'scripts' = array(
- 'resources/uw.base.js',
- ),
- ),
'uw.EventFlowLogger' = array(
'scripts' = array(
'resources/uw.EventFlowLogger.js',
@@ -58,6 +53,7 @@
'uw.controller.Thanks',
'uw.controller.Tutorial',
'uw.controller.Upload',
+ 'uw.model.Description',
),
'scripts' = array(
// jquery interface helpers
@@ -626,6 +622,32 @@
'mwe-upwiz-thanks-url',
),
),
+
+ 'uw.base' = array(
+ 'scripts' = array(
+ 'resources/uw/uw.base.js',
+ ),
+ ),
+
+ 'uw.model.base' = array(
+ 'scripts' = array(
+ 'resources/uw/model/uw.model.base.js',
+ ),
+
+ 'dependencies' = array(
+ 'uw.base',
+ ),
+ ),
+
+ 'uw.model.Description' = array(
+ 'scripts' = array(
+ 'resources/uw/model/uw.model.Description.js',
+ ),
+
+ 'dependencies' = array(
+ 'uw.model.base',
+ ),
+ ),
);
/**
@@ -825,6 +847,7 @@
'tests/qunit/mw.UploadWizard.test.js',
'tests/qunit/mw.UploadWizardUpload.test.js',
'tests/qunit/mw.UploadWizardLicenseInput.test.js',
+ 'tests/qunit/mw.uw.model.Description.test.js',
'tests/qunit/mw.FlickrChecker.test.js',
'tests/qunit/mw.UploadWizardDetails.test.js',
'tests/qunit/mw.UtilitiesTime.test.js',
diff --git a/docs/jsduck-config.json b/docs/jsduck-config.json
index 259a28c..e935552 100644
--- a/docs/jsduck-config.json
+++ b/docs/jsduck-config.json
@@ -6,6 +6,7 @@
--output: ./js,
--: [
./external.js,
- ../resources/mw.ConfirmCloseWindow.js
+ ../resources/mw.ConfirmCloseWindow.js,
+ ../resources/uw/model
]
}
diff --git a/resources/mw.UploadWizardDescription.js
b/resources/mw.UploadWizardDescription.js
index 49d8f1c..c90da13 100644
--- a/resources/mw.UploadWizardDescription.js
+++ b/resources/mw.UploadWizardDescription.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function ( mw, $, uw ) {
/**
* Object that represents an indvidual language description, in the
details portion of Upload Wizard
* @param languageCode -- string
@@ -33,7 +33,7 @@
}
this.languageMenu = mw.LanguageUpWiz.getMenu( 'lang',
languageCode );
- $(this.languageMenu).addClass( 'mwe-upwiz-desc-lang-select' );
+ $( this.languageMenu ).addClass( 'mwe-upwiz-desc-lang-select' );
this.input = $( 'textarea name=' + this.id + ' rows=2
cols=36 class=mwe-upwiz-desc-lang-text/textarea' )
.growTextArea();
@@ -46,6 +46,7 @@
this.div = $('div
class=mwe-upwiz-details-descriptions-container ui-helper-clearfix/div' )
.append( errorLabelDiv, fieldnameDiv,
this.languageMenu, this.input );
+ this.description = new uw.model.Description( languageCode,
initialValue,
[MediaWiki-commits] [Gerrit] hiera: test functionality of dynlookup feature - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162213
Change subject: hiera: test functionality of dynlookup feature
..
hiera: test functionality of dynlookup feature
Change-Id: I189fd1bc8127e32786d0858e2115681a7fa867cc
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A hieradata/hosts/mw1017.yaml
A hieradata/hosts/mw1018.yaml
A hieradata/hosts/mw1019.yaml
A hieradata/hosts/mw1020.yaml
A hieradata/hosts/mw1021.yaml
A hieradata/mainrole/appserver_hhvm.yaml
M manifests/site.pp
7 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/162213/1
diff --git a/hieradata/hosts/mw1017.yaml b/hieradata/hosts/mw1017.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1017.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1018.yaml b/hieradata/hosts/mw1018.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1018.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1019.yaml b/hieradata/hosts/mw1019.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1019.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1020.yaml b/hieradata/hosts/mw1020.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1020.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1021.yaml b/hieradata/hosts/mw1021.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1021.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/mainrole/appserver_hhvm.yaml
b/hieradata/mainrole/appserver_hhvm.yaml
new file mode 100644
index 000..12d874d
--- /dev/null
+++ b/hieradata/mainrole/appserver_hhvm.yaml
@@ -0,0 +1 @@
+cluster: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index ef6a360..d27e471 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2140,7 +2140,7 @@
node /^mw10(1[7-9]|2[01])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = 'appserver_hhvm'
+#$cluster = 'appserver_hhvm'
if $::hostname =~ /^mw101[78]$/ {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/162213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I189fd1bc8127e32786d0858e2115681a7fa867cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw-prod: initial ring - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: initial ring .. codfw-prod: initial ring prime the ring with three machines, one per zone (i.e. row): ms-be2001, ms-be2005, ms-be2009 Change-Id: Ie37adeb1eabcc176f12804da48246f7377a902d1 --- M Makefile A codfw-prod/account.builder A codfw-prod/account.dump A codfw-prod/account.ring.gz A codfw-prod/container.builder A codfw-prod/container.dump A codfw-prod/container.ring.gz A codfw-prod/object.builder A codfw-prod/object.dump A codfw-prod/object.ring.gz 10 files changed, 61 insertions(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/Makefile b/Makefile index b0e38e2..8fab645 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ DESTHOST=palladium.eqiad.wmnet -TARGETS=eqiad-prod esams-prod +TARGETS=eqiad-prod esams-prod codfw-prod BUILDER_FILES=$(foreach dir,$(TARGETS),$(wildcard $(dir)/*.builder)) RING_FILES=$(foreach builder,$(BUILDER_FILES),$(subst .builder,.ring.gz,$(builder))) diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder new file mode 100644 index 000..f62af7b --- /dev/null +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump new file mode 100644 index 000..a2f7a68 --- /dev/null +++ b/codfw-prod/account.dump @@ -0,0 +1,10 @@ +codfw-prod/account.builder, build version 6 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 6 devices, 100.00 balance +The minimum number of hours before a partition can be reassigned is 3 +Devices:id region zone ip address port replication ip replication port name weight partitions balance meta + 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 0 -100.00 + 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 0 -100.00 + 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 0 -100.00 + 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 0 -100.00 + 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 0 -100.00 + 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 0 -100.00 diff --git a/codfw-prod/account.ring.gz b/codfw-prod/account.ring.gz new file mode 100644 index 000..d9272d6 --- /dev/null +++ b/codfw-prod/account.ring.gz Binary files differ diff --git a/codfw-prod/container.builder b/codfw-prod/container.builder new file mode 100644 index 000..5ddcfaa --- /dev/null +++ b/codfw-prod/container.builder Binary files differ diff --git a/codfw-prod/container.dump b/codfw-prod/container.dump new file mode 100644 index 000..60c87c4 --- /dev/null +++ b/codfw-prod/container.dump @@ -0,0 +1,10 @@ +codfw-prod/container.builder, build version 6 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 6 devices, 100.00 balance +The minimum number of hours before a partition can be reassigned is 3 +Devices:id region zone ip address port replication ip replication port name weight partitions balance meta + 0 1 1 10.192.0.19 6001 10.192.0.19 6001 sdm3 92.00 0 -100.00 + 1 1 1 10.192.0.19 6001 10.192.0.19 6001 sdn3 92.00 0 -100.00 + 2 1 210.192.16.21 600110.192.16.21 6001 sdm3 92.00 0 -100.00 + 3 1 210.192.16.21 600110.192.16.21 6001 sdn3 92.00 0 -100.00 + 4 1 310.192.32.14 600110.192.32.14 6001 sdm3 92.00 0 -100.00 + 5 1 310.192.32.14 600110.192.32.14 6001 sdn3 92.00 0 -100.00 diff --git a/codfw-prod/container.ring.gz b/codfw-prod/container.ring.gz new file mode 100644 index 000..51a3842 --- /dev/null +++ b/codfw-prod/container.ring.gz Binary files differ diff --git a/codfw-prod/object.builder b/codfw-prod/object.builder new file mode 100644 index 000..a362997 --- /dev/null +++ b/codfw-prod/object.builder Binary files differ diff --git a/codfw-prod/object.dump b/codfw-prod/object.dump new file mode 100644 index 000..259098a --- /dev/null +++ b/codfw-prod/object.dump @@ -0,0 +1,40 @@ +codfw-prod/object.builder, build version 36 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 36 devices, 100.00 balance +The minimum number of hours before a partition can be reassigned is 3 +Devices:id region zone ip address port replication ip replication port name weight partitions
[MediaWiki-commits] [Gerrit] Add missing dependency to the source module - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/162214 Change subject: Add missing dependency to the source module .. Add missing dependency to the source module Change-Id: I43fe304765908c1df513bdcf4b896a11ed42f9bf --- M Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/14/162214/1 diff --git a/Resources.php b/Resources.php index 3596f2d..8be20bc 100644 --- a/Resources.php +++ b/Resources.php @@ -118,6 +118,7 @@ 'dependencies' = array( 'ext.cx.sitemapper', 'ext.cx.util', + 'jquery.throttle-debounce', 'jquery.uls.data', ), 'messages' = array( -- To view, visit https://gerrit.wikimedia.org/r/162214 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43fe304765908c1df513bdcf4b896a11ed42f9bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove remaining uses of wgContentTranslationDomainTemplate - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162215
Change subject: Remove remaining uses of wgContentTranslationDomainTemplate
..
Remove remaining uses of wgContentTranslationDomainTemplate
Removed mw.cx.doCX, it is now part of mw.cx.SiteMapper, which can be
accessed via mw.cx.siteMapper (but dependency injection is preferred).
Change-Id: I9c0b5dca07f0d426724d034b3123f70bf83b1850
---
M ContentTranslation.hooks.php
M ContentTranslation.php
M Resources.php
M modules/base/ext.cx.base.js
M modules/base/ext.cx.model.js
M modules/base/ext.cx.sitemapper.js
M modules/entrypoint/ext.cx.entrypoint.js
M modules/source/ext.cx.source.selector.js
M modules/tools/ext.cx.tools.template.js
M modules/util/ext.cx.util.js
10 files changed, 45 insertions(+), 82 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/15/162215/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 8409e6d..6c8489d 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -73,13 +73,12 @@
* @param array $vars
*/
public static function addConfig( array $vars ) {
- global $wgContentTranslationServerURL,
$wgContentTranslationDomainTemplate,
+ global $wgContentTranslationServerURL,
$wgContentTranslationTranslateInTarget,
$wgContentTranslationExperimentalFeatures,
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationServerURL'] =
$wgContentTranslationServerURL;
- $vars['wgContentTranslationDomainTemplate'] =
$wgContentTranslationDomainTemplate;
$vars['wgContentTranslationSiteTemplates'] =
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationTranslateInTarget'] =
$wgContentTranslationTranslateInTarget;
$vars['wgContentTranslationExperimentalFeatures'] =
$wgContentTranslationExperimentalFeatures;
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 90da953..7ed8d79 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -103,16 +103,6 @@
$GLOBALS['wgContentTranslationEventLogging'] = false;
/**
- * Domain template for starting an article in a foreign language.
- * This is used when starting an article from scratch,
- * and can be used when starting a translation on Special:ContentTranslation
- * if $wgContentTranslationTranslateInTarget is true.
- * $1 is replaced with the language code.
- * The default is for Wikipedia.
- */
-$GLOBALS['wgContentTranslationDomainTemplate'] = $1.wikipedia.org;
-
-/**
* Patterns to access MediaWiki pages, APIs and cxserver in different languages
* for the site family.
*/
@@ -125,7 +115,7 @@
/**
* Whether to open Special:ContentTranslation in the target wiki
* when clicking the button in the entry point.
- * The domain will be based on $wgContentTranslationDomainTemplate.
+ * The domain will be based on $wgContentTranslationSiteTemplates.
* The default is to open Special:ContentTranslation on the same wiki.
*/
$GLOBALS['wgContentTranslationTranslateInTarget'] = false;
diff --git a/Resources.php b/Resources.php
index 8be20bc..c39b194 100644
--- a/Resources.php
+++ b/Resources.php
@@ -117,7 +117,6 @@
),
'dependencies' = array(
'ext.cx.sitemapper',
- 'ext.cx.util',
'jquery.throttle-debounce',
'jquery.uls.data',
),
@@ -404,7 +403,6 @@
),
'dependencies' = array(
'ext.cx.sitemapper',
- 'ext.cx.util',
'jquery.uls.data',
'mediawiki.Uri',
'mediawiki.jqueryMsg',
diff --git a/modules/base/ext.cx.base.js b/modules/base/ext.cx.base.js
index dfb5af6..c2f780c 100644
--- a/modules/base/ext.cx.base.js
+++ b/modules/base/ext.cx.base.js
@@ -107,11 +107,13 @@
}
} );
};
+
$.fn.cx.defaults = {};
- $( function () {
- var siteMapper = new mw.cx.SiteMapper( mw.config.get(
'wgContentTranslationSiteTemplates' ) );
+ // Set the global siteMapper for code which we cannot inject it
+ mw.cx.siteMapper = new mw.cx.SiteMapper( mw.config.get(
'wgContentTranslationSiteTemplates' ) );
- $( 'body' ).cx( siteMapper );
+ $( function () {
+ $( 'body' ).cx( mw.cx.siteMapper );
} );
}( jQuery, mediaWiki ) );
diff --git a/modules/base/ext.cx.model.js b/modules/base/ext.cx.model.js
index 7eb807f..2dcca21 100644
--- a/modules/base/ext.cx.model.js
+++ b/modules/base/ext.cx.model.js
@@ -23,5 +23,10 @@
mw.cx.sourceRevision = null;
// Translated title
mw.cx.targetTitle = null;
+ // Different tools that are available
mw.cx.tools = {};
[MediaWiki-commits] [Gerrit] url_downloader: assign to chromium - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: url_downloader: assign to chromium
..
url_downloader: assign to chromium
Assign chromium the url_dowloader role which is help in pmtpa by linne.
In order for this to work, assign the unused 208.80.154.156 IPv4 address
service IP to chromium
Change-Id: I184eeb71970cc5d78dff37d4ceb02a34b421bfbc
---
M manifests/site.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 8e323ad..113399a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -482,6 +482,15 @@
include standard
include role::dns::recursor
+if $::hostname == 'chromium' {
+interface::ip { 'url-downloader':
+interface = 'eth0',
+address = '208.80.154.156',
+}
+$url_downloader_ip = '208.80.154.156'
+include role::url_downloader
+}
+
interface::add_ip6_mapped { 'main':
interface = 'eth0',
}
--
To view, visit https://gerrit.wikimedia.org/r/161951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I184eeb71970cc5d78dff37d4ceb02a34b421bfbc
Gerrit-PatchSet: 2
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] Add missing dependency to the source module - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing dependency to the source module .. Add missing dependency to the source module Change-Id: I43fe304765908c1df513bdcf4b896a11ed42f9bf --- M Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Santhosh: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 3596f2d..8be20bc 100644 --- a/Resources.php +++ b/Resources.php @@ -118,6 +118,7 @@ 'dependencies' = array( 'ext.cx.sitemapper', 'ext.cx.util', + 'jquery.throttle-debounce', 'jquery.uls.data', ), 'messages' = array( -- To view, visit https://gerrit.wikimedia.org/r/162214 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43fe304765908c1df513bdcf4b896a11ed42f9bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Santhosh santhosh.thottin...@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] hiera: test functionality of dynlookup feature - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hiera: test functionality of dynlookup feature
..
hiera: test functionality of dynlookup feature
Change-Id: I189fd1bc8127e32786d0858e2115681a7fa867cc
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A hieradata/hosts/mw1017.yaml
A hieradata/hosts/mw1018.yaml
A hieradata/hosts/mw1019.yaml
A hieradata/hosts/mw1020.yaml
A hieradata/hosts/mw1021.yaml
A hieradata/mainrole/appserver_hhvm.yaml
M manifests/site.pp
M modules/puppetmaster/files/production.hiera.yaml
8 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/mw1017.yaml b/hieradata/hosts/mw1017.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1017.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1018.yaml b/hieradata/hosts/mw1018.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1018.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1019.yaml b/hieradata/hosts/mw1019.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1019.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1020.yaml b/hieradata/hosts/mw1020.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1020.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/hosts/mw1021.yaml b/hieradata/hosts/mw1021.yaml
new file mode 100644
index 000..e30aca3
--- /dev/null
+++ b/hieradata/hosts/mw1021.yaml
@@ -0,0 +1 @@
+mainrole: appserver_hhvm
diff --git a/hieradata/mainrole/appserver_hhvm.yaml
b/hieradata/mainrole/appserver_hhvm.yaml
new file mode 100644
index 000..12d874d
--- /dev/null
+++ b/hieradata/mainrole/appserver_hhvm.yaml
@@ -0,0 +1 @@
+cluster: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index 113399a..64aa802 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2152,7 +2152,7 @@
node /^mw10(1[7-9]|2[01])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = 'appserver_hhvm'
+$cluster = hiera('cluster')
if $::hostname =~ /^mw101[78]$/ {
$ganglia_aggregator = true
diff --git a/modules/puppetmaster/files/production.hiera.yaml
b/modules/puppetmaster/files/production.hiera.yaml
index 2b82c37..e91211e 100644
--- a/modules/puppetmaster/files/production.hiera.yaml
+++ b/modules/puppetmaster/files/production.hiera.yaml
@@ -10,7 +10,7 @@
:private:
:datadir: /etc/puppet/private/hiera
:hierarchy:
- - host/%{::hostname}
+ - hosts/%{::hostname}
- %{::realm}
- %{::site}
- private
--
To view, visit https://gerrit.wikimedia.org/r/162213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I189fd1bc8127e32786d0858e2115681a7fa867cc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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 missing space to log message - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162216
Change subject: Add missing space to log message
..
Add missing space to log message
Follow-up I72c5c3fb75 (6fc2e603).
Change-Id: I9375da8542b3c2fb33cf0b692ab38722445081bc
---
M includes/context/RequestContext.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/162216/1
diff --git a/includes/context/RequestContext.php
b/includes/context/RequestContext.php
index db57371..952af8c 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -140,7 +140,7 @@
if ( $this-title === null ) {
global $wgTitle; # fallback to $wg till we can improve
this
$this-title = $wgTitle;
- wfDebugLog( 'GlobalTitleFail', __METHOD__ . ' called by
' . wfGetCaller() . 'with no title set.' );
+ wfDebugLog( 'GlobalTitleFail', __METHOD__ . ' called by
' . wfGetCaller() . ' with no title set.' );
}
return $this-title;
--
To view, visit https://gerrit.wikimedia.org/r/162216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9375da8542b3c2fb33cf0b692ab38722445081bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove uses of wgContentTranslationServerURL - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162217
Change subject: Remove uses of wgContentTranslationServerURL
..
Remove uses of wgContentTranslationServerURL
PHP variable is left to give some transition time for updating
configurations.
Change-Id: I8ba21b418a5ff02e85efdba23e2f5ed2ff6906de
---
M ContentTranslation.hooks.php
M ContentTranslation.php
M Resources.php
M modules/base/ext.cx.sitemapper.js
M modules/source/ext.cx.source.js
M modules/source/ext.cx.source.selector.js
M modules/tools/ext.cx.tools.dictionary.js
M modules/tools/ext.cx.tools.manager.js
M modules/tools/ext.cx.tools.mt.js
M tests/qunit/tools/ext.cx.tools.template.test.js
10 files changed, 73 insertions(+), 28 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/17/162217/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 6c8489d..5be3f6a 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -78,7 +78,11 @@
$wgContentTranslationExperimentalFeatures,
$wgContentTranslationSiteTemplates;
- $vars['wgContentTranslationServerURL'] =
$wgContentTranslationServerURL;
+ // Temporary BC code for old configuration
+ if ( $wgContentTranslationServerURL !== null ) {
+ $wgContentTranslationSiteTemplates['cx'] =
$wgContentTranslationServerURL;
+ }
+
$vars['wgContentTranslationSiteTemplates'] =
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationTranslateInTarget'] =
$wgContentTranslationTranslateInTarget;
$vars['wgContentTranslationExperimentalFeatures'] =
$wgContentTranslationExperimentalFeatures;
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 7ed8d79..0b0dc1d 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -44,8 +44,8 @@
$GLOBALS['wgMessagesDirs']['ContentTranslation'] = $dir/i18n;
-// Content translation server URL
-$GLOBALS['wgContentTranslationServerURL'] = 'http://localhost:8080';
+// Content translation server URL, deprecated, use
$wgContentTranslationSiteTemplates
+$GLOBALS['wgContentTranslationServerURL'] = null;
$GLOBALS['wgContentTranslationExperimentalFeatures'] = false;
$GLOBALS['wgContentTranslationParsoid'] = array(
'url' = 'http://parsoid.wmflabs.org/',
@@ -109,7 +109,7 @@
$GLOBALS['wgContentTranslationSiteTemplates'] = array(
'view' = '//$1.wikipedia.org/wiki/$2',
'api' = '//$1.wikipedia.org/w/api.php',
- 'cx' = 'http://localhost:8080/page/$1/$2',
+ 'cx' = 'http://localhost:8080/',
);
/**
diff --git a/Resources.php b/Resources.php
index c39b194..d65486d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -180,17 +180,17 @@
),
'dependencies' = array(
'ext.cx.progressbar',
- 'mediawiki.jqueryMsg',
- 'ext.cx.tools.manager',
'ext.cx.tools.dictionary',
+ 'ext.cx.tools.images',
'ext.cx.tools.instructions',
'ext.cx.tools.link',
- 'ext.cx.tools.images',
- 'ext.cx.tools.mtabuse',
+ 'ext.cx.tools.manager',
'ext.cx.tools.mt',
+ 'ext.cx.tools.mtabuse',
'ext.cx.tools.reference',
'ext.cx.tools.template',
'ext.cx.util.selection',
+ 'mediawiki.jqueryMsg',
),
) + $resourcePaths;
@@ -298,6 +298,7 @@
'cx-tools-mt-dont-use',
),
'dependencies' = array(
+ 'ext.cx.init',
'ext.cx.model',
'ext.cx.source',
'ext.cx.tools.card',
diff --git a/modules/base/ext.cx.sitemapper.js
b/modules/base/ext.cx.sitemapper.js
index 169a7dc..c0da65c 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -44,12 +44,18 @@
/**
* Get a URL to an article in a wiki for a given language.
*
-* @param {string} language Language code
-* @param {string} title Page title
+* @param {string} module CXServer module path
+* @param {Object} [params]
* @return {string}
*/
- mw.cx.SiteMapper.prototype.getCXServerUrl = function ( language, title
) {
- return this.config.cx.replace( '$1', language ).replace( '$2',
title );
+ mw.cx.SiteMapper.prototype.getCXServerUrl = function ( module, params )
{
+ if ( params !== undefined ) {
+ $.each( params, function ( key, value ) {
+ module = module.replace( key,
encodeURIComponent( value ) );
+ } );
+ }
+
+ return this.config.cx + module;
};
[MediaWiki-commits] [Gerrit] MT: Service selector menu should contain only service provid... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: MT: Service selector menu should contain only service provider
name
..
MT: Service selector menu should contain only service provider name
When the current language is supported, it should not be explicitly
stated in the Services list ( i.e., the selector should indicate
From Apertium instead of From Apertium, Español to Català ).
Since this will reduce the required menu width, adjust the style a bit
Change-Id: Ie6cdc6534a2a4937b006515a30afad307a67e358
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/tools/ext.cx.tools.mt.js
M modules/tools/styles/ext.cx.tools.mt.less
5 files changed, 10 insertions(+), 23 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 3596f2d..e7340cf 100644
--- a/Resources.php
+++ b/Resources.php
@@ -304,7 +304,6 @@
'ext.cx.tools.manager',
'ext.cx.translation',
'ext.cx.util',
- 'jquery.uls.data',
),
) + $resourcePaths;
diff --git a/i18n/en.json b/i18n/en.json
index d781bed..c24eab1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -58,7 +58,7 @@
cx-tools-mt-use-source: Use source text,
cx-tools-mt-clear-translation: Clear translation,
cx-tools-mt-restore: Restore,
- cx-tools-mt-provider-title: From $1, $2 to $3,
+ cx-tools-mt-provider-title: From $1,
cx-tools-mt-not-available: Not available for $1,
cx-tools-mt-dont-use: Don't use machine translation,
cx-stats-title: Content translation statistics,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4d58cde..8c81ebd 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -63,7 +63,7 @@
cx-tools-mt-use-source: A button in the machine translation tool
card on Special:ContentTranslation. Clicking the button pastes the source text
to the translation column.,
cx-tools-mt-clear-translation: A button in the machine translation
tool card on Special:ContentTranslation. Clicking the button removes the
machine translation that was added to the paragraph.,
cx-tools-mt-restore: A button in the machine translation tool card
on Special:ContentTranslation. It appears if the translation was cleared using
the button {{msg-mw|cx-tools-mt-clear-translation}}, and clicking it restores
the machine translation.\n{{Identical|Restore}},
- cx-tools-mt-provider-title: An item in a menu in the machine
translation tool card on Special:ContentTranslation. The menu lists different
available machine translation providers for this language.\n* $1 is the name of
the provider, such as Apertium, Microsoft Translator, Google Translate, etc.\n*
$2 is the name of the source language.\n* $3 is the name of the target
language.,
+ cx-tools-mt-provider-title: An item in a menu in the machine
translation tool card on Special:ContentTranslation. The menu lists different
available machine translation providers for this language.\n* $1 is the name of
the provider, such as Apertium, Microsoft Translator, Google Translate, etc.,
cx-tools-mt-not-available: An item in a menu in the machine
translation tool card on Special:ContentTranslation. It's shown when there is
no machine translation provider for that language. $1 is the name of the
language.,
cx-tools-mt-dont-use: An item in a menu in the machine translation
tool card on Special:ContentTranslation. Other items in same menu will use the
message {{msg-mw|cx-tools-mt-from-provider}}. Selecting this item disables
machine translation. It may be the default for some languages.,
cx-stats-title: The title for the Special:ContentTranslationStats
special page.,
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 98aeb59..3e9939f 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -279,11 +279,7 @@
MTControlCard.provider = providerId;
// Set the main label
- this.$providerSelectorTrigger.text( this.getProviderTitle(
- providerId,
- mw.cx.sourceLanguage,
- mw.cx.targetLanguage
- ) );
+ this.$providerSelectorTrigger.text( this.getProviderTitle(
providerId ) );
};
MTControlCard.prototype.listen = function () {
@@ -338,32 +334,24 @@
/**
* Get the text for the menu item in the providers list.
* @param {string} id Provider id.
-* @param {string} sourceLang Source language code.
-* @param {string} targetLang Target language code.
* @return {string}
*/
- MTControlCard.prototype.getProviderTitle = function ( id, from, to ) {
+ MTControlCard.prototype.getProviderTitle = function ( id ) {
[MediaWiki-commits] [Gerrit] url_downloader: squid3 cache_dir fix - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/162218 Change subject: url_downloader: squid3 cache_dir fix .. url_downloader: squid3 cache_dir fix In squid 2.6, 2.7 and 3.0 disabling the on disk cache required the usage of a cache_dir null declaration using the null storage type. In 3.1 and upwards this is now accomplished by not declaring any cache_dir directives at all. As a result the null type was also dropped and the specified directive in the configuration prevents squid from starting. However, in 3.3 (at least in Ubuntu land), a cache_dir null directive no longer stops the server from starting but is rather silently ignored. This seems to be an un-documented behavior, at least in: http://www.squid-cache.org/Doc/config/cache_dir/ or http://bazaar.launchpad.net/~squid/squid/trunk/view/head:/ChangeLog and a quick traversing of the code did not turn up anything. Fix the problem on 3.1 (precise) by omitting the cache_dir directive Please do note the in memory caching has nothing to do with any of this. Change-Id: Ie623bb0fdce584e578e2f440b1ab213b64a99fdd --- M modules/url_downloader/templates/squid.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/162218/1 diff --git a/modules/url_downloader/templates/squid.conf.erb b/modules/url_downloader/templates/squid.conf.erb index 1ee2deb..2e836b1 100644 --- a/modules/url_downloader/templates/squid.conf.erb +++ b/modules/url_downloader/templates/squid.conf.erb @@ -10,7 +10,6 @@ broken_vary_encoding allow apache maximum_object_size 510 MB cache_replacement_policy heap LFUDA -cache_dir null /tmp access_log /var/log/%= @package_name %/access.log squid log_mime_hdrs on hosts_file /etc/hosts @@ -81,6 +80,7 @@ %- if @package_name == 'squid' -% reply_body_max_size 534773760 allow all +cache_dir null /tmp %- else -% reply_body_max_size 510 MB all %- end -% -- To view, visit https://gerrit.wikimedia.org/r/162218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie623bb0fdce584e578e2f440b1ab213b64a99fdd 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] url_downloader: squid3 cache_dir fix - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: url_downloader: squid3 cache_dir fix .. url_downloader: squid3 cache_dir fix In squid 2.6, 2.7 and 3.0 disabling the on disk cache required the usage of a cache_dir null declaration using the null storage type. In 3.1 and upwards this is now accomplished by not declaring any cache_dir directives at all. As a result the null type was also dropped and the specified directive in the configuration prevents squid from starting. However, in 3.3 (at least in Ubuntu land), a cache_dir null directive no longer stops the server from starting but is rather silently ignored. This seems to be an un-documented behavior, at least in: http://www.squid-cache.org/Doc/config/cache_dir/ or http://bazaar.launchpad.net/~squid/squid/trunk/view/head:/ChangeLog and a quick traversing of the code did not turn up anything. Fix the problem on 3.1 (precise) by omitting the cache_dir directive Please do note the in memory caching has nothing to do with any of this. Change-Id: Ie623bb0fdce584e578e2f440b1ab213b64a99fdd --- M modules/url_downloader/templates/squid.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/url_downloader/templates/squid.conf.erb b/modules/url_downloader/templates/squid.conf.erb index 1ee2deb..2e836b1 100644 --- a/modules/url_downloader/templates/squid.conf.erb +++ b/modules/url_downloader/templates/squid.conf.erb @@ -10,7 +10,6 @@ broken_vary_encoding allow apache maximum_object_size 510 MB cache_replacement_policy heap LFUDA -cache_dir null /tmp access_log /var/log/%= @package_name %/access.log squid log_mime_hdrs on hosts_file /etc/hosts @@ -81,6 +80,7 @@ %- if @package_name == 'squid' -% reply_body_max_size 534773760 allow all +cache_dir null /tmp %- else -% reply_body_max_size 510 MB all %- end -% -- To view, visit https://gerrit.wikimedia.org/r/162218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie623bb0fdce584e578e2f440b1ab213b64a99fdd 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 Phabricator footer (License, Terms of Use) - change (operations/puppet)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162219
Change subject: Update Phabricator footer (License, Terms of Use)
..
Update Phabricator footer (License, Terms of Use)
https://phabricator.wikimedia.org/T171
https://phabricator.wikimedia.org/T198
Change-Id: Ibf30b71e68cb69bb93b71f317cbef02aa73f1b65
---
M modules/phabricator/data/fixed_settings.yaml
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/162219/1
diff --git a/modules/phabricator/data/fixed_settings.yaml
b/modules/phabricator/data/fixed_settings.yaml
index e1b8963..00a7ffa 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -1,10 +1,11 @@
#These custom values are hardcoded here to persist across Phabriactor
Mediawiki installs
ui.footer-items:
+ - {name: 'Text is available under the Creative Commons
Attribution-ShareAlike License; code is available under the GNU General Public
License or other appropriate open source licenses. By using this site, you
agree to the Terms of Use and Privacy Policy. Wikipedia\u00ae is a registered
trademark of the Wikimedia Foundation, Inc., a non-profit organization.'}
- {name: Copyright 2014}
- {href: 'https://www.wikimedia.org/', name: Wikimedia Foundation}
- {href: 'https://wikimediafoundation.org/wiki/Privacy_policy', name:
Privacy Policy}
- - {href: 'https://wikimediafoundation.org/wiki/Terms_of_Use', name: Terms of
Use}
+ - {href: 'https://wikimediafoundation.org/wiki/Terms_of_Use/Phabricator',
name: Terms of Use}
- {href:
'https://wikimediafoundation.org/wiki/Wikimedia:General_disclaimer', name:
Disclaimer}
maniphest.priorities:
--
To view, visit https://gerrit.wikimedia.org/r/162219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf30b71e68cb69bb93b71f317cbef02aa73f1b65
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aklapper aklap...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: use hiera in appserver role - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/162221 Change subject: mediawiki: use hiera in appserver role .. mediawiki: use hiera in appserver role Change-Id: Ic6c44840b15e0857f6049c6a7ca6e1c0cca78147 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- A hieradata/hosts/mw1022.yaml A hieradata/hosts/mw1023.yaml A hieradata/hosts/mw1024.yaml A hieradata/hosts/mw1025.yaml A hieradata/hosts/mw1026.yaml A hieradata/hosts/mw1027.yaml A hieradata/hosts/mw1028.yaml A hieradata/hosts/mw1029.yaml A hieradata/hosts/mw1030.yaml A hieradata/hosts/mw1031.yaml A hieradata/hosts/mw1032.yaml A hieradata/hosts/mw1033.yaml A hieradata/hosts/mw1034.yaml A hieradata/hosts/mw1035.yaml A hieradata/hosts/mw1036.yaml A hieradata/hosts/mw1037.yaml A hieradata/hosts/mw1038.yaml A hieradata/hosts/mw1039.yaml A hieradata/hosts/mw1040.yaml A hieradata/hosts/mw1041.yaml A hieradata/hosts/mw1042.yaml A hieradata/hosts/mw1043.yaml A hieradata/hosts/mw1044.yaml A hieradata/hosts/mw1045.yaml A hieradata/hosts/mw1046.yaml A hieradata/hosts/mw1047.yaml A hieradata/hosts/mw1048.yaml A hieradata/hosts/mw1049.yaml A hieradata/hosts/mw1050.yaml A hieradata/hosts/mw1051.yaml A hieradata/hosts/mw1052.yaml A hieradata/hosts/mw1054.yaml A hieradata/hosts/mw1055.yaml A hieradata/hosts/mw1056.yaml A hieradata/hosts/mw1057.yaml A hieradata/hosts/mw1058.yaml A hieradata/hosts/mw1059.yaml A hieradata/hosts/mw1060.yaml A hieradata/hosts/mw1061.yaml A hieradata/hosts/mw1062.yaml A hieradata/hosts/mw1063.yaml A hieradata/hosts/mw1064.yaml A hieradata/hosts/mw1065.yaml A hieradata/hosts/mw1066.yaml A hieradata/hosts/mw1067.yaml A hieradata/hosts/mw1068.yaml A hieradata/hosts/mw1069.yaml A hieradata/hosts/mw1070.yaml A hieradata/hosts/mw1071.yaml A hieradata/hosts/mw1072.yaml A hieradata/hosts/mw1073.yaml A hieradata/hosts/mw1074.yaml A hieradata/hosts/mw1075.yaml A hieradata/hosts/mw1076.yaml A hieradata/hosts/mw1077.yaml A hieradata/hosts/mw1078.yaml A hieradata/hosts/mw1079.yaml A hieradata/hosts/mw1080.yaml A hieradata/hosts/mw1081.yaml A hieradata/hosts/mw1082.yaml A hieradata/hosts/mw1083.yaml A hieradata/hosts/mw1084.yaml A hieradata/hosts/mw1085.yaml A hieradata/hosts/mw1086.yaml A hieradata/hosts/mw1087.yaml A hieradata/hosts/mw1088.yaml A hieradata/hosts/mw1089.yaml A hieradata/hosts/mw1090.yaml A hieradata/hosts/mw1091.yaml A hieradata/hosts/mw1092.yaml A hieradata/hosts/mw1093.yaml A hieradata/hosts/mw1094.yaml A hieradata/hosts/mw1095.yaml A hieradata/hosts/mw1096.yaml A hieradata/hosts/mw1097.yaml A hieradata/hosts/mw1098.yaml A hieradata/hosts/mw1099.yaml A hieradata/hosts/mw1100.yaml A hieradata/hosts/mw1101.yaml A hieradata/hosts/mw1102.yaml A hieradata/hosts/mw1103.yaml A hieradata/hosts/mw1104.yaml A hieradata/hosts/mw1105.yaml A hieradata/hosts/mw1106.yaml A hieradata/hosts/mw1107.yaml A hieradata/hosts/mw1108.yaml A hieradata/hosts/mw1109.yaml A hieradata/hosts/mw1110.yaml A hieradata/hosts/mw.yaml A hieradata/hosts/mw1112.yaml A hieradata/hosts/mw1113.yaml A hieradata/hosts/mw1149.yaml A hieradata/hosts/mw1150.yaml A hieradata/hosts/mw1151.yaml A hieradata/hosts/mw1152.yaml A hieradata/hosts/mw1161.yaml A hieradata/hosts/mw1162.yaml A hieradata/hosts/mw1163.yaml A hieradata/hosts/mw1164.yaml A hieradata/hosts/mw1165.yaml A hieradata/hosts/mw1166.yaml A hieradata/hosts/mw1167.yaml A hieradata/hosts/mw1168.yaml A hieradata/hosts/mw1169.yaml A hieradata/hosts/mw1170.yaml A hieradata/hosts/mw1171.yaml A hieradata/hosts/mw1172.yaml A hieradata/hosts/mw1173.yaml A hieradata/hosts/mw1174.yaml A hieradata/hosts/mw1175.yaml A hieradata/hosts/mw1176.yaml A hieradata/hosts/mw1177.yaml A hieradata/hosts/mw1178.yaml A hieradata/hosts/mw1179.yaml A hieradata/hosts/mw1180.yaml A hieradata/hosts/mw1181.yaml A hieradata/hosts/mw1182.yaml A hieradata/hosts/mw1183.yaml A hieradata/hosts/mw1184.yaml A hieradata/hosts/mw1185.yaml A hieradata/hosts/mw1186.yaml A hieradata/hosts/mw1187.yaml A hieradata/hosts/mw1188.yaml A hieradata/hosts/mw1209.yaml A hieradata/hosts/mw1210.yaml A hieradata/hosts/mw1211.yaml A hieradata/hosts/mw1212.yaml A hieradata/hosts/mw1213.yaml A hieradata/hosts/mw1214.yaml A hieradata/hosts/mw1215.yaml A hieradata/hosts/mw1216.yaml A hieradata/hosts/mw1217.yaml A hieradata/hosts/mw1218.yaml A hieradata/hosts/mw1219.yaml A hieradata/hosts/mw1220.yaml A hieradata/mainrole/appserver.yaml A hieradata/mainrole/default.yaml M manifests/role/mediawiki.pp 138 files changed, 140 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/162221/1 diff --git a/hieradata/hosts/mw1022.yaml b/hieradata/hosts/mw1022.yaml new file mode 100644 index 000..2c726b4 --- /dev/null +++ b/hieradata/hosts/mw1022.yaml @@ -0,0 +1 @@ +mainrole: appserver diff --git a/hieradata/hosts/mw1023.yaml b/hieradata/hosts/mw1023.yaml new file mode 100644 index 000..2c726b4 ---
[MediaWiki-commits] [Gerrit] mediawiki: first step in simplification - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162220
Change subject: mediawiki: first step in simplification
..
mediawiki: first step in simplification
Change-Id: I7eb31c4b6c877d668fd59177376662b648cc0aa3
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/mainrole/appserver_hhvm.yaml
M manifests/role/mediawiki.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/162220/1
diff --git a/hieradata/mainrole/appserver_hhvm.yaml
b/hieradata/mainrole/appserver_hhvm.yaml
index 12d874d..393c03b 100644
--- a/hieradata/mainrole/appserver_hhvm.yaml
+++ b/hieradata/mainrole/appserver_hhvm.yaml
@@ -1 +1,2 @@
cluster: appserver_hhvm
+role::mediawiki::webserver::pool: hhvm_appservers
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index d608c5d..59f6fdd 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -77,7 +77,7 @@
if ubuntu_version('= trusty') {
-$pool = 'hhvm_appservers'
+include ::role::mediawiki::webserver
monitor_service { 'appserver_http_hhvm':
description = 'HHVM rendering',
@@ -85,9 +85,8 @@
}
} else {
$pool = 'apaches'
+class { 'role::mediawiki::webserver': pool = $pool, }
}
-
-class { 'role::mediawiki::webserver': pool = $pool, }
}
class role::mediawiki::appserver::api {
--
To view, visit https://gerrit.wikimedia.org/r/162220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7eb31c4b6c877d668fd59177376662b648cc0aa3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: first step in simplification - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: first step in simplification
..
mediawiki: first step in simplification
Change-Id: I7eb31c4b6c877d668fd59177376662b648cc0aa3
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/mainrole/appserver_hhvm.yaml
M manifests/role/mediawiki.pp
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/mainrole/appserver_hhvm.yaml
b/hieradata/mainrole/appserver_hhvm.yaml
index 12d874d..393c03b 100644
--- a/hieradata/mainrole/appserver_hhvm.yaml
+++ b/hieradata/mainrole/appserver_hhvm.yaml
@@ -1 +1,2 @@
cluster: appserver_hhvm
+role::mediawiki::webserver::pool: hhvm_appservers
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index d608c5d..59f6fdd 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -77,7 +77,7 @@
if ubuntu_version('= trusty') {
-$pool = 'hhvm_appservers'
+include ::role::mediawiki::webserver
monitor_service { 'appserver_http_hhvm':
description = 'HHVM rendering',
@@ -85,9 +85,8 @@
}
} else {
$pool = 'apaches'
+class { 'role::mediawiki::webserver': pool = $pool, }
}
-
-class { 'role::mediawiki::webserver': pool = $pool, }
}
class role::mediawiki::appserver::api {
--
To view, visit https://gerrit.wikimedia.org/r/162220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7eb31c4b6c877d668fd59177376662b648cc0aa3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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 missing dependency AbstractedRepoApi = RepoApi - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/16 Change subject: Add missing dependency AbstractedRepoApi = RepoApi .. Add missing dependency AbstractedRepoApi = RepoApi Change-Id: I1886fa659176ed3ec68495c180b363eddea527cc --- M lib/resources/wikibase.RepoApi/resources.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/22/16/1 diff --git a/lib/resources/wikibase.RepoApi/resources.php b/lib/resources/wikibase.RepoApi/resources.php index ea41c1d..4c03897 100644 --- a/lib/resources/wikibase.RepoApi/resources.php +++ b/lib/resources/wikibase.RepoApi/resources.php @@ -23,6 +23,7 @@ 'dependencies' = array( 'util.inherit', 'wikibase.datamodel', + 'wikibase.RepoApi', 'wikibase.serialization.entities', ), ), -- To view, visit https://gerrit.wikimedia.org/r/16 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1886fa659176ed3ec68495c180b363eddea527cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point cawikimedia's interwikis to English wikis - change (mediawiki...WikimediaMaintenance)
TTO has uploaded a new change for review. https://gerrit.wikimedia.org/r/162223 Change subject: Point cawikimedia's interwikis to English wikis .. Point cawikimedia's interwikis to English wikis cawikimedia is for Wikimedia Canada, not Catalonia. Change-Id: I7f111813bd7143ff5c9e4a2a3dadc5485379d96a --- M dumpInterwiki.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance refs/changes/23/162223/1 diff --git a/dumpInterwiki.php b/dumpInterwiki.php index 30dbb4d..410366f 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -125,6 +125,7 @@ 'bd' = 'bn', 'be' = 'en', 'br' = 'pt', + 'ca' = 'en', 'co' = 'es', 'dk' = 'da', 'il' = 'he', -- To view, visit https://gerrit.wikimedia.org/r/162223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f111813bd7143ff5c9e4a2a3dadc5485379d96a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add java_opts option - change (operations...kafka)
Ottomata has submitted this change and it was merged. Change subject: Add java_opts option .. Add java_opts option Change-Id: I8dc008c791c8cda730c396069d506fcdb0d7b79b --- M manifests/defaults.pp M manifests/server.pp M templates/kafka.default.erb 3 files changed, 11 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/defaults.pp b/manifests/defaults.pp index dfadbc8..f8b684a 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -28,6 +28,7 @@ # Broker Server settings $java_home = undef +$java_opts = undef $jmx_port= $log_dirs= ['/var/spool/kafka'] $heap_opts = undef diff --git a/manifests/server.pp b/manifests/server.pp index 7419d64..8a7ed59 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -34,6 +34,8 @@ # # $java_home- Value for the JAVA_HOME environment variable. Default: undef # +# $java_opts- Extra Java options. Default: undef. +# # $jmx_port - Port on which to expose JMX metrics. Default: # # $heap_opts- Heap options to pass to JVM on startup. Default: undef @@ -132,6 +134,7 @@ $zookeeper_chroot= $kafka::defaults::zookeeper_chroot, $java_home = $kafka::defaults::java_home, +$java_opts = $kafka::defaults::java_opts, $jmx_port= $kafka::defaults::jmx_port, $heap_opts = $kafka::defaults::heap_opts, $nofiles_ulimit = $kafka::defaults::nofiles_ulimit, diff --git a/templates/kafka.default.erb b/templates/kafka.default.erb index a83838e..56bd507 100644 --- a/templates/kafka.default.erb +++ b/templates/kafka.default.erb @@ -12,6 +12,13 @@ JAVA_HOME=%= @java_home % % end -% +# Extra Java options +% if @java_opts -% +JAVA_OPTS=%= @java_opts % +% else -% +#JAVA_OPTS= +% end -% + KAFKA_NOFILES_ULIMIT=%= @nofiles_ulimit % # The default JMX_PORT for Kafka Brokers is . -- To view, visit https://gerrit.wikimedia.org/r/162152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8dc008c791c8cda730c396069d506fcdb0d7b79b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/kafka Gerrit-Branch: master Gerrit-Owner: Plucas plu...@yelp.com Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: Plucas plu...@yelp.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing dependency AbstractedRepoApi = RepoApi - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing dependency AbstractedRepoApi = RepoApi .. Add missing dependency AbstractedRepoApi = RepoApi Change-Id: I1886fa659176ed3ec68495c180b363eddea527cc --- M lib/resources/wikibase.RepoApi/resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/wikibase.RepoApi/resources.php b/lib/resources/wikibase.RepoApi/resources.php index ea41c1d..4c03897 100644 --- a/lib/resources/wikibase.RepoApi/resources.php +++ b/lib/resources/wikibase.RepoApi/resources.php @@ -23,6 +23,7 @@ 'dependencies' = array( 'util.inherit', 'wikibase.datamodel', + 'wikibase.RepoApi', 'wikibase.serialization.entities', ), ), -- To view, visit https://gerrit.wikimedia.org/r/16 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1886fa659176ed3ec68495c180b363eddea527cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point cawikimedia's interwikis to English wikis - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged. Change subject: Point cawikimedia's interwikis to English wikis .. Point cawikimedia's interwikis to English wikis cawikimedia is for Wikimedia Canada, not Catalonia. Change-Id: I7f111813bd7143ff5c9e4a2a3dadc5485379d96a --- M dumpInterwiki.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/dumpInterwiki.php b/dumpInterwiki.php index ac0eb36..96415ff 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -125,6 +125,7 @@ 'bd' = 'bn', 'be' = 'en', 'br' = 'pt', + 'ca' = 'en', 'co' = 'es', 'dk' = 'da', 'il' = 'he', -- To view, visit https://gerrit.wikimedia.org/r/162223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f111813bd7143ff5c9e4a2a3dadc5485379d96a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: TTO at.li...@live.com.au Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase weight of author namespace in wikisource - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Increase weight of author namespace in wikisource .. Increase weight of author namespace in wikisource Bug: 69771 DEPLOYMENT: Does nothing until Ice3febecd8cd39c551d2809f1a88a6c8c91fae26 is deployed. Change-Id: I191dc91997d801e3e945b2e020f5c7490d44a5ed --- M wmf-config/CirrusSearch-common.php M wmf-config/InitialiseSettings.php 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index e8581f3..aa304ac 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -57,6 +57,8 @@ $wgCirrusSearchWeights = array_merge( $wgCirrusSearchWeights, $wmgCirrusSearchWeightsOverrides ); $wgCirrusSearchPowerSpecialRandom = $wmgCirrusSearchPowerSpecialRandom; $wgCirrusSearchAllFields = $wmgCirrusSearchAllFields; +$wgCirrusSearchNamespaceWeights = array_merge( $wgCirrusSearchNamespaceWeights, + $wmgCirrusSearchNamespaceWeightOverrides ); // Enable cache warming for wikis with more than one shard. Cache warming is good // for smoothing out I/O spikes caused by merges at the cost of potentially polluting diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index df16acc..c1c0415 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13808,6 +13808,13 @@ 'default' = array( 'build' = true, 'use' = true ), ), +'wmgCirrusSearchNamespaceWeightOverrides' = array( + 'default' = array(), + 'wikisource' = array( + 'author' = 1, + ), +), + 'wmgUseCite' = array( 'default' = true, 'loginwiki' = false, -- To view, visit https://gerrit.wikimedia.org/r/161022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I191dc91997d801e3e945b2e020f5c7490d44a5ed Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Billinghurst billinghu...@gmail.com Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] Lower throttle on two cirrus jobs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Lower throttle on two cirrus jobs .. Lower throttle on two cirrus jobs This lowers the throttle on the job reacting to template changes again because the current value still wasn't enought to cause a small backlog to appear. This introduces a throttle for the job the counts links. The throttle is set the same as the template change jobs because we have fewer count links jobs to deal with then the template change jobs so it should be enough. The goal of introducing this throttle isn't to create a backlog for deduplication its to make sure we don't overwhelm elasticsearch with too many of these at once. Change-Id: I9ddbdf559371bc882ca2fd851ed79f3f7d3cb817 --- M wmf-config/CirrusSearch-common.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index e8581f3..25baedc 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -40,7 +40,11 @@ # Set the backoff for Cirrus' job that reacts to template changes - slow and steady # will help prevent spikes in Elasticsearch load. -$wgJobBackoffThrottling['cirrusSearchLinksUpdate'] = 1.25; +$wgJobBackoffThrottling['cirrusSearchLinksUpdate'] = 0.75; +# Also engage a delay for the Cirrus job that counts incoming links to pages when +# pages are newly linked or unlinked. Too many link count queries at once could flood +# Elasticsearch. +$wgJobBackoffThrottling['cirrusSearchLinksUpdateSecondary'] = 0.75; # Ban the hebrew plugin, it is unstable $wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; -- To view, visit https://gerrit.wikimedia.org/r/161960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ddbdf559371bc882ca2fd851ed79f3f7d3cb817 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] Added a few more languages to VisualEditor screenshot job - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/162224 Change subject: Added a few more languages to VisualEditor screenshot job .. Added a few more languages to VisualEditor screenshot job Change-Id: I12951cd0056f005e849f873b5e1c2aa22bb55250 Languages: Croatian, Japanese and a couple of Chinese. --- M job-templates-browsertests.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/24/162224/1 diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml index 6094318..63b92b8 100644 --- a/job-templates-browsertests.yaml +++ b/job-templates-browsertests.yaml @@ -70,8 +70,10 @@ - fr - gl - he + - hr - ilo - it + - ja - kn - mk - nb @@ -84,6 +86,8 @@ - uk - vi - yue + - zh-hans + - zh-hant - defaults: name: browsertests -- To view, visit https://gerrit.wikimedia.org/r/162224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12951cd0056f005e849f873b5e1c2aa22bb55250 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a few more languages to VisualEditor screenshot job - change (integration/jenkins-job-builder-config)
Zfilipin has submitted this change and it was merged. Change subject: Add a few more languages to VisualEditor screenshot job .. Add a few more languages to VisualEditor screenshot job Languages: Croatian, Japanese and a couple of Chinese. Paired with: Amir Aharoni Change-Id: I12951cd0056f005e849f873b5e1c2aa22bb55250 --- M job-templates-browsertests.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml index 6094318..63b92b8 100644 --- a/job-templates-browsertests.yaml +++ b/job-templates-browsertests.yaml @@ -70,8 +70,10 @@ - fr - gl - he + - hr - ilo - it + - ja - kn - mk - nb @@ -84,6 +86,8 @@ - uk - vi - yue + - zh-hans + - zh-hant - defaults: name: browsertests -- To view, visit https://gerrit.wikimedia.org/r/162224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12951cd0056f005e849f873b5e1c2aa22bb55250 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Vikassy vikasyaligar...@gmail.com 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] WIP Running language screenshot job using local Firefox - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162225
Change subject: WIP Running language screenshot job using local Firefox
..
WIP Running language screenshot job using local Firefox
Created job: browsertests-VisualEditor-language-screenshot-linux-firefox
Paired with: Amir Aharoni
Bug: 69535
Change-Id: Ic47b1321546202d586e121ddadda54171d4001c2
---
M browsertests.yaml
M job-templates-browsertests.yaml
2 files changed, 29 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/25/162225/1
diff --git a/browsertests.yaml b/browsertests.yaml
index 7dfe8df..9c79bb8 100644
--- a/browsertests.yaml
+++ b/browsertests.yaml
@@ -491,6 +491,12 @@
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
mediawiki_user: LanguageScreenshotBot
+ - 'browsertests-{name}-language-screenshot-{platform}-{browser}':
+browser: firefox
+headless: 'true'
+mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
+mediawiki_user: LanguageScreenshotBot
+
# Wikidata
- job:
name: browsertests-Wikidata-wikidata.beta.wmflabs.org-linux-firefox-sauce
diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml
index 63b92b8..d28a8b0 100644
--- a/job-templates-browsertests.yaml
+++ b/job-templates-browsertests.yaml
@@ -89,6 +89,29 @@
- zh-hans
- zh-hant
+- job-template:
+name: 'browsertests-{name}-language-screenshot-{platform}-{browser}'
+defaults: browsertests
+project-type: matrix
+parameters:
+ - string:
+name: MEDIAWIKI_API_UPLOAD_URL
+default: https://commons.wikimedia.org/w/api.php
+description: Upload API URL for uploading screenshots
+execution-strategy:
+ sequential: true
+axes:
+ - axis:
+type: label-expression
+name: label
+values:
+ - contintLabsSlave UbuntuPrecise
+ - axis:
+type: user-defined
+name: LANGUAGE_SCREENSHOT_CODE
+values:
+- yue
+
- defaults:
name: browsertests
node: contintLabsSlave UbuntuPrecise
--
To view, visit https://gerrit.wikimedia.org/r/162225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic47b1321546202d586e121ddadda54171d4001c2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Throttle cirrus links update jobs some more - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/162226 Change subject: Throttle cirrus links update jobs some more .. Throttle cirrus links update jobs some more Change-Id: I9e387d8627c23fa446607d1cee9c81ccc9a8bd6e --- M wmf-config/CirrusSearch-common.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/26/162226/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 70c7c8a..1aff7e4 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -44,7 +44,7 @@ # Also engage a delay for the Cirrus job that counts incoming links to pages when # pages are newly linked or unlinked. Too many link count queries at once could flood # Elasticsearch. -$wgJobBackoffThrottling['cirrusSearchLinksUpdateSecondary'] = 0.75; +$wgJobBackoffThrottling['cirrusSearchLinksUpdateSecondary'] = 0.25; # Ban the hebrew plugin, it is unstable $wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; -- To view, visit https://gerrit.wikimedia.org/r/162226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e387d8627c23fa446607d1cee9c81ccc9a8bd6e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Throttle cirrus links update jobs some more - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Throttle cirrus links update jobs some more .. Throttle cirrus links update jobs some more Change-Id: I9e387d8627c23fa446607d1cee9c81ccc9a8bd6e --- M wmf-config/CirrusSearch-common.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 70c7c8a..1aff7e4 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -44,7 +44,7 @@ # Also engage a delay for the Cirrus job that counts incoming links to pages when # pages are newly linked or unlinked. Too many link count queries at once could flood # Elasticsearch. -$wgJobBackoffThrottling['cirrusSearchLinksUpdateSecondary'] = 0.75; +$wgJobBackoffThrottling['cirrusSearchLinksUpdateSecondary'] = 0.25; # Ban the hebrew plugin, it is unstable $wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; -- To view, visit https://gerrit.wikimedia.org/r/162226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e387d8627c23fa446607d1cee9c81ccc9a8bd6e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] family.py: make Family() comparable with strings - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: family.py: make Family() comparable with strings
..
family.py: make Family() comparable with strings
Replace Family.__cmp__() with __eq__() and __ne__().
Now it will compare also to an object which is not an instance
of Family() and without a name attribute by trying to load the
corresponding family.
This will allow comparisons like:
site.family == pywikibot.config.family
Moved Family() from site.py to family.py and converted to staticmethod
Family.load().
Change-Id: Id3da11fd8a6e649bee768dbb42f53e7167fe43e3
---
M pywikibot/family.py
M pywikibot/page.py
M pywikibot/site.py
M pywikibot/textlib.py
M pywikibot/tools.py
M scripts/checkimages.py
M scripts/maintenance/wikimedia_sites.py
A tests/family_tests.py
M tox.ini
9 files changed, 193 insertions(+), 87 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index a38f471..1bfd558 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-
+Objects representing MediaWiki families.
#
# (C) Pywikibot team, 2004-2014
#
@@ -12,6 +12,7 @@
import logging
import re
import collections
+import imp
if sys.version_info[0] == 2:
from urlparse import urlparse
@@ -21,12 +22,15 @@
import pywikibot
from pywikibot import config2 as config
from pywikibot.tools import deprecated
+from pywikibot.exceptions import Error
logger = logging.getLogger(pywiki.wiki.family)
-# Parent class for all wiki families
class Family(object):
+
+Parent class for all wiki families.
+
def __init__(self):
if not hasattr(self, 'name'):
self.name = None
@@ -840,6 +844,51 @@
# 'pt': { '_default': [0]}
# }
+_families = {}
+
+@staticmethod
+def load(fam=None, fatal=True):
+Import the named family.
+
+@param fam: family name (if omitted, uses the configured default)
+@type fam: str
+@param fatal: if True, the bot will stop running if the given family is
+unknown. If False, it will only raise a ValueError exception.
+@param fatal: bool
+@return: a Family instance configured for the named family.
+
+
+if fam is None:
+fam = config.family
+if fam in Family._families:
+return Family._families[fam]
+
+if fam in config.family_files:
+family_file = config.family_files[fam]
+
+if family_file.startswith('http://') or
family_file.startswith('https://'):
+myfamily = AutoFamily(fam, family_file)
+Family._families[fam] = myfamily
+return Family._families[fam]
+
+try:
+# Ignore warnings due to dots in family names.
+import warnings
+with warnings.catch_warnings():
+warnings.simplefilter(ignore, RuntimeWarning)
+myfamily = imp.load_source(fam, config.family_files[fam])
+except (ImportError, KeyError):
+if fatal:
+pywikibot.error(u\
+Error importing the %s family. This probably means the family
+does not exist. Also check your configuration file.
+% fam, exc_info=True)
+sys.exit(1)
+else:
+raise Error(Family %s does not exist % fam)
+Family._families[fam] = myfamily.Family()
+return Family._families[fam]
+
@property
def iwkeys(self):
if self.interwiki_forward:
@@ -1033,11 +1082,23 @@
Return list of historical encodings for a specific language Wiki.
return self.code2encodings(code)
-def __cmp__(self, otherfamily):
+def __eq__(self, other):
+Compare self with other.
+
+If other is not a Family() object, try to create one.
+
+if not isinstance(other, Family):
+other = self.load(other, fatal=False)
try:
-return cmp(self.name, otherfamily.name)
+return self.name == other.name
except AttributeError:
-return cmp(id(self), id(otherfamily))
+return id(self) == id(other)
+
+def __ne__(self, other):
+try:
+return not self.__eq__(other)
+except Error:
+return False
def __hash__(self):
return hash(self.name)
@@ -1092,8 +1153,10 @@
return putText
-# Parent class for all wikimedia families
class WikimediaFamily(Family):
+
+#Class for all wikimedia families.
+
def __init__(self):
super(WikimediaFamily, self).__init__()
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 39cb3ad..4cfced4 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -18,13 +18,16 @@
#
import sys
-import pywikibot
-from pywikibot import config
[MediaWiki-commits] [Gerrit] Make options of a custom campaign field parseable - change (mediawiki...UploadWizard)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162227
Change subject: Make options of a custom campaign field parseable
..
Make options of a custom campaign field parseable
Bug: 71160
Change-Id: Iff16de257abad9893c63e5ce0c11c2aacb89018c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/906
---
M includes/UploadWizardCampaign.php
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/27/162227/1
diff --git a/includes/UploadWizardCampaign.php
b/includes/UploadWizardCampaign.php
index 9b6ceb7..44e4a1c 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -251,7 +251,16 @@
foreach ( $array as $key = $value ) {
if ( $forKeys !== null ) {
if( in_array( $key, $forKeys ) ) {
- $parsed[$key] = $this-parseValue(
$value, $lang );
+ if ( is_array( $value ) ) {
+ $parsedArray = array();
+ foreach ( $value as $k = $val
) {
+ $parsedArray[$k] =
$this-parseValue( $val, $lang );
+ }
+
+ $parsed[$key] = $parsedArray;
+ } else {
+ $parsed[$key] =
$this-parseValue( $value, $lang );
+ }
} else {
$parsed[$key] = $value;
}
@@ -307,7 +316,7 @@
$parsedConfig['fields'][] =
$this-parseArrayValues(
$field,
$lang,
- array( 'label' )
+ array( 'label',
'options' )
);
}
break;
--
To view, visit https://gerrit.wikimedia.org/r/162227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff16de257abad9893c63e5ce0c11c2aacb89018c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove removeClaim from AbstractedRepoApi - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove removeClaim from AbstractedRepoApi
..
Remove removeClaim from AbstractedRepoApi
Change-Id: I6c13f9981a248f47e2d9eeb6cdcf22ee8a15487f
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
2 files changed, 1 insertion(+), 22 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 1af0308..3cbadce 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -349,7 +349,7 @@
claimview.disable();
this._removeClaimApiCall( claimview.value() )
- .done( function( savedClaim, pageInfo ) {
+ .done( function() {
// NOTE: we don't update rev store here! If we want
uniqueness for Claims, this
// might be an issue at a later point and we would
need a solution then
diff --git a/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
b/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
index 4efbbc0..b9d6f6f 100644
--- a/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
+++ b/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
@@ -17,27 +17,6 @@
*/
wb.AbstractedRepoApi = util.inherit( 'wbAbstractedRepoApi', PARENT, {
/**
-* Removes an existing claim.
-*
-* @param {String} claimGuid The GUID of the Claim to be removed
(wb.datamodel.Claim.getGuid)
-* @param {Number} baseRevId
-* @return {jQuery.Promise} When resolved, the first parameter in
callbacks is the related
-* page info which holds the revision ID of the related entity.
-*/
- removeClaim: function( claimGuid, baseRevId ) {
- var deferred = $.Deferred();
-
- PARENT.prototype.removeClaim.apply( this, arguments )
- .done( function( result ) {
- deferred.resolve( result.pageinfo );
- } ).fail( function() {
- deferred.reject.apply( deferred, arguments );
- } );
-
- return deferred.promise();
- },
-
- /**
* Adds a new or updates an existing Reference of a Statement.
*
* @since 0.4
--
To view, visit https://gerrit.wikimedia.org/r/160650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c13f9981a248f47e2d9eeb6cdcf22ee8a15487f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] url-downloader: further fixes - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/162228 Change subject: url-downloader: further fixes .. url-downloader: further fixes squid 3.1 that comes bundled with precise is different than 3.3 that comes bundled with trusty in quite a few ways. Aside from the ACL all that is already built-in in 3.1, 3.3 also has builtin manager, localhost and to_localhost ACLs. For now target precise. Full trusty support should be done better in a squid module that will abstract of all this. broken_vary_encoding is another example of this. Supported in 2.x, unsupported in 3.1, undetermined in 3.3, as in it is accepted in the configuration file but documentation does not state it as a legal configuration directive Change-Id: Ie9edff95487762f8587218d414837b65c29cb038 --- M modules/url_downloader/templates/squid.conf.erb 1 file changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/162228/1 diff --git a/modules/url_downloader/templates/squid.conf.erb b/modules/url_downloader/templates/squid.conf.erb index 2e836b1..39b2f30 100644 --- a/modules/url_downloader/templates/squid.conf.erb +++ b/modules/url_downloader/templates/squid.conf.erb @@ -4,10 +4,18 @@ http_port %= @service_ip %:8080 hierarchy_stoplist cgi-bin ? -acl everything src 0.0.0.0/0.0.0.0 +%- if @package_name == 'squid' -% +# ACLs that are builtin in squid 3 but not squid 2 +acl all src 0.0.0.0/0.0.0.0 +%- end -% +# The following 3 are built-in in squid 3.3 but not squid 3.1 +acl manager proto cache_object +acl localhost src 127.0.0.1/255.255.255.255 +acl to_localhost dst 127.0.0.0/8 + +acl everything src all cache deny everything acl apache rep_header Server ^Apache -broken_vary_encoding allow apache maximum_object_size 510 MB cache_replacement_policy heap LFUDA access_log /var/log/%= @package_name %/access.log squid @@ -27,13 +35,6 @@ request_timeout 30 seconds client_lifetime 5 minutes -%- if @package_name == 'squid' -% -# ACLs that are builtin in squid 3 but not squid 2 -acl all src 0.0.0.0/0.0.0.0 -acl manager proto cache_object -acl localhost src 127.0.0.1/255.255.255.255 -acl to_localhost dst 127.0.0.0/8 -%- end -% acl SSL_ports port 443 # https acl Safe_ports port 80 443 # http, https acl Safe_ports port 21 # ftp @@ -81,6 +82,7 @@ %- if @package_name == 'squid' -% reply_body_max_size 534773760 allow all cache_dir null /tmp +broken_vary_encoding allow apache %- else -% reply_body_max_size 510 MB all %- end -% -- To view, visit https://gerrit.wikimedia.org/r/162228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9edff95487762f8587218d414837b65c29cb038 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] mediawiki: use hiera in appserver role - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mediawiki: use hiera in appserver role .. mediawiki: use hiera in appserver role Change-Id: Ic6c44840b15e0857f6049c6a7ca6e1c0cca78147 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- A hieradata/hosts/mw1022.yaml A hieradata/hosts/mw1023.yaml A hieradata/hosts/mw1024.yaml A hieradata/hosts/mw1025.yaml A hieradata/hosts/mw1026.yaml A hieradata/hosts/mw1027.yaml A hieradata/hosts/mw1028.yaml A hieradata/hosts/mw1029.yaml A hieradata/hosts/mw1030.yaml A hieradata/hosts/mw1031.yaml A hieradata/hosts/mw1032.yaml A hieradata/hosts/mw1033.yaml A hieradata/hosts/mw1034.yaml A hieradata/hosts/mw1035.yaml A hieradata/hosts/mw1036.yaml A hieradata/hosts/mw1037.yaml A hieradata/hosts/mw1038.yaml A hieradata/hosts/mw1039.yaml A hieradata/hosts/mw1040.yaml A hieradata/hosts/mw1041.yaml A hieradata/hosts/mw1042.yaml A hieradata/hosts/mw1043.yaml A hieradata/hosts/mw1044.yaml A hieradata/hosts/mw1045.yaml A hieradata/hosts/mw1046.yaml A hieradata/hosts/mw1047.yaml A hieradata/hosts/mw1048.yaml A hieradata/hosts/mw1049.yaml A hieradata/hosts/mw1050.yaml A hieradata/hosts/mw1051.yaml A hieradata/hosts/mw1052.yaml A hieradata/hosts/mw1054.yaml A hieradata/hosts/mw1055.yaml A hieradata/hosts/mw1056.yaml A hieradata/hosts/mw1057.yaml A hieradata/hosts/mw1058.yaml A hieradata/hosts/mw1059.yaml A hieradata/hosts/mw1060.yaml A hieradata/hosts/mw1061.yaml A hieradata/hosts/mw1062.yaml A hieradata/hosts/mw1063.yaml A hieradata/hosts/mw1064.yaml A hieradata/hosts/mw1065.yaml A hieradata/hosts/mw1066.yaml A hieradata/hosts/mw1067.yaml A hieradata/hosts/mw1068.yaml A hieradata/hosts/mw1069.yaml A hieradata/hosts/mw1070.yaml A hieradata/hosts/mw1071.yaml A hieradata/hosts/mw1072.yaml A hieradata/hosts/mw1073.yaml A hieradata/hosts/mw1074.yaml A hieradata/hosts/mw1075.yaml A hieradata/hosts/mw1076.yaml A hieradata/hosts/mw1077.yaml A hieradata/hosts/mw1078.yaml A hieradata/hosts/mw1079.yaml A hieradata/hosts/mw1080.yaml A hieradata/hosts/mw1081.yaml A hieradata/hosts/mw1082.yaml A hieradata/hosts/mw1083.yaml A hieradata/hosts/mw1084.yaml A hieradata/hosts/mw1085.yaml A hieradata/hosts/mw1086.yaml A hieradata/hosts/mw1087.yaml A hieradata/hosts/mw1088.yaml A hieradata/hosts/mw1089.yaml A hieradata/hosts/mw1090.yaml A hieradata/hosts/mw1091.yaml A hieradata/hosts/mw1092.yaml A hieradata/hosts/mw1093.yaml A hieradata/hosts/mw1094.yaml A hieradata/hosts/mw1095.yaml A hieradata/hosts/mw1096.yaml A hieradata/hosts/mw1097.yaml A hieradata/hosts/mw1098.yaml A hieradata/hosts/mw1099.yaml A hieradata/hosts/mw1100.yaml A hieradata/hosts/mw1101.yaml A hieradata/hosts/mw1102.yaml A hieradata/hosts/mw1103.yaml A hieradata/hosts/mw1104.yaml A hieradata/hosts/mw1105.yaml A hieradata/hosts/mw1106.yaml A hieradata/hosts/mw1107.yaml A hieradata/hosts/mw1108.yaml A hieradata/hosts/mw1109.yaml A hieradata/hosts/mw1110.yaml A hieradata/hosts/mw.yaml A hieradata/hosts/mw1112.yaml A hieradata/hosts/mw1113.yaml A hieradata/hosts/mw1149.yaml A hieradata/hosts/mw1150.yaml A hieradata/hosts/mw1151.yaml A hieradata/hosts/mw1152.yaml A hieradata/hosts/mw1161.yaml A hieradata/hosts/mw1162.yaml A hieradata/hosts/mw1163.yaml A hieradata/hosts/mw1164.yaml A hieradata/hosts/mw1165.yaml A hieradata/hosts/mw1166.yaml A hieradata/hosts/mw1167.yaml A hieradata/hosts/mw1168.yaml A hieradata/hosts/mw1169.yaml A hieradata/hosts/mw1170.yaml A hieradata/hosts/mw1171.yaml A hieradata/hosts/mw1172.yaml A hieradata/hosts/mw1173.yaml A hieradata/hosts/mw1174.yaml A hieradata/hosts/mw1175.yaml A hieradata/hosts/mw1176.yaml A hieradata/hosts/mw1177.yaml A hieradata/hosts/mw1178.yaml A hieradata/hosts/mw1179.yaml A hieradata/hosts/mw1180.yaml A hieradata/hosts/mw1181.yaml A hieradata/hosts/mw1182.yaml A hieradata/hosts/mw1183.yaml A hieradata/hosts/mw1184.yaml A hieradata/hosts/mw1185.yaml A hieradata/hosts/mw1186.yaml A hieradata/hosts/mw1187.yaml A hieradata/hosts/mw1188.yaml A hieradata/hosts/mw1209.yaml A hieradata/hosts/mw1210.yaml A hieradata/hosts/mw1211.yaml A hieradata/hosts/mw1212.yaml A hieradata/hosts/mw1213.yaml A hieradata/hosts/mw1214.yaml A hieradata/hosts/mw1215.yaml A hieradata/hosts/mw1216.yaml A hieradata/hosts/mw1217.yaml A hieradata/hosts/mw1218.yaml A hieradata/hosts/mw1219.yaml A hieradata/hosts/mw1220.yaml A hieradata/mainrole/appserver.yaml A hieradata/mainrole/default.yaml M manifests/role/mediawiki.pp 138 files changed, 140 insertions(+), 6 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/mw1022.yaml b/hieradata/hosts/mw1022.yaml new file mode 100644 index 000..2c726b4 --- /dev/null +++ b/hieradata/hosts/mw1022.yaml @@ -0,0 +1 @@ +mainrole: appserver diff --git a/hieradata/hosts/mw1023.yaml b/hieradata/hosts/mw1023.yaml new file mode 100644 index 000..2c726b4 --- /dev/null +++
[MediaWiki-commits] [Gerrit] url-downloader: further fixes - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: url-downloader: further fixes .. url-downloader: further fixes squid 3.1 that comes bundled with precise is different than 3.3 that comes bundled with trusty in quite a few ways. Aside from the ACL all that is already built-in in 3.1, 3.3 also has builtin manager, localhost and to_localhost ACLs. For now target precise. Full trusty support should be done better in a squid module that will abstract of all this. broken_vary_encoding is another example of this. Supported in 2.x, unsupported in 3.1, undetermined in 3.3, as in it is accepted in the configuration file but documentation does not state it as a legal configuration directive Change-Id: Ie9edff95487762f8587218d414837b65c29cb038 --- M modules/url_downloader/templates/squid.conf.erb 1 file changed, 11 insertions(+), 9 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/url_downloader/templates/squid.conf.erb b/modules/url_downloader/templates/squid.conf.erb index 2e836b1..39b2f30 100644 --- a/modules/url_downloader/templates/squid.conf.erb +++ b/modules/url_downloader/templates/squid.conf.erb @@ -4,10 +4,18 @@ http_port %= @service_ip %:8080 hierarchy_stoplist cgi-bin ? -acl everything src 0.0.0.0/0.0.0.0 +%- if @package_name == 'squid' -% +# ACLs that are builtin in squid 3 but not squid 2 +acl all src 0.0.0.0/0.0.0.0 +%- end -% +# The following 3 are built-in in squid 3.3 but not squid 3.1 +acl manager proto cache_object +acl localhost src 127.0.0.1/255.255.255.255 +acl to_localhost dst 127.0.0.0/8 + +acl everything src all cache deny everything acl apache rep_header Server ^Apache -broken_vary_encoding allow apache maximum_object_size 510 MB cache_replacement_policy heap LFUDA access_log /var/log/%= @package_name %/access.log squid @@ -27,13 +35,6 @@ request_timeout 30 seconds client_lifetime 5 minutes -%- if @package_name == 'squid' -% -# ACLs that are builtin in squid 3 but not squid 2 -acl all src 0.0.0.0/0.0.0.0 -acl manager proto cache_object -acl localhost src 127.0.0.1/255.255.255.255 -acl to_localhost dst 127.0.0.0/8 -%- end -% acl SSL_ports port 443 # https acl Safe_ports port 80 443 # http, https acl Safe_ports port 21 # ftp @@ -81,6 +82,7 @@ %- if @package_name == 'squid' -% reply_body_max_size 534773760 allow all cache_dir null /tmp +broken_vary_encoding allow apache %- else -% reply_body_max_size 510 MB all %- end -% -- To view, visit https://gerrit.wikimedia.org/r/162228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9edff95487762f8587218d414837b65c29cb038 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] Change url-downloader to point to new IP - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Change url-downloader to point to new IP .. Change url-downloader to point to new IP linne that has had the url-downloader role up to now is being decomissioned. Move the DNS A/PTR records to point to a new unused IP that is to be assigned to chromium Change-Id: I9e21409ebb775c4204c86244fb6e80d2c55ee6de --- M templates/152.80.208.in-addr.arpa M templates/154.80.208.in-addr.arpa M templates/wikimedia.org 3 files changed, 2 insertions(+), 2 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index 076cb92..4c2645b 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -32,7 +32,6 @@ 136 1H IN PTR mexia.wikimedia.org. 141 1H IN PTR wireless.tech.wikimedia.org. -143 1H IN PTR url-downloader.wikimedia.org. 145 1H IN PTR ae0-101.cr2-pmtpa.wikimedia.org. 154 1H IN PTR pdf2.wikimedia.org. diff --git a/templates/154.80.208.in-addr.arpa b/templates/154.80.208.in-addr.arpa index 5de3815..c29f0f3 100644 --- a/templates/154.80.208.in-addr.arpa +++ b/templates/154.80.208.in-addr.arpa @@ -104,6 +104,7 @@ 153 1H IN PTR silver.wikimedia.org. 154 1H IN PTR titanium.wikimedia.org. 155 1H IN PTR stat1001.wikimedia.org. +156 1H IN PTR url-downloader.wikimedia.org. ; chromium 157 1H IN PTR chromium.wikimedia.org. 158 1H IN PTR calcium.wikimedia.org. 159 1H IN PTR netmon1001.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 9d5378c..c2381cc 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -469,7 +469,7 @@ wiki-mail-eqiad 1H IN A208.80.154.91 1H IN 2620:0:861:3:208:80:154:91 -url-downloader 1H IN A208.80.152.143 ; linne +url-downloader 1H IN A208.80.154.156 ; chromium ; Wikis (alphabetic order) -- To view, visit https://gerrit.wikimedia.org/r/161956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e21409ebb775c4204c86244fb6e80d2c55ee6de Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master 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] Don't hardcode url-downloader.wikimedia.org:8080, use $wgCop... - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162230
Change subject: Don't hardcode url-downloader.wikimedia.org:8080, use
$wgCopyUploadProxy
..
Don't hardcode url-downloader.wikimedia.org:8080, use $wgCopyUploadProxy
Change-Id: I69e1c29db93c634acc74721ed50d9c0a8ee7db49
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/30/162230/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index adb8f11..aea18bb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1042,12 +1042,12 @@
$wgTorDisableAdminBlocks = false;
$wgTorTagChanges = false;
$wgGroupPermissions['user']['torunblocked'] = false;
- $wgTorBlockProxy = 'url-downloader.wikimedia.org:8080';
+ $wgTorBlockProxy = $wgCopyUploadProxy;
}
if ( $wmgUseRSSExtension ) {
include( $IP/extensions/RSS/RSS.php );
- $wgRSSProxy = 'url-downloader.wikimedia.org:8080';
+ $wgRSSProxy = $wgCopyUploadProxy;
$wgRSSUrlWhitelist = $wmgRSSUrlWhitelist;
}
--
To view, visit https://gerrit.wikimedia.org/r/162230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69e1c29db93c634acc74721ed50d9c0a8ee7db49
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce: mw.Api.newFor - change (mediawiki/core)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162229
Change subject: Introduce: mw.Api.newFor
..
Introduce: mw.Api.newFor
This is useful if you want to get a mw.Api instance for a certain
(possibly remote) Wiki in a handy way.
Change-Id: Ifdda1470364afd433300a92f015f6f73712ece6d
---
M resources/src/mediawiki.api/mediawiki.api.js
1 file changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/162229/1
diff --git a/resources/src/mediawiki.api/mediawiki.api.js
b/resources/src/mediawiki.api/mediawiki.api.js
index 51b3238..3d265fc 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -331,6 +331,43 @@
};
/**
+* Returns a mediaWiki.Api instance which can interact with a given API
endpoint,
+* even if it's remote.
+*
+* @static
+* @param {string} apiEndpoint
+* @return {mediaWiki.Api}
+*/
+ mw.Api.newFor = function( apiEndpoint ) {
+ var localApiEndpoint = mw.config.get( 'wgServer' )
+ + mw.config.get( 'wgScriptPath' )
+ + '/api.php';
+ var mwApiOptions = {};
+
+ if( localApiEndpoint !== apiEndpoint ) {
+ var corsOrigin = mw.config.get( 'wgServer' );
+ if ( corsOrigin.indexOf( '//' ) === 0 ) {
+ // The origin parameter musn't be protocol
relative
+ corsOrigin = document.location.protocol +
corsOrigin;
+ }
+ mwApiOptions = {
+ ajax: {
+ url: apiEndpoint,
+ xhrFields: {
+ withCredentials: true
+ },
+ crossDomain: true
+ },
+ parameters: {
+ origin: corsOrigin
+ }
+ };
+ }
+
+ return new mw.Api( mwApiOptions );
+ }
+
+ /**
* @static
* @property {Array}
* List of errors we might receive from the API.
--
To view, visit https://gerrit.wikimedia.org/r/162229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdda1470364afd433300a92f015f6f73712ece6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show error message at correct location - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/162231 Change subject: Show error message at correct location .. Show error message at correct location showError was called on apiTarget. For replies, this target used to be the form (IIRC), but is not the topic (which actually makes perfect sense for what apiTarget is used for) However, this resulted in the error being displayed in the first error div: the one in the topic (instead of the one near the form where the comment is being added) Let's just find the error div closest to whatever fired the event. Change-Id: I04f09cb470a977ae3a32157ae90aad0f2ce44351 --- M modules/new/components/flow-board.js 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/31/162231/1 diff --git a/modules/new/components/flow-board.js b/modules/new/components/flow-board.js index 1c989e5..611290b 100644 --- a/modules/new/components/flow-board.js +++ b/modules/new/components/flow-board.js @@ -1588,7 +1588,7 @@ * error message, just fall back to some default error. */ errorMsg = apiErrorMessage( code, result ); - FlowBoardComponent.UI.showError( info.$target, errorMsg ); + FlowBoardComponent.UI.showError( $this, errorMsg ); FlowBoardComponent.UI.events.apiHandlers[ handlerName ].apply( _this, args ); } ); @@ -1955,8 +1955,6 @@ flowFindUpward( $node, '.flow-content-preview' ).hide(); flowFindUpward( $node, '.flow-error-container' ).filter( ':first' ).replaceWith( html ); - - mw.log.warn( msg ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/162231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04f09cb470a977ae3a32157ae90aad0f2ce44351 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent ConfirmEdit captcha from attempting to leave the pag... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162232
Change subject: Prevent ConfirmEdit captcha from attempting to leave the page
in FF
..
Prevent ConfirmEdit captcha from attempting to leave the page in FF
Change-Id: Iedd1c6f61c74a57d01d237892dcaedb406bf6a84
---
M includes/SpamFilter/ConfirmEdit.php
1 file changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/32/162232/1
diff --git a/includes/SpamFilter/ConfirmEdit.php
b/includes/SpamFilter/ConfirmEdit.php
index 1be6bf6..d24d0ce 100644
--- a/includes/SpamFilter/ConfirmEdit.php
+++ b/includes/SpamFilter/ConfirmEdit.php
@@ -41,6 +41,8 @@
$wgOut-getScriptsForBottomQueue( false ) .
$html;
+ $html = $this-safeHtml( $html );
+
$msg = wfMessage( 'flow-spam-confirmedit-form'
)-rawParams( $html );
return Status::newFatal( $msg );
}
@@ -49,6 +51,27 @@
}
/**
+* TL;DR: this will replace document.write calls.
+*
+* We've captured CSS JS stuff as well, to ensure the captcha
functions
+* well. However, that JS part has a document.write() part to launch the
+* resourceloader scripts.
+* Because there's no proper spec for document.write, browsers implement
+* this differently. In FireFox, when the page has already loaded, this
+* implicitly does a document.open() call, which will (in our JS) then
+* trigger a new, blank page to be loaded (or rather, we'll get the are
+* you sure you want to leave this page prompt)
+*
+* @see
http://stackoverflow.com/questions/25398005/why-document-write-behaves-differently-in-firefox-and-chrome
+*
+* @param string $html
+* @return string
+*/
+ public function safeHtml( $html ) {
+ return str_replace( 'document.write', 'document.body.innerHTML
+= ', $html );
+ }
+
+ /**
* Checks if ConfirmEdit is installed.
*
* @return bool
--
To view, visit https://gerrit.wikimedia.org/r/162232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedd1c6f61c74a57d01d237892dcaedb406bf6a84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SWAT Update Cirrus - change (mediawiki/core)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/162233 Change subject: SWAT Update Cirrus .. SWAT Update Cirrus Grabs: I3c7d0eb67e5f08472d8d8c0518ad9b9a009a Change-Id: I040ef87af80ff5f7c987c24e8347208aa8040a47 --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/33/162233/1 diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index d2e54d9..a15f3fb 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit d2e54d9ca39bdaa1bb8dd308c46645316354c863 +Subproject commit a15f3fb00a0c9805d540a20e29977b364ac4c854 -- To view, visit https://gerrit.wikimedia.org/r/162233 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I040ef87af80ff5f7c987c24e8347208aa8040a47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf21 Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: simplify api and rendering - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/162234 Change subject: mediawiki: simplify api and rendering .. mediawiki: simplify api and rendering Change-Id: I6e5409e9fc34073fc888408e7998fd89726334e2 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- A hieradata/hosts/mw1114.yaml A hieradata/hosts/mw1115.yaml A hieradata/hosts/mw1116.yaml A hieradata/hosts/mw1117.yaml A hieradata/hosts/mw1118.yaml A hieradata/hosts/mw1119.yaml A hieradata/hosts/mw1120.yaml A hieradata/hosts/mw1121.yaml A hieradata/hosts/mw1122.yaml A hieradata/hosts/mw1123.yaml A hieradata/hosts/mw1124.yaml A hieradata/hosts/mw1125.yaml A hieradata/hosts/mw1126.yaml A hieradata/hosts/mw1127.yaml A hieradata/hosts/mw1128.yaml A hieradata/hosts/mw1129.yaml A hieradata/hosts/mw1130.yaml A hieradata/hosts/mw1131.yaml A hieradata/hosts/mw1132.yaml A hieradata/hosts/mw1133.yaml A hieradata/hosts/mw1134.yaml A hieradata/hosts/mw1135.yaml A hieradata/hosts/mw1136.yaml A hieradata/hosts/mw1137.yaml A hieradata/hosts/mw1138.yaml A hieradata/hosts/mw1139.yaml A hieradata/hosts/mw1140.yaml A hieradata/hosts/mw1141.yaml A hieradata/hosts/mw1142.yaml A hieradata/hosts/mw1143.yaml A hieradata/hosts/mw1144.yaml A hieradata/hosts/mw1145.yaml A hieradata/hosts/mw1146.yaml A hieradata/hosts/mw1147.yaml A hieradata/hosts/mw1148.yaml A hieradata/hosts/mw1153.yaml A hieradata/hosts/mw1154.yaml A hieradata/hosts/mw1155.yaml A hieradata/hosts/mw1156.yaml A hieradata/hosts/mw1157.yaml A hieradata/hosts/mw1158.yaml A hieradata/hosts/mw1159.yaml A hieradata/hosts/mw1160.yaml A hieradata/hosts/mw1189.yaml A hieradata/hosts/mw1190.yaml A hieradata/hosts/mw1191.yaml A hieradata/hosts/mw1192.yaml A hieradata/hosts/mw1193.yaml A hieradata/hosts/mw1194.yaml A hieradata/hosts/mw1195.yaml A hieradata/hosts/mw1196.yaml A hieradata/hosts/mw1197.yaml A hieradata/hosts/mw1198.yaml A hieradata/hosts/mw1199.yaml A hieradata/hosts/mw1200.yaml A hieradata/hosts/mw1201.yaml A hieradata/hosts/mw1202.yaml A hieradata/hosts/mw1203.yaml A hieradata/hosts/mw1204.yaml A hieradata/hosts/mw1205.yaml A hieradata/hosts/mw1206.yaml A hieradata/hosts/mw1207.yaml A hieradata/hosts/mw1208.yaml A hieradata/mainrole/api_appserver.yaml A hieradata/mainrole/imagescaler.yaml M manifests/role/mediawiki.pp 66 files changed, 71 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/162234/1 diff --git a/hieradata/hosts/mw1114.yaml b/hieradata/hosts/mw1114.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1114.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1115.yaml b/hieradata/hosts/mw1115.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1115.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1116.yaml b/hieradata/hosts/mw1116.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1116.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1117.yaml b/hieradata/hosts/mw1117.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1117.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1118.yaml b/hieradata/hosts/mw1118.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1118.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1119.yaml b/hieradata/hosts/mw1119.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1119.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1120.yaml b/hieradata/hosts/mw1120.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1120.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1121.yaml b/hieradata/hosts/mw1121.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1121.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1122.yaml b/hieradata/hosts/mw1122.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1122.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1123.yaml b/hieradata/hosts/mw1123.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1123.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1124.yaml b/hieradata/hosts/mw1124.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1124.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1125.yaml b/hieradata/hosts/mw1125.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1125.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1126.yaml
[MediaWiki-commits] [Gerrit] SWAT update Cirrus - change (mediawiki/core)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/162235 Change subject: SWAT update Cirrus .. SWAT update Cirrus Grabs: If4f0faf51c145d067996da70afb8842ad38ab106 Ib2d61e5153c5415d4f00ed4dfc26e524f3c14ab0 I3c7d0eb67e5f08472d8d8c0518ad9b9a009a Change-Id: I076f2b619f6b20f1ffeafee0a3d886e8eaff35fa --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/35/162235/1 diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index 069abea..2f3473d 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit 069abea6c6d962bb76acdb2acd733c50e177c70f +Subproject commit 2f3473d3102d0b36245c0464668dce827abcfb1c -- To view, visit https://gerrit.wikimedia.org/r/162235 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I076f2b619f6b20f1ffeafee0a3d886e8eaff35fa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf22 Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: simplify api and rendering - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mediawiki: simplify api and rendering .. mediawiki: simplify api and rendering Change-Id: I6e5409e9fc34073fc888408e7998fd89726334e2 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- A hieradata/hosts/mw1114.yaml A hieradata/hosts/mw1115.yaml A hieradata/hosts/mw1116.yaml A hieradata/hosts/mw1117.yaml A hieradata/hosts/mw1118.yaml A hieradata/hosts/mw1119.yaml A hieradata/hosts/mw1120.yaml A hieradata/hosts/mw1121.yaml A hieradata/hosts/mw1122.yaml A hieradata/hosts/mw1123.yaml A hieradata/hosts/mw1124.yaml A hieradata/hosts/mw1125.yaml A hieradata/hosts/mw1126.yaml A hieradata/hosts/mw1127.yaml A hieradata/hosts/mw1128.yaml A hieradata/hosts/mw1129.yaml A hieradata/hosts/mw1130.yaml A hieradata/hosts/mw1131.yaml A hieradata/hosts/mw1132.yaml A hieradata/hosts/mw1133.yaml A hieradata/hosts/mw1134.yaml A hieradata/hosts/mw1135.yaml A hieradata/hosts/mw1136.yaml A hieradata/hosts/mw1137.yaml A hieradata/hosts/mw1138.yaml A hieradata/hosts/mw1139.yaml A hieradata/hosts/mw1140.yaml A hieradata/hosts/mw1141.yaml A hieradata/hosts/mw1142.yaml A hieradata/hosts/mw1143.yaml A hieradata/hosts/mw1144.yaml A hieradata/hosts/mw1145.yaml A hieradata/hosts/mw1146.yaml A hieradata/hosts/mw1147.yaml A hieradata/hosts/mw1148.yaml A hieradata/hosts/mw1153.yaml A hieradata/hosts/mw1154.yaml A hieradata/hosts/mw1155.yaml A hieradata/hosts/mw1156.yaml A hieradata/hosts/mw1157.yaml A hieradata/hosts/mw1158.yaml A hieradata/hosts/mw1159.yaml A hieradata/hosts/mw1160.yaml A hieradata/hosts/mw1189.yaml A hieradata/hosts/mw1190.yaml A hieradata/hosts/mw1191.yaml A hieradata/hosts/mw1192.yaml A hieradata/hosts/mw1193.yaml A hieradata/hosts/mw1194.yaml A hieradata/hosts/mw1195.yaml A hieradata/hosts/mw1196.yaml A hieradata/hosts/mw1197.yaml A hieradata/hosts/mw1198.yaml A hieradata/hosts/mw1199.yaml A hieradata/hosts/mw1200.yaml A hieradata/hosts/mw1201.yaml A hieradata/hosts/mw1202.yaml A hieradata/hosts/mw1203.yaml A hieradata/hosts/mw1204.yaml A hieradata/hosts/mw1205.yaml A hieradata/hosts/mw1206.yaml A hieradata/hosts/mw1207.yaml A hieradata/hosts/mw1208.yaml A hieradata/mainrole/api_appserver.yaml A hieradata/mainrole/imagescaler.yaml M manifests/role/mediawiki.pp 66 files changed, 71 insertions(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/mw1114.yaml b/hieradata/hosts/mw1114.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1114.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1115.yaml b/hieradata/hosts/mw1115.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1115.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1116.yaml b/hieradata/hosts/mw1116.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1116.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1117.yaml b/hieradata/hosts/mw1117.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1117.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1118.yaml b/hieradata/hosts/mw1118.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1118.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1119.yaml b/hieradata/hosts/mw1119.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1119.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1120.yaml b/hieradata/hosts/mw1120.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1120.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1121.yaml b/hieradata/hosts/mw1121.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1121.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1122.yaml b/hieradata/hosts/mw1122.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1122.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1123.yaml b/hieradata/hosts/mw1123.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1123.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1124.yaml b/hieradata/hosts/mw1124.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1124.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1125.yaml b/hieradata/hosts/mw1125.yaml new file mode 100644 index 000..dd4fedb --- /dev/null +++ b/hieradata/hosts/mw1125.yaml @@ -0,0 +1 @@ +mainrole: api_appserver diff --git a/hieradata/hosts/mw1126.yaml b/hieradata/hosts/mw1126.yaml new file mode
[MediaWiki-commits] [Gerrit] Fix total_shards_per_node config - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162237
Change subject: Fix total_shards_per_node config
..
Fix total_shards_per_node config
Before this was only being applied after the index was created. Now it
gets a special value if the index is being reindexed to spread the index
as evenly as possible during the write traffic reindex event. Once the
reindex is done the value is set to whatever the user configured it to
be.
Change-Id: I9807023baa2fa8c4e4a5a79cf38d1c372462ddfb
(cherry picked from commit 0db3da04254b904cb425905befd17022b096a4c1)
---
M maintenance/updateOneSearchIndexConfig.php
1 file changed, 39 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/37/162237/1
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 884977a..b3ca52f 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -336,7 +336,7 @@
$actualMaxShardsPerNode = $actualMaxShardsPerNode 0 ?
'unlimited' : $actualMaxShardsPerNode;
$expectedMaxShardsPerNode = isset(
$wgCirrusSearchMaxShardsPerNode[ $this-indexType ] ) ?
$wgCirrusSearchMaxShardsPerNode[ $this-indexType ] :
'unlimited';
- if ( $actualMaxShardsPerNode === $expectedMaxShardsPerNode ) {
+ if ( $actualMaxShardsPerNode == $expectedMaxShardsPerNode ) {
$this-output( ok\n );
} else {
$this-output( is $actualMaxShardsPerNode but should
be $expectedMaxShardsPerNode... );
@@ -574,22 +574,14 @@
$this-validateIndexSettings();
$this-output( $this-indent . \tWaiting for
all shards to start...\n );
list( $lower, $upper ) = explode( '-',
$this-getReplicaCount() );
- $indexName = $this-getSpecificIndexName();
- $path = _cluster/health/$indexName;
$each = 0;
while ( true ) {
- $response =
Connection::getClient()-request( $path );
- if ( $response-hasError() ) {
- $this-error( 'Error fetching
index health but going to retry. Message: ' + $response-getError() );
- sleep( 1 );
- continue;
- }
- $health = $response-getData();
+ $health = $this-getHealth();
$active = $health[ 'active_shards' ];
$relocating = $health[
'relocating_shards' ];
$initializing = $health[
'initializing_shards' ];
$unassigned = $health[
'unassigned_shards' ];
- $nodes = $health['number_of_nodes'];
+ $nodes = $health[ 'number_of_nodes' ];
if ( $nodes $lower ) {
$this-error( Require $lower
replicas but only have $nodes nodes.
. This is almost
always due to misconfiguration, aborting., 1 );
@@ -687,12 +679,15 @@
// Set some settings that should help io load during bulk
indexing. We'll have to
// optimize after this to consolidate down to a proper number
of shards but that is
- // is worth the price.
+ // is worth the price. total_shards_per_node will help to make
sure that each shard
+ // has as few neighbors as possible.
$settings = $this-getIndex()-getSettings();
+ $maxShardsPerNode = $this-decideMaxShardsPerNodeForReindex();
$settings-set( array(
'refresh_interval' = -1,
'merge.policy.segments_per_tier' = 40,
'merge.policy.max_merge_at_once' = 40,
+ 'routing.allocation.total_shards_per_node' =
$maxShardsPerNode,
) );
if ( $this-reindexProcesses 1 ) {
@@ -822,6 +817,20 @@
}
}
+ private function getHealth() {
+ while ( true ) {
+ $indexName = $this-getSpecificIndexName();
+ $path = _cluster/health/$indexName;
+ $response = Connection::getClient()-request( $path );
+ if (
[MediaWiki-commits] [Gerrit] Rename file page button - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/162236 Change subject: Rename file page button .. Rename file page button Change-Id: Ic3c2b2b7201c4870e1548597a4309483983ae431 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/870 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/36/162236/1 diff --git a/i18n/en.json b/i18n/en.json index b328698..679563b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -100,7 +100,7 @@ multimediaviewer-description-page-button-text: More details about this file, multimediaviewer-description-page-popup-text: More details about this file on $1, multimediaviewer-commons-subtitle: The free media repository, -multimediaviewer-view-expanded: Expand view, +multimediaviewer-view-expanded: Open in Media Viewer, multimediaviewer-close-popup-text: Close this tool (Esc), multimediaviewer-fullscreen-popup-text: Show in full screen, multimediaviewer-defullscreen-popup-text: Exit full screen, -- To view, visit https://gerrit.wikimedia.org/r/162236 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3c2b2b7201c4870e1548597a4309483983ae431 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nagios_common: Move check_all_memcached into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162238
Change subject: nagios_common: Move check_all_memcached into module
..
nagios_common: Move check_all_memcached into module
Change-Id: I9dad231c9eb7bc227d3df8317a77136ef63639ab
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/check_all_memcached.php
A modules/nagios_common/files/check_commands/check_all_memcached.php.cfg
M modules/nagios_common/manifests/commands.pp
M templates/icinga/checkcommands.cfg.erb
5 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/162238/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index f1620c6..3a3ef20 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -565,12 +565,6 @@
group = 'root',
mode = '0755',
}
-file { '/usr/lib/nagios/plugins/check_all_memcached.php':
-source = 'puppet:///files/icinga/check_all_memcached.php',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
file { '/usr/lib/nagios/plugins/check_longqueries':
source = 'puppet:///files/icinga/check_longqueries',
owner = 'root',
diff --git a/files/icinga/check_all_memcached.php
b/modules/nagios_common/files/check_commands/check_all_memcached.php
similarity index 100%
rename from files/icinga/check_all_memcached.php
rename to modules/nagios_common/files/check_commands/check_all_memcached.php
diff --git
a/modules/nagios_common/files/check_commands/check_all_memcached.php.cfg
b/modules/nagios_common/files/check_commands/check_all_memcached.php.cfg
new file mode 100644
index 000..7385509
--- /dev/null
+++ b/modules/nagios_common/files/check_commands/check_all_memcached.php.cfg
@@ -0,0 +1,4 @@
+define command{
+command_namecheck_all_memcached
+command_line/usr/bin/php $USER1$/check_all_memcached.php
+}
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 44c7cd1..b459be8 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -32,6 +32,7 @@
'check_wikidata',
'check_cert',
'check_solr',
+'check_all_memcached.php',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index 27f75e0..ce4dee4 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -308,11 +308,6 @@
}
define command{
-command_namecheck_all_memcached
-command_line/usr/bin/php $USER1$/check_all_memcached.php
-}
-
-define command{
command_namenrpe_check_raid
command_line/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c
check_raid
}
--
To view, visit https://gerrit.wikimedia.org/r/162238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dad231c9eb7bc227d3df8317a77136ef63639ab
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] nagios_common: Move users check into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162239
Change subject: nagios_common: Move users check into module
..
nagios_common: Move users check into module
Also setup a define for commands that don't have an associated
executable script
Change-Id: I2cac9ff3d3bea938a17bcb16e5a3a0121e04c76b
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/users.cfg
M modules/nagios_common/manifests/check_command.pp
M modules/nagios_common/manifests/commands.pp
4 files changed, 51 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/162239/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 3a3ef20..b611778 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -543,12 +543,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/users.cfg':
-source = 'puppet:///files/icinga/plugin-config/users.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/vsz.cfg':
source = 'puppet:///files/icinga/plugin-config/vsz.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/users.cfg
b/modules/nagios_common/files/check_commands/users.cfg
similarity index 100%
rename from files/icinga/plugin-config/users.cfg
rename to modules/nagios_common/files/check_commands/users.cfg
diff --git a/modules/nagios_common/manifests/check_command.pp
b/modules/nagios_common/manifests/check_command.pp
index f414019..63c8c1f 100644
--- a/modules/nagios_common/manifests/check_command.pp
+++ b/modules/nagios_common/manifests/check_command.pp
@@ -14,7 +14,7 @@
# Path to source for the executable plugin file.
# Defaults to puppet:///modules/nagios_common/check_commands/$title
#
-# [*plugin_source*]
+# [*config_source*]
# Path to source for the plugin configuration.
# Defaults to puppet:///modules/nagios_common/check_commands/$title.cfg
#
@@ -43,6 +43,47 @@
mode = '0755',
}
+nagios_common::check_command::config { $title:
+ensure = $ensure,
+source = $config_source,
+config_dir = $config_dir,
+owner = $owner,
+$group = $group
+}
+}
+
+# = Define: nagions_common::check_command::config
+# Sets up a check_command without an associated custom
+# check script. Useful when we want a command that just
+# builds on other existing commands
+#
+# [*ensure*]
+# present or absent, to make the definition
+# present or absent. Defaults to present
+#
+# [*config_dir*]
+# The base directory to put configuration in.
+# Defaults to '/etc/icinga/'
+#
+# [*source*]
+# Path to source for the plugin configuration.
+# Defaults to puppet:///modules/nagios_common/check_commands/$title.cfg
+#
+# [*owner*]
+# The user which should own the config file.
+# Defaults to 'root'
+#
+# [*group*]
+# The group which should own the config file.
+# Defaults to 'root'
+#
+define nagios_common::check_command::config(
+$ensure = present,
+$config_dir = '/etc/icinga',
+$source = puppet:///modules/nagios_common/check_commands/$title.cfg,
+$owner = 'root',
+$group = 'root',
+) {
file { $config_dir/commands/$title.cfg:
ensure = $ensure,
source = $config_source,
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index b459be8..4a641e5 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -40,6 +40,15 @@
group = $group,
}
+nagios_common::check_command::config { [
+'users'
+] :
+require= File[$config_dir/commands],
+config_dir = $config_dir,
+owner = $owner,
+group = $group,
+}
+
nagios_common::check_command { 'check_ssl_cert':
require = File[$config_dir/commands],
config_dir= $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cac9ff3d3bea938a17bcb16e5a3a0121e04c76b
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] Use the moved version of PropertyDataTypeLookup and InMemory... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Use the moved version of PropertyDataTypeLookup and
InMemoryDataTypeLookup
..
Use the moved version of PropertyDataTypeLookup and InMemoryDataTypeLookup
(Part of Kill ALL of the Lib code!)
Change-Id: I69d9df29540e4f2090896eb10c5c9cc478762606
---
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M lib/includes/EntityRetrievingDataTypeLookup.php
D lib/includes/InMemoryDataTypeLookup.php
D lib/includes/PropertyDataTypeLookup.php
M lib/includes/PropertyInfoDataTypeLookup.php
D lib/includes/PropertyNotFoundException.php
M lib/includes/SnakConstructionService.php
M lib/includes/ValuesFinder.php
M lib/includes/formatters/PropertyValueSnakFormatter.php
M lib/includes/formatters/WikibaseSnakFormatterBuilders.php
M lib/includes/serializers/SerializerFactory.php
M lib/includes/serializers/SnakSerializer.php
D lib/tests/phpunit/InMemoryDataTypeLookupTest.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/PropertyInfoDataTypeLookupTest.php
M lib/tests/phpunit/PropertyNotFoundExceptionTest.php
M lib/tests/phpunit/SnakConstructionServiceTest.php
M lib/tests/phpunit/ValuesFinderTest.php
M lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
M lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php
M lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
M lib/tests/phpunit/serializers/SnakSerializerTest.php
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/Validators/SnakValidator.php
M repo/includes/View/SnakHtmlGenerator.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/ApiHelperFactory.php
M repo/includes/api/ApiWikibase.php
M repo/includes/api/ClaimModificationHelper.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
40 files changed, 56 insertions(+), 223 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 045f148..2e7be7c 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -36,7 +36,7 @@
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
-use Wikibase\Lib\PropertyDataTypeLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyInfoDataTypeLookup;
use Wikibase\Lib\Serializers\ForbiddenSerializer;
use Wikibase\Lib\SnakFormatter;
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index a8fa543..f677e16 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -42,7 +42,7 @@
public function testGetPropertyDataTypeLookupReturnType() {
$returnValue =
$this-getDefaultInstance()-getPropertyDataTypeLookup();
- $this-assertInstanceOf( 'Wikibase\Lib\PropertyDataTypeLookup',
$returnValue );
+ $this-assertInstanceOf(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup', $returnValue );
}
public function testNewSnakFormatterReturnType() {
diff --git a/lib/includes/EntityRetrievingDataTypeLookup.php
b/lib/includes/EntityRetrievingDataTypeLookup.php
index 6413682..0a720ff 100644
--- a/lib/includes/EntityRetrievingDataTypeLookup.php
+++ b/lib/includes/EntityRetrievingDataTypeLookup.php
@@ -3,7 +3,9 @@
namespace Wikibase\Lib;
use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Entity\PropertyNotFoundException;
use Wikibase\Lib\Store\EntityLookup;
/**
diff --git a/lib/includes/InMemoryDataTypeLookup.php
b/lib/includes/InMemoryDataTypeLookup.php
deleted file mode 100644
index 51031c3..000
--- a/lib/includes/InMemoryDataTypeLookup.php
+++ /dev/null
@@ -1,61 +0,0 @@
-?php
-
-namespace Wikibase\Lib;
-
-use InvalidArgumentException;
-use Wikibase\DataModel\Entity\PropertyId;
-
-/**
- * PropertyDataTypeLookup that uses an in memory array to retrieve the
requested information.
- * If the information is not set when requested an exception is thrown.
- * This class can be used
[MediaWiki-commits] [Gerrit] Fix total_shards_per_node config - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix total_shards_per_node config
..
Fix total_shards_per_node config
Before this was only being applied after the index was created. Now it
gets a special value if the index is being reindexed to spread the index
as evenly as possible during the write traffic reindex event. Once the
reindex is done the value is set to whatever the user configured it to
be.
Change-Id: I9807023baa2fa8c4e4a5a79cf38d1c372462ddfb
(cherry picked from commit 0db3da04254b904cb425905befd17022b096a4c1)
---
M maintenance/updateOneSearchIndexConfig.php
1 file changed, 39 insertions(+), 13 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 884977a..b3ca52f 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -336,7 +336,7 @@
$actualMaxShardsPerNode = $actualMaxShardsPerNode 0 ?
'unlimited' : $actualMaxShardsPerNode;
$expectedMaxShardsPerNode = isset(
$wgCirrusSearchMaxShardsPerNode[ $this-indexType ] ) ?
$wgCirrusSearchMaxShardsPerNode[ $this-indexType ] :
'unlimited';
- if ( $actualMaxShardsPerNode === $expectedMaxShardsPerNode ) {
+ if ( $actualMaxShardsPerNode == $expectedMaxShardsPerNode ) {
$this-output( ok\n );
} else {
$this-output( is $actualMaxShardsPerNode but should
be $expectedMaxShardsPerNode... );
@@ -574,22 +574,14 @@
$this-validateIndexSettings();
$this-output( $this-indent . \tWaiting for
all shards to start...\n );
list( $lower, $upper ) = explode( '-',
$this-getReplicaCount() );
- $indexName = $this-getSpecificIndexName();
- $path = _cluster/health/$indexName;
$each = 0;
while ( true ) {
- $response =
Connection::getClient()-request( $path );
- if ( $response-hasError() ) {
- $this-error( 'Error fetching
index health but going to retry. Message: ' + $response-getError() );
- sleep( 1 );
- continue;
- }
- $health = $response-getData();
+ $health = $this-getHealth();
$active = $health[ 'active_shards' ];
$relocating = $health[
'relocating_shards' ];
$initializing = $health[
'initializing_shards' ];
$unassigned = $health[
'unassigned_shards' ];
- $nodes = $health['number_of_nodes'];
+ $nodes = $health[ 'number_of_nodes' ];
if ( $nodes $lower ) {
$this-error( Require $lower
replicas but only have $nodes nodes.
. This is almost
always due to misconfiguration, aborting., 1 );
@@ -687,12 +679,15 @@
// Set some settings that should help io load during bulk
indexing. We'll have to
// optimize after this to consolidate down to a proper number
of shards but that is
- // is worth the price.
+ // is worth the price. total_shards_per_node will help to make
sure that each shard
+ // has as few neighbors as possible.
$settings = $this-getIndex()-getSettings();
+ $maxShardsPerNode = $this-decideMaxShardsPerNodeForReindex();
$settings-set( array(
'refresh_interval' = -1,
'merge.policy.segments_per_tier' = 40,
'merge.policy.max_merge_at_once' = 40,
+ 'routing.allocation.total_shards_per_node' =
$maxShardsPerNode,
) );
if ( $this-reindexProcesses 1 ) {
@@ -822,6 +817,20 @@
}
}
+ private function getHealth() {
+ while ( true ) {
+ $indexName = $this-getSpecificIndexName();
+ $path = _cluster/health/$indexName;
+ $response = Connection::getClient()-request( $path );
+ if ( $response-hasError() ) {
+
[MediaWiki-commits] [Gerrit] Redo job that counts incoming links - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162240
Change subject: Redo job that counts incoming links
..
Redo job that counts incoming links
Old way:
When a page gets a link added or removed queue a single job with the target
of those links in it. That job counts all the links to each of the updated
pages and reindexes all of them.
New way:
When a page gets a link added or removed queue one job per link target that
was added or removed. That job counts all the links for only a single
page.
The new way is better then the old way because it allows deduplication of
links count update jobs. This is important if a popular template is edited
to add or remove links to a certain page. In the old way the incoming links
were counted over and over and over again and the page might be updated
many time though many will be nooped because the incoming links count won't
have changed enough. In the new way the page will be updated and the links
counted far fewer times due to deduplication.
Change-Id: Ie1ddf414f0bcb188dfa536ea9050aeff5f410cf5
---
M CirrusSearch.php
A includes/Job/IncomingLinkCount.php
M includes/Job/LinksUpdate.php
M includes/Job/LinksUpdateSecondary.php
M includes/Updater.php
M tests/jenkins/Jenkins.php
D tests/unit/Job/LinksUpdateSecondaryTest.php
7 files changed, 74 insertions(+), 85 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/40/162240/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index c04ce44..dccb1f4 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -528,6 +528,7 @@
$wgAutoloadClasses['CirrusSearch\InterwikiSearcher'] = $includes .
'InterwikiSearcher.php';
$wgAutoloadClasses['CirrusSearch\Job\Job'] = $jobsDir . 'Job.php';
$wgAutoloadClasses['CirrusSearch\Job\DeletePages'] = $jobsDir .
'DeletePages.php';
+$wgAutoloadClasses['CirrusSearch\Job\IncomingLinkCount'] = $jobsDir .
'IncomingLinkCount.php';
$wgAutoloadClasses['CirrusSearch\Job\LinksUpdate'] = $jobsDir .
'LinksUpdate.php';
$wgAutoloadClasses['CirrusSearch\Job\LinksUpdateSecondary'] = $jobsDir .
'LinksUpdateSecondary.php';
$wgAutoloadClasses['CirrusSearch\Job\MassIndex'] = $jobsDir . 'MassIndex.php';
@@ -592,6 +593,7 @@
* Jobs
*/
$wgJobClasses[ 'cirrusSearchDeletePages' ] = 'CirrusSearch\Job\DeletePages';
+$wgJobClasses[ 'cirrusSearchIncomingLinkCount' ] =
'CirrusSearch\Job\IncomingLinkCount';
$wgJobClasses[ 'cirrusSearchLinksUpdate' ] = 'CirrusSearch\Job\LinksUpdate';
$wgJobClasses[ 'cirrusSearchLinksUpdatePrioritized' ] =
'CirrusSearch\Job\LinksUpdate';
$wgJobClasses[ 'cirrusSearchLinksUpdateSecondary' ] =
'CirrusSearch\Job\LinksUpdateSecondary';
diff --git a/includes/Job/IncomingLinkCount.php
b/includes/Job/IncomingLinkCount.php
new file mode 100644
index 000..e9e4570
--- /dev/null
+++ b/includes/Job/IncomingLinkCount.php
@@ -0,0 +1,37 @@
+?php
+
+namespace CirrusSearch\Job;
+use \CirrusSearch\Updater;
+
+/**
+ * Updates link counts to page when it is newly linked or unlinked.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+class IncomingLinkCount extends Job {
+ public function __construct( $title, $params ) {
+ parent::__construct( $title, $params );
+ }
+
+ protected function doJob() {
+ // Load the titles and filter out any that no longer exist.
+ $updater = new Updater();
+ // We're intentionally throwing out whether or not this job
succeeds.
+ // We're loggging it but we're not retrying.
+ $updater-updateLinkedArticles( array( $this-getTitle() ) );
+ return true;
+ }
+}
diff --git a/includes/Job/LinksUpdate.php b/includes/Job/LinksUpdate.php
index 38a52e3..92c639c 100644
--- a/includes/Job/LinksUpdate.php
+++ b/includes/Job/LinksUpdate.php
@@ -3,6 +3,7 @@
namespace CirrusSearch\Job;
use \CirrusSearch\Updater;
use \JobQueueGroup;
+use \Title;
/**
* Performs the appropriate updates to Elasticsearch after a LinksUpdate is
@@ -47,25 +48,27 @@
$updater = new Updater();
$res = $updater-updateFromTitle( $this-title );
if ( $res
[MediaWiki-commits] [Gerrit] Update tests of strings with one parameters - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Update tests of strings with one parameters
..
Update tests of strings with one parameters
And ignoring some that take forever to get fixed.
Some strings don't have a parameter anymore.
Added test for it but commented out for now since
it's not yet necessary.
Change-Id: I4a477e33f05d1b3fc71e96ff36b1f993984b5f58
---
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
1 file changed, 24 insertions(+), 6 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index 33e8935..2f42067 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -25,7 +25,7 @@
public class TranslationTests extends
ActivityInstrumentationTestCase2PageActivity {
public static final String TAG = TrTest;
private PageActivity activity;
-private StringBuilder missingParam = new StringBuilder();
+private StringBuilder paramMismatches = new StringBuilder();
public TranslationTests() {
super(PageActivity.class);
@@ -47,16 +47,23 @@
Log.i(TAG, locale= + (lang.equals() ? DEFAULT : lang));
setLocale(lang);
//checkAllStrings(); // might take too long
+
+// commented out during the transition from 1 param to 0
+//
checkOneStringWith0Parameter(R.string.saved_pages_search_empty_message);
+//
checkOneStringWith0Parameter(R.string.history_search_empty_message);
+
if (!lang.startsWith(qq)) {
-
checkOneStringWithParameter(R.string.saved_pages_search_empty_message);
checkOneStringWithParameter(R.string.last_updated_text);
-
checkOneStringWithParameter(R.string.editing_error_spamblacklist);
-
checkOneStringWithParameter(R.string.history_search_empty_message);
+if (!lang.startsWith(ak) !lang.startsWith(el)) {
+// taking forever to get those fixed :(
+
checkOneStringWithParameter(R.string.editing_error_spamblacklist);
+}
checkOneStringWithParameter(R.string.page_protected_other);
+checkOneStringWithParameter(R.string.search_redirect_title);
// TODO: build a list of all parameterized string resources
from default strings dynamically first
}
}
-assertTrue(missingParam.toString(), missingParam.length() == 0);
+assertTrue(paramMismatches.toString(), paramMismatches.length() == 0);
}
private Locale myLocale;
@@ -101,6 +108,17 @@
return myLocale + - + i + ; name = + name;
}
+private void checkOneStringWith0Parameter(int resourceId) {
+final String param1 = [param1];
+String translatedString =
getInstrumentation().getTargetContext().getString(resourceId, param1);
+//Log.i(TAG, myLocale + : + translatedString);
+if (translatedString.contains(param1)) {
+final String msg = myLocale + : + translatedString + ' contains
+ param1;
+Log.e(TAG, msg);
+paramMismatches.append(msg).append(\n);
+}
+}
+
public void checkOneStringWithParameter(int resourceId) throws Exception {
final String param1 = [param1];
String translatedString =
getInstrumentation().getTargetContext().getString(resourceId, param1);
@@ -108,7 +126,7 @@
if (!translatedString.contains(param1)) {
final String msg = myLocale + : + translatedString + ' doesn't
contain + param1;
Log.e(TAG, msg);
-missingParam.append(msg).append(\n);
+paramMismatches.append(msg).append(\n);
}
//assertTrue(myLocale + :' + translatedString + ' doesn't contain
+ param1, translatedString.contains(param1));
}
--
To view, visit https://gerrit.wikimedia.org/r/161993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a477e33f05d1b3fc71e96ff36b1f993984b5f58
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@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] salt: make grain-ensure.py operate locally - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: salt: make grain-ensure.py operate locally .. salt: make grain-ensure.py operate locally This patch is meant to solve an issue with grain-ensure.py hanging when salt-minion is unable to authenticate with the Salt master. It does so by explicitly telling Salt to work with local grain data. See http://docs.saltstack.com/en/latest/ref/clients/#salt.client.Caller (especially the last example) and http://docs.saltstack.com/en/latest/ref/file_server/file_roots.html#local-file-server. Note that this issue affected passive examination of grains as well as setting them. Change-Id: I3d6ef6ed579f87d0f89eb1a43774a36bc6b0dace --- M modules/salt/files/grain-ensure.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/salt/files/grain-ensure.py b/modules/salt/files/grain-ensure.py index f5c828f..f5d387b 100644 --- a/modules/salt/files/grain-ensure.py +++ b/modules/salt/files/grain-ensure.py @@ -40,9 +40,20 @@ import argparse import salt.client +import salt.config -caller = salt.client.Caller() +class SaltLocalCaller(salt.client.Caller): +A salt.client.Caller that doesn't require the salt master. +See http://docs.saltstack.com/en/latest/ref/clients/#salt.client.Caller. + +def __init__(self, c_path='/etc/salt/minion'): +self.opts = salt.config.minion_config(c_path) +self.opts['file_client'] = 'local' +self.sminion = salt.minion.SMinion(self.opts) + + +caller = SaltLocalCaller() def get(grain): -- To view, visit https://gerrit.wikimedia.org/r/161332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d6ef6ed579f87d0f89eb1a43774a36bc6b0dace Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Right swipe in ToC hint for RTL - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Right swipe in ToC hint for RTL .. Right swipe in ToC hint for RTL Some RTL don't have translations for the toc_hint text yet. Adding a fuzzy English text indicating right swipe instead of left swipe. Change-Id: I2cc6d8757ab7710e7332ca066421dec0dcde208d --- M wikipedia/res/values-ar/strings.xml M wikipedia/res/values-fa/strings.xml M wikipedia/res/values-yi/strings.xml 3 files changed, 4 insertions(+), 0 deletions(-) Approvals: Dbrant: Looks good to me, approved diff --git a/wikipedia/res/values-ar/strings.xml b/wikipedia/res/values-ar/strings.xml index b55b325..1af189b 100644 --- a/wikipedia/res/values-ar/strings.xml +++ b/wikipedia/res/values-ar/strings.xml @@ -179,6 +179,7 @@ string name=saved_pages_update_all_error_messageحدث خطأ أثناء تحديث الصفحات المحفوظة/string string name=saved_pages_progress_titleتحديث الصفحات المحفوظة/string string name=saved_pages_refresh_pages_completeاكتمل التحديث/string + string name=toc_hint fuzzy=trueSwipe right for sections, or use the menu button on the top right./string string name=app_store_descriptionتطبيق ويكيبيديا الرسمي لأندرويد. ويكيبيديا هي موسوعة حرة تحتوي على أكثر من 32 مليون مقالة في 280 لغة. كما أنها الموسوعة الأشمل والأكثر استخداماً على نطاق واسع. وهي أكبر عمل موسوعي جمعته البشرية. تم إعادة تطوير التطبيق من الصفر وأصبح أفضل من أي وقتٍ مضى. المميزات: diff --git a/wikipedia/res/values-fa/strings.xml b/wikipedia/res/values-fa/strings.xml index e3ef19a..5d26168 100644 --- a/wikipedia/res/values-fa/strings.xml +++ b/wikipedia/res/values-fa/strings.xml @@ -216,6 +216,8 @@ string name=search_results_titleنتایج جستجو/string string name=search_error_retryتلاش مجدد/string string name=search_redirect_titleتغییر مسیر از «%s»./string + string name=toc_hint fuzzy=trueSwipe right for sections, or use the menu button on the top right./string + string name=app_store_descriptionنرم افزار رسمی ویکیپدیا برای استفاده در آندروید. ویکی پدیا حاوی بیش از ۳۲ میلیون مقاله به زبان ۲۸۰ است و جامعترین و گستردهترین مرجع کار انسان تا کنون است. این برنامه از ابتدا بازنویسی شده است و بهتر از قبل کار می کند. ویژگیها: -سرعت: نرم افزار جدید، بومی ما به شما اجازهٔ مرور و ویرایش ویکیپدیا را با سریع بیشتری میدهد. diff --git a/wikipedia/res/values-yi/strings.xml b/wikipedia/res/values-yi/strings.xml index d974dfb..c605ed5 100644 --- a/wikipedia/res/values-yi/strings.xml +++ b/wikipedia/res/values-yi/strings.xml @@ -132,4 +132,5 @@ string name=color_theme_lightהעל/string string name=color_theme_darkטונקל/string string name=page_similar_titlesענלעכע בלעטער/string + string name=toc_hint fuzzy=trueSwipe right for sections, or use the menu button on the top right./string /resources -- To view, visit https://gerrit.wikimedia.org/r/162199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cc6d8757ab7710e7332ca066421dec0dcde208d Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND bsitzm...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix [Object object] placeholder text in topic reply field - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162243
Change subject: Fix [Object object] placeholder text in topic reply field
..
Fix [Object object] placeholder text in topic reply field
Change-Id: I51e4c8586be8995f5fbb32970f23fe9eec596186
---
M modules/new/flow-handlebars.js
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/43/162243/1
diff --git a/modules/new/flow-handlebars.js b/modules/new/flow-handlebars.js
index eb4be15..1a045ef 100644
--- a/modules/new/flow-handlebars.js
+++ b/modules/new/flow-handlebars.js
@@ -218,6 +218,14 @@
} ),
result = strings[ str ];
+ // Parameters could be Message::rawParam (in PHP) object, which
will
+ // translate into a { raw: string } object in JS.
+ // @todo: this does not exactly match the behavior in PHP yet
(no parse,
+ // no escape), but at least it won't print an [Object object]
param.
+ parameters = parameters.map( function ( arg ) {
+ return arg.raw || arg;
+ } );
+
if ( !result ) {
return mw.message( str ).params( parameters );
}
--
To view, visit https://gerrit.wikimedia.org/r/162243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51e4c8586be8995f5fbb32970f23fe9eec596186
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix counting of centuries and millennia. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162242
Change subject: Fix counting of centuries and millennia.
..
Fix counting of centuries and millennia.
Bug: 64742
Bug: 70935
Change-Id: Ia1692d12411af42376fbd0042790e9c725574d11
---
M lib/includes/formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
2 files changed, 111 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/42/162242/1
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php
b/lib/includes/formatters/MwTimeIsoFormatter.php
index 46be1e1..354d298 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -217,53 +217,71 @@
* @return string
*/
private function getLocalizedYear( $isoTimestamp, $precision ) {
- $shift = 1e-0;
- $round = 0;
+ $shift = 1e+0;
+ $unshift = 1e-0;
+ $func = 'round';
switch ( $precision ) {
case TimeValue::PRECISION_Ga:
$msg = 'Gannum';
- $shift = 1e-9;
+ $shift = 1e+9;
break;
case TimeValue::PRECISION_100Ma:
$msg = 'Mannum';
- $shift = 1e-6;
- $round = -2;
+ $shift = 1e+8;
+ $unshift = 1e+2;
break;
case TimeValue::PRECISION_10Ma:
$msg = 'Mannum';
- $shift = 1e-6;
- $round = -1;
+ $shift = 1e+7;
+ $unshift = 1e+1;
break;
case TimeValue::PRECISION_Ma:
$msg = 'Mannum';
- $shift = 1e-6;
+ $shift = 1e+6;
break;
case TimeValue::PRECISION_100ka:
$msg = 'annum';
- $round = -5;
+ $shift = 1e+5;
+ $unshift = 1e+5;
break;
case TimeValue::PRECISION_10ka:
$msg = 'annum';
- $round = -4;
+ $shift = 1e+4;
+ $unshift = 1e+4;
break;
case TimeValue::PRECISION_ka:
$msg = 'millennium';
- $shift = 1e-3;
+ $func = 'ceil';
+ $shift = 1e+3;
break;
case TimeValue::PRECISION_100a:
$msg = 'century';
- $shift = 1e-2;
+ $func = 'ceil';
+ $shift = 1e+2;
break;
case TimeValue::PRECISION_10a:
$msg = '10annum';
- $round = -1;
+ $func = 'floor';
+ $shift = 1e+1;
+ $unshift = 1e+1;
break;
}
$isBCE = substr( $isoTimestamp, 0, 1 ) === '-';
$year = abs( floatval( $isoTimestamp ) );
- $number = round( $year * $shift, $round );
+
+ switch ( $func ) {
+ case 'ceil':
+ $number = round( ceil( $year / $shift ) *
$unshift );
+ break;
+ case 'floor':
+ $number = round( floor( $year / $shift ) *
$unshift );
+ break;
+ default:
+ $number = round( round( $year / $shift ) *
$unshift );
+ }
+
$formattedNumber = $this-language-formatNum( $number, true );
if ( empty( $number )
diff --git a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
index 6709b8e..cce31e8 100644
--- a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
@@ -75,6 +75,64 @@
'1234013',
),
[MediaWiki-commits] [Gerrit] nagios_common: Move snmp into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162246
Change subject: nagios_common: Move snmp into module
..
nagios_common: Move snmp into module
Change-Id: I6ca912cb83d7cad0496a1cc1b268b74023ca5716
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/snmp.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/162246/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index f5772b3..8220aee 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -519,12 +519,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/snmp.cfg':
-source = 'puppet:///files/icinga/plugin-config/snmp.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/tcp_udp.cfg':
source = 'puppet:///files/icinga/plugin-config/tcp_udp.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/snmp.cfg
b/modules/nagios_common/files/check_commands/snmp.cfg
similarity index 100%
rename from files/icinga/plugin-config/snmp.cfg
rename to modules/nagios_common/files/check_commands/snmp.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index f573dd2..999bbaf 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -44,6 +44,7 @@
'users',
'telnet',
'ssh',
+'snmp',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ca912cb83d7cad0496a1cc1b268b74023ca5716
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] nagios_common: Move ssh into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162245
Change subject: nagios_common: Move ssh into module
..
nagios_common: Move ssh into module
Change-Id: I3aeb53d65870caa91222ecd5c43765843076c224
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/ssh.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/162245/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 8e8c164..f5772b3 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -525,12 +525,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/ssh.cfg':
-source = 'puppet:///files/icinga/plugin-config/ssh.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/tcp_udp.cfg':
source = 'puppet:///files/icinga/plugin-config/tcp_udp.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/ssh.cfg
b/modules/nagios_common/files/check_commands/ssh.cfg
similarity index 100%
rename from files/icinga/plugin-config/ssh.cfg
rename to modules/nagios_common/files/check_commands/ssh.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index b5528d2..f573dd2 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -43,6 +43,7 @@
nagios_common::check_command::config { [
'users',
'telnet',
+'ssh',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aeb53d65870caa91222ecd5c43765843076c224
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] nagios_common: Move telnet into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162244
Change subject: nagios_common: Move telnet into module
..
nagios_common: Move telnet into module
Change-Id: If8ae885825c801fe5f48bab297c6d93e82c850df
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/telnet.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/162244/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index b611778..8e8c164 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -537,12 +537,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/telnet.cfg':
-source = 'puppet:///files/icinga/plugin-config/telnet.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/vsz.cfg':
source = 'puppet:///files/icinga/plugin-config/vsz.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/telnet.cfg
b/modules/nagios_common/files/check_commands/telnet.cfg
similarity index 100%
rename from files/icinga/plugin-config/telnet.cfg
rename to modules/nagios_common/files/check_commands/telnet.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 4a641e5..b5528d2 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -41,7 +41,8 @@
}
nagios_common::check_command::config { [
-'users'
+'users',
+'telnet',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8ae885825c801fe5f48bab297c6d93e82c850df
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] nagios_common: Move apt into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162251
Change subject: nagios_common: Move apt into module
..
nagios_common: Move apt into module
Change-Id: I2a1f6d8d747ff38cc0534f66b957135f3e65e8fb
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/apt.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/162251/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 49b2ef7..df4aea9 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/apt.cfg':
-source = 'puppet:///files/icinga/plugin-config/apt.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/breeze.cfg':
source = 'puppet:///files/icinga/plugin-config/breeze.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/apt.cfg
b/modules/nagios_common/files/check_commands/apt.cfg
similarity index 100%
rename from files/icinga/plugin-config/apt.cfg
rename to modules/nagios_common/files/check_commands/apt.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 4f13f90..56891f6 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -49,6 +49,7 @@
'radius',
'rpc-nfs',
'tcp_udp',
+'apt',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a1f6d8d747ff38cc0534f66b957135f3e65e8fb
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] nagios_common: Move breeze into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162252
Change subject: nagios_common: Move breeze into module
..
nagios_common: Move breeze into module
Change-Id: I74f5938ad6bb952d21e408f78f8e39a3d5d9c3f2
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/breeze.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/162252/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index df4aea9..b212e40 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/breeze.cfg':
-source = 'puppet:///files/icinga/plugin-config/breeze.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/dhcp.cfg':
source = 'puppet:///files/icinga/plugin-config/dhcp.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/breeze.cfg
b/modules/nagios_common/files/check_commands/breeze.cfg
similarity index 100%
rename from files/icinga/plugin-config/breeze.cfg
rename to modules/nagios_common/files/check_commands/breeze.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 56891f6..6afa79a 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -50,6 +50,7 @@
'rpc-nfs',
'tcp_udp',
'apt',
+'breeze',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74f5938ad6bb952d21e408f78f8e39a3d5d9c3f2
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] nagios_common: Move rpc-nfs into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162249
Change subject: nagios_common: Move rpc-nfs into module
..
nagios_common: Move rpc-nfs into module
Change-Id: I78da39142ef5a76ba81ff22be07490c385ee1cd6
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/rpc-nfs.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/162249/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 1f937a0..2cade0e 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -501,12 +501,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/rpc-nfs.cfg':
-source = 'puppet:///files/icinga/plugin-config/rpc-nfs.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/tcp_udp.cfg':
source = 'puppet:///files/icinga/plugin-config/tcp_udp.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/rpc-nfs.cfg
b/modules/nagios_common/files/check_commands/rpc-nfs.cfg
similarity index 100%
rename from files/icinga/plugin-config/rpc-nfs.cfg
rename to modules/nagios_common/files/check_commands/rpc-nfs.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 05d891b..71e8f63 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -47,6 +47,7 @@
'snmp',
'real'
'radius',
+'rpc-nfs',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78da39142ef5a76ba81ff22be07490c385ee1cd6
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] nagios_common: Move dns into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162256
Change subject: nagios_common: Move dns into module
..
nagios_common: Move dns into module
Change-Id: Ie18d8db14d4af3e0a6ace74f266eaaedd99ea486
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/dns.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/162256/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 9603812..d03427f 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/dns.cfg':
-source = 'puppet:///files/icinga/plugin-config/dns.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/dummy.cfg':
source = 'puppet:///files/icinga/plugin-config/dummy.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/dns.cfg
b/modules/nagios_common/files/check_commands/dns.cfg
similarity index 100%
rename from files/icinga/plugin-config/dns.cfg
rename to modules/nagios_common/files/check_commands/dns.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 1372141..5e8dc83 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -54,6 +54,7 @@
'dhcp',
'disk-smb',
'disk',
+'dns',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162256
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie18d8db14d4af3e0a6ace74f266eaaedd99ea486
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] nagios_common: Move tcp_udp into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162250
Change subject: nagios_common: Move tcp_udp into module
..
nagios_common: Move tcp_udp into module
Change-Id: I68708ad584f6dc0b7fbabbc644ee172fe98fc4c0
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/tcp_udp.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/162250/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 2cade0e..49b2ef7 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -501,12 +501,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/tcp_udp.cfg':
-source = 'puppet:///files/icinga/plugin-config/tcp_udp.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/vsz.cfg':
source = 'puppet:///files/icinga/plugin-config/vsz.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/tcp_udp.cfg
b/modules/nagios_common/files/check_commands/tcp_udp.cfg
similarity index 100%
rename from files/icinga/plugin-config/tcp_udp.cfg
rename to modules/nagios_common/files/check_commands/tcp_udp.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 71e8f63..4f13f90 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -48,6 +48,7 @@
'real'
'radius',
'rpc-nfs',
+'tcp_udp',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68708ad584f6dc0b7fbabbc644ee172fe98fc4c0
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] nagios_common: Move real into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162247
Change subject: nagios_common: Move real into module
..
nagios_common: Move real into module
Change-Id: I5fd02f1d5e290a3bea475cc6c9cf7ee6a366f032
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/real.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/162247/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 8220aee..faac6a3 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -507,12 +507,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/real.cfg':
-source = 'puppet:///files/icinga/plugin-config/real.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/rpc-nfs.cfg':
source = 'puppet:///files/icinga/plugin-config/rpc-nfs.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/real.cfg
b/modules/nagios_common/files/check_commands/real.cfg
similarity index 100%
rename from files/icinga/plugin-config/real.cfg
rename to modules/nagios_common/files/check_commands/real.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 999bbaf..1adae91 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -45,6 +45,7 @@
'telnet',
'ssh',
'snmp',
+'real'
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fd02f1d5e290a3bea475cc6c9cf7ee6a366f032
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] nagios_common: Move radius into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162248
Change subject: nagios_common: Move radius into module
..
nagios_common: Move radius into module
Change-Id: I129794527a61390a5e63fc5712c986deb9dd510c
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/radius.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/162248/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index faac6a3..1f937a0 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -501,12 +501,6 @@
group = 'root',
mode = '0644',
}
-file { '/etc/nagios-plugins/config/radius.cfg':
-source = 'puppet:///files/icinga/plugin-config/radius.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/rpc-nfs.cfg':
source = 'puppet:///files/icinga/plugin-config/rpc-nfs.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/radius.cfg
b/modules/nagios_common/files/check_commands/radius.cfg
similarity index 100%
rename from files/icinga/plugin-config/radius.cfg
rename to modules/nagios_common/files/check_commands/radius.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 1adae91..05d891b 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -46,6 +46,7 @@
'ssh',
'snmp',
'real'
+'radius',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I129794527a61390a5e63fc5712c986deb9dd510c
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] nagios_common: Move disk-smb into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162254
Change subject: nagios_common: Move disk-smb into module
..
nagios_common: Move disk-smb into module
Change-Id: Ib8740d39d8719fa166131800cac83648e5e6343a
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/disk-smb.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/162254/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 23fa63b..ada64b1 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/disk-smb.cfg':
-source = 'puppet:///files/icinga/plugin-config/disk-smb.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/disk.cfg':
source = 'puppet:///files/icinga/plugin-config/disk.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/disk-smb.cfg
b/modules/nagios_common/files/check_commands/disk-smb.cfg
similarity index 100%
rename from files/icinga/plugin-config/disk-smb.cfg
rename to modules/nagios_common/files/check_commands/disk-smb.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index a0e..c063bdf 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -52,6 +52,7 @@
'apt',
'breeze',
'dhcp',
+'disk-smb',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8740d39d8719fa166131800cac83648e5e6343a
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] nagios_common: Move dhcp into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162253
Change subject: nagios_common: Move dhcp into module
..
nagios_common: Move dhcp into module
Change-Id: I65b5bfc7889ad0bf3ae6826485e72761c342761c
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/dhcp.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/162253/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index b212e40..23fa63b 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/dhcp.cfg':
-source = 'puppet:///files/icinga/plugin-config/dhcp.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/disk-smb.cfg':
source = 'puppet:///files/icinga/plugin-config/disk-smb.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/dhcp.cfg
b/modules/nagios_common/files/check_commands/dhcp.cfg
similarity index 100%
rename from files/icinga/plugin-config/dhcp.cfg
rename to modules/nagios_common/files/check_commands/dhcp.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 6afa79a..a0e 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -51,6 +51,7 @@
'tcp_udp',
'apt',
'breeze',
+'dhcp',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65b5bfc7889ad0bf3ae6826485e72761c342761c
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] nagios_common: Move dummy into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162257
Change subject: nagios_common: Move dummy into module
..
nagios_common: Move dummy into module
Change-Id: I4d7ede9e49ce91e56e5d450866f02c753ef0903e
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/dummy.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/162257/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index d03427f..77f3fb4 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/dummy.cfg':
-source = 'puppet:///files/icinga/plugin-config/dummy.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/flexlm.cfg':
source = 'puppet:///files/icinga/plugin-config/flexlm.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/dummy.cfg
b/modules/nagios_common/files/check_commands/dummy.cfg
similarity index 100%
rename from files/icinga/plugin-config/dummy.cfg
rename to modules/nagios_common/files/check_commands/dummy.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 5e8dc83..c707f1a 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -55,6 +55,7 @@
'disk-smb',
'disk',
'dns',
+'dummy',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d7ede9e49ce91e56e5d450866f02c753ef0903e
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] nagios_common: Move ftp into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162259
Change subject: nagios_common: Move ftp into module
..
nagios_common: Move ftp into module
Change-Id: I78e060725f62778d02dcc50554fb0088b523f717
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/ftp.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/162259/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 4a02a24..1090d14 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/ftp.cfg':
-source = 'puppet:///files/icinga/plugin-config/ftp.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/hppjd.cfg':
source = 'puppet:///files/icinga/plugin-config/hppjd.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/ftp.cfg
b/modules/nagios_common/files/check_commands/ftp.cfg
similarity index 100%
rename from files/icinga/plugin-config/ftp.cfg
rename to modules/nagios_common/files/check_commands/ftp.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 74e2550..30b5bd3 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -56,7 +56,8 @@
'disk',
'dns',
'dummy',
-'flexlm'
+'flexlm',
+'ftp',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78e060725f62778d02dcc50554fb0088b523f717
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] icinga: Remove hppjd check - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162260
Change subject: icinga: Remove hppjd check
..
icinga: Remove hppjd check
The file was fully commented out and unused.
Change-Id: Icc64279e30144b2e8431ef7aceecec2c916d95ed
---
D files/icinga/plugin-config/hppjd.cfg
M manifests/misc/icinga.pp
2 files changed, 0 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/162260/1
diff --git a/files/icinga/plugin-config/hppjd.cfg
b/files/icinga/plugin-config/hppjd.cfg
deleted file mode 100644
index 57b313b..000
--- a/files/icinga/plugin-config/hppjd.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# 'check_hpjd' command definition
-#define command{
-# command_namecheck_hpjd
-# command_line/usr/lib/nagios/plugins/check_hpjd -H '$HOSTADDRESS$'
-C public
-# }
-
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 1090d14..b77b013 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/hppjd.cfg':
-source = 'puppet:///files/icinga/plugin-config/hppjd.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/http.cfg':
source = 'puppet:///files/icinga/plugin-config/http.cfg',
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/162260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc64279e30144b2e8431ef7aceecec2c916d95ed
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] nagios_common: Move mail into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162265
Change subject: nagios_common: Move mail into module
..
nagios_common: Move mail into module
Change-Id: I3275271c26dfb5416065ed45becb643b9e73b0fa
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/mail.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/162265/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 13ef39e..b8d520d 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/mail.cfg':
-source = 'puppet:///files/icinga/plugin-config/mail.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/mrtg.cfg':
source = 'puppet:///files/icinga/plugin-config/mrtg.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/mail.cfg
b/modules/nagios_common/files/check_commands/mail.cfg
similarity index 100%
rename from files/icinga/plugin-config/mail.cfg
rename to modules/nagios_common/files/check_commands/mail.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index a78af6e..c4cb2d5 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -62,6 +62,7 @@
'ifstatus',
'ldap',
'load',
+'mail',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3275271c26dfb5416065ed45becb643b9e73b0fa
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] nagios_common: Move ifstatus into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162262
Change subject: nagios_common: Move ifstatus into module
..
nagios_common: Move ifstatus into module
Change-Id: I7aac0b349b565d8243d21baec37afc8eb1abacf4
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/ifstatus.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/162262/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index d940260..0b57280 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/ifstatus.cfg':
-source = 'puppet:///files/icinga/plugin-config/ifstatus.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/ldap.cfg':
source = 'puppet:///files/icinga/plugin-config/ldap.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/ifstatus.cfg
b/modules/nagios_common/files/check_commands/ifstatus.cfg
similarity index 100%
rename from files/icinga/plugin-config/ifstatus.cfg
rename to modules/nagios_common/files/check_commands/ifstatus.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 59906b3..cd2308b 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -59,6 +59,7 @@
'flexlm',
'ftp',
'http',
+'ifstatus',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aac0b349b565d8243d21baec37afc8eb1abacf4
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] nagios_common: Move flexlm into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162258
Change subject: nagios_common: Move flexlm into module
..
nagios_common: Move flexlm into module
Change-Id: I575c3d247c24242fa36a76dadd771b86b755d29f
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/flexlm.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/162258/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 77f3fb4..4a02a24 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/flexlm.cfg':
-source = 'puppet:///files/icinga/plugin-config/flexlm.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/ftp.cfg':
source = 'puppet:///files/icinga/plugin-config/ftp.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/flexlm.cfg
b/modules/nagios_common/files/check_commands/flexlm.cfg
similarity index 100%
rename from files/icinga/plugin-config/flexlm.cfg
rename to modules/nagios_common/files/check_commands/flexlm.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index c707f1a..74e2550 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -56,6 +56,7 @@
'disk',
'dns',
'dummy',
+'flexlm'
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I575c3d247c24242fa36a76dadd771b86b755d29f
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] nagios_common: Move http into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162261
Change subject: nagios_common: Move http into module
..
nagios_common: Move http into module
Change-Id: I0350856445c85e560adc858cf6a467770480ff10
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/http.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/162261/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index b77b013..d940260 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/http.cfg':
-source = 'puppet:///files/icinga/plugin-config/http.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/ifstatus.cfg':
source = 'puppet:///files/icinga/plugin-config/ifstatus.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/http.cfg
b/modules/nagios_common/files/check_commands/http.cfg
similarity index 100%
rename from files/icinga/plugin-config/http.cfg
rename to modules/nagios_common/files/check_commands/http.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 30b5bd3..59906b3 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -58,6 +58,7 @@
'dummy',
'flexlm',
'ftp',
+'http',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0350856445c85e560adc858cf6a467770480ff10
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] nagios_common: move mrtg into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162266
Change subject: nagios_common: move mrtg into module
..
nagios_common: move mrtg into module
Change-Id: Ieb71ba1ca0f676798f0d286157618185c2003c7b
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/mrtg.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/162266/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index b8d520d..aa724df 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/mrtg.cfg':
-source = 'puppet:///files/icinga/plugin-config/mrtg.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/mysql.cfg':
source = 'puppet:///files/icinga/plugin-config/mysql.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/mrtg.cfg
b/modules/nagios_common/files/check_commands/mrtg.cfg
similarity index 100%
rename from files/icinga/plugin-config/mrtg.cfg
rename to modules/nagios_common/files/check_commands/mrtg.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index c4cb2d5..1d1092e 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -63,6 +63,7 @@
'ldap',
'load',
'mail',
+'mrtg',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb71ba1ca0f676798f0d286157618185c2003c7b
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] First trim content, then truncate - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162277
Change subject: First trim content, then truncate
..
First trim content, then truncate
Otherwise, we'd only get 150chars if the first 50 were whitespace.
Change-Id: I5cf62ac67dc5660af6ea6267704e2abe2c8dca98
---
M modules/new/components/flow-board.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/77/162277/1
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 9aed6e0..75377af 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -1632,7 +1632,7 @@
},
// text for
flow-reply-topic-title-placeholder placeholder
properties: {
- 'topic-of-post':
replyToContent.substr( 0, 200 ).trim()
+ 'topic-of-post':
replyToContent.trim().substr( 0, 200 )
}
}
) ).children();
--
To view, visit https://gerrit.wikimedia.org/r/162277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cf62ac67dc5660af6ea6267704e2abe2c8dca98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nagios_common: move mysql into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162267
Change subject: nagios_common: move mysql into module
..
nagios_common: move mysql into module
Change-Id: Ic7d169480b4cc8f649428420c24c8759a3aec31e
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/mysql.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/162267/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index aa724df..ed95b3e 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/mysql.cfg':
-source = 'puppet:///files/icinga/plugin-config/mysql.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/netware.cfg':
source = 'puppet:///files/icinga/plugin-config/netware.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/mysql.cfg
b/modules/nagios_common/files/check_commands/mysql.cfg
similarity index 100%
rename from files/icinga/plugin-config/mysql.cfg
rename to modules/nagios_common/files/check_commands/mysql.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 1d1092e..6a0c409 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -64,6 +64,7 @@
'load',
'mail',
'mrtg',
+'mysql',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7d169480b4cc8f649428420c24c8759a3aec31e
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] nagios_common: move vsz into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162275
Change subject: nagios_common: move vsz into module
..
nagios_common: move vsz into module
Change-Id: Ie2a01656c185dc020dd48a1fe9e918f701d4d032
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/vsz.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/162275/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 1ac87bd..17d3d89 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/vsz.cfg':
-source = 'puppet:///files/icinga/plugin-config/vsz.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
File | tag == nagiosplugin |
diff --git a/files/icinga/plugin-config/vsz.cfg
b/modules/nagios_common/files/check_commands/vsz.cfg
similarity index 100%
rename from files/icinga/plugin-config/vsz.cfg
rename to modules/nagios_common/files/check_commands/vsz.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 0c2fb27..d404b13 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -72,6 +72,7 @@
'pgsql',
'ping',
'procs',
+'vsz',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2a01656c185dc020dd48a1fe9e918f701d4d032
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] nagios_common: move nt into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162270
Change subject: nagios_common: move nt into module
..
nagios_common: move nt into module
Change-Id: Ib6c68bfa17e39db1084132789bbe95e62f59c8eb
---
M manifests/misc/icinga.pp
R modules/nagios_common/files/check_commands/nt.cfg
M modules/nagios_common/manifests/commands.pp
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/162270/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index f9bd4b5..910beec 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -357,12 +357,6 @@
group = 'root',
mode = '0755',
}
-file { '/etc/nagios-plugins/config/nt.cfg':
-source = 'puppet:///files/icinga/plugin-config/nt.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
file { '/etc/nagios-plugins/config/ntp.cfg':
source = 'puppet:///files/icinga/plugin-config/ntp.cfg',
owner = 'root',
diff --git a/files/icinga/plugin-config/nt.cfg
b/modules/nagios_common/files/check_commands/nt.cfg
similarity index 100%
rename from files/icinga/plugin-config/nt.cfg
rename to modules/nagios_common/files/check_commands/nt.cfg
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index e4178b9..a7455e2 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -67,6 +67,7 @@
'mysql',
'netware',
'news',
+'nt',
] :
require= File[$config_dir/commands],
config_dir = $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/162270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6c68bfa17e39db1084132789bbe95e62f59c8eb
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] Placeholder should only contain text of exactly the topic be... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/162276 Change subject: Placeholder should only contain text of exactly the topic being replied to .. Placeholder should only contain text of exactly the topic being replied to When replying to a higher-level post, it would include the contents of all lower-level posts as well. It should only fetch text of the first post, no children. Change-Id: I978736bb2ae194389709a7ad0029d14400eae30a --- M modules/new/components/flow-board.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/76/162276/1 diff --git a/modules/new/components/flow-board.js b/modules/new/components/flow-board.js index 611290b..9aed6e0 100644 --- a/modules/new/components/flow-board.js +++ b/modules/new/components/flow-board.js @@ -1607,7 +1607,7 @@ $targetPost = $( this ).closest( '.flow-post:not([data-flow-post-max-depth])' ), postId = $targetPost.data( 'flow-id' ), topicTitle = $post.closest( '.flow-topic' ).find( '.flow-topic-title' ).text(), - replyToContent = $post.find( '.flow-post-content' ).text() || topicTitle, + replyToContent = $post.find( '.flow-post-content:first' ).text() || topicTitle, author = $.trim( $post.find( '.flow-author:first .mw-userlink' ).text() ); // Check if reply form has already been opened -- To view, visit https://gerrit.wikimedia.org/r/162276 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I978736bb2ae194389709a7ad0029d14400eae30a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
