diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-05-08 12:40:15 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-05-08 12:40:15 -0300 |
| commit | 9b0b7e0505d9bc5adeea389a9c8aeb833c4fc13d (patch) | |
| tree | 9945638978ef78cc7baa7b07439b7203b8761071 | |
| parent | dd123cc1aceed8739e202dea5f552a31329217cc (diff) | |
| download | puppet-reprepro-9b0b7e0505d9bc5adeea389a9c8aeb833c4fc13d.tar.gz puppet-reprepro-9b0b7e0505d9bc5adeea389a9c8aeb833c4fc13d.tar.bz2 | |
Using templates instead of plain config files, adding $reprepro_basedir
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | files/uploaders | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 11 | ||||
| -rw-r--r-- | templates/distributions.erb (renamed from files/distributions) | 24 | ||||
| -rw-r--r-- | templates/index.html.erb (renamed from files/index.html) | 12 | ||||
| -rw-r--r-- | templates/uploaders.erb | 4 |
6 files changed, 30 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/files/uploaders b/files/uploaders deleted file mode 100644 index 2625b7b..0000000 --- a/files/uploaders +++ /dev/null @@ -1,2 +0,0 @@ -# anarcat -allow * by key 4023702f diff --git a/manifests/init.pp b/manifests/init.pp index 140bad7..02a8794 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,9 @@ class reprepro { - $basedir = '/srv/reprepro' + $basedir = $reprepro_basedir ? { + '' => '/srv/reprepro', + default => $reprepro_basedir, + } case $lsbdistcodename { etch: { @@ -66,11 +69,11 @@ class reprepro { "$basedir/conf/distributions": mode => 0664, owner => root, group => reprepro, - source => "puppet://$servername/reprepro/distributions"; + content => template("reprepro/distributions.erb"); "$basedir/conf/uploaders": mode => 0660, owner => root, group => reprepro, - source => "puppet://$servername/reprepro/uploaders"; + content => template("reprepro/uploaders.erb"); "$basedir/conf/incoming": mode => 0664, owner => root, group => reprepro, @@ -78,7 +81,7 @@ class reprepro { "$basedir/index.html": mode => 0664, owner => root, group => reprepro, - source => "puppet://$servername/reprepro/index.html"; + source => template("reprepro/index.html.erb"); "$basedir/.gnupg": mode => 750, owner => reprepro, group => root, diff --git a/files/distributions b/templates/distributions.erb index 00dbb02..c295245 100644 --- a/files/distributions +++ b/templates/distributions.erb @@ -1,41 +1,41 @@ -Origin: koumbit -Label: koumbit +Origin: <%= domain %> +Label: <%= domain %> Suite: oldstable Codename: etch Version: 4.0 Architectures: i386 amd64 source Components: main non-free contrib -Description: koumbit specific (or backported) packages +Description: <%= domain %> specific (or backported) packages SignWith: yes Uploaders: uploaders -Origin: koumbit -Label: koumbit +Origin: <%= domain %> +Label: <%= domain %> Suite: stable Codename: lenny Version: 5.0 Architectures: i386 amd64 source Components: main non-free contrib -Description: koumbit specific (or backported) packages +Description: <%= domain %> specific (or backported) packages SignWith: yes Uploaders: uploaders -Origin: koumbit -Label: koumbit +Origin: <%= domain %> +Label: <%= domain %> Suite: testing Codename: squeeze Architectures: i386 amd64 source Components: main non-free contrib -Description: koumbit specific (or backported) packages +Description: <%= domain %> specific (or backported) packages SignWith: yes Uploaders: uploaders -Origin: koumbit -Label: koumbit +Origin: <%= domain %> +Label: <%= domain %> Suite: unstable Codename: sid Architectures: i386 amd64 source Components: main non-free contrib -Description: koumbit specific (or backported) packages +Description: <%= domain %> specific (or backported) packages SignWith: yes Uploaders: uploaders diff --git a/files/index.html b/templates/index.html.erb index ffcaf4a..719460e 100644 --- a/files/index.html +++ b/templates/index.html.erb @@ -1,22 +1,22 @@ <html> <head> -<title>Koumbit Debian package repository</title> +<title><%= domain %> Debian package repository</title> </head> <body> <h1>Introduction</h1> -<p>This is the Debian package repository of Koumbit. It is used for internal +<p>This is the Debian package repository of <%= domain %>. 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, see <a -href="https://wiki.koumbit.net/Beta">the Beta page</a> for more information.</p> +href="https://wiki.<%= domain %>/Beta">the Beta page</a> for more information.</p> <h1>How to use</h1> <p>In your /etc/apt/source.list: <pre> -deb http://debian.koumbit.net/debian lenny main -deb-src http://debian.koumbit.net/debian lenny main +deb http://debian.<%= domain %>/debian lenny main +deb-src http://debian.<%= domain %>/debian lenny main </pre> "lenny", of course, can be replaced by your distribution. Know that we usually @@ -32,7 +32,7 @@ more precise).</p> <p>The key of the archive is in the <a href="/key.asc">key.asc file</a>. You should add the key using something like this:</p> <pre> -wget http://debian.koumbit.net/debian/key.asc +wget http://debian.<%= domain %>/debian/key.asc apt-key add key.asc apt-get update </pre> diff --git a/templates/uploaders.erb b/templates/uploaders.erb new file mode 100644 index 0000000..560e3ce --- /dev/null +++ b/templates/uploaders.erb @@ -0,0 +1,4 @@ +# reprepro uploaders, file managed by puppet +<% reprepro_upladers.each do |uploader| -%> +allow * by key <%= uploader %> +<% end -%> |