From 7caba367f9d39eca08c88f436bde223b3a50d96f Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 30 Nov 2012 23:42:13 +0100 Subject: default keylength 4096, type rsa --- lib/puppet/type/gpgkey.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 -- cgit v1.2.3 From 1119538e70988b439bb8fe0ed3ffcf0f963f13f8 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 30 Nov 2012 23:51:32 +0100 Subject: set password for key, if given --- lib/puppet/provider/gpgkey/gpgme.rb | 1 + 1 file changed, 1 insertion(+) 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 += "\n" ctx.genkey(keydata, nil, nil) -- cgit v1.2.3