[MediaWiki-commits] [Gerrit] operations/puppet[production]: Hardcode $dist-backports components

2016-08-02 Thread Mark Bergsma (Code Review) 
Mark Bergsma has uploaded a new change for review.

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

Change subject: Hardcode $dist-backports components
..

Hardcode $dist-backports components

Change-Id: I57432bbfb54ecba8db8d5ec19d3e38e066a5c863
---
M modules/package_builder/templates/D02backports.erb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/package_builder/templates/D02backports.erb 
b/modules/package_builder/templates/D02backports.erb
index 7033d16..94d7f5a 100755
--- a/modules/package_builder/templates/D02backports.erb
+++ b/modules/package_builder/templates/D02backports.erb
@@ -3,8 +3,8 @@
 # Avoid running hooks if backports is not specified
 if [ "${BACKPORTS}" = "yes" ]; then
 cat > /etc/apt/sources.list.d/<%= @distribution %>-backports.list <<-'EOF'
-deb <%= @upstream_mirror %> <%= @distribution %>-backports <%= @components 
%>
-deb-src <%= @upstream_mirror %> <%= @distribution %>-backports <%= 
@components %>
+deb <%= @upstream_mirror %> <%= @distribution %>-backports main contrib 
non-free
+deb-src <%= @upstream_mirror %> <%= @distribution %>-backports main 
contrib non-free
 EOF
 apt-get update
 fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57432bbfb54ecba8db8d5ec19d3e38e066a5c863
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Hardcode $dist-backports components

2016-08-02 Thread Mark Bergsma (Code Review) 
Mark Bergsma has submitted this change and it was merged.

Change subject: Hardcode $dist-backports components
..


Hardcode $dist-backports components

Change-Id: I57432bbfb54ecba8db8d5ec19d3e38e066a5c863
---
M modules/package_builder/templates/D02backports.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Mark Bergsma: Verified; Looks good to me, approved



diff --git a/modules/package_builder/templates/D02backports.erb 
b/modules/package_builder/templates/D02backports.erb
index 7033d16..94d7f5a 100755
--- a/modules/package_builder/templates/D02backports.erb
+++ b/modules/package_builder/templates/D02backports.erb
@@ -3,8 +3,8 @@
 # Avoid running hooks if backports is not specified
 if [ "${BACKPORTS}" = "yes" ]; then
 cat > /etc/apt/sources.list.d/<%= @distribution %>-backports.list <<-'EOF'
-deb <%= @upstream_mirror %> <%= @distribution %>-backports <%= @components 
%>
-deb-src <%= @upstream_mirror %> <%= @distribution %>-backports <%= 
@components %>
+deb <%= @upstream_mirror %> <%= @distribution %>-backports main contrib 
non-free
+deb-src <%= @upstream_mirror %> <%= @distribution %>-backports main 
contrib non-free
 EOF
 apt-get update
 fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57432bbfb54ecba8db8d5ec19d3e38e066a5c863
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 
Gerrit-Reviewer: Mark Bergsma 

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