diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-06 14:07:17 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-06 14:07:17 -0500 |
| commit | ce1ebea7cc3911ebac616a8a065a484b9452e72b (patch) | |
| tree | aab52e2f06ae31b39a34d59b5432311f30a22911 /templates/distributions.erb | |
| parent | 31a7ed2a84d909215f1f12ed2bb78bb5fe28bbcd (diff) | |
| parent | 50075192d8827d7fa8721ffb6847fedbb4a99c60 (diff) | |
Merge branch 'master' into leap
There were merge conflicts with this merge, but I deliberately
merged with '-s recursive -X theirs' to take the shared modules
version of the changes.
We had some changes that we made, that I will incorporate as
separate commits on top of shared
Diffstat (limited to 'templates/distributions.erb')
| -rw-r--r-- | templates/distributions.erb | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/templates/distributions.erb b/templates/distributions.erb index e93baaf..3e8dea8 100644 --- a/templates/distributions.erb +++ b/templates/distributions.erb @@ -1,43 +1,45 @@ -Origin: <%= reprepro_origin %> -Label: <%= reprepro_origin %> +# This file is managed by Puppet. Do not edit, any changes will be overwritten! + +Origin: <%= @origin %> +Label: <%= @origin %> Suite: oldstable Pull: stable Codename: lenny Version: 5.0 -Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 +Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= reprepro_origin %> specific (or backported) packages -SignWith: <%= reprepro_signwith %> +Description: <%= @origin %> specific (or backported) packages +SignWith: yes Uploaders: uploaders -Origin: <%= reprepro_origin %> -Label: <%= reprepro_origin %> +Origin: <%= @origin %> +Label: <%= @origin %> Suite: stable Pull: testing Codename: squeeze Version: 6.0 -Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 +Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= reprepro_origin %> specific (or backported) packages -SignWith: <%= reprepro_signwith %> +Description: <%= @origin %> specific (or backported) packages +SignWith: yes Uploaders: uploaders -Origin: <%= reprepro_origin %> -Label: <%= reprepro_origin %> +Origin: <%= @origin %> +Label: <%= @origin %> Suite: testing Codename: wheezy -Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 +Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= reprepro_origin %> specific (or backported) packages -SignWith: <%= reprepro_signwith %> +Description: <%= @origin %> specific (or backported) packages +SignWith: yes Uploaders: uploaders -Origin: <%= reprepro_origin %> -Label: <%= reprepro_origin %> +Origin: <%= @origin %> +Label: <%= @origin %> Suite: unstable Codename: sid -Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 +Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= reprepro_origin %> specific (or backported) packages -SignWith: <%= reprepro_signwith %> +Description: <%= @origin %> specific (or backported) packages +SignWith: yes Uploaders: uploaders |