Add default keyring path for aptly mirror resource

lib/puppet/provider/aptly_mirror/cli.rb

@@ -17,7 +17,8 @@ def create
       flags: {
         'architectures' => [resource[:architectures]].join(','),
         'with-sources'  => resource[:with_sources],
-        'with-udebs'    => resource[:with_udebs]
+        'with-udebs'    => resource[:with_udebs],
+        'keyring'       => resource[:keyring]
       }
     )
 
@@ -28,7 +29,10 @@ def create
       gid: resource[:gid],
       object: :mirror,
       action: 'update',
-      arguments: [name]
+      arguments: [name],
+      flags: {
+        'keyring' => resource[:keyring]
+      }
     )
   end
 

lib/puppet/type/aptly_mirror.rb

@@ -60,6 +60,11 @@
     defaultto :undef
   end
 
+  newparam(:keyring) do
+    desc 'Set path to keyring. Default /etc/apt/trusted.gpg'
+    defaultto "/etc/apt/trusted.gpg"
+  end
+
   newparam(:with_sources, boolean: true, parent: Puppet::Parameter::Boolean) do
     desc 'Whether to mirror the source packages or not'
     defaultto :false

lib/puppet_x/aptly/cli.rb

@@ -49,7 +49,7 @@ def self.execute(options = {})
 
         begin
           Puppet.debug("Executing: #{cmd}")
-          result = Puppet::Util::Execution.execute(cmd, uid: uid, gid: gid)
+          result = Puppet::Util::Execution.execute(cmd, uid: uid, gid: gid, failonfail: true)
         rescue => e
           raise Puppet::Error, e.message if exceptions
           e.message

manifests/install.pp

@@ -6,11 +6,12 @@
 
   if ! defined(User[$aptly::user]) {
     user { $aptly::user:
-      ensure  => present,
-      uid     => $aptly::uid,
-      gid     => $aptly::group,
-      shell   => '/bin/bash',
-      require => Group[$aptly::group],
+      ensure     => present,
+      uid        => $aptly::uid,
+      gid        => $aptly::group,
+      shell      => '/bin/bash',
+      managehome => true
+      require    => Group[$aptly::group],
     }
   }
 

manifests/mirror.pp

@@ -12,8 +12,12 @@
   $components    = [],
   $with_sources  = false,
   $with_udebs    = false,
+  $keyring       = '/etc/apt/trusted.gpg'
 ) {
-  validate_string( $distribution)
+  validate_string(
+    $distribution,
+    $keyring
+  )
   validate_array(
     $architectures,
     $components
@@ -34,5 +38,6 @@
     components    => $components,
     with_sources  => $with_sources,
     with_udebs    => $with_udebs,
+    keyring       => $keyring,
   }
 }