diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 11:58:37 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 11:58:37 -0500 |
| commit | e20017a22d135361980c4889f1827e5ecd3fd1af (patch) | |
| tree | 9e7c44c39cb7b481c8320ff73c785370ed0cba9d /templates/distributions.erb | |
| parent | 4ea15148100fdf0f8b172901c41ba58b06ff0bec (diff) | |
| parent | cc12ced0f3f62c975f9f711da67770ffb33d7ba7 (diff) | |
Merge branch 'master' into leap
this brings our master back to before we made some changes. I've split out
those changes into topic branches, and rebased them on top of the current state
of master. I will merge those in next
Conflicts:
manifests/init.pp
templates/distributions.erb
Diffstat (limited to 'templates/distributions.erb')
| -rw-r--r-- | templates/distributions.erb | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/templates/distributions.erb b/templates/distributions.erb index 350d4da..0e98142 100644 --- a/templates/distributions.erb +++ b/templates/distributions.erb @@ -2,44 +2,28 @@ Origin: <%= @origin %> Label: <%= @origin %> -Suite: oldstable -Pull: stable -Codename: lenny -Version: 5.0 -Architectures: <%= @architectures.join(' ') %> -Components: main non-free contrib -Description: <%= @origin %> specific (or backported) packages -SignWith: <%= signwith %> -Uploaders: uploaders - -Origin: <%= @origin %> -Label: <%= @origin %> Suite: stable Pull: testing -Codename: squeeze -Version: 6.0 +Codename: stable Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= @origin %> specific (or backported) packages -SignWith: <%= signwith %> Uploaders: uploaders Origin: <%= @origin %> Label: <%= @origin %> Suite: testing -Codename: wheezy +Pull: unstable +Codename: testing Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= @origin %> specific (or backported) packages -SignWith: <%= signwith %> +SignWith: yes Uploaders: uploaders Origin: <%= @origin %> Label: <%= @origin %> Suite: unstable -Codename: sid +Codename: unstable Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -Description: <%= @origin %> specific (or backported) packages -SignWith: <%= signwith %> +SignWith: yes Uploaders: uploaders |