hostprivkey default

Author: reverson

manifests/config.pp

@@ -27,6 +27,7 @@
     'rundir': value => $puppet::rundir;
     'ssldir': value => $puppet::ssldir;
     'privatekeydir': value => '$ssldir/private_keys { group = service }';
+    'hostprivkey': value => $hostprivkey;
     'show_diff': value => $puppet::show_diff;
     'codedir': value => $puppet::codedir;
   }
@@ -73,15 +74,6 @@
       'certname': value => $client_certname;
     }
   }
-  if $hostprivkey {
-    puppet::config::main {
-      'hostprivkey': value => $hostprivkey;
-    }
-  } else {
-    puppet::config::main {
-      'hostprivkey': value => '$privatekeydir/$certname.pem { mode = 640 }';
-    }
-  }
 
   $additional_settings.each |$key,$value| {
     puppet::config::main { $key: value => $value }

manifests/init.pp

@@ -628,7 +628,7 @@
   Optional[Variant[Boolean, Enum['chain', 'leaf']]] $certificate_revocation = $puppet::params::certificate_revocation,
   Optional[String] $prerun_command = $puppet::params::prerun_command,
   Optional[String] $postrun_command = $puppet::params::postrun_command,
-  Optional[String] $hostprivkey = $puppet::params::hostprivkey,
+  String $hostprivkey = $puppet::params::hostprivkey,
   Array[String] $dns_alt_names = $puppet::params::dns_alt_names,
   Boolean $use_srv_records = $puppet::params::use_srv_records,
   Optional[String] $srv_domain = $puppet::params::srv_domain,

manifests/params.pp

@@ -31,7 +31,7 @@
   $prerun_command      = undef
   $postrun_command     = undef
   $server_compile_mode = undef
-  $hostprivkey         = undef
+  $hostprivkey         = '$privatekeydir/$certname.pem { mode = 640 }'
   $dns_alt_names       = []
   $use_srv_records     = false
   $agent_default_schedules = false