Skip to content

Commit

Permalink
Merge pull request #6 from bdellegrazie/override-template
Browse files Browse the repository at this point in the history
Make the pbuilderrc template replaceable
  • Loading branch information
raphink committed Mar 25, 2015
2 parents 1ce010f + 6273ce4 commit 4c84be6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ The pbuilder type takes the following arguments :
Defaults to "/etc/pbuilder"
- cachedir: where to create the aptcache, build and result directories
Defaults to "/var/cache/pbuilder"

- templaterc: the pbuilderrc ERB template to use
Defaults to "pbuilder/pbuilderrc.erb"

This module assumes the following directories:

Expand Down
3 changes: 2 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
$chrootdir = '/var/chroot/pbuilder',
$confdir = '/etc/pbuilder',
$cachedir = '/var/cache/pbuilder',
$rctemplate = 'pbuilder/pbuilderrc.erb',
) {

# Include commons (package and group)
Expand Down Expand Up @@ -103,7 +104,7 @@
require => Exec["confdir-${name}"];
$pbuilderrc:
ensure => file,
content => template('pbuilder/pbuilderrc.erb'),
content => template($rctemplate),
require => Exec["confdir-${name}"];

}
Expand Down

0 comments on commit 4c84be6

Please sign in to comment.