Merge pull request #1 from varac/master

Set password for new key, use more secure defaults

2 files changed, 6 insertions, 5 deletions

diff --git a/lib/puppet/provider/gpgkey/gpgme.rb b/lib/puppet/provider/gpgkey/gpgme.rb
index 7a37f45..4e50828 100644
--- a/lib/puppet/provider/gpgkey/gpgme.rb
+++ b/lib/puppet/provider/gpgkey/gpgme.rb
@@ -15,6 +15,7 @@ Puppet::Type.type(:gpgkey).provide(:gpgme) do
     keydata += "Name-Comment: "   +keyname()+"\n"
     keydata += "Name-Email: "     +@resource.value(:email)+"\n"
     keydata += "Expire-Date: "    +@resource.value(:expire)+"\n"
+    keydata += "Passphrase: "     +@resource.value(:password)+"\n"
     keydata += "</GnupgKeyParms>\n"
 
     ctx.genkey(keydata, nil, nil)
diff --git a/lib/puppet/type/gpgkey.rb b/lib/puppet/type/gpgkey.rb
index 83bbd6f..85eafaf 100644
--- a/lib/puppet/type/gpgkey.rb
+++ b/lib/puppet/type/gpgkey.rb
@@ -7,13 +7,13 @@ Puppet::Type.newtype(:gpgkey) do
     end
 
     newparam(:keytype) do
-      defaultto 'DSA'
+      defaultto 'RSA'
       desc 'GPG Key Type'
     end
 
     newparam(:keylength) do
-      defaultto '1024'
-      desc 'Key Length (default 1024)'
+      defaultto '4096'
+      desc 'Key Length (default 4096)'
     end
 
     newparam(:subkeytype) do
@@ -22,8 +22,8 @@ Puppet::Type.newtype(:gpgkey) do
     end
 
     newparam(:subkeylength) do
-      defaultto '1024'
-      desc 'Sub Key Length (default 1024)'
+      defaultto '4096'
+      desc 'Sub Key Length (default 4096)'
     end
 
     newparam(:email) do