Merge branch 'add_secringsource' into leap

Conflicts:
	manifests/repository.pp

1 files changed, 3 insertions, 1 deletions

diff --git a/manifests/repository.pp b/manifests/repository.pp
index 70b9d57..d97db59 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -11,7 +11,8 @@ define reprepro::repository (
   $manage_incoming_conf         = true,
   $handle_incoming_with_cron    = false,
   $handle_incoming_with_inotify = false,
-  $signwith = 'yes'
+  $signwith = 'yes',
+  $secring_source = undef,
 ) {
   include reprepro
 
@@ -86,6 +87,7 @@ define reprepro::repository (
   }
   file { "${basedir}/.gnupg/secring.gpg":
     ensure => present,
+    source => $secring_source,
     mode   => '0600',
   }