diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 15:24:02 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 15:24:02 -0500 |
| commit | 5acc8bab68a718d7d91fa4e5b26a515cd88bd680 (patch) | |
| tree | e6db5e010b4dd5b32db018dcdb79177bfbee98bd | |
| parent | d5452d0fa6c843d541c2038f76c6b33a8c96ab4f (diff) | |
| parent | f4c0de8cd4225fab2ff6ef2a5da77d96f762e53c (diff) | |
Merge branch 'add_customizable_distributions' into leap
Conflicts:
manifests/repository.pp
| -rw-r--r-- | manifests/repository.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/repository.pp b/manifests/repository.pp index 768a87c..0b3f4f3 100644 --- a/manifests/repository.pp +++ b/manifests/repository.pp @@ -14,6 +14,7 @@ define reprepro::repository ( $signwith = 'yes', $secring_source = undef, $index_template = 'reprepro/index.html.erb', + $distributions_template = 'reprepro/distributions.erb' ) { include reprepro @@ -107,7 +108,7 @@ define reprepro::repository ( File["${basedir}/conf/distributions"] { owner => root, mode => '0664', - content => template('reprepro/distributions.erb'), + content => template($distributions_template), } exec { "reprepro -b ${basedir} createsymlinks": |