From 4ed9def99c99a6d5c21af18eb0b73a1d6081cbee Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 23 Oct 2012 15:03:54 +0200 Subject: Convert the reprepro class to parametrized format We remove the deprecated dynamic lookup for variables and now have them as class parameters. The reprepro::cron and reprepro::inoticoming classes have been integrated in the reprepro class as two boolean arguments. As these are not mutually exclusive, it is cleaner that way. We add a test manifest for the reprepro class along the way. --- templates/distributions.erb | 30 +++++++++++++++--------------- templates/index.html.erb | 2 +- templates/uploaders.erb | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'templates') diff --git a/templates/distributions.erb b/templates/distributions.erb index 8ec9883..44ba277 100644 --- a/templates/distributions.erb +++ b/templates/distributions.erb @@ -1,55 +1,55 @@ -Origin: <%= @reprepro_origin %> -Label: <%= @reprepro_origin %> +Origin: <%= @origin %> +Label: <%= @origin %> Suite: reallyoldstable Codename: etch Version: 3.0 Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 Components: main non-free contrib -Description: <%= @reprepro_origin %> specific (or backported) packages +Description: <%= @origin %> specific (or backported) packages SignWith: yes Uploaders: uploaders -Origin: <%= @reprepro_origin %> -Label: <%= @reprepro_origin %> +Origin: <%= @origin %> +Label: <%= @origin %> Suite: oldstable Pull: stable Codename: lenny Version: 5.0 Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 Components: main non-free contrib -Description: <%= @reprepro_origin %> specific (or backported) packages +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 Components: main non-free contrib -Description: <%= @reprepro_origin %> specific (or backported) packages +Description: <%= @origin %> specific (or backported) packages SignWith: yes Uploaders: uploaders -Origin: <%= @reprepro_origin %> -Label: <%= @reprepro_origin %> +Origin: <%= @origin %> +Label: <%= @origin %> Suite: testing Pull: unstable Codename: wheezy Architectures: i386 amd64 source kfreebsd-amd64 kfreebsd-i386 Components: main non-free contrib -Description: <%= @reprepro_origin %> specific (or backported) packages +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 Components: main non-free contrib -Description: <%= @reprepro_origin %> specific (or backported) packages +Description: <%= @origin %> specific (or backported) packages SignWith: yes Uploaders: uploaders-sid diff --git a/templates/index.html.erb b/templates/index.html.erb index 1173021..acbe2f7 100644 --- a/templates/index.html.erb +++ b/templates/index.html.erb @@ -5,7 +5,7 @@

Introduction

This is the Debian package repository of <%= @reprepro_origin %>. It is used for internal +

This is the Debian package repository of <%= @origin %>. It is used for internal distribution of locally built packages not yet part of Debian. Feel free to use it for yourself, but it comes at no warranty. diff --git a/templates/uploaders.erb b/templates/uploaders.erb index d962b55..ea64e1d 100644 --- a/templates/uploaders.erb +++ b/templates/uploaders.erb @@ -1,4 +1,4 @@ # reprepro uploaders, file managed by puppet -<% @reprepro_uploaders.each do |uploader| -%> +<% @uploaders.each do |uploader| -%> allow * by key <%= uploader %> <% end -%> -- cgit v1.2.3