jenkins-bot has submitted this change and it was merged. Change subject: Sync /etc/apt/sources.list.d/wikimedia.list with WMF production ......................................................................
Sync /etc/apt/sources.list.d/wikimedia.list with WMF production On a labs_vagrant instance, the wikimedia.list installed by operations/puppet and ours disagree. This causes unnecessary battles between the two puppet systems for the "proper" content of this file. Add non-free component and remove comments about puppet managing the file so that our version of the file looks like theirs. Change-Id: I38f4d91dcefc8c48c34c492f2d23d0dd15474b36 --- M puppet/modules/apt/templates/wikimedia.list.erb 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/apt/templates/wikimedia.list.erb b/puppet/modules/apt/templates/wikimedia.list.erb index a0f57c1..c5d1663 100644 --- a/puppet/modules/apt/templates/wikimedia.list.erb +++ b/puppet/modules/apt/templates/wikimedia.list.erb @@ -1,5 +1,2 @@ -# Wikimedia apt package repository source file. -# This file is managed by Puppet. -# -deb http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe -deb-src http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe +deb http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe non-free +deb-src http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe non-free -- To view, visit https://gerrit.wikimedia.org/r/162183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38f4d91dcefc8c48c34c492f2d23d0dd15474b36 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis <[email protected]> Gerrit-Reviewer: BryanDavis <[email protected]> Gerrit-Reviewer: Dduvall <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
