summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-06-11 16:49:19 +0000
committerintrigeri <intrigeri@boum.org>2019-06-11 16:49:19 +0000
commita91520c8633a6c5db964239fde12c728ebaddfa7 (patch)
treed55d30b839830eb1bca2bdcff304e40e47805049
parent1c6774527902de5b50aca1939a52771e47204e2f (diff)
parentec384a49fedcc1ad3daed1653f5ea564fc4601fe (diff)
Merge remote-tracking branch 'origin/master' into feature15510feature15510
-rw-r--r--templates/reprepro/snapshots/time_based/torproject/distributions.erb13
-rw-r--r--templates/reprepro/snapshots/time_based/torproject/updates.erb7
2 files changed, 0 insertions, 20 deletions
diff --git a/templates/reprepro/snapshots/time_based/torproject/distributions.erb b/templates/reprepro/snapshots/time_based/torproject/distributions.erb
index 2f98ec5..bf6556a 100644
--- a/templates/reprepro/snapshots/time_based/torproject/distributions.erb
+++ b/templates/reprepro/snapshots/time_based/torproject/distributions.erb
@@ -78,19 +78,6 @@ ValidFor: 10d
Origin: TorProject
Label: TorProject
-Suite: tor-nightly-0.3.4.x-stretch
-Codename: tor-nightly-0.3.4.x-stretch
-Architectures: <%= @architectures['torproject'].join(' ') %>
-Components: main
-<%- if @signwith -%>
-SignWith: <%= @signwith %>
-<%- end -%>
-Update: - torproject-tor-nightly-0.3.4.x-stretch
-Log: torproject-tor-nightly-0.3.4.x-stretch
-ValidFor: 10d
-
-Origin: TorProject
-Label: TorProject
Suite: tor-experimental-0.4.0.x-stretch
Codename: tor-experimental-0.4.0.x-stretch
Architectures: <%= @architectures['torproject'].join(' ') %>
diff --git a/templates/reprepro/snapshots/time_based/torproject/updates.erb b/templates/reprepro/snapshots/time_based/torproject/updates.erb
index 60ff9bd..7211392 100644
--- a/templates/reprepro/snapshots/time_based/torproject/updates.erb
+++ b/templates/reprepro/snapshots/time_based/torproject/updates.erb
@@ -40,13 +40,6 @@ Architectures: <%= @architectures['torproject'].join(' ') %>
Components: main
VerifyRelease: EE8CBC9E886DDD89+
-Name: torproject-tor-nightly-0.3.4.x-stretch
-Method: http://deb.torproject.org/torproject.org
-Suite: tor-nightly-0.3.4.x-stretch
-Architectures: <%= @architectures['torproject'].join(' ') %>
-Components: main
-VerifyRelease: EE8CBC9E886DDD89+
-
Name: torproject-tor-experimental-0.4.0.x-stretch
Method: http://deb.torproject.org/torproject.org
Suite: tor-experimental-0.4.0.x-stretch