Unverified Commit 52241328 authored by intrigeri's avatar intrigeri
Browse files

Use v3 Onion Service for the deb.torproject.org APT repository

This is the only v2 Onion Service that's left in our APT sources.

refs #18256
parent 98112c7d
......@@ -44,7 +44,7 @@ s{
/[0-9]{10} # serial
/?
(\s+)
}{$1tor+http://sdscoq7snqtznauu.onion/torproject.org/$2}xms;
}{$1tor+http://apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd.onion/torproject.org/$2}xms;
### Tagged snapshots
......@@ -76,7 +76,7 @@ s{
/torproject
/?
(\s+)
}{$1tor+http://sdscoq7snqtznauu.onion/torproject.org/$2}xms;
}{$1tor+http://apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd.onion/torproject.org/$2}xms;
### Custom APT repository
......
......@@ -6,7 +6,7 @@ Feature: APT sources are correctly configured
Scenario: APT sources are configured correctly
Given a computer
And I start Tails from DVD with network unplugged and genuine APT sources
Then the only hosts in APT sources are "cdn-fastly.deb.debian.org,umjqavufhoix3smyq6az2sx4istmuvsgmz4bq5u5x56rnayejoo6l2qd.onion,sdscoq7snqtznauu.onion"
Then the only hosts in APT sources are "cdn-fastly.deb.debian.org,umjqavufhoix3smyq6az2sx4istmuvsgmz4bq5u5x56rnayejoo6l2qd.onion,apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd.onion"
And no proposed-updates APT suite is enabled
And no experimental APT suite is enabled for deb.torproject.org
And if releasing, no unversioned Tails APT source is enabled
......
......@@ -21,8 +21,8 @@ Then /^no proposed-updates APT suite is enabled$/ do
end
Then /^no experimental APT suite is enabled for deb[.]torproject[.]org$/ do
# sdscoq7snqtznauu.onion == deb.torproject.org
assert_no_match(/sdscoq7snqtznauu[.]onion.*experimental/, apt_sources)
# apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd.onion == deb.torproject.org
assert_no_match(/apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd[.]onion.*experimental/, apt_sources)
end
Then /^if releasing, the tagged Tails APT source is enabled$/ do
......@@ -47,7 +47,7 @@ When /^I configure APT to use non-onion sources$/ do
script = <<-SCRIPT
use strict;
use warnings FATAL => "all";
s{sdscoq7snqtznauu[.]onion}{deb.torproject.org};
s{apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd[.]onion}{deb.torproject.org};
s{umjqavufhoix3smyq6az2sx4istmuvsgmz4bq5u5x56rnayejoo6l2qd[.]onion}{deb.tails.boum.org};
SCRIPT
# VMCommand:s cannot handle newlines, and they're irrelevant in the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment