Always define the server package

Author: ekohl

manifests/init.pp

@@ -668,7 +668,7 @@
   Boolean $server_ssl_key_manage = true,
   Array[String] $server_ssl_protocols = ['TLSv1.2'],
   Optional[Stdlib::Absolutepath] $server_ssl_chain_filepath = undef,
-  Optional[Variant[String, Array[String]]] $server_package = $puppet::params::server_package,
+  Variant[String, Array[String]] $server_package = $puppet::params::server_package,
   Optional[String] $server_version = undef,
   String $server_certname = $puppet::params::server_certname,
   Integer[0] $server_request_timeout = 60,

manifests/params.pp

@@ -164,7 +164,7 @@
   if ($facts['os']['family'] =~ /(FreeBSD|DragonFly)/) {
     $server_package = "puppetserver${puppet_major}"
   } else {
-    $server_package = undef
+    $server_package = 'puppetserver'
   }
 
   $server_ssl_dir = $ssldir

manifests/server.pp

@@ -392,7 +392,7 @@
   Boolean $ssl_key_manage = $puppet::server_ssl_key_manage,
   Array[String] $ssl_protocols = $puppet::server_ssl_protocols,
   Optional[Stdlib::Absolutepath] $ssl_chain_filepath = $puppet::server_ssl_chain_filepath,
-  Optional[Variant[String, Array[String]]] $package = $puppet::server_package,
+  Variant[String, Array[String]] $package = $puppet::server_package,
   Optional[String] $version = $puppet::server_version,
   String $certname = $puppet::server_certname,
   Integer[0] $request_timeout = $puppet::server_request_timeout,

manifests/server/install.pp

@@ -26,16 +26,15 @@
   }
 
   if $puppet::manage_packages == true or $puppet::manage_packages == 'server' {
-    $server_package = pick($puppet::server::package, 'puppetserver')
     $server_version = pick($puppet::server::version, $puppet::version)
 
-    package { $server_package:
+    package { $puppet::server::package:
       ensure          => $server_version,
       install_options => $puppet::package_install_options,
     }
 
     if $puppet::server::manage_user {
-      Package[$server_package] -> User[$puppet::server::user]
+      Package[$puppet::server::package] -> User[$puppet::server::user]
     }
   }
 }