Commit b6368e80 authored by anonym's avatar anonym
Browse files

Merge branch 'bugfix/17993-stop-using-Debian-onion-service' into 'stable'

APT: use non-onion HTTPS sources for Debian repositories

Closes #17993

See merge request tails/tails!383
parents cb1882f0 f7e911fa
......@@ -23,7 +23,7 @@ s{
/[0-9]{10} # serial
/?
(\s+)
}{$1tor+http://vwakviie2ienjx6t.onion/debian/$2}xms;
}{$1tor+https://cdn-fastly.deb.debian.org/debian/$2}xms;
s{
^
......@@ -33,7 +33,7 @@ s{
/[0-9]{10} # serial
/?
(\s+)
}{$1tor+http://sgvtcaew4bxjd7ln.onion/$2}xms;
}{$1tor+https://cdn-fastly.deb.debian.org/debian-security/$2}xms;
s{
^
......@@ -55,7 +55,7 @@ s{
/debian
/?
(\s+)
}{$1tor+http://vwakviie2ienjx6t.onion/debian/$2}xms;
}{$1tor+https://cdn-fastly.deb.debian.org/debian/$2}xms;
s{
^
......@@ -65,7 +65,7 @@ s{
/debian-security
/?
(\s+)
}{$1tor+http://sgvtcaew4bxjd7ln.onion/$2}xms;
}{$1tor+https://cdn-fastly.deb.debian.org/debian-security/$2}xms;
s{
^
......
......@@ -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 "vwakviie2ienjx6t.onion,sgvtcaew4bxjd7ln.onion,umjqavufhoix3smyq6az2sx4istmuvsgmz4bq5u5x56rnayejoo6l2qd.onion,sdscoq7snqtznauu.onion"
Then the only hosts in APT sources are "cdn-fastly.deb.debian.org,umjqavufhoix3smyq6az2sx4istmuvsgmz4bq5u5x56rnayejoo6l2qd.onion,sdscoq7snqtznauu.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
......
......@@ -47,8 +47,6 @@ When /^I configure APT to use non-onion sources$/ do
script = <<-SCRIPT
use strict;
use warnings FATAL => "all";
s{vwakviie2ienjx6t[.]onion}{ftp.us.debian.org};
s{sgvtcaew4bxjd7ln[.]onion}{security.debian.org};
s{sdscoq7snqtznauu[.]onion}{deb.torproject.org};
s{umjqavufhoix3smyq6az2sx4istmuvsgmz4bq5u5x56rnayejoo6l2qd[.]onion}{deb.tails.boum.org};
SCRIPT
......
Supports Markdown
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