diff --git a/manifests/params.pp b/manifests/params.pp
index b875be4..623966c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,456 +1,459 @@
 # Default parameters
 class puppet::params {
 
   # Basic config
   $version             = 'present'
   $manage_user         = true
   $user                = 'puppet'
   $group               = 'puppet'
   $ip                  = '0.0.0.0'
   $port                = 8140
   $listen              = false
   $listen_to           = []
   $pluginsync          = true
   $splay               = false
   $splaylimit          = 1800
   $runinterval         = 1800
   $runmode             = 'service'
   $report              = true
 
   # Not defined here as the commands depend on module parameter "dir"
   $cron_cmd            = undef
   $systemd_cmd         = undef
 
   $agent_noop          = false
   $show_diff           = false
   $module_repository   = undef
   $hiera_config        = '$confdir/hiera.yaml'
   $usecacheonfailure   = true
   $ca_server           = undef
   $ca_port             = undef
   $ca_crl_filepath     = undef
   $server_crl_enable   = undef
   $prerun_command      = undef
   $postrun_command     = undef
   $server_compile_mode = undef
   $dns_alt_names       = []
   $use_srv_records     = false
 
   if defined('$::domain') {
     $srv_domain = $::domain
   } else {
     $srv_domain = undef
   }
 
   # lint:ignore:puppet_url_without_modules
   $pluginsource        = 'puppet:///plugins'
   $pluginfactsource    = 'puppet:///pluginfacts'
   # lint:endignore
   $classfile           = '$statedir/classes.txt'
   $syslogfacility      = undef
   $environment         = $::environment
 
   $aio_package      = ($::osfamily == 'Windows' or $::rubysitedir =~ /\/opt\/puppetlabs\/puppet/)
 
   $systemd_randomizeddelaysec = 0
 
   case $::osfamily {
     'Windows' : {
       # Windows prefixes normal paths with the Data Directory's path and leaves 'puppet' off the end
       $dir_prefix                 = 'C:/ProgramData/PuppetLabs/puppet'
       $dir                        = "${dir_prefix}/etc"
       $codedir                    = "${dir_prefix}/etc"
       $logdir                     = "${dir_prefix}/var/log"
       $rundir                     = "${dir_prefix}/var/run"
       $ssldir                     = "${dir_prefix}/etc/ssl"
       $vardir                     = "${dir_prefix}/var"
       $sharedir                   = "${dir_prefix}/share"
       $bindir                     = "${dir_prefix}/bin"
       $root_group                 = undef
       $server_puppetserver_dir    = undef
       $server_puppetserver_vardir = undef
       $server_puppetserver_rundir = undef
       $server_puppetserver_logdir = undef
       $server_ruby_load_paths     = []
       $server_jruby_gem_home      = undef
     }
 
     /^(FreeBSD|DragonFly)$/ : {
       $dir                        = '/usr/local/etc/puppet'
       $codedir                    = '/usr/local/etc/puppet'
       $logdir                     = '/var/log/puppet'
       $rundir                     = '/var/run/puppet'
       $ssldir                     = '/var/puppet/ssl'
       $vardir                     = '/var/puppet'
       $sharedir                   = '/usr/local/share/puppet'
       $bindir                     = '/usr/local/bin'
       $root_group                 = undef
       $server_puppetserver_dir    = '/usr/local/etc/puppetserver'
       $server_puppetserver_vardir = '/var/puppet/server/data/puppetserver'
       $server_puppetserver_rundir = '/var/run/puppetserver'
       $server_puppetserver_logdir = '/var/log/puppetserver'
       $ruby_gem_dir               = regsubst($::rubyversion, '^(\d+\.\d+).*$', '/usr/local/lib/ruby/gems/\1/gems')
       $server_ruby_load_paths     = [$::rubysitedir, "${ruby_gem_dir}/facter-${::facterversion}/lib"]
       $server_jruby_gem_home      = '/var/puppet/server/data/puppetserver/jruby-gems'
     }
 
     'Archlinux' : {
       $dir                        = '/etc/puppetlabs/puppet'
       $codedir                    = '/etc/puppetlabs/code'
       $logdir                     = '/var/log/puppetlabs/puppet'
       $rundir                     = '/var/run/puppetlabs'
       $ssldir                     = '/etc/puppetlabs/puppet/ssl'
       $vardir                     = '/opt/puppetlabs/puppet/cache'
       $sharedir                   = '/opt/puppetlabs/puppet'
       $bindir                     = '/usr/bin'
       $root_group                 = undef
       $server_puppetserver_dir    = undef
       $server_puppetserver_vardir = undef
       $server_puppetserver_rundir = undef
       $server_puppetserver_logdir = undef
       $server_ruby_load_paths     = []
       $server_jruby_gem_home      = undef
     }
 
     default : {
       if $aio_package {
         $dir                        = '/etc/puppetlabs/puppet'
         $codedir                    = '/etc/puppetlabs/code'
         $logdir                     = '/var/log/puppetlabs/puppet'
         $rundir                     = '/var/run/puppetlabs'
         $ssldir                     = '/etc/puppetlabs/puppet/ssl'
         $vardir                     = '/opt/puppetlabs/puppet/cache'
         $sharedir                   = '/opt/puppetlabs/puppet'
         $bindir                     = '/opt/puppetlabs/bin'
         $server_puppetserver_dir    = '/etc/puppetlabs/puppetserver'
         $server_puppetserver_vardir = '/opt/puppetlabs/server/data/puppetserver'
         $server_puppetserver_rundir = '/var/run/puppetlabs/puppetserver'
         $server_puppetserver_logdir = '/var/log/puppetlabs/puppetserver'
         $server_ruby_load_paths     = ['/opt/puppetlabs/puppet/lib/ruby/vendor_ruby']
         $server_jruby_gem_home      = '/opt/puppetlabs/server/data/puppetserver/jruby-gems'
       } else {
         $dir                        = '/etc/puppet'
         $codedir                    =  $::osfamily ? {
           'Debian' => '/etc/puppet/code',
           default  => '/etc/puppet',
         }
         $logdir                     = '/var/log/puppet'
         $rundir                     = '/var/run/puppet'
         $ssldir                     = '/var/lib/puppet/ssl'
         $vardir                     = '/var/lib/puppet'
         $sharedir                   = '/usr/share/puppet'
         $bindir                     = '/usr/bin'
         $server_puppetserver_dir    = '/etc/puppetserver'
         $server_puppetserver_vardir = $vardir
         $server_puppetserver_rundir = undef
         $server_puppetserver_logdir = undef
         $server_ruby_load_paths     = []
         $server_jruby_gem_home      = '/var/lib/puppet/jruby-gems'
       }
       $root_group = undef
     }
   }
 
   $configtimeout = undef
 
   $autosign         = "${dir}/autosign.conf"
   $autosign_entries = []
   $autosign_mode    = '0664'
   $autosign_content = undef
   $autosign_source  = undef
 
   $puppet_cmd = "${bindir}/puppet"
   $puppetserver_cmd = "${bindir}/puppetserver"
 
   $manage_packages = true
 
   if $::osfamily == 'Windows' {
     $dir_owner = undef
     $dir_group = undef
   } elsif $aio_package or $::osfamily == 'Suse' {
     $dir_owner = 'root'
     $dir_group = $root_group
   } else {
     $dir_owner = $user
     $dir_group = $group
   }
 
   $package_provider = $::osfamily ? {
     'windows' => 'chocolatey',
     default   => undef,
   }
 
   $package_source = undef
 
   # Need your own config templates? Specify here:
   $auth_template   = 'puppet/auth.conf.erb'
 
   # Allow any to the CRL. Needed in case of puppet CA proxy
   $allow_any_crl_auth = false
 
   # Authenticated nodes to allow
   $auth_allowed = ['$1']
 
   # Will this host be a puppet agent ?
   $agent                      = true
   $remove_lock                = true
   $client_certname            = $::clientcert
 
   if defined('$::puppetmaster') {
     $puppetmaster             = $::puppetmaster
   } else {
     $puppetmaster             = undef
   }
 
   # Hashes containing additional settings
   $additional_settings        = {}
   $agent_additional_settings  = {}
   $server_additional_settings = {}
 
   # Will this host be a puppetmaster?
   $server                     = false
   $server_ca                  = true
   $server_ca_crl_sync         = false
   $server_reports             = 'foreman'
   $server_external_nodes      = "${dir}/node.rb"
   $server_enc_api             = 'v2'
   $server_report_api          = 'v2'
   $server_request_timeout     = 60
   $server_certname            = $::clientcert
   $server_strict_variables    = false
   $server_http                = false
   $server_http_port           = 8139
 
   # Need a new master template for the server?
   $server_template      = 'puppet/server/puppet.conf.erb'
   # Template for server settings in [main]
   $server_main_template = 'puppet/server/puppet.conf.main.erb'
 
   # The script that is run to determine the reported manifest version. Undef
   # means we determine it in server.pp
   $server_config_version       = undef
 
   # Set 'false' for static environments, or 'true' for git-based workflow
   $server_git_repo             = false
   # Git branch to puppet env mapping for the post receive hook
   $server_git_branch_map       = {}
 
   # Owner of the environments dir: for cases external service needs write
   # access to manage it.
   $server_environments_owner   = $user
   $server_environments_group   = $root_group
   $server_environments_mode    = '0755'
   # Where we store our puppet environments
   $server_envs_dir             = "${codedir}/environments"
   $server_envs_target          = undef
   # Modules in this directory would be shared across all environments
   $server_common_modules_path  = unique(["${server_envs_dir}/common", "${codedir}/modules", "${sharedir}/modules", '/usr/share/puppet/modules'])
 
   # Dynamic environments config, ignore if the git_repo is 'false'
   # Path to the repository
   $server_git_repo_path       = "${vardir}/puppet.git"
   # mode of the repository
   $server_git_repo_mode       = '0755'
   # user of the repository
   $server_git_repo_user       = $user
   # group of the repository
   $server_git_repo_group      = $user
   # Override these if you need your own hooks
   $server_post_hook_content   = 'puppet/server/post-receive.erb'
   $server_post_hook_name      = 'post-receive'
   $server_custom_trusted_oid_mapping = undef
 
   # PuppetDB config
   $server_puppetdb_host = undef
   $server_puppetdb_port = 8081
   $server_puppetdb_swf  = false
 
   # Do you use storeconfigs? (note: not required)
   # - undef if you don't
   # - active_record for 2.X style db
   # - puppetdb for puppetdb
   $server_storeconfigs_backend = undef
 
-  $server_ssl_dir  = $ssldir
-  $server_package     = undef
-  $server_version     = undef
+  $puppet_major = regsubst($::puppetversion, '^(\d+)\..*$', '\1')
+
+  if ($::osfamily =~ /(FreeBSD|DragonFly)/ and versioncmp($puppet_major, '5') >= 0) {
+    $server_package = "puppetserver${puppet_major}"
+  } else {
+    $server_package = undef
+  }
+
+  $server_ssl_dir = $ssldir
+  $server_version = undef
 
   if $aio_package {
     $client_package = ['puppet-agent']
   } elsif ($::osfamily =~ /(FreeBSD|DragonFly)/) {
-    if (versioncmp($::puppetversion, '5.0') > 0) {
-      $client_package = ['puppet5']
-    } else {
-      $client_package = ['puppet4']
-    }
+    $client_package = ["puppet${puppet_major}"]
   } else {
     $client_package = ['puppet']
   }
 
   # Puppet service name
   $service_name = 'puppet'
 
   # Puppet onedshot systemd service and timer name
   $systemd_unit_name = 'puppet-run'
   # Mechanisms to manage and reload/restart the agent
   # If supported on the OS, reloading is prefered since it does not kill a currently active puppet run
   case $::osfamily {
     'Debian' : {
       $agent_restart_command = "/usr/sbin/service ${service_name} reload"
       if ($::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
         $unavailable_runmodes = []
       } else {
         $unavailable_runmodes = ['systemd.timer']
       }
     }
     'Redhat' : {
       # PSBM is a CentOS 6 based distribution
       # it reports its $osreleasemajor as 2, not 6.
       # thats why we're matching for '2' in both parts
       # Amazon Linux is like RHEL6 but reports its osreleasemajor as 2017.
       $osreleasemajor = regsubst($::operatingsystemrelease, '^(\d+)\..*$', '\1') # workaround for the possibly missing operatingsystemmajrelease
       $agent_restart_command = $osreleasemajor ? {
         /^(2|5|6|2017)$/ => "/sbin/service ${service_name} reload",
         '7'       => "/usr/bin/systemctl reload-or-restart ${service_name}",
         default   => undef,
       }
       $unavailable_runmodes = $osreleasemajor ? {
         /^(2|5|6|2017)$/ => ['systemd.timer'],
         default   => [],
       }
     }
     'Windows': {
       $agent_restart_command = undef
       $unavailable_runmodes = ['cron', 'systemd.timer']
     }
     'Archlinux': {
       $agent_restart_command = "/usr/bin/systemctl reload-or-restart ${service_name}"
       $unavailable_runmodes = ['cron']
     }
     default  : {
       $agent_restart_command = undef
       $unavailable_runmodes = ['systemd.timer']
     }
   }
 
   # Foreman parameters
   $lower_fqdn              = downcase($::fqdn)
   $server_foreman          = true
   $server_foreman_facts    = true
   $server_puppet_basedir   = $aio_package ? {
     true  => '/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet',
     false => undef,
   }
   $server_foreman_url      = "https://${lower_fqdn}"
   $server_foreman_ssl_ca   = undef
   $server_foreman_ssl_cert = undef
   $server_foreman_ssl_key  = undef
 
   # Which Parser do we want to use? https://docs.puppetlabs.com/references/latest/configuration.html#parser
   $server_parser = 'current'
 
   # Timeout for cached environments, changed in puppet 3.7.x
   $server_environment_timeout = undef
 
   # puppet server configuration file
   $server_jvm_config = $::osfamily ? {
     'RedHat' => '/etc/sysconfig/puppetserver',
     'Debian' => '/etc/default/puppetserver',
     default  => '/etc/default/puppetserver',
   }
 
   $server_jvm_java_bin      = '/usr/bin/java'
 
   if versioncmp($::puppetversion, '5.0.0') < 0 {
     $server_jvm_extra_args = '-XX:MaxPermSize=256m'
   } else {
     $server_jvm_extra_args = '-Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger'
   }
 
   $server_jvm_cli_args = undef
 
   # This is some very trivial "tuning". See the puppet reference:
   # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
   if ($::memorysize_mb =~ String) {
     $mem_in_mb = scanf($::memorysize_mb, '%i')[0]
   } else {
     $mem_in_mb = 0 + $::memorysize_mb
   }
   if $mem_in_mb >= 3072 {
     $server_jvm_min_heap_size = '2G'
     $server_jvm_max_heap_size = '2G'
     $server_max_active_instances = min(abs($::processorcount), 4)
   } elsif $mem_in_mb >= 1024 {
     $server_max_active_instances = 1
     $server_jvm_min_heap_size = '1G'
     $server_jvm_max_heap_size = '1G'
   } else {
     # VMs with 1GB RAM and a crash kernel enabled usually have an effective 992MB RAM
     $server_max_active_instances = 1
     $server_jvm_min_heap_size = '768m'
     $server_jvm_max_heap_size = '768m'
   }
 
   $server_ssl_dir_manage                  = true
   $server_ssl_key_manage                  = true
   $server_default_manifest                = false
   $server_default_manifest_path           = '/etc/puppet/manifests/default_manifest.pp'
   $server_default_manifest_content        = '' # lint:ignore:empty_string_assignment
   $server_max_requests_per_instance       = 0
   $server_max_queued_requests             = 0
   $server_max_retry_delay                 = 1800
   $server_idle_timeout                    = 1200000
   $server_web_idle_timeout                = 30000
   $server_connect_timeout                 = 120000
   $server_ca_auth_required                = true
   $server_admin_api_whitelist             = [ 'localhost', $lower_fqdn ]
   $server_ca_client_whitelist             = [ 'localhost', $lower_fqdn ]
   $server_cipher_suites                   = [ 'TLS_RSA_WITH_AES_256_CBC_SHA256', 'TLS_RSA_WITH_AES_256_CBC_SHA', 'TLS_RSA_WITH_AES_128_CBC_SHA256', 'TLS_RSA_WITH_AES_128_CBC_SHA' ]
   $server_ssl_protocols                   = [ 'TLSv1.2' ]
   $server_ssl_chain_filepath              = "${server_ssl_dir}/ca/ca_crt.pem"
   $server_check_for_updates               = true
   $server_environment_class_cache_enabled = false
   $server_allow_header_cert_info          = false
   $server_ca_allow_sans                   = false
   $server_ca_allow_auth_extensions        = false
   $server_ca_enable_infra_crl             = false
 
   # Puppetserver >= 2.2 Which auth.conf shall we use?
   $server_use_legacy_auth_conf      = false
 
   # For Puppetserver, certain configuration parameters are version specific. We assume a particular version here.
   if versioncmp($::puppetversion, '6.0.0') >= 0 {
     $server_puppetserver_version = '6.0.0'
   } elsif versioncmp($::puppetversion, '5.5.7') >= 0 {
     $server_puppetserver_version = '5.3.6'
   } elsif versioncmp($::puppetversion, '5.5.0') >= 0 {
     $server_puppetserver_version = '5.3.0'
   } elsif versioncmp($::puppetversion, '5.1.0') >= 0 {
     $server_puppetserver_version = '5.1.0'
   } elsif versioncmp($::puppetversion, '5.0.0') >= 0 {
     $server_puppetserver_version = '5.0.0'
   } else {
     $server_puppetserver_version = '2.7.0'
   }
 
   # For Puppetserver 5, use JRuby 9k?
   $server_puppetserver_jruby9k      = false
 
   # this switch also controls Ruby profiling, by default disabled for Puppetserver 2.x, enabled for 5.x
   $server_puppetserver_metrics = versioncmp($::puppetversion, '5.0.0') >= 0
 
   # Puppetserver metrics shipping
   $server_metrics_jmx_enable        = true
   $server_metrics_graphite_enable   = false
   $server_metrics_graphite_host     = '127.0.0.1'
   $server_metrics_graphite_port     = 2003
   $server_metrics_server_id         = $lower_fqdn
   $server_metrics_graphite_interval = 5
   $server_metrics_allowed           = undef
 
   # For Puppetserver 5, should the /puppet/experimental route be enabled?
   $server_puppetserver_experimental = true
 
   # Normally agents can only fetch their own catalogs.  If you want some nodes to be able to fetch *any* catalog, add them here.
   $server_puppetserver_trusted_agents = []
 }
diff --git a/metadata.json b/metadata.json
index 61163a1..4ea7765 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,114 +1,115 @@
 {
   "name": "theforeman-puppet",
   "version": "10.1.1",
   "author": "theforeman",
   "summary": "Puppet agent and server configuration",
   "license": "GPL-3.0+",
   "source": "git://github.com/theforeman/puppet-puppet",
   "project_page": "https://github.com/theforeman/puppet-puppet",
   "issues_url": "https://github.com/theforeman/puppet-puppet/issues",
   "description": "Module for installing the Puppet agent and Puppet server",
   "tags": [
     "foreman",
     "puppet",
     "puppetmaster",
     "puppet-server"
   ],
   "dependencies": [
     {
       "name": "puppetlabs/concat",
       "version_requirement": ">= 1.0.0 < 6.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.0 < 6.0.0"
     },
     {
       "name": "puppet/extlib",
       "version_requirement": ">= 3.0.0 < 4.0.0"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 4.6.1 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
         "26"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
         "16.04",
         "18.04"
       ]
     },
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "DragonFly",
       "operatingsystemrelease": [
         "4"
       ]
     },
     {
       "operatingsystem": "Archlinux"
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "windows",
       "operatingsystemrelease": [
         "7",
         "8",
         "2008 R2",
         "2012",
         "2012 R2"
       ]
     }
   ]
 }
diff --git a/spec/classes/puppet_agent_spec.rb b/spec/classes/puppet_agent_spec.rb
index e2f6f7a..3eb3361 100644
--- a/spec/classes/puppet_agent_spec.rb
+++ b/spec/classes/puppet_agent_spec.rb
@@ -1,352 +1,354 @@
 require 'spec_helper'
 require 'deep_merge'
 
 describe 'puppet' do
   on_os_under_test.each do |os, facts|
     context "on #{os}" do
       case facts[:osfamily]
       when 'FreeBSD'
+        puppet_major = facts[:puppetversion].to_i
+
         bindir = '/usr/local/bin'
-        client_package = Puppet.version < '5.0' ? 'puppet4' : 'puppet5'
+        client_package = "puppet#{puppet_major}"
         confdir = '/usr/local/etc/puppet'
         package_provider = nil
       when 'windows'
         bindir = 'C:/ProgramData/PuppetLabs/puppet/bin'
         client_package = 'puppet-agent'
         confdir = 'C:/ProgramData/PuppetLabs/puppet/etc'
         package_provider = 'chocolatey'
       when 'Archlinux'
         bindir = '/usr/bin'
         client_package = 'puppet'
         confdir = '/etc/puppetlabs/puppet'
         package_provider = nil
       else
         bindir = '/opt/puppetlabs/bin'
         client_package = 'puppet-agent'
         confdir = '/etc/puppetlabs/puppet'
         package_provider = nil
       end
 
       let :facts do
         facts.deep_merge(
           # rspec-puppet(-facts) doesn't mock this
           clientcert: 'client.example.com',
           # Cron/systemd timers are based on the IP - make it consistent
           networking: { ip: '192.0.2.100' }
         )
       end
 
       let :params do
         {
           agent: true
         }
       end
 
       describe 'with no custom parameters' do
         # For windows we specify a package provider which doesn't compile
         if facts[:osfamily] != 'windows'
           it { is_expected.to compile.with_all_deps }
         end
 
         # install
         it do
           is_expected.to contain_class('puppet::agent::install')
             .with_manage_packages(true)
             .with_package_name([client_package])
             .with_package_version('present')
             .with_package_provider(package_provider)
             .with_package_source(nil)
             .that_notifies(['Class[puppet::agent::config]', 'Class[puppet::agent::service]'])
         end
 
         it do
           is_expected.to contain_package(client_package)
             .with_ensure('present')
             .with_provider(package_provider)
             .with_source(nil)
         end
 
         # config
         it { is_expected.to contain_class('puppet::agent::config').that_notifies('Class[puppet::agent::service]') }
         it { is_expected.to contain_file(confdir).with_ensure('directory') }
         it { is_expected.to contain_concat("#{confdir}/puppet.conf") }
         it { is_expected.to contain_concat__fragment('puppet.conf_agent').with_content(/^\[agent\]/) }
         it { is_expected.to contain_puppet__config__agent('certname').with_value(facts[:clientcert]) }
         it { is_expected.to contain_puppet__config__agent('report').with_value('true') }
         it { is_expected.not_to contain_puppet__config__agent('prerun_command') }
         it { is_expected.not_to contain_puppet__config__agent('postrun_command') }
 
         if facts[:osfamily] == 'Debian'
           it do
             is_expected.to contain_augeas('puppet::set_start')
               .with_context('/files/etc/default/puppet')
               .with_changes('set START yes')
               .with_incl('/etc/default/puppet')
               .with_lens('Shellvars.lns')
           end
           it { is_expected.to contain_file('/var/lib/puppet/state/agent_disabled.lock').with_ensure(:absent) }
         end
 
         # service
         it { is_expected.to contain_class('puppet::agent::service') }
 
         it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(true) }
         it do
           is_expected.to contain_service('puppet')
             .with_ensure('running')
             .with_name('puppet')
             .with_hasstatus('true')
             .with_enable('true')
         end
 
         it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
         if os =~ /\A(windows|archlinux)/
           it { is_expected.not_to contain_cron('puppet') }
         else
           it { is_expected.to contain_cron('puppet').with_ensure('absent') }
         end
 
         it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
         case os
         when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
           it do
             is_expected.to contain_exec('systemctl-daemon-reload-puppet')
               .with_refreshonly(true)
               .with_command('systemctl daemon-reload')
           end
 
           it do
             is_expected.to contain_service('puppet-run.timer')
               .with_ensure(:stopped)
               .with_provider('systemd')
               .with_name('puppet-run.timer')
               .with_enable(false)
           end
 
           it { is_expected.to contain_file('/etc/systemd/system/puppet-run.timer').with_ensure(:absent) }
           it { is_expected.to contain_file('/etc/systemd/system/puppet-run.service').with_ensure(:absent) }
         else
           it { is_expected.not_to contain_service('puppet-run.timer') }
           it { is_expected.not_to contain_file('/etc/systemd/system/puppet-run.timer') }
           it { is_expected.not_to contain_file('/etc/systemd/system/puppet-run.service') }
           it { is_expected.not_to contain_exec('systemctl-daemon-reload-puppet') }
         end
       end
 
       describe 'set prerun_command will be included in config' do
         let :params do
           super().merge(prerun_command: '/my/prerun')
         end
 
         it { is_expected.to contain_puppet__config__agent('prerun_command').with_value('/my/prerun') }
       end
 
       describe 'set postrun_command will be included in config' do
         let :params do
           super().merge(postrun_command: '/my/postrun')
         end
 
         it { is_expected.to contain_puppet__config__agent('postrun_command').with_value('/my/postrun') }
       end
 
       describe 'with additional settings' do
         let :params do
           super().merge(agent_additional_settings: { 'ignoreschedules' => true })
         end
 
         it { is_expected.to contain_puppet__config__agent('ignoreschedules').with_value('true') }
       end
 
       context 'manage_packages' do
         describe 'when manage_packages => false' do
           let :params do
             super().merge(manage_packages: false)
           end
 
           it { is_expected.not_to contain_package(client_package) }
         end
 
         describe "when manage_packages => 'agent'" do
           let :params do
             super().merge(manage_packages: 'agent')
           end
 
           it { is_expected.to contain_package(client_package) }
         end
 
         describe "when manage_packages => 'server'" do
           let :params do
             super().merge(manage_packages: 'server')
           end
 
           it { is_expected.not_to contain_package(client_package) }
         end
       end
 
       context 'runmode' do
         describe 'when runmode => cron' do
           let :params do
             super().merge(runmode: 'cron')
           end
 
           case os
           when /\A(windows|archlinux)/
             it { is_expected.to raise_error(Puppet::Error, /Runmode of cron not supported on #{facts[:kernel]} operating systems!/) }
           when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_concat__fragment('puppet.conf_agent') }
             if facts[:osfamily] == 'Debian'
               it do
                 is_expected.to contain_augeas('puppet::set_start')
                   .with_context('/files/etc/default/puppet')
                   .with_changes('set START no')
                   .with_incl('/etc/default/puppet')
                   .with_lens('Shellvars.lns')
               end
               it { is_expected.to contain_file('/var/lib/puppet/state/agent_disabled.lock').with_ensure(:absent) }
             end
 
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(true) }
             it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
             it do
               is_expected.to contain_service('puppet')
                 .with_ensure('stopped')
                 .with_name('puppet')
                 .with_hasstatus('true')
                 .with_enable('false')
             end
             it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
             it { is_expected.to contain_service('puppet-run.timer').with_ensure(:stopped) }
             it do
               is_expected.to contain_cron('puppet')
                 .with_command("#{bindir}/puppet agent --config #{confdir}/puppet.conf --onetime --no-daemonize")
                 .with_user('root')
                 .with_minute(%w[10 40])
                 .with_hour('*')
             end
           else
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(true) }
             it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
             it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
             it { is_expected.not_to contain_service('puppet-run.timer') }
             it do
               is_expected.to contain_cron('puppet')
                 .with_command("#{bindir}/puppet agent --config #{confdir}/puppet.conf --onetime --no-daemonize")
                 .with_user('root')
                 .with_minute(%w[10 40])
                 .with_hour('*')
             end
           end
         end
 
         describe 'when runmode => systemd.timer' do
           let :params do
             super().merge(runmode: 'systemd.timer')
           end
 
           case os
           when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
             it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(true) }
             it { is_expected.to contain_service('puppet-run.timer').with_ensure(:running) }
 
             it do
               is_expected.to contain_file('/etc/systemd/system/puppet-run.timer')
                 .with_content(/.*OnCalendar\=\*-\*-\* \*\:10,40:00.*/)
             end
 
             it do
               is_expected.to contain_file('/etc/systemd/system/puppet-run.timer')
                 .with_content(/^RandomizedDelaySec\=0$/)
             end
 
             it do
               is_expected.to contain_file('/etc/systemd/system/puppet-run.service')
                 .with_content(%r{^ExecStart=#{bindir}/puppet agent --config #{confdir}/puppet.conf --onetime --no-daemonize --detailed-exitcode --no-usecacheonfailure$})
             end
 
             it do
               is_expected.to contain_exec('systemctl-daemon-reload-puppet')
                 .with_refreshonly(true)
                 .with_command('systemctl daemon-reload')
             end
 
             it do
               is_expected.to contain_service('puppet-run.timer')
                 .with_provider('systemd')
                 .with_ensure('running')
                 .with_name('puppet-run.timer')
                 .with_enable('true')
             end
           else
             it { is_expected.to raise_error(Puppet::Error, /Runmode of systemd.timer not supported on #{facts[:kernel]} operating systems!/) }
           end
         end
 
         describe 'when runmode => none' do
           let :params do
             super().merge(runmode: 'none')
           end
 
           # For windows we specify a package provider which doesn't compile
           if facts[:osfamily] != 'windows'
             it { is_expected.to compile.with_all_deps }
           end
           it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
           it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
           it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
 
           case os
           when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
             it { is_expected.to contain_service('puppet-run.timer').with_ensure(:stopped) }
           else
             it { is_expected.not_to contain_service('puppet-run.timer') }
           end
         end
       end
 
       describe 'when unavailable_runmodes => ["cron"]' do
         let :params do
           super().merge(unavailable_runmodes: ['cron'])
         end
 
         it { is_expected.not_to contain_cron('puppet') }
       end
 
       describe 'with custom service_name' do
         let :params do
           super().merge(service_name: 'pe-puppet')
         end
 
         it { is_expected.to contain_service('puppet').with_name('pe-puppet') }
       end
 
       context 'with remove_lock => false' do
         let :params do
           super().merge(remove_lock: false)
         end
 
         it { should_not contain_file('/var/lib/puppet/state/agent_disabled.lock') }
       end
 
       context 'with client_certname => false' do
         let :params do
           super().merge(client_certname: false)
         end
 
         it { is_expected.not_to contain_puppet__config__agent('certname') }
       end
 
       context 'with report => false' do
         let :params do
           super().merge(report: false)
         end
 
         it { is_expected.to contain_puppet__config__agent('report').with_value('false') }
       end
     end
   end
 end
diff --git a/spec/classes/puppet_init_spec.rb b/spec/classes/puppet_init_spec.rb
index e898098..a8ac6bb 100644
--- a/spec/classes/puppet_init_spec.rb
+++ b/spec/classes/puppet_init_spec.rb
@@ -1,122 +1,124 @@
 require 'spec_helper'
 
 describe 'puppet' do
   on_os_under_test.each do |os, facts|
     context "on #{os}" do
       case facts[:osfamily]
       when 'FreeBSD'
+        puppet_major = facts[:puppetversion].to_i
+
         puppet_concat    = '/usr/local/etc/puppet/puppet.conf'
         puppet_directory = '/usr/local/etc/puppet'
-        puppet_package   = Puppet.version < '5.0' ? 'puppet4' : 'puppet5'
+        puppet_package   = "puppet#{puppet_major}"
       when 'windows'
         puppet_concat    = 'C:/ProgramData/PuppetLabs/puppet/etc/puppet.conf'
         puppet_directory = 'C:/ProgramData/PuppetLabs/puppet/etc'
         puppet_package   = 'puppet-agent'
       when 'Archlinux'
         puppet_concat    = '/etc/puppetlabs/puppet/puppet.conf'
         puppet_directory = '/etc/puppetlabs/puppet'
         puppet_package   = 'puppet'
       else
         puppet_concat    = '/etc/puppetlabs/puppet/puppet.conf'
         puppet_directory = '/etc/puppetlabs/puppet'
         puppet_package   = 'puppet-agent'
       end
 
       let :facts do
         facts
       end
 
       describe 'with no custom parameters' do
         it { is_expected.to compile.with_all_deps unless facts[:osfamily] == 'windows' }
         it { should contain_class('puppet::agent') }
         it { should contain_class('puppet::config') }
         it { should_not contain_class('puppet::server') }
         it { should contain_file(puppet_directory).with_ensure('directory') }
         it { should contain_concat(puppet_concat) }
         it { should contain_package(puppet_package).with_ensure('present') }
       end
 
       describe 'with server => true', :unless => unsupported_puppetmaster_osfamily(facts[:osfamily]) do
         let :params do {
           :server => true,
         } end
 
         it { is_expected.to compile.with_all_deps }
         it { should contain_class('puppet::server') }
         it { should contain_class('puppet::agent::service').that_requires('Class[puppet::server]') }
       end
 
       describe 'with empty ca_server' do
         let :params do {
           :ca_server => '',
         } end
 
         it { should_not contain_puppet__config__main('ca_server') }
       end
 
       describe 'with ca_server' do
         let :params do {
           :ca_server => 'ca.example.org',
         } end
 
         it { should contain_puppet__config__main('ca_server').with_value('ca.example.org') }
       end
 
       describe 'with undef ca_port' do
         let :params do {
           :ca_port => :undef,
         } end
 
         it { should_not contain_puppet__config__main('ca_port') }
       end
 
       describe 'with ca_port' do
         let :params do {
           :ca_port => 8140,
         } end
 
         it { should contain_puppet__config__main('ca_port').with_value(8140) }
       end
 
       describe 'with package_source => Httpurl' do
         let :params do {
           :package_source => 'https://example.com:123/test'
         } end
 
         if facts[:osfamily] != 'windows'
           it { is_expected.to compile }
         end
       end
 
       describe 'with package_source => Unixpath' do
         let :params do {
           :package_source => '/test/folder/path/source.rpm'
         } end
 
         if facts[:osfamily] != 'windows'
           it { is_expected.to compile }
         end
       end
 
       describe 'with package_source => Windowspath' do
         let :params do {
           :package_source => 'C:\test\folder\path\source.exe'
         } end
 
         if facts[:osfamily] != 'windows'
           it { is_expected.to compile }
         end
       end
 
       describe 'with package_source => foo' do
         let :params do {
           :package_source => 'foo'
         } end
 
         if facts[:osfamily] != 'windows'
           it { is_expected.not_to compile }
         end
       end
     end
   end
 end
diff --git a/spec/classes/puppet_server_spec.rb b/spec/classes/puppet_server_spec.rb
index 400fb10..0abe547 100644
--- a/spec/classes/puppet_server_spec.rb
+++ b/spec/classes/puppet_server_spec.rb
@@ -1,677 +1,681 @@
 require 'spec_helper'
 
 describe 'puppet' do
   on_os_under_test.each do |os, facts|
     context "on #{os}", unless: unsupported_puppetmaster_osfamily(facts[:osfamily]) do
       if facts[:osfamily] == 'FreeBSD'
+        puppet_major = facts[:puppetversion].to_i
+
         codedir             = '/usr/local/etc/puppet'
         conf_d_dir          = '/usr/local/etc/puppetserver/conf.d'
         conf_file           = '/usr/local/etc/puppet/puppet.conf'
         confdir             = '/usr/local/etc/puppet'
         environments_dir    = '/usr/local/etc/puppet/environments'
         etcdir              = '/usr/local/etc/puppet'
         if facts[:puppetversion] >= '6.0'
           puppetcacmd         = '/usr/local/bin/puppetserver ca setup'
         else
           puppetcacmd         = '/usr/local/bin/puppet cert --generate puppetmaster.example.com --allow-dns-alt-names'
         end
         puppetserver_logdir = '/var/log/puppetserver'
         puppetserver_rundir = '/var/run/puppetserver'
         puppetserver_vardir = '/var/puppet/server/data/puppetserver'
         sharedir            = '/usr/local/share/puppet'
         ssldir              = '/var/puppet/ssl'
         vardir              = '/var/puppet'
         rubydir             = %r{^/usr/local/lib/ruby/site_ruby/\d+\.\d+/puppet$}
+        puppetserver_pkg    = puppet_major > 4 ? "puppetserver#{puppet_major}" : 'puppetserver'
       else
         codedir             = '/etc/puppetlabs/code'
         conf_d_dir          = '/etc/puppetlabs/puppetserver/conf.d'
         conf_file           = '/etc/puppetlabs/puppet/puppet.conf'
         confdir             = '/etc/puppetlabs/puppet'
         environments_dir    = '/etc/puppetlabs/code/environments'
         etcdir              = '/etc/puppetlabs/puppet'
         if facts[:puppetversion] >= '6.0'
           puppetcacmd         = '/opt/puppetlabs/bin/puppetserver ca setup'
         else
           puppetcacmd         = '/opt/puppetlabs/bin/puppet cert --generate puppetmaster.example.com --allow-dns-alt-names'
         end
         puppetserver_logdir = '/var/log/puppetlabs/puppetserver'
         puppetserver_rundir = '/var/run/puppetlabs/puppetserver'
         puppetserver_vardir = '/opt/puppetlabs/server/data/puppetserver'
         sharedir            = '/opt/puppetlabs/puppet'
         ssldir              = '/etc/puppetlabs/puppet/ssl'
         vardir              = '/opt/puppetlabs/puppet/cache'
         rubydir             = '/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet'
+        puppetserver_pkg    = 'puppetserver'
       end
 
       let(:facts) { facts }
 
       let(:params) do
         {
           server: true,
           server_certname: 'puppetmaster.example.com'
         }
       end
 
       describe 'with no custom parameters' do
         it { should compile.with_all_deps }
 
         # install
         it { should contain_class('puppet::server::install') }
         it { should contain_user('puppet') }
-        it { should contain_package('puppetserver') }
+        it { should contain_package(puppetserver_pkg) }
 
         # config
         it { should contain_class('puppet::server::config') }
         it { should contain_puppet__config__main('reports').with_value('foreman') }
         it { should contain_puppet__config__main('hiera_config').with_value('$confdir/hiera.yaml') }
         it { should contain_puppet__config__main('environmentpath').with_value(environments_dir) }
         it do
           should contain_puppet__config__main('basemodulepath')
             .with_value(["#{environments_dir}/common", "#{codedir}/modules", "#{sharedir}/modules", '/usr/share/puppet/modules'])
             .with_joiner(':')
         end
         it { should_not contain_puppet__config__main('default_manifest') }
         it { should contain_puppet__config__master('autosign').with_value("#{etcdir}\/autosign.conf \{ mode = 0664 \}") }
         it { should contain_puppet__config__master('ca').with_value('true') }
         it { should contain_puppet__config__master('certname').with_value('puppetmaster.example.com') }
         it { should contain_puppet__config__master('parser').with_value('current') }
         it { should contain_puppet__config__master('strict_variables').with_value('false') }
         it { should contain_puppet__config__master('ssldir').with_value(ssldir) }
         it { should_not contain_puppet__config__master('environment_timeout') }
         it { should_not contain_puppet__config__master('storeconfigs') }
         it { should_not contain_puppet__config__master('storeconfigs_backend') }
         it { should_not contain_puppet__config__master('manifest') }
         it { should_not contain_puppet__config__master('modulepath') }
         it { should_not contain_puppet__config__master('config_version') }
 
         it { should contain_puppet__config__master('external_nodes').with_value("#{etcdir}\/node.rb") }
         it { should contain_puppet__config__master('node_terminus').with_value('exec') }
         it { should contain_puppet__config__master('logdir').with_value(puppetserver_logdir) }
         it { should contain_puppet__config__master('rundir').with_value(puppetserver_rundir) }
         it { should contain_puppet__config__master('vardir').with_value(puppetserver_vardir) }
 
         it 'should set up SSL permissions' do
           should contain_file("#{ssldir}/private_keys") \
             .with_group('puppet') \
             .with_mode('0750')
 
           should contain_file("#{ssldir}/private_keys/puppetmaster.example.com.pem") \
             .with_group('puppet') \
             .with_mode('0640')
 
           should contain_exec('puppet_server_config-create_ssl_dir') \
             .with_creates(ssldir) \
             .with_command("/bin/mkdir -p #{ssldir}") \
             .with_umask('0022')
 
           should contain_exec('puppet_server_config-generate_ca_cert') \
             .with_creates("#{ssldir}/certs/puppetmaster.example.com.pem") \
             .with_command(puppetcacmd) \
             .with_umask('0022') \
             .that_requires(["Concat[#{conf_file}]", 'Exec[puppet_server_config-create_ssl_dir]'])
         end
 
         it { should contain_exec('puppet_server_config-generate_ca_cert').that_notifies('Service[puppetserver]') }
 
         it 'should set up the environments' do
           should contain_file(environments_dir)
             .with_ensure('directory')
             .with_owner('puppet')
             .with_group(nil)
             .with_mode('0755')
 
           should contain_file(sharedir).with_ensure('directory')
 
           should contain_file("#{codedir}/environments/common")
             .with_ensure('directory')
             .with_owner('puppet')
             .with_group(nil)
             .with_mode('0755')
 
           should contain_file("#{sharedir}/modules")
             .with_ensure('directory')
             .with_owner('puppet')
             .with_group(nil)
             .with_mode('0755')
         end
 
         it { should contain_concat(conf_file) }
 
         it { should_not contain_puppet__config__agent('configtimeout') }
         it { should_not contain_class('puppetdb') }
         it { should_not contain_class('puppetdb::master::config') }
         it { should_not contain_file("#{confdir}/custom_trusted_oid_mapping.yaml") }
 
         it { should contain_file("#{confdir}/autosign.conf") }
         it { should_not contain_file("#{confdir}/autosign.conf").with_content(/# Managed by Puppet/) }
         it { should_not contain_file("#{confdir}/autosign.conf").with_content(/foo.bar/) }
 
         it 'should set up the ENC' do
           should contain_class('foreman::puppetmaster')
             .with_foreman_url('https://foo.example.com')
             .with_receive_facts(true)
             .with_puppet_home(puppetserver_vardir)
             .with_puppet_etcdir(etcdir)
             .with_timeout(60)
             .with_puppet_basedir(rubydir)
         end
 
         # service
         it { should contain_class('puppet::server::service') }
         it { should contain_class('puppet::server::puppetserver') }
       end
 
       describe 'with uppercase hostname' do
         let(:facts) do
           super().merge(
             fqdn: 'PUPPETMASTER.example.com',
             # clientcert is always lowercase by Puppet design
             clientcert: 'puppetmaster.example.com'
           )
         end
 
         it { should compile.with_all_deps }
 
         it 'should use lowercase certificates' do
           should contain_class('puppet::server::puppetserver')
             .with_server_ssl_cert("#{ssldir}/certs/puppetmaster.example.com.pem")
             .with_server_ssl_cert_key("#{ssldir}/private_keys/puppetmaster.example.com.pem")
         end
       end
 
       describe 'with ip parameter' do
         let(:params) do
           super().merge(server_ip: '127.0.0.1')
         end
 
         it { should compile.with_all_deps }
         it { should contain_class('puppet::server').with_ip('127.0.0.1') }
         it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(/host: 127.0.0.1/) }
         it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(/ssl-host: 127.0.0.1/) }
       end
 
       context 'manage_packages' do
         tests = {
           false    => false,
           'agent'  => false,
           'server' => true
         }
 
         tests.each do |value, expected|
           describe "when manage_packages => #{value.inspect}" do
             let(:params) do
               super().merge(manage_packages: value)
             end
 
             it { should compile.with_all_deps }
             if expected
-              it { should contain_package('puppetserver') }
+              it { should contain_package(puppetserver_pkg) }
             else
-              it { should_not contain_package('puppetserver') }
+              it { should_not contain_package(puppetserver_pkg) }
             end
           end
         end
       end
 
       describe 'when autosign => true' do
         let(:params) do
           super().merge(autosign: true)
         end
 
         it { should contain_puppet__config__master('autosign').with_value(true) }
       end
 
       describe 'when autosign => /somedir/custom_autosign, autosign_mode => 664' do
         let(:params) do
           super().merge(
             autosign: '/somedir/custom_autosign',
             autosign_mode: '664'
           )
         end
 
         it { should contain_puppet__config__master('autosign').with_value('/somedir/custom_autosign { mode = 664 }') }
       end
 
       describe "when autosign_entries set to ['foo.bar']" do
         let(:params) do
           super().merge(autosign_entries: ['foo.bar'])
         end
 
         it 'should contain autosign.conf with content set' do
           should contain_file("#{confdir}/autosign.conf")
           should contain_file("#{confdir}/autosign.conf").with_content(/# Managed by Puppet/)
           should contain_file("#{confdir}/autosign.conf").with_content(/foo.bar/)
         end
       end
 
       describe "when autosign_content => set to foo.bar and and autosign_entries set to ['foo.bar']=> true" do
         let(:params) do
           super().merge(
             autosign_content: 'foo.bar',
             autosign_entries: ['foo.bar']
           )
         end
 
         it { should raise_error(Puppet::Error, %r{Cannot set both autosign_content/autosign_source and autosign_entries}) }
       end
 
       describe "when autosign_source => set to puppet:///foo/bar and and autosign_entries set to ['foo.bar']=> true" do
         let(:params) do
           super().merge(
             autosign_source: 'puppet:///foo/bar',
             autosign_entries: ['foo.bar']
           )
         end
 
         it { should raise_error(Puppet::Error, %r{Cannot set both autosign_content\/autosign_source and autosign_entries}) }
       end
 
       context 'when autosign => /usr/local/bin/custom_autosign.sh, autosign_mode => 775' do
         let(:params) do
           super().merge(
             autosign: '/usr/local/bin/custom_autosign.sh',
             autosign_mode: '775'
           )
         end
 
         describe "when autosign_content set to 'foo.bar'" do
           let(:params) do
             super().merge(autosign_content: 'foo.bar')
           end
 
           it { should contain_puppet__config__master('autosign').with_value('/usr/local/bin/custom_autosign.sh { mode = 775 }') }
           it { should contain_file('/usr/local/bin/custom_autosign.sh').with_content('foo.bar') }
         end
 
         describe "autosign_source set to 'puppet:///foo/bar'" do
           let(:params) do
             super().merge(autosign_source: 'puppet:///foo/bar')
           end
 
           it { should contain_puppet__config__master('autosign').with_value('/usr/local/bin/custom_autosign.sh { mode = 775 }') }
           it { should contain_file('/usr/local/bin/custom_autosign.sh').with_source('puppet:///foo/bar') }
         end
       end
 
       describe "when hiera_config => '/etc/puppet/hiera/production/hiera.yaml'" do
         let(:params) do
           super().merge(hiera_config: '/etc/puppet/hiera/production/hiera.yaml')
         end
 
         it { should contain_puppet__config__main('hiera_config').with_value('/etc/puppet/hiera/production/hiera.yaml') }
       end
 
       describe 'without foreman' do
         let(:params) do
           super().merge(
             server_foreman: false,
             server_reports: 'store',
             server_external_nodes: ''
           )
         end
 
         it { should_not contain_class('foreman::puppetmaster') }
         it { should_not contain_puppet__config__master('node_terminus') }
         it { should_not contain_puppet__config__master('external_nodes') }
       end
 
       describe 'with server_default_manifest => true and undef content' do
         let(:params) do
           super().merge(server_default_manifest: true)
         end
 
         it { should contain_puppet__config__main('default_manifest').with_value('/etc/puppet/manifests/default_manifest.pp') }
         it { should_not contain_file('/etc/puppet/manifests/default_manifest.pp') }
       end
 
       describe 'with server_default_manifest => true and server_default_manifest_content => "include foo"' do
         let(:params) do
           super().merge(
             server_default_manifest: true,
             server_default_manifest_content: 'include foo'
           )
         end
 
         it { should contain_puppet__config__main('default_manifest').with_value('/etc/puppet/manifests/default_manifest.pp') }
         it { should contain_file('/etc/puppet/manifests/default_manifest.pp').with_content('include foo') }
       end
 
       describe 'with git repo' do
         let(:params) do
           super().merge(server_git_repo: true)
         end
 
         it do
           should contain_class('puppet::server')
             .with_git_repo(true)
             .with_git_repo_path("#{vardir}/puppet.git")
             .with_post_hook_name('post-receive')
         end
 
         it 'should set up the environments directory' do
           should contain_file(environments_dir) \
             .with_ensure('directory') \
             .with_owner('puppet')
         end
 
         it 'should create the puppet user' do
           shell = case facts[:osfamily]
                   when /^(FreeBSD|DragonFly)$/
                     '/usr/local/bin/git-shell'
                   else
                     '/usr/bin/git-shell'
                   end
           should contain_user('puppet')
             .with_shell(shell)
             .that_requires('Class[git]')
         end
 
         it do
           should contain_file(vardir)
             .with_ensure('directory')
             .with_owner('puppet')
         end
 
         it do
           should contain_git__repo('puppet_repo')
             .with_bare(true)
             .with_target("#{vardir}/puppet.git")
             .with_user('puppet')
             .that_requires("File[#{environments_dir}]")
         end
 
         it do
           should contain_file("#{vardir}/puppet.git/hooks/post-receive")
             .with_owner('puppet') \
             .with_mode('0755') \
             .that_requires('Git::Repo[puppet_repo]') \
             .with_content(/BRANCH_MAP = \{[^a-zA-Z=>]\}/)
         end
 
         describe 'with a puppet git branch map' do
           let(:params) do
             super().merge(server_git_branch_map: { 'a' => 'b', 'c' => 'd' })
           end
 
           it 'should add the branch map to the post receive hook' do
             should contain_file("#{vardir}/puppet.git/hooks/post-receive")
               .with_content(/BRANCH_MAP = \{\n  "a" => "b",\n  "c" => "d",\n\}/)
           end
         end
       end
 
       context 'with directory environments owner' do
         let(:params) { super().merge(server_environments_owner: 'apache') }
         it { should contain_file(environments_dir).with_owner('apache') }
       end
 
       context 'with no common modules directory' do
         let(:params) { super().merge(server_common_modules_path: '') }
         it { should_not contain_puppet__config__main('basemodulepath') }
       end
 
       describe 'with SSL path overrides' do
         let(:params) do
           super().merge(
             server_foreman_ssl_ca: '/etc/example/ca.pem',
             server_foreman_ssl_cert: '/etc/example/cert.pem',
             server_foreman_ssl_key: '/etc/example/key.pem'
           )
         end
 
         it 'should pass SSL parameters to the ENC' do
           should contain_class('foreman::puppetmaster')
             .with_ssl_ca('/etc/example/ca.pem')
             .with_ssl_cert('/etc/example/cert.pem')
             .with_ssl_key('/etc/example/key.pem')
         end
       end
 
       describe 'with a PuppetDB host set' do
         let(:params) do
           super().merge(
             server_puppetdb_host: 'mypuppetdb.example.com',
             server_storeconfigs_backend: 'puppetdb'
           )
         end
 
         it 'should configure PuppetDB' do
           should compile.with_all_deps
           should contain_class('puppetdb::master::config')
             .with_puppetdb_server('mypuppetdb.example.com')
             .with_puppetdb_port(8081)
             .with_puppetdb_soft_write_failure(false)
             .with_manage_storeconfigs(false)
             .with_restart_puppet(false)
         end
       end
 
       describe 'with additional settings' do
         let(:params) do
           super().merge(server_additional_settings: { 'stringify_facts' => true })
         end
 
         it 'should configure puppet.conf' do
           should contain_puppet__config__master('stringify_facts').with_value(true)
         end
       end
 
       describe 'with server_parser => future' do
         let(:params) do
           super().merge(server_parser: 'future')
         end
 
         it { should contain_puppet__config__master('parser').with_value('future') }
       end
 
       describe 'with server_environment_timeout set' do
         let(:params) do
           super().merge(server_environment_timeout: '10m')
         end
 
         it { should contain_puppet__config__master('environment_timeout').with_value('10m') }
       end
 
       describe 'with no ssldir managed for master' do
         let(:params) do
           super().merge(server_ssl_dir_manage: false)
         end
 
         it { should_not contain_puppet__config__master('ssl_dir') }
       end
 
       describe 'with ssl key management disabled for server' do
         let(:params) do
           super().merge(
             server_certname: 'servercert',
             server_ssl_dir: '/etc/custom/puppetlabs/puppet/ssl',
             server_ssl_key_manage: false
           )
         end
 
         it { should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/private_keys/servercert.pem') }
       end
 
       describe 'with nondefault CA settings' do
         let(:params) do
           super().merge(server_ca: false)
         end
 
         it { should contain_exec('puppet_server_config-create_ssl_dir') }
         it { should_not contain_exec('puppet_server_config-generate_ca_cert') }
       end
 
       describe 'with server_ca_crl_sync => true' do
         let(:params) do
           super().merge(server_ca_crl_sync: true)
         end
 
         context 'with server_ca => false and running "puppet apply"' do
           let(:params) do
             super().merge(
               server_ca: false,
               server_ssl_dir: '/etc/custom/puppetlabs/puppet/ssl'
             )
           end
 
           it 'should not sync the crl' do
             should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
           end
         end
 
         context 'with server_ca => false: running "puppet agent -t"' do
           let(:params) do
             super().merge(
               server_ca: false,
               server_ssl_dir: '/etc/custom/puppetlabs/puppet/ssl'
             )
           end
 
           let(:facts) do
             facts.merge(servername: 'myserver')
           end
 
           before :context do
             @cacrl = Tempfile.new('cacrl')
             File.open(@cacrl, 'w') { |f| f.write 'This is my CRL File' }
             Puppet.settings[:cacrl] = @cacrl.path
           end
 
           it 'should sync the crl from the ca' do
             should contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
               .with_content('This is my CRL File')
           end
         end
 
         context 'with server_ca => true: running "puppet agent -t"' do
           let(:params) do
             super().merge(
               server_ca: true,
               server_ssl_dir: '/etc/custom/puppetlabs/puppet/ssl'
             )
           end
 
           let(:facts) do
             facts.merge(servername: 'myserver')
           end
 
           it 'should not sync the crl' do
             should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')
           end
         end
       end
 
       describe 'allow crl checking' do
         context 'as ca' do
           let(:params) do
             super().merge(server_ca: true)
           end
 
           it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(%r{ssl-crl-path: #{ssldir}/ca/ca_crl\.pem}) }
         end
 
         context 'as non-ca' do
           let(:params) do
             super().merge(server_ca: false)
           end
 
           it { should contain_file("#{conf_d_dir}/webserver.conf").without_content(%r{ssl-crl-path: #{ssldir}/crl\.pem}) }
 
           context 'server_crl_enable' do
             let(:params) do
               super().merge(server_crl_enable: true)
             end
 
             it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(%r{ssl-crl-path: #{ssldir}/crl\.pem}) }
           end
         end
       end
 
       describe 'with ssl_protocols overwritten' do
         let(:params) do
           super().merge(server_ssl_protocols: ['TLSv1.1', 'TLSv1.2'])
         end
 
         it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(/ssl-protocols: \[\n( +)TLSv1.1,\n( +)TLSv1.2,\n( +)\]/) }
       end
 
       describe 'with ssl_protocols overwritten' do
         let(:params) do
           super().merge(server_cipher_suites: %w[TLS_RSA_WITH_AES_256_CBC_SHA256 TLS_RSA_WITH_AES_256_CBC_SHA])
         end
 
         it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(/cipher-suites: \[\n( +)TLS_RSA_WITH_AES_256_CBC_SHA256,\n( +)TLS_RSA_WITH_AES_256_CBC_SHA,\n( +)\]/) }
       end
 
       describe 'with ssl_chain_filepath overwritten' do
         let(:params) do
           super().merge(server_ssl_chain_filepath: '/etc/example/certchain.pem')
         end
 
         it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(%r{ssl-cert-chain: /etc/example/certchain.pem}) }
       end
 
       describe 'with server_custom_trusted_oid_mapping overwritten' do
         let(:params) do
           super().merge(server_custom_trusted_oid_mapping: {
                           '1.3.6.1.4.1.34380.1.2.1.1' => {
                             shortname: 'myshortname',
                             longname: 'My Long Name'
                           },
                           '1.3.6.1.4.1.34380.1.2.1.2' => {
                             shortname: 'myothershortname'
                           }
                         })
         end
 
         it 'should have a configured custom_trusted_oid_mapping.yaml' do
           verify_exact_contents(catalogue, "#{confdir}/custom_trusted_oid_mapping.yaml", [
                                   '---',
                                   'oid_mapping:',
                                   '  1.3.6.1.4.1.34380.1.2.1.1:',
                                   '    shortname: myshortname',
                                   '    longname: My Long Name',
                                   '  1.3.6.1.4.1.34380.1.2.1.2:',
                                   '    shortname: myothershortname'
                                 ])
         end
       end
 
       describe 'with server_certname parameter' do
         let(:params) do
           super().merge(
             server_certname: 'puppetserver43.example.com',
             server_ssl_dir: '/etc/custom/puppet/ssl'
           )
         end
 
         it 'should put the correct ssl key path in webserver.conf' do
           should contain_file("#{conf_d_dir}/webserver.conf")
             .with_content(%r{ssl-key: /etc/custom/puppet/ssl/private_keys/puppetserver43\.example\.com\.pem})
         end
 
         it 'should put the correct ssl cert path in webserver.conf' do
           should contain_file("#{conf_d_dir}/webserver.conf")
             .with_content(%r{ssl-cert: /etc/custom/puppet/ssl/certs/puppetserver43\.example\.com\.pem})
         end
       end
 
       describe 'with server_http parameter set to true for the puppet class' do
         let(:params) do
           super().merge(server_http: true)
         end
 
         it { should contain_file("#{conf_d_dir}/webserver.conf").with_content(/ host:\s0\.0\.0\.0/).with_content(/ port:\s8139/) }
         it { should contain_file("#{conf_d_dir}/auth.conf").with_content(/allow-header-cert-info: true/) }
       end
 
       describe 'with server_allow_header_cert_info => true' do
         let(:params) do
           super().merge(server_allow_header_cert_info: true)
         end
 
         it { should contain_file("#{conf_d_dir}/auth.conf").with_content(/allow-header-cert-info: true/) }
       end
     end
   end
 end