diff options
| -rw-r--r-- | manifests/repository.pp | 11 | ||||
| -rw-r--r-- | templates/distributions.erb | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/manifests/repository.pp b/manifests/repository.pp index 04aa5db..f5313a6 100644 --- a/manifests/repository.pp +++ b/manifests/repository.pp @@ -11,6 +11,10 @@ define reprepro::repository ( $manage_incoming_conf = true, $handle_incoming_with_cron = false, $handle_incoming_with_inotify = false, + $signwith = 'yes', + $secring_source = undef, + $index_template = 'reprepro/index.html.erb', + $distributions_template = 'reprepro/distributions.erb' $incoming_source = 'puppet:///modules/reprepro/incoming', ) { include reprepro @@ -77,7 +81,7 @@ define reprepro::repository ( file { "${basedir}/index.html": mode => '0664', owner => root, - content => template('reprepro/index.html.erb'), + content => template($index_template), } file { "${basedir}/.gnupg": @@ -86,6 +90,7 @@ define reprepro::repository ( } file { "${basedir}/.gnupg/secring.gpg": ensure => present, + source => $secring_source, mode => '0600', } @@ -104,7 +109,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": @@ -184,7 +189,7 @@ define reprepro::repository ( ensure => $inoticoming_enabled, enable => $inoticoming_enabled, pattern => 'inoticoming.*reprepro.*processincoming', - require => [ Package['inoticoming'], + require => [ Package['reprepro'], Package['inoticoming'], File['/etc/default/reprepro'], File['/etc/init.d/reprepro'], File["${basedir}/incoming"] ], diff --git a/templates/distributions.erb b/templates/distributions.erb index b58b6ea..1f22aab 100644 --- a/templates/distributions.erb +++ b/templates/distributions.erb @@ -7,7 +7,7 @@ Pull: testing Codename: stable Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -SignWith: yes +SignWith: <%= signwith %> Uploaders: uploaders Origin: <%= @origin %> @@ -17,7 +17,7 @@ Pull: unstable Codename: testing Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -SignWith: yes +SignWith: <%= signwith %> Uploaders: uploaders Origin: <%= @origin %> @@ -26,5 +26,5 @@ Suite: unstable Codename: unstable Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -SignWith: yes +SignWith: <%= signwith %> Uploaders: uploaders |