diff --git a/manifests/server/puppetserver.pp b/manifests/server/puppetserver.pp
index 42f89ec..48ec55d 100644
--- a/manifests/server/puppetserver.pp
+++ b/manifests/server/puppetserver.pp
@@ -1,417 +1,408 @@
 # == Class: puppet::server::puppetserver
 #
 # Configures the puppetserver jvm configuration file using augeas.
 #
 # === Parameters:
 #
 # * `java_bin`
 # Path to the java executable to use
 #
 # * `config`
 # Path to the jvm configuration file.
 # This file is usually either /etc/default/puppetserver or
 # /etc/sysconfig/puppetserver depending on your *nix flavor.
 #
 # * `jvm_min_heap_size`
 # Translates into the -Xms option and is added to the JAVA_ARGS
 #
 # * `jvm_max_heap_size`
 # Translates into the -Xmx option and is added to the JAVA_ARGS
 #
 # * `jvm_extra_args`
 # Custom options to pass through to the java binary. These get added to
 # the end of the JAVA_ARGS variable
 #
 # * `jvm_cli_args`
 # Custom options to pass through to the java binary when using a
 # puppetserver subcommand, (eg puppetserver gem). These get used
 # in the JAVA_ARGS_CLI variable.
 #
 # * `server_puppetserver_dir`
 # Puppetserver config directory
 #
 # * `server_puppetserver_vardir`
 # Puppetserver var directory
 #
 # * `server_jruby_gem_home`
 # Puppetserver jruby gemhome
 #
 # * `server_cipher_suites`
 # Puppetserver array of acceptable ciphers
 #
 # * `server_ssl_protocols`
 # Puppetserver array of acceptable ssl protocols
 #
 # * `server_max_active_instances`
 # Puppetserver number of max jruby instances
 #
 # * `server_max_requests_per_instance`
 # Puppetserver number of max requests per jruby instance
 #
 # * `server_max_queued_requests`
 # The maximum number of requests that may be queued waiting
 # to borrow a JRuby from the pool.
 #
 # * `server_max_retry_delay`
 # Sets the upper limit for the random sleep set as a Retry-After
 # header on 503 responses returned when max-queued-requests is enabled.
 #
 # === Example
 #
 # @example
 #
 #   # configure memory for java < 8
 #   class {'::puppet::server::puppetserver':
 #     jvm_min_heap_size => '1G',
 #     jvm_max_heap_size => '3G',
 #     jvm_extra_args    => '-XX:MaxPermSize=256m',
 #   }
 #
 class puppet::server::puppetserver (
   $config                                 = $::puppet::server::jvm_config,
   $java_bin                               = $::puppet::server::jvm_java_bin,
   $jvm_extra_args                         = $::puppet::server::jvm_extra_args,
   $jvm_cli_args                           = $::puppet::server::jvm_cli_args,
   $jvm_min_heap_size                      = $::puppet::server::jvm_min_heap_size,
   $jvm_max_heap_size                      = $::puppet::server::jvm_max_heap_size,
   $server_puppetserver_dir                = $::puppet::server::puppetserver_dir,
   $server_puppetserver_vardir             = $::puppet::server::puppetserver_vardir,
   $server_puppetserver_rundir             = $::puppet::server::puppetserver_rundir,
   $server_puppetserver_logdir             = $::puppet::server::puppetserver_logdir,
   $server_jruby_gem_home                  = $::puppet::server::jruby_gem_home,
   $server_ruby_load_paths                 = $::puppet::server::ruby_load_paths,
   $server_cipher_suites                   = $::puppet::server::cipher_suites,
   $server_max_active_instances            = $::puppet::server::max_active_instances,
   $server_max_requests_per_instance       = $::puppet::server::max_requests_per_instance,
   $server_max_queued_requests             = $::puppet::server::max_queued_requests,
   $server_max_retry_delay                 = $::puppet::server::max_retry_delay,
   $server_ssl_protocols                   = $::puppet::server::ssl_protocols,
   $server_ssl_ca_crl                      = $::puppet::server::ssl_ca_crl,
   $server_ssl_ca_cert                     = $::puppet::server::ssl_ca_cert,
   $server_ssl_cert                        = $::puppet::server::ssl_cert,
   $server_ssl_cert_key                    = $::puppet::server::ssl_cert_key,
   $server_ssl_chain                       = $::puppet::server::ssl_chain,
   $server_crl_enable                      = $::puppet::server::crl_enable_real,
   $server_ip                              = $::puppet::server::ip,
   $server_port                            = $::puppet::server::port,
   $server_http                            = $::puppet::server::http,
   $server_http_allow                      = $::puppet::server::http_allow,
   $server_http_port                       = $::puppet::server::http_port,
   $server_ca                              = $::puppet::server::ca,
   $server_dir                             = $::puppet::server::dir,
   $codedir                                = $::puppet::server::codedir,
   $server_idle_timeout                    = $::puppet::server::idle_timeout,
   $server_web_idle_timeout                = $::puppet::server::web_idle_timeout,
   $server_connect_timeout                 = $::puppet::server::connect_timeout,
   $server_ca_auth_required                = $::puppet::server::ca_auth_required,
   $server_ca_client_whitelist             = $::puppet::server::ca_client_whitelist,
   $server_admin_api_whitelist             = $::puppet::server::admin_api_whitelist,
   $server_puppetserver_version            = $::puppet::server::puppetserver_version,
   $server_use_legacy_auth_conf            = $::puppet::server::use_legacy_auth_conf,
   $server_check_for_updates               = $::puppet::server::check_for_updates,
   $server_environment_class_cache_enabled = $::puppet::server::environment_class_cache_enabled,
   $server_jruby9k                         = $::puppet::server::puppetserver_jruby9k,
   $server_metrics                         = $::puppet::server::puppetserver_metrics,
   $metrics_jmx_enable                     = $::puppet::server::metrics_jmx_enable,
   $metrics_graphite_enable                = $::puppet::server::metrics_graphite_enable,
   $metrics_graphite_host                  = $::puppet::server::metrics_graphite_host,
   $metrics_graphite_port                  = $::puppet::server::metrics_graphite_port,
   $metrics_server_id                      = $::puppet::server::metrics_server_id,
   $metrics_graphite_interval              = $::puppet::server::metrics_graphite_interval,
   $metrics_allowed                        = $::puppet::server::metrics_allowed,
   $server_experimental                    = $::puppet::server::puppetserver_experimental,
   $server_trusted_agents                  = $::puppet::server::puppetserver_trusted_agents,
   $allow_header_cert_info                 = $::puppet::server::allow_header_cert_info,
   $compile_mode                           = $::puppet::server::compile_mode,
 ) {
   include ::puppet::server
 
   if versioncmp($server_puppetserver_version, '2.2') < 0 {
     fail('puppetserver <2.2 is not supported by this module version')
   }
 
   if !(empty($server_http_allow)) {
     fail('setting $server_http_allow is not supported for puppetserver as it would have no effect')
   }
 
   $puppetserver_package = pick($::puppet::server::package, 'puppetserver')
 
   $jvm_cmd_arr = ["-Xms${jvm_min_heap_size}", "-Xmx${jvm_max_heap_size}", $jvm_extra_args]
   $jvm_cmd = strip(join(flatten($jvm_cmd_arr), ' '))
 
   if $::osfamily == 'FreeBSD' {
     augeas { 'puppet::server::puppetserver::jvm':
       context => '/files/etc/rc.conf',
       changes => [ "set puppetserver_java_opts '\"${jvm_cmd}\"'" ],
     }
   } else {
     if $jvm_cli_args {
       $changes = [
         "set JAVA_ARGS '\"${jvm_cmd}\"'",
         "set JAVA_BIN ${java_bin}",
         "set JAVA_ARGS_CLI '\"${jvm_cli_args}\"'",
       ]
     } else {
       $changes = [
         "set JAVA_ARGS '\"${jvm_cmd}\"'",
         "set JAVA_BIN ${java_bin}",
       ]
     }
     augeas { 'puppet::server::puppetserver::jvm':
       lens    => 'Shellvars.lns',
       incl    => $config,
       context => "/files${config}",
       changes => $changes,
     }
 
     if versioncmp($server_puppetserver_version, '2.4.99') == 0 {
       $bootstrap_paths = "${server_puppetserver_dir}/bootstrap.cfg,${server_puppetserver_dir}/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
     } elsif versioncmp($server_puppetserver_version, '2.5') >= 0 {
       $bootstrap_paths = "${server_puppetserver_dir}/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
     } else { # 2.4
       $bootstrap_paths = "${server_puppetserver_dir}/bootstrap.cfg"
     }
 
     augeas { 'puppet::server::puppetserver::bootstrap':
       lens    => 'Shellvars.lns',
       incl    => $config,
       context => "/files${config}",
       changes => "set BOOTSTRAP_CONFIG '\"${bootstrap_paths}\"'",
     }
 
     if versioncmp($server_puppetserver_version, '5.0') >= 0 {
       $jruby_jar_changes = $server_jruby9k ? {
         true    => "set JRUBY_JAR '\"/opt/puppetlabs/server/apps/puppetserver/jruby-9k.jar\"'",
         default => 'rm JRUBY_JAR'
       }
 
       augeas { 'puppet::server::puppetserver::jruby_jar':
         lens    => 'Shellvars.lns',
         incl    => $config,
         context => "/files${config}",
         changes => $jruby_jar_changes,
       }
     }
   }
 
   # 2.4.99 configures for both 2.4 and 2.5 making upgrades and new installations easier when the
   # precise version available isn't known
   if versioncmp($server_puppetserver_version, '2.4.99') >= 0 {
     $servicesd = "${server_puppetserver_dir}/services.d"
     file { $servicesd:
       ensure => directory,
     }
     file { "${servicesd}/ca.cfg":
       ensure  => file,
       content => template('puppet/server/puppetserver/services.d/ca.cfg.erb'),
     }
 
     unless $::osfamily == 'FreeBSD' {
       file { '/opt/puppetlabs/server/apps/puppetserver/config':
         ensure => directory,
       }
       file { '/opt/puppetlabs/server/apps/puppetserver/config/services.d':
         ensure => directory,
       }
     }
   }
 
   if versioncmp($server_puppetserver_version, '2.5') < 0 {
     $bootstrapcfg = "${server_puppetserver_dir}/bootstrap.cfg"
     file { $bootstrapcfg:
       ensure => file,
     }
 
     $ca_enabled_ensure = $server_ca ? {
       true    => present,
       default => absent,
     }
 
     $ca_disabled_ensure = $server_ca ? {
       false   => present,
       default => absent,
     }
 
     file_line { 'ca_enabled':
       ensure  => $ca_enabled_ensure,
       path    => $bootstrapcfg,
       line    => 'puppetlabs.services.ca.certificate-authority-service/certificate-authority-service',
       require => File[$bootstrapcfg],
     }
 
     file_line { 'ca_disabled':
       ensure  => $ca_disabled_ensure,
       path    => $bootstrapcfg,
       line    => 'puppetlabs.services.ca.certificate-authority-disabled-service/certificate-authority-disabled-service',
       require => File[$bootstrapcfg],
     }
 
     if versioncmp($server_puppetserver_version, '2.3') >= 0 {
       $versioned_code_service_ensure = present
     } else {
       $versioned_code_service_ensure = absent
     }
 
     file_line { 'versioned_code_service':
       ensure  => $versioned_code_service_ensure,
       path    => $bootstrapcfg,
       line    => 'puppetlabs.services.versioned-code-service.versioned-code-service/versioned-code-service',
       require => File[$bootstrapcfg],
     }
   }
 
   file { "${server_puppetserver_dir}/conf.d/ca.conf":
     ensure => absent,
   }
 
   file { "${server_puppetserver_dir}/conf.d/puppetserver.conf":
     ensure  => file,
     content => template('puppet/server/puppetserver/conf.d/puppetserver.conf.erb'),
   }
 
   file { "${server_puppetserver_dir}/conf.d/auth.conf":
     ensure  => file,
     content => template('puppet/server/puppetserver/conf.d/auth.conf.erb'),
   }
 
   $webserver_conf = "${server_puppetserver_dir}/conf.d/webserver.conf"
 
   file { $webserver_conf:
     ensure  => file,
   }
 
   $webserver_general_settings = {
     'webserver.access-log-config'         => "${server_puppetserver_dir}/request-logging.xml",
     'webserver.client-auth'               => 'want',
     'webserver.ssl-host'                  => $server_ip,
     'webserver.ssl-port'                  => $server_port,
     'webserver.ssl-cert'                  => $server_ssl_cert,
     'webserver.ssl-key'                   => $server_ssl_cert_key,
     'webserver.ssl-ca-cert'               => $server_ssl_ca_cert,
     'webserver.idle-timeout-milliseconds' => $server_web_idle_timeout,
     'webserver.ssl-protocols'             => $server_ssl_protocols,
     'webserver.cipher-suites'             => $server_cipher_suites,
   }
 
   $webserver_general_settings.each |$setting, $value| {
     hocon_setting { $setting:
       ensure  => present,
       path    => $webserver_conf,
       setting => $setting,
       value   => $value,
       require => File[$webserver_conf],
     }
   }
 
   $webserver_http_settings_ensure = $server_http ? {
     true    => present,
     default => absent,
   }
 
   $webserver_http_settings = {
     'webserver.host' => $server_ip,
     'webserver.port' => $server_http_port,
   }
 
   $webserver_http_settings.each |$setting, $value| {
     hocon_setting { $setting:
       ensure  => $webserver_http_settings_ensure,
       path    => $webserver_conf,
       setting => $setting,
       value   => $value,
       require => File[$webserver_conf],
     }
   }
 
   $webserver_crl_settings_ensure = $server_crl_enable ? {
     true    => present,
     default => absent,
   }
 
   hocon_setting { 'webserver.ssl-crl-path':
     ensure  => $webserver_crl_settings_ensure,
     path    => $webserver_conf,
     setting => 'webserver.ssl-crl-path',
     value   => $server_ssl_ca_crl,
     require => File[$webserver_conf],
   }
 
   $webserver_ca_settings_ensure = $server_ca ? {
     true    => present,
     default => absent,
   }
 
   hocon_setting { 'webserver.ssl-cert-chain':
     ensure  => $webserver_ca_settings_ensure,
     path    => $webserver_conf,
     setting => 'webserver.ssl-cert-chain',
     value   => $server_ssl_chain,
     require => File[$webserver_conf],
   }
 
-  $product_conf = "${server_puppetserver_dir}/conf.d/product.conf"
-
   if versioncmp($server_puppetserver_version, '2.7') >= 0 {
     $product_conf_ensure = file
-
-    hocon_setting { 'product.check-for-updates':
-      ensure  => present,
-      path    => $product_conf,
-      setting => 'product.check-for-updates',
-      value   => $server_check_for_updates,
-      require => File[$product_conf],
-    }
   } else {
     $product_conf_ensure = absent
   }
 
-  file { $product_conf:
-    ensure => $product_conf_ensure,
+  file { "${server_puppetserver_dir}/conf.d/product.conf":
+    ensure  => $product_conf_ensure,
+    content => template('puppet/server/puppetserver/conf.d/product.conf.erb'),
   }
 
   if versioncmp($server_puppetserver_version, '5.0') >= 0 {
     $metrics_conf = "${server_puppetserver_dir}/conf.d/metrics.conf"
 
     $metrics_conf_ensure = $server_metrics ? {
       true    => file,
       default => absent
     }
 
     file { $metrics_conf:
       ensure  => $metrics_conf_ensure,
     }
 
     $metrics_general_settings = {
       'metrics.server-id'                                          => $metrics_server_id,
       'metrics.registries.puppetserver.reporters.jmx.enabled'      => $metrics_jmx_enable,
       'metrics.registries.puppetserver.reporters.graphite.enabled' => $metrics_graphite_enable,
       'metrics.reporters.graphite.host'                            => $metrics_graphite_host,
       'metrics.reporters.graphite.port'                            => $metrics_graphite_port,
       'metrics.reporters.graphite.update-interval-seconds'         => $metrics_graphite_interval,
     }
 
     $metrics_general_settings.each |$setting, $value| {
       hocon_setting { $setting:
         ensure  => present,
         path    => $metrics_conf,
         setting => $setting,
         value   => $value,
         require => File[$metrics_conf],
       }
     }
 
     $metrics_allowed_settings = $metrics_allowed ? {
       undef   => absent,
       default => present,
     }
 
     hocon_setting { 'metrics.registries.puppetserver.metrics-allowed':
       ensure  => $metrics_allowed_settings,
       path    => $metrics_conf,
       setting => 'metrics.registries.puppetserver.metrics-allowed',
       value   => $metrics_allowed,
       type    => 'array',
       require => File[$metrics_conf],
     }
   }
 }
diff --git a/spec/classes/puppet_server_puppetserver_spec.rb b/spec/classes/puppet_server_puppetserver_spec.rb
index a573865..06d6b76 100644
--- a/spec/classes/puppet_server_puppetserver_spec.rb
+++ b/spec/classes/puppet_server_puppetserver_spec.rb
@@ -1,871 +1,863 @@
 require 'spec_helper'
 
 describe 'puppet::server::puppetserver' do
   on_os_under_test.each do |os, facts|
     next if facts[:osfamily] == 'windows'
     next if facts[:osfamily] == 'Archlinux'
     context "on #{os}" do
       let :pre_condition do
         "class {'puppet': server_implementation => 'puppetserver'}"
       end
 
       let(:facts) do
         facts
       end
 
       let(:default_params) do {
         :java_bin                               => '/usr/bin/java',
         :config                                 => '/etc/default/puppetserver',
         :jvm_min_heap_size                      => '2G',
         :jvm_max_heap_size                      => '2G',
         :jvm_extra_args                         => '',
         :jvm_cli_args                           => false, # In reality defaults to undef
         :server_ca_auth_required                => true,
         :server_ca_client_whitelist             => [ 'localhost', 'puppetserver123.example.com' ],
         :server_admin_api_whitelist             => [ 'localhost', 'puppetserver123.example.com' ],
         :server_ruby_load_paths                 => [ '/some/path', ],
         :server_ssl_protocols                   => [ 'TLSv1.2', ],
         :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_max_active_instances            => 2,
         :server_max_requests_per_instance       => 0,
         :server_max_queued_requests             => 0,
         :server_max_retry_delay                 => 1800,
         :server_http                            => false,
         :server_http_allow                      => [],
         :server_ca                              => true,
         :server_puppetserver_version            => '2.4.99',
         :server_use_legacy_auth_conf            => false,
         :server_puppetserver_dir                => '/etc/custom/puppetserver',
         :server_puppetserver_vardir             => '/opt/puppetlabs/server/data/puppetserver',
         :server_puppetserver_rundir             => '/var/run/puppetlabs/puppetserver',
         :server_puppetserver_logdir             => '/var/log/puppetlabs/puppetserver',
         :server_jruby_gem_home                  => '/opt/puppetlabs/server/data/puppetserver/jruby-gems',
         :server_dir                             => '/etc/puppetlabs/puppet',
         :codedir                                => '/etc/puppetlabs/code',
         :server_idle_timeout                    => 1200000,
         :server_web_idle_timeout                => 30000,
         :server_connect_timeout                 => 120000,
         :server_check_for_updates               => true,
         :server_environment_class_cache_enabled => false,
         :server_jruby9k                         => false,
         :server_metrics                         => true,
         :metrics_jmx_enable                     => true,
         :metrics_graphite_enable                => true,
         :metrics_graphite_host                  => 'graphitehost.example.com',
         :metrics_graphite_port                  => 2003,
         :metrics_server_id                      => 'puppetserver.example.com',
         :metrics_graphite_interval              => 5,
         :metrics_allowed                        => ['single.element.array'],
         :server_experimental                    => true,
         :server_ip                              => '0.0.0.0',
         :server_port                            => '8140',
         :server_http_port                       => '8139',
         :server_ssl_ca_crl                      => '/etc/puppetlabs/puppet/ssl/ca/ca_crl.pem',
         :server_ssl_ca_cert                     => '/etc/puppetlabs/puppet/ssl/ca/ca_crt.pem',
         :server_ssl_cert                        => '/etc/puppetlabs/puppet/ssl/certs/puppetserver123.example.com.pem',
         :server_ssl_cert_key                    => '/etc/puppetlabs/puppet/ssl/private_keys/puppetserver123.example.com.pem',
         :server_ssl_chain                       => '/etc/puppetlabs/puppet/ssl/ca/ca_crt.pem',
         :server_crl_enable                      => true,
         :server_trusted_agents                  => [],
         :allow_header_cert_info                 => false,
         :compile_mode                           => 'off', # In reality defaults to undef
       } end
 
       describe 'with default parameters' do
         let(:params) do
           default_params.merge(:server_puppetserver_dir => '/etc/custom/puppetserver')
         end
         it { should contain_file('/etc/custom/puppetserver/bootstrap.cfg') }
         it { should contain_file_line('ca_enabled').with_ensure('present') }
         it { should contain_file_line('ca_disabled'). with_ensure('absent') }
         it { should contain_file('/etc/custom/puppetserver/services.d').with_ensure('directory') }
         it {
           should contain_file('/etc/custom/puppetserver/services.d/ca.cfg').
             with_content(%r{^puppetlabs.services.ca.certificate-authority-service/certificate-authority-service}).
             with_content(%r{^#puppetlabs.services.ca.certificate-authority-disabled-service/certificate-authority-disabled-service}).
             without_content(%r{^puppetlabs.trapperkeeper.services.watcher.filesystem-watch-service/filesystem-watch-service})
         }
         if facts[:osfamily] == 'FreeBSD'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm').
               with_changes([
                 'set puppetserver_java_opts \'"-Xms2G -Xmx2G"\'',
               ]).
             with_context('/files/etc/rc.conf').
             with({})
           }
         else
           it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config').with_ensure('directory') }
           it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config/services.d').with_ensure('directory') }
           it {
             should contain_augeas('puppet::server::puppetserver::bootstrap').
               with_changes('set BOOTSTRAP_CONFIG \'"/etc/custom/puppetserver/bootstrap.cfg,/etc/custom/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"\'')
           }
           it {
             should contain_augeas('puppet::server::puppetserver::jvm').
               with_changes([ 'set JAVA_ARGS \'"-Xms2G -Xmx2G"\'', 'set JAVA_BIN /usr/bin/java' ]).
               with_context('/files/etc/default/puppetserver').
               with_incl('/etc/default/puppetserver').
               with_lens('Shellvars.lns').
               with({})
           }
         end
 
         it { should contain_file('/etc/custom/puppetserver/conf.d/ca.conf').with_ensure('absent') }
         it {
           should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
             without_content(/^# Settings related to the puppet-admin HTTP API$/).
             without_content(/^puppet-admin: \{$/).
             without_content(/^\s+client-whitelist: \[$/).
             without_content(/^\s+"localhost"\,$/).
             without_content(/^\s+"puppetserver123.example.com"\,$/).
             with({}) # So we can use a trailing dot on each with_content line
         }
         it {
           should contain_hocon_setting('webserver.ssl-host').
             with_path('/etc/custom/puppetserver/conf.d/webserver.conf').
             with_setting('webserver.ssl-host').
             with_value('0.0.0.0').
             with_ensure('present')
         }
         it {
           should contain_hocon_setting('webserver.ssl-port').
             with_path('/etc/custom/puppetserver/conf.d/webserver.conf').
             with_setting('webserver.ssl-port').
             with_value('8140').
             with_ensure('present')
         }
         it { should contain_hocon_setting('webserver.host').with_ensure('absent') }
         it { should contain_hocon_setting('webserver.port').with_ensure('absent') }
         it {
           should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
             with_content(/allow-header-cert-info: false/).
             with_content(/^\s+path: "\/puppet-ca\/v1\/certificate_status\/"/).
             with_content(/^\s+name: "certificate_status"/).
             with_content(/^\s+path: "\/puppet-ca\/v1\/certificate_statuses\/"/).
             with_content(/^\s+name: "certificate_statuses"/).
             with_content(/^\s+path: "\/puppet-admin-api\/v1\/environment-cache"/).
             with_content(/^\s+name: "environment-cache"/).
             with_content(/^\s+path: "\/puppet-admin-api\/v1\/jruby-pool"/).
             with_content(/^\s+name: "jruby-pool"/).
             with({}) # So we can use a trailing dot on each with_content line
         }
       end
 
       describe 'server_puppetserver_vardir' do
         context 'with default parameters' do
           let(:params) do
             default_params.merge(:server_puppetserver_dir => '/etc/custom/puppetserver')
           end
           it 'should have master-var-dir: /opt/puppetlabs/server/data/puppetserver' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    master-var-dir: /opt/puppetlabs/server/data/puppetserver\n])
           end
         end
         context 'with custom server_puppetserver_vardir' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir    => '/etc/custom/puppetserver',
               :server_puppetserver_vardir => '/opt/custom/puppetlabs/server/data/puppetserver',
             )
           end
           it 'should have master-var-dir: /opt/puppetlabs/server/data/puppetserver' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    master-var-dir: /opt/custom/puppetlabs/server/data/puppetserver\n])
           end
         end
       end
 
       describe 'use-legacy-auth-conf' do
         context 'with default parameters' do
           let(:params) do
             default_params.merge(:server_puppetserver_dir => '/etc/custom/puppetserver')
           end
           it 'should have use-legacy-auth-conf: false in puppetserver.conf' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    use-legacy-auth-conf: false\n])
           end
         end
         context 'when use-legacy-auth-conf = true' do
           let(:params) do
             default_params.merge(
               :server_use_legacy_auth_conf => true,
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it 'should have use-legacy-auth-conf: true in puppetserver.conf' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    use-legacy-auth-conf: true\n])
           end
         end
       end
 
       describe 'environment-class-cache-enabled' do
         context 'with default parameters' do
           let(:params) do
             default_params.merge(:server_puppetserver_dir => '/etc/custom/puppetserver')
           end
           it 'should have environment-class-cache-enabled: false in puppetserver.conf' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    environment-class-cache-enabled: false\n])
           end
         end
         context 'when environment-class-cache-enabled = true' do
           let(:params) do
             default_params.merge(
               :server_environment_class_cache_enabled => true,
               :server_puppetserver_dir                => '/etc/custom/puppetserver',
             )
           end
           it 'should have environment-class-cache-enabled: true in puppetserver.conf' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    environment-class-cache-enabled: true\n])
           end
         end
         context 'when server_puppetserver_version < 2.4' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.2.2',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it 'should not have a environment-class-cache-enabled setting in puppetserver.conf' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).not_to include('environment-class-cache-enabled')
           end
         end
       end
 
       describe 'server_max_requests_per_instance' do
         context 'with default parameters' do
           let(:params) do
             default_params.merge(:server_puppetserver_dir => '/etc/custom/puppetserver')
             end
           it 'should have max-requests-per-instance: /opt/puppetlabs/server/data/puppetserver' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    max-requests-per-instance: 0\n])
           end
         end
         context 'custom server_max_requests_per_instance' do
           let(:params) do
             default_params.merge(:server_max_requests_per_instance => 123456)
           end
 
           it 'should have custom max-requests-per-instance: /opt/puppetlabs/server/data/puppetserver' do
             content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
             expect(content).to include(%Q[    max-requests-per-instance: 123456\n])
           end
         end
       end
 
       describe 'server_max_queued_requests' do
         context 'when server_puppetserver_version >= 5.0 with default parameters' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_puppetserver_version => '5.0.0',
             )
           end
           it 'should have max-queued-requests: 0' do
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               with_content(%r{^    max-queued-requests: 0\n})
           end
         end
         context 'when server_puppetserver_version >= 5.0 with custom server_max_queued_requests' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_puppetserver_version => '5.0.0',
               :server_max_queued_requests  => 100,
             )
           end
           it 'should have custom max-queued-requests: 100' do
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               with_content(%r{^    max-queued-requests: 100\n})
           end
         end
         context 'when server_puppetserver_version < 5.0 with default parameters' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_puppetserver_version => '2.7.0',
             )
           end
           it 'should not have max-queued-requests' do
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               without_content(%r{^    max-queued-requests: (.*)$})
           end
         end
       end
 
       describe 'server_max_retry_delay' do
         context 'when server_puppetserver_version >= 5.0 with default parameters' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_puppetserver_version => '5.0.0',
             )
           end
           it 'should have max-retry-delay: 1800' do
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               with_content(%r{^    max-retry-delay: 1800\n})
           end
         end
         context 'when server_puppetserver_version >= 5.0 custom server_max_retry_delay' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_puppetserver_version => '5.0.0',
               :server_max_retry_delay      => 100
             )
           end
           it 'should have custom max-retry-delay: 100' do
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               with_content(%r{^    max-retry-delay: 100\n})
           end
         end
         context 'when server_puppetserver_version < 5.0 with default parameters' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_puppetserver_version => '2.7.0',
             )
           end
           it 'should not have max-retry-delay' do
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               without_content(%r{^    max-retry-delay: (.*)$})
           end
         end
       end
 
       describe 'versioned-code-service' do
         context 'when server_puppetserver_version >= 2.5' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.5.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it { should_not contain_file_line('versioned_code_service') }
         end
 
         context 'when server_puppetserver_version >= 2.3 and < 2.5' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.3.1',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it 'should have versioned-code-service in bootstrap.cfg' do
             should contain_file_line('versioned_code_service').
               with_ensure('present').
               with_path('/etc/custom/puppetserver/bootstrap.cfg').
               with_line('puppetlabs.services.versioned-code-service.versioned-code-service/versioned-code-service').
               that_requires('File[/etc/custom/puppetserver/bootstrap.cfg]')
           end
         end
 
         context 'when server_puppetserver_version < 2.3' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.2.2',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it 'should not have versioned-code-service in bootstrap.cfg' do
             should contain_file_line('versioned_code_service').
               with_ensure('absent').
               with_path('/etc/custom/puppetserver/bootstrap.cfg').
               with_line('puppetlabs.services.versioned-code-service.versioned-code-service/versioned-code-service').
               that_requires('File[/etc/custom/puppetserver/bootstrap.cfg]')
           end
         end
       end
 
       describe 'bootstrap.cfg' do
         context 'when server_puppetserver_version >= 2.5' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.5.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it { should_not contain_file('/etc/custom/puppetserver/bootstrap.cfg') }
           it { should_not contain_file_line('ca_enabled') }
           it { should_not contain_file_line('ca_disabled') }
         end
 
         context 'when server_puppetserver_version < 2.4.99' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.4.98',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it { should contain_file('/etc/custom/puppetserver/bootstrap.cfg') }
           it {
             should contain_file_line('ca_enabled').
               with_ensure('present').
               with_path('/etc/custom/puppetserver/bootstrap.cfg').
               with_line('puppetlabs.services.ca.certificate-authority-service/certificate-authority-service').
               that_requires('File[/etc/custom/puppetserver/bootstrap.cfg]')
           }
           it {
             should contain_file_line('ca_disabled').
               with_ensure('absent').
               with_path('/etc/custom/puppetserver/bootstrap.cfg').
               with_line('puppetlabs.services.ca.certificate-authority-disabled-service/certificate-authority-disabled-service').
               that_requires('File[/etc/custom/puppetserver/bootstrap.cfg]')
           }
           unless facts[:osfamily] == 'FreeBSD'
             it {
               should contain_augeas('puppet::server::puppetserver::bootstrap').
                 with_changes('set BOOTSTRAP_CONFIG \'"/etc/custom/puppetserver/bootstrap.cfg"\'').
                 with_context('/files/etc/default/puppetserver').
                 with_incl('/etc/default/puppetserver').
                 with_lens('Shellvars.lns').
                 with({})
             }
           end
         end
       end
 
       describe 'ca.cfg' do
         context 'when server_puppetserver_version >= 2.5' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.5.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it { should contain_file('/etc/custom/puppetserver/services.d').with_ensure('directory') }
           it {
             should contain_file('/etc/custom/puppetserver/services.d/ca.cfg').
               with_content(%r{^puppetlabs.services.ca.certificate-authority-service/certificate-authority-service}).
               with_content(%r{^#puppetlabs.services.ca.certificate-authority-disabled-service/certificate-authority-disabled-service})
           }
           unless facts[:osfamily] == 'FreeBSD'
             it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config').with_ensure('directory') }
             it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config/services.d').with_ensure('directory') }
             it {
               should contain_augeas('puppet::server::puppetserver::bootstrap').
                 with_changes('set BOOTSTRAP_CONFIG \'"/etc/custom/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"\'').
                 with_context('/files/etc/default/puppetserver').
                 with_incl('/etc/default/puppetserver').
                 with_lens('Shellvars.lns').
                 with({})
             }
           end
         end
 
         context 'when server_puppetserver_version >= 2.5 and server_ca => false' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.5.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_ca                   => false,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/services.d/ca.cfg').
               with_content(%r{^#puppetlabs.services.ca.certificate-authority-service/certificate-authority-service}).
               with_content(%r{^puppetlabs.services.ca.certificate-authority-disabled-service/certificate-authority-disabled-service})
           }
         end
 
         context 'when server_puppetserver_version < 2.4.99' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.4.98',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it { should_not contain_file('/etc/custom/puppetserver/services.d') }
           it { should_not contain_file('/etc/custom/puppetserver/services.d/ca.cfg') }
           it { should_not contain_file('/opt/puppetlabs/server/apps/puppetserver/config') }
           it { should_not contain_file('/opt/puppetlabs/server/apps/puppetserver/config/services.d') }
         end
 
         context 'when server_puppetserver_version >= 5.1' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.1.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/services.d/ca.cfg').
               with_content(%r{^puppetlabs.services.ca.certificate-authority-service/certificate-authority-service}).
               with_content(%r{^#puppetlabs.services.ca.certificate-authority-disabled-service/certificate-authority-disabled-service}).
               with_content(%r{^puppetlabs.trapperkeeper.services.watcher.filesystem-watch-service/filesystem-watch-service})
           }
         end
       end
 
       describe 'product.conf' do
         context 'when server_puppetserver_version >= 2.7' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.7.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_check_for_updates    => false,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/product.conf').
-              with_ensure('file')
-          }
-          it {
-            should contain_hocon_setting('product.check-for-updates').
-              with_path('/etc/custom/puppetserver/conf.d/product.conf').
-              with_setting('product.check-for-updates').
-              with_value(false).
-              with_ensure('present')
+              with_content(/^\s+check-for-updates: false/)
           }
         end
 
         context 'when server_puppetserver_version < 2.7' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.6.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
           it { should contain_file('/etc/custom/puppetserver/conf.d/product.conf').with_ensure('absent') }
-          it { should_not contain_hocon_setting('product.check-for-updates') }
         end
       end
 
       describe 'server_metrics' do
         context 'when server_puppetserver_version < 5.0 and server_metrics => true' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.7.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_metrics              => true,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               without_content(%r{^    metrics-enabled: (.*)$}).
               with_content(%r{^profiler: \{\n    # enable or disable profiling for the Ruby code;\n    enabled: true})
           }
           it { should_not contain_file('/etc/custom/puppetserver/conf.d/metrics.conf') }
         end
 
         context 'when server_puppetserver_version < 5.0 and server_metrics => false' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.7.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_metrics              => false,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               without_content(%r{^    metrics-enabled: (.*)$}).
               with_content(%r{^profiler: \{\n    # enable or disable profiling for the Ruby code;\n    enabled: false})
           }
           it { should_not contain_file('/etc/custom/puppetserver/conf.d/metrics.conf') }
         end
 
         context 'when server_puppetserver_version >= 5.0 and server_metrics => true' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.0.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_metrics              => true,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
             with_content(%r{^    # Whether to enable http-client metrics; defaults to 'true'.\n    metrics-enabled: true$(.*)}).
             with_content(%r{^profiler: \{\n    # enable or disable profiling for the Ruby code;\n    enabled: true})
           }
           it { should contain_file('/etc/custom/puppetserver/conf.d/metrics.conf').with_ensure('file') }
           it {
             should contain_hocon_setting('metrics.server-id').
               with_path('/etc/custom/puppetserver/conf.d/metrics.conf').
               with_setting('metrics.server-id').
               with_value('puppetserver.example.com').
               with_ensure('present')
           }
           it {
             should contain_hocon_setting('metrics.reporters.graphite.host').
               with_path('/etc/custom/puppetserver/conf.d/metrics.conf').
               with_setting('metrics.reporters.graphite.host').
               with_value('graphitehost.example.com').
               with_ensure('present')
           }
           it {
             should contain_hocon_setting('metrics.registries.puppetserver.metrics-allowed').
               with_path('/etc/custom/puppetserver/conf.d/metrics.conf').
               with_setting('metrics.registries.puppetserver.metrics-allowed').
               with_value(['single.element.array']).
               with_type('array').
               with_ensure('present')
           }
         end
 
         context 'when server_puppetserver_version >= 5.0 and server_metrics => false' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.0.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_metrics              => false,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf').
               with_content(%r{^    # Whether to enable http-client metrics; defaults to 'true'.\n    metrics-enabled: false$}).
               with_content(%r{^profiler: \{\n    # enable or disable profiling for the Ruby code;\n    enabled: false})
           }
           it { should contain_file('/etc/custom/puppetserver/conf.d/metrics.conf').with_ensure('absent') }
         end
       end
 
       describe 'server_experimental' do
         context 'when server_puppetserver_version < 5.0 and server_experimental => true' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.7.0',
               :server_puppetserver_dir => '/etc/custom/puppetserver',
               :server_experimental => true,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               without_content(%r{^(\ *)path: "/puppet/experimental"$})
           }
         end
 
         context 'when server_puppetserver_version < 5.0 and server_experimental => false' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.7.0',
               :server_puppetserver_dir => '/etc/custom/puppetserver',
               :server_experimental => false,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               without_content(%r{^(\ *)path: "/puppet/experimental"$})
           }
         end
 
         context 'when server_puppetserver_version >= 5.0 and server_experimental => true' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.0.0',
               :server_puppetserver_dir => '/etc/custom/puppetserver',
               :server_experimental => true,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               with_content(%r{^(\ *)path: "/puppet/experimental"$})
           }
         end
 
         context 'when server_puppetserver_version >= 5.0 and server_experimental => false' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.0.0',
               :server_puppetserver_dir => '/etc/custom/puppetserver',
               :server_experimental => false,
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               without_content(%r{^(\ *)path: "/puppet/experimental"$})
           }
         end
       end
 
       describe 'puppet tasks information' do
         context 'when server_puppetserver_version < 5.1' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.0.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
 
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               without_content(%r{^(\ *)path: "/puppet/v3/tasks"$})
           }
         end
 
         context 'when server_puppetserver_version >= 5.1' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '5.1.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
             )
           end
 
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               with_content(%r{^(\ *)path: "/puppet/v3/tasks"$})
           }
         end
       end
 
 
       describe 'server_trusted_agents' do
         context 'when set' do
           let(:params) do
             default_params.merge(
               :server_puppetserver_version => '2.7.0',
               :server_puppetserver_dir     => '/etc/custom/puppetserver',
               :server_trusted_agents       => ['jenkins', 'octocatalog-diff'],
             )
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/auth.conf').
               with_content(%r{^            allow: \["jenkins", "octocatalog-diff", "\$1"\]$})
           }
         end
       end
 
       unless facts[:osfamily] == 'FreeBSD'
         describe 'server_jruby9k' do
           context 'when server_puppetserver_version < 5.0 and server_jruby9k => true' do
             let(:params) do
               default_params.merge(
                 :server_puppetserver_version => '2.7.0',
                 :server_puppetserver_dir     => '/etc/custom/puppetserver',
                 :server_jruby9k              => true,
               )
             end
               it { should_not contain_augeas('puppet::server::puppetserver::jruby_jar') }
           end
 
           context 'when server_puppetserver_version < 5.0 and server_jruby9k => false' do
             let(:params) do
               default_params.merge(
                 :server_puppetserver_version => '2.7.0',
                 :server_puppetserver_dir     => '/etc/custom/puppetserver',
                 :server_jruby9k              => false,
               )
             end
             it { should_not contain_augeas('puppet::server::puppetserver::jruby_jar') }
           end
 
           context 'when server_puppetserver_version >= 5.0 and server_jruby9k => true' do
             let(:params) do
               default_params.merge(
                 :server_puppetserver_version => '5.0.0',
                 :server_puppetserver_dir     => '/etc/custom/puppetserver',
                 :server_jruby9k              => true,
               )
             end
             it { should contain_augeas('puppet::server::puppetserver::jruby_jar').
               with_changes(['set JRUBY_JAR \'"/opt/puppetlabs/server/apps/puppetserver/jruby-9k.jar"\'']).
               with_context('/files/etc/default/puppetserver').
               with_incl('/etc/default/puppetserver').
               with_lens('Shellvars.lns').
               with({})
             }
           end
 
           context 'when server_puppetserver_version >= 5.0 and server_jruby9k => false' do
             let(:params) do
               default_params.merge(
                   :server_puppetserver_version => '5.0.0',
                   :server_puppetserver_dir     => '/etc/custom/puppetserver',
                   :server_jruby9k              => false,
               )
             end
             it {
               should contain_augeas('puppet::server::puppetserver::jruby_jar').
                 with_changes(['rm JRUBY_JAR']).
                 with_context('/files/etc/default/puppetserver').
                 with_incl('/etc/default/puppetserver').
                 with_lens('Shellvars.lns').
                 with({})
             }
           end
         end
       end
 
       describe 'with extra_args parameter' do
         let :params do
           default_params.merge(
             :jvm_extra_args => ['-XX:foo=bar', '-XX:bar=foo'],
           )
         end
         if facts[:osfamily] == 'FreeBSD'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm').
               with_changes([
                 'set puppetserver_java_opts \'"-Xms2G -Xmx2G -XX:foo=bar -XX:bar=foo"\'',
               ]).
               with_context('/files/etc/rc.conf').
               with({})
           }
         else
           it {
             should contain_augeas('puppet::server::puppetserver::jvm').
               with_changes([
                 'set JAVA_ARGS \'"-Xms2G -Xmx2G -XX:foo=bar -XX:bar=foo"\'',
                 'set JAVA_BIN /usr/bin/java',
               ]).
               with_context('/files/etc/default/puppetserver').
               with_incl('/etc/default/puppetserver').
               with_lens('Shellvars.lns').
               with({})
           }
         end
       end
 
       describe 'with cli_args parameter' do
         let :params do
           default_params.merge(:jvm_cli_args => '-Djava.io.tmpdir=/var/puppettmp')
         end
         if facts[:osfamily] != 'FreeBSD'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm').
               with_changes([
                 'set JAVA_ARGS \'"-Xms2G -Xmx2G"\'',
                 'set JAVA_BIN /usr/bin/java',
                 'set JAVA_ARGS_CLI \'"-Djava.io.tmpdir=/var/puppettmp"\'',
               ]).
               with_context('/files/etc/default/puppetserver').
               with_incl('/etc/default/puppetserver').
               with_lens('Shellvars.lns').
               with({})
           }
         end
       end
 
       describe 'with jvm_config file parameter' do
         let :params do
           default_params.merge(:config => '/etc/custom/puppetserver')
         end
         if facts[:osfamily] == 'FreeBSD'
           it { should contain_augeas('puppet::server::puppetserver::jvm').with_context('/files/etc/rc.conf') }
         else
           it {
             should contain_augeas('puppet::server::puppetserver::jvm').
               with_context('/files/etc/custom/puppetserver').
               with_incl('/etc/custom/puppetserver').
               with_lens('Shellvars.lns').
               with({})
           }
         end
       end
 
       describe 'when server_puppetserver_version < 2.2' do
         let(:params) do
           default_params.merge(:server_puppetserver_version => '2.1.0')
         end
         it { should raise_error(Puppet::Error, /puppetserver <2.2 is not supported by this module version/) }
       end
     end
   end
 end
diff --git a/templates/server/puppetserver/conf.d/product.conf.erb b/templates/server/puppetserver/conf.d/product.conf.erb
new file mode 100644
index 0000000..0f72646
--- /dev/null
+++ b/templates/server/puppetserver/conf.d/product.conf.erb
@@ -0,0 +1,4 @@
+product: {
+  # automatic update checks and corresponding analytic data collection
+  check-for-updates: <%= @server_check_for_updates %>
+}