Faidon Liambotis has submitted this change and it was merged.

Change subject: reprepro: add updates from torproject.org
......................................................................


reprepro: add updates from torproject.org

Change-Id: I4f5bf1c7362df1aa93dddaffbb1b863187bd936e
---
M modules/install-server/files/reprepro/distributions
M modules/install-server/files/reprepro/updates
2 files changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/modules/install-server/files/reprepro/distributions 
b/modules/install-server/files/reprepro/distributions
index cba7489..864769a 100644
--- a/modules/install-server/files/reprepro/distributions
+++ b/modules/install-server/files/reprepro/distributions
@@ -36,7 +36,7 @@
 Architectures: source amd64 i386
 Components: main universe non-free thirdparty
 UDebComponents: main
-Update: hwraid cassandra elasticsearch logstash
+Update: hwraid cassandra elasticsearch logstash tor-trusty
 Description: Wikimedia specific packages for Ubuntu Trusty Tahr
 SignWith: default
 DebOverride: deb-override
diff --git a/modules/install-server/files/reprepro/updates 
b/modules/install-server/files/reprepro/updates
index 90e84b1..06e0468 100644
--- a/modules/install-server/files/reprepro/updates
+++ b/modules/install-server/files/reprepro/updates
@@ -7,7 +7,6 @@
 VerifyRelease: 9B7D32F2D50582E6
 ListShellHook: grep-dctrl -X -S jenkins || [ $? -eq 1 ]
 
-# track the cloudera hadoop release
 Name: cloudera
 Method: http://archive.cloudera.com/cdh5/ubuntu/precise/amd64/cdh/
 Components: contrib>thirdparty
@@ -56,3 +55,12 @@
 Architectures: amd64
 VerifyRelease: D27D666CD88E42B4
 ListShellHook: grep-dctrl -X -S logstash || [ $? -eq 1 ]
+
+Name: tor-trusty
+Method: http://deb.torproject.org/torproject.org/
+Components: main>thirdparty
+UDebComponents:
+Suite: trusty
+Architectures: amd64 source
+VerifyRelease: 74A941BA219EC810
+ListShellHook: grep-dctrl -X -S tor || [ $? -eq 1 ]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f5bf1c7362df1aa93dddaffbb1b863187bd936e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to