Added variable for puppet key length and increased default to 2048.

puppet/manifests/init.pp

@@ -9,6 +9,10 @@ class puppet::client {
         $puppet_server = "puppet"
     }
 
+    if ! $puppet_keylength {
+        $puppet_keylength = "2048"
+    }
+
     case $operatingsystem {
         openbsd: { $vardir = "/var/puppet" }
         default: { $vardir = "/var/lib/puppet" }

puppet/templates/puppet.conf.erb

@@ -40,6 +40,9 @@
     pluginsignore = .svn CVS RCS
     factpath = $vardir/lib/facter
 
+    # The bit length of keys.
+    keylength = <%= puppet_keylength %>
+
 <% if puppetversion[/\d+/].to_i >= 2 -%>
 [agent]
 <% else -%>