diff --git a/manifests/server/puppetserver.pp b/manifests/server/puppetserver.pp index 3c6153a..a8ce8e0 100644 --- a/manifests/server/puppetserver.pp +++ b/manifests/server/puppetserver.pp @@ -1,284 +1,352 @@ # == 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 # # === 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_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, $server_experimental = $::puppet::server::puppetserver_experimental, ) { include ::puppet::server 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], } } if versioncmp($server_puppetserver_version, '2.2') < 0 { $ca_conf_ensure = file } else { $ca_conf_ensure = absent } file { "${server_puppetserver_dir}/conf.d/ca.conf": ensure => $ca_conf_ensure, content => template('puppet/server/puppetserver/conf.d/ca.conf.erb'), } 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/webserver.conf": + file { "${server_puppetserver_dir}/conf.d/auth.conf": ensure => file, - content => template('puppet/server/puppetserver/conf.d/webserver.conf.erb'), + content => template('puppet/server/puppetserver/conf.d/auth.conf.erb'), } - file { "${server_puppetserver_dir}/conf.d/auth.conf": + $webserver_conf = "${server_puppetserver_dir}/conf.d/webserver.conf" + + file { $webserver_conf: ensure => file, - content => template('puppet/server/puppetserver/conf.d/auth.conf.erb'), + } + + $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_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 { 'server_check_for_updates': + 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, } } diff --git a/spec/classes/puppet_server_config_spec.rb b/spec/classes/puppet_server_config_spec.rb index 9637181..10a5acb 100644 --- a/spec/classes/puppet_server_config_spec.rb +++ b/spec/classes/puppet_server_config_spec.rb @@ -1,919 +1,945 @@ require 'spec_helper' describe 'puppet::server::config' do before :each do @cacrl = Tempfile.new('cacrl') File.open(@cacrl, 'w') { |f| f.write "This is my CRL File" } Puppet.settings[:cacrl] = @cacrl.path end on_os_under_test.each do |os, facts| next if unsupported_puppetmaster_osfamily(facts[:osfamily]) context "on #{os}" do if Puppet.version < '4.0' codedir = '/etc/puppet' confdir = '/etc/puppet' conf_file = '/etc/puppet/puppet.conf' environments_dir = '/etc/puppet/environments' logdir = '/var/log/puppet' rundir = '/var/run/puppet' vardir = '/var/lib/puppet' puppetserver_vardir = '/var/lib/puppet' puppetserver_logdir = '/var/log/puppet' puppetserver_rundir = '/var/run/puppet' ssldir = '/var/lib/puppet/ssl' sharedir = '/usr/share/puppet' etcdir = '/etc/puppet' puppetcacmd = '/usr/bin/puppet cert' additional_facts = {} else codedir = '/etc/puppetlabs/code' confdir = '/etc/puppetlabs/puppet' conf_file = '/etc/puppetlabs/puppet/puppet.conf' environments_dir = '/etc/puppetlabs/code/environments' logdir = '/var/log/puppetlabs/puppet' rundir = '/var/run/puppetlabs' vardir = '/opt/puppetlabs/puppet/cache' puppetserver_vardir = '/opt/puppetlabs/server/data/puppetserver' puppetserver_logdir = '/var/log/puppetlabs/puppetserver' puppetserver_rundir = '/var/run/puppetlabs/puppetserver' ssldir = '/etc/puppetlabs/puppet/ssl' sharedir = '/opt/puppetlabs/puppet' etcdir = '/etc/puppetlabs/puppet' puppetcacmd = '/opt/puppetlabs/bin/puppet cert' additional_facts = {:rubysitedir => '/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.1.0'} end if facts[:osfamily] == 'FreeBSD' codedir = '/usr/local/etc/puppet' confdir = '/usr/local/etc/puppet' conf_file = '/usr/local/etc/puppet/puppet.conf' environments_dir = '/usr/local/etc/puppet/environments' logdir = '/var/log/puppet' rundir = '/var/run/puppet' vardir = '/var/puppet' puppetserver_vardir = '/var/puppet/server/data/puppetserver' puppetserver_logdir = '/var/log/puppetserver' puppetserver_rundir = '/var/run/puppetserver' ssldir = '/var/puppet/ssl' sharedir = '/usr/local/share/puppet' etcdir = '/usr/local/etc/puppet' puppetcacmd = '/usr/local/bin/puppet cert' additional_facts = {} end let(:facts) do facts.merge({:clientcert => 'puppetmaster.example.com'}).merge(additional_facts) end describe 'with no custom parameters' do let :pre_condition do "class {'puppet': server => true}" end it 'should set up SSL permissions' do should contain_file("#{ssldir}/private_keys").with({ :group => 'puppet', :mode => '0750', }) should contain_file("#{ssldir}/private_keys/puppetmaster.example.com.pem").with({ :group => 'puppet', :mode => '0640', }) should contain_exec('puppet_server_config-create_ssl_dir').with({ :creates => ssldir, :command => "/bin/mkdir -p #{ssldir}", :umask => '0022', }) should contain_exec('puppet_server_config-generate_ca_cert').with({ :creates => "#{ssldir}/certs/puppetmaster.example.com.pem", :command => "#{puppetcacmd} --generate puppetmaster.example.com --allow-dns-alt-names", :umask => '0022', :require => ["Concat[#{conf_file}]", "Exec[puppet_server_config-create_ssl_dir]"], }) end context 'with non-AIO packages', :if => (Puppet.version < '4.0' || facts[:osfamily] == 'FreeBSD') do it 'CA cert generation should notify the Apache service' do should contain_exec('puppet_server_config-generate_ca_cert').that_notifies('Service[httpd]') end end context 'with AIO packages', :if => (Puppet.version > '4.0' && facts[:osfamily] != 'FreeBSD') do it 'CA cert generation should notify the puppetserver service' do should contain_exec('puppet_server_config-generate_ca_cert').that_notifies('Service[puppetserver]') end end it 'should set up the ENC' do should contain_class('foreman::puppetmaster').with({ :foreman_url => "https://foo.example.com", :receive_facts => true, :puppet_home => puppetserver_vardir, :puppet_etcdir => etcdir, # Since this is managed inside the foreman module it does not # make sense to test it here #:puppet_basedir => '/usr/lib/ruby/site_ruby/1.9/puppet', :timeout => 60, }) end it 'should set up the environments' do should contain_file(environments_dir).with({ :ensure => 'directory', :owner => 'puppet', :group => nil, :mode => '0755', }) should contain_file(sharedir).with_ensure('directory') should contain_file("#{codedir}/environments/common").with({ :ensure => 'directory', :owner => 'puppet', :group => nil, :mode => '0755', }) should contain_file("#{sharedir}/modules").with({ :ensure => 'directory', :owner => 'puppet', :group => nil, :mode => '0755', }) should contain_puppet__server__env('development') should contain_puppet__server__env('production') end it 'should configure puppet' do should contain_puppet__config__main("logdir").with({'value' => "#{logdir}"}) should contain_puppet__config__main("rundir").with({'value' => "#{rundir}"}) should contain_puppet__config__main("ssldir").with({'value' => "#{ssldir}"}) should contain_puppet__config__main("privatekeydir").with({'value' => '$ssldir/private_keys { group = service }'}) should contain_puppet__config__main("hostprivkey").with({'value' => '$privatekeydir/$certname.pem { mode = 640 }'}) should contain_puppet__config__main("reports").with({'value' => 'foreman'}) if Puppet.version >= '3.6' should contain_puppet__config__main("environmentpath").with({'value' => "#{codedir}/environments"}) should contain_puppet__config__main("basemodulepath").with({ 'value' => ["#{codedir}/environments/common","#{codedir}/modules","#{sharedir}/modules"], 'joiner' => ':'}) end should contain_puppet__config__agent('classfile').with({'value' => '$statedir/classes.txt'}) should contain_puppet__config__master('external_nodes').with({'value' => "#{etcdir}\/node.rb"}) should contain_puppet__config__master('node_terminus').with({'value' => 'exec'}) should contain_puppet__config__master('ca').with({'value' => 'true'}) should contain_puppet__config__master('ssldir').with({'value' => "#{ssldir}"}) should contain_puppet__config__master('parser').with({'value' => 'current'}) should contain_puppet__config__master("autosign").with({'value' => "#{etcdir}\/autosign.conf \{ mode = 0664 \}"}) should contain_concat(conf_file) should_not contain_puppet__config__master('storeconfigs') should contain_file("#{etcdir}/autosign.conf") end context 'on Puppet < 4.0.0', :if => (Puppet.version < '4.0.0') do it 'should set configtimeout' do should contain_puppet__config__agent('configtimeout').with({'value' => '120'}) end end context 'on Puppet >= 4.0.0', :if => (Puppet.version >= '4.0.0') do it 'should not set configtimeout' do should_not contain_puppet__config__agent('configtimeout') end end it 'should not configure PuppetDB' do should_not contain_class('puppetdb') should_not contain_class('puppetdb::master::config') end end describe "when autosign => true" do let :pre_condition do "class {'puppet': server => true, autosign => true, }" end it 'should contain puppet.conf [main] with autosign = true' do should contain_puppet__config__master('autosign').with({'value' => true}) end end describe 'when autosign => /somedir/custom_autosign, autosign_mode => 664' do let :pre_condition do "class {'puppet': server => true, autosign => '/somedir/custom_autosign', autosign_mode => '664', }" end it 'should contain puppet.conf [main] with autosign = /somedir/custom_autosign { mode = 664 }' do should contain_puppet__config__master('autosign').with({'value' => "/somedir/custom_autosign { mode = 664 }"}) end end describe "when autosign_entries is not set" do let :pre_condition do "class {'puppet': server => true, }" end it 'should contain autosign.conf with out content set' do should contain_file("#{confdir}/autosign.conf") should_not contain_file("#{confdir}/autosign.conf").with_content(/# Managed by Puppet/) should_not contain_file("#{confdir}/autosign.conf").with_content(/foo.bar/) end end describe "when autosign_entries set to ['foo.bar']" do let :pre_condition do "class {'puppet': server => true, 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 :pre_condition do "class {'puppet': server => true, autosign_content => 'foo.bar', autosign_entries => ['foo.bar'], }" end it { should raise_error(Puppet::Error, /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 :pre_condition do "class {'puppet': server => true, autosign_source => 'puppet:///foo/bar', autosign_entries => ['foo.bar'], }" end it { should raise_error(Puppet::Error, /Cannot set both autosign_content\/autosign_source and autosign_entries/) } end describe "when autosign => #{confdir}/custom_autosign.sh, autosign_mode => 775 and autosign_content set to 'foo.bar'" do let :pre_condition do "class {'puppet': server => true, autosign => '#{confdir}/custom_autosign.sh', autosign_mode => '775', autosign_content => 'foo.bar', }" end it 'should contain puppet.conf [main] with autosign = /somedir/custom_autosign { mode = 775 }' do should contain_puppet__config__master('autosign').with({'value' => "#{confdir}/custom_autosign.sh { mode = 775 }"}) end it 'should contain custom_autosign.sh with content set' do should contain_file("#{confdir}/custom_autosign.sh") should contain_file("#{confdir}/custom_autosign.sh").with_content(/foo.bar/) end end describe "when autosign => #{confdir}/custom_autosign.sh, autosign_mode => 775 and autosign_source set to 'puppet:///foo/bar'" do let :pre_condition do "class {'puppet': server => true, autosign => '#{confdir}/custom_autosign.sh', autosign_mode => '775', autosign_source => 'puppet:///foo/bar', }" end it 'should contain puppet.conf [main] with autosign = /somedir/custom_autosign { mode = 775 }' do should contain_puppet__config__master('autosign').with({'value' => "#{confdir}/custom_autosign.sh { mode = 775 }"}) end it 'should contain custom_autosign.sh with content set' do should contain_file("#{confdir}/custom_autosign.sh") should contain_file("#{confdir}/custom_autosign.sh").with_source('puppet:///foo/bar') end end describe "when hiera_config => '$confdir/hiera.yaml'" do let :pre_condition do "class {'puppet': server => true, hiera_config => '/etc/puppet/hiera/production/hiera.yaml', }" end it 'should contain puppet.conf [main] with non-default hiera_config' do should contain_puppet__config__main("hiera_config").with({'value' => '/etc/puppet/hiera/production/hiera.yaml'}) end end describe 'without foreman' do let :pre_condition do "class {'puppet': server => true, server_reports => 'store', server_external_nodes => '', }" end it 'should contain an empty external_nodes' do should_not contain_puppet__config__master('external_nodes') end end describe 'without external_nodes' do let :pre_condition do "class {'puppet': server => true, server_external_nodes => '', }" end it 'should not contain external_nodes' do should_not contain_puppet__config__master('external_nodes') should_not contain_puppet__config__master('node_terminus') end end describe 'with server_default_manifest => true and undef content' do let :pre_condition do 'class { "::puppet": server_default_manifest => true, server => true }' end it 'should contain default_manifest setting in puppet.conf' do should contain_puppet__config__main('default_manifest').with({'value' => '/etc/puppet/manifests/default_manifest.pp'}) end it 'should_not contain default manifest /etc/puppet/manifests/default_manifest.pp' do should_not contain_file('/etc/puppet/manifests/default_manifest.pp') end end describe 'with server_default_manifest => true and server_default_manifest_content => "include foo"' do let :pre_condition do 'class { "::puppet": server_default_manifest => true, server_default_manifest_content => "include foo", server => true }' end it 'should contain default_manifest setting in puppet.conf' do should contain_puppet__config__main('default_manifest').with({'value' => '/etc/puppet/manifests/default_manifest.pp'}) end it 'should contain default manifest /etc/puppet/manifests/default_manifest.pp' do should contain_file('/etc/puppet/manifests/default_manifest.pp').with_content(/include foo/) end end describe 'with git repo' do let :pre_condition do "class {'puppet': server => true, server_git_repo => true, }" end it 'should set up the environments directory' do should contain_file(environments_dir).with({ :ensure => 'directory', :owner => 'puppet', }) end it 'should create the git repo' do should contain_file(vardir).with({ :ensure => 'directory', :owner => 'puppet', }) should contain_git__repo('puppet_repo').with({ :bare => true, :target => "#{vardir}/puppet.git", :user => 'puppet', :require => %r{File\[#{environments_dir}\]}, }) should contain_file("#{vardir}/puppet.git/hooks/post-receive").with({ :owner => 'puppet', :mode => '0755', :require => %r{Git::Repo\[puppet_repo\]}, :content => %r{BRANCH_MAP = \{[^a-zA-Z=>]\}}, }) end it { should_not contain_puppet__server__env('development') } it { should_not contain_puppet__server__env('production') } context 'with directory environments' do let :pre_condition do "class {'puppet': server => true, server_git_repo => true, server_directory_environments => true, }" end it 'should configure puppet.conf' do should_not contain_puppet__config__master('config_version') should contain_puppet__config__main('environmentpath').with({'value' => "#{environments_dir}"}) end end context 'with config environments' do let :pre_condition do "class {'puppet': server => true, server_git_repo => true, server_directory_environments => false, }" end it 'should configure puppet.conf' do should contain_puppet__config__master('manifest').with({'value' => "#{environments_dir}/\$environment/manifests/site.pp"}) should contain_puppet__config__master('modulepath').with({'value' => "#{environments_dir}/\$environment/modules"}) should contain_puppet__config__master('config_version').with({'value' => "git --git-dir #{environments_dir}/\$environment/.git describe --all --long"}) end end end describe 'with dynamic environments' do context 'with directory environments' do let :pre_condition do "class {'puppet': server => true, server_dynamic_environments => true, server_directory_environments => true, server_environments_owner => 'apache', }" end it 'should set up the environments directory' do should contain_file(environments_dir).with({ :ensure => 'directory', :owner => 'apache', }) end it 'should configure puppet.conf' do should contain_puppet__config__main('environmentpath').with({'value' => "#{environments_dir}"}) should contain_puppet__config__main('basemodulepath').with({'value' => ["#{environments_dir}/common","#{codedir}/modules","#{sharedir}/modules"]}) end it { should_not contain_puppet__server__env('development') } it { should_not contain_puppet__server__env('production') } end context 'with no common modules directory' do let :pre_condition do "class {'puppet': server => true, server_dynamic_environments => true, server_directory_environments => true, server_environments_owner => 'apache', server_common_modules_path => '', }" end it 'should configure puppet.conf' do should_not contain_puppet__config__main('basemodulepath') end end context 'with config environments' do let :pre_condition do "class {'puppet': server => true, server_dynamic_environments => true, server_directory_environments => false, server_environments_owner => 'apache', }" end it 'should set up the environments directory' do should contain_file(environments_dir).with({ :ensure => 'directory', :owner => 'apache', }) end it 'should configure puppet.conf' do should contain_puppet__config__master('manifest').with({'value' => "#{environments_dir}/\$environment/manifests/site.pp"}) should contain_puppet__config__master('modulepath').with({'value' => "#{environments_dir}/\$environment/modules"}) end it { should_not contain_puppet__server__env('development') } it { should_not contain_puppet__server__env('production') } end end describe 'with SSL path overrides' do let :pre_condition do "class {'puppet': server => true, 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', :ssl_cert => '/etc/example/cert.pem', :ssl_key => '/etc/example/key.pem', }) end end describe 'with a PuppetDB host set' do let :pre_condition do "class {'puppet': server => true, 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', :puppetdb_port => 8081, :puppetdb_soft_write_failure => false, :manage_storeconfigs => false, :restart_puppet => false, }) end end describe 'with a puppet git branch map' do let :pre_condition do "class {'puppet': server => true, server_git_repo => true, 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 describe 'with additional settings' do let :pre_condition do "class {'puppet': server => true, 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 'directory environments default' do let :pre_condition do "class {'puppet': server => true, }" end context 'on old Puppet', :if => (Puppet.version < '3.6.0') do it 'should be disabled' do should_not contain_puppet__config__main('environmentpath') end end context 'on Puppet 3.6.0+', :if => (Puppet.version >= '3.6.0') do it 'should be enabled' do should contain_puppet__config__main('environmentpath').with({'value' => "#{environments_dir}"}) end end end describe 'with server_parser => future' do let :pre_condition do "class {'puppet': server => true, server_parser => 'future', }" end it 'should configure future parser' do should contain_puppet__config__master('parser').with({'value' => "future"}) end end describe 'with server_environment_timeout set' do let :pre_condition do "class {'puppet': server => true, server_environment_timeout => '10m', }" end it 'should configure environment_timeout accordingly' do should contain_puppet__config__master('environment_timeout').with({'value' => "10m"}) end end describe 'with no ssldir managed for master' do let :pre_condition do "class {'puppet': server => true, server_ssl_dir_manage => false}" end it 'should not contain ssl_dir configuration setting in the master section' do should_not contain_puppet__config__master('ssl_dir') end end describe 'with ssl key management disabled for server' do let :pre_condition do "class {'puppet': server => true, server_certname => 'servercert', server_ssl_key_manage => false, server_ssl_dir => '/etc/custom/puppetlabs/puppet/ssl' }" end it 'should not contain a default ssl key definition' do should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/private_keys/servercert.pem') end end describe 'with nondefault CA settings' do context 'with server_ca => false' do let :pre_condition do "class {'puppet': server => true, server_ca => false, }" end it 'should create the ssl directory' do should contain_exec('puppet_server_config-create_ssl_dir') end it 'should not generate CA certificates' do should_not contain_exec('puppet_server_config-generate_ca_cert') end end end describe 'with server_implementation => "puppetserver"', :if => (Puppet.version >= '4.0.0') do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver' }" end it 'should configure puppet.conf' do should contain_puppet__config__master("vardir").with_value(puppetserver_vardir) should contain_puppet__config__master("logdir").with_value(puppetserver_logdir) should contain_puppet__config__master("rundir").with_value(puppetserver_rundir) end end describe 'with server_ca_crl_sync => true' do context 'with server_ca => false and running "puppet apply"' do let :pre_condition do "class {'puppet': server => true, server_ca_crl_sync => true, 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 :pre_condition do "class {'puppet': server => true, server_ca_crl_sync => true, server_ca => false, server_ssl_dir => '/etc/custom/puppetlabs/puppet/ssl' }" end let(:facts) do facts.merge({:servername => 'myserver' }) 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 :pre_condition do "class {'puppet': server => true, server_ca_crl_sync => true, 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 :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_ca => true, server_puppetserver_dir => '/etc/custom/puppetserver', server_jruby_gem_home => '/opt/puppetlabs/server/data/puppetserver/jruby-gems' }" end it 'should use the ca_crl.pem file' do - should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(/ssl-crl-path: #{ssldir}\/ca\/ca_crl.pem/) + should contain_hocon_setting('webserver.ssl-crl-path'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-crl-path'). + with_value("#{ssldir}/ca/ca_crl.pem"). + with_ensure('present') end end context 'as non-ca with default' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_ca => false, server_puppetserver_dir => '/etc/custom/puppetserver', server_jruby_gem_home => '/opt/puppetlabs/server/data/puppetserver/jruby-gems' }" end it 'should use the ca_crl.pem file' do - should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - without_content(/ssl-crl-path: #{ssldir}\/crl.pem/) + should contain_hocon_setting('webserver.ssl-crl-path'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-crl-path'). + with_ensure('absent') end end - context 'as non-ca with default' do + context 'as non-ca with server_crl_enable' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_ca => false, server_crl_enable => true, server_puppetserver_dir => '/etc/custom/puppetserver', server_jruby_gem_home => '/opt/puppetlabs/server/data/puppetserver/jruby-gems' }" end - it 'should use the ca_crl.pem file' do - should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(/ssl-crl-path: #{ssldir}\/crl.pem/) + it 'should use the crl.pem file' do + should contain_hocon_setting('webserver.ssl-crl-path'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-crl-path'). + with_value("#{ssldir}/crl.pem"). + with_ensure('present') end end end describe 'with ssl_chain_filepath overwritten' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_ca => true, server_puppetserver_dir => '/etc/custom/puppetserver', server_jruby_gem_home => '/opt/puppetlabs/server/data/puppetserver/jruby-gems', server_ssl_chain_filepath => '/etc/example/certchain.pem', }" end it 'should use the server_ssl_chain_filepath file' do - should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(/ssl-cert-chain: \/etc\/example\/certchain.pem/) + should contain_hocon_setting('webserver.ssl-cert-chain'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-cert-chain'). + with_value('/etc/example/certchain.pem'). + with_ensure('present') end end describe 'with server_ip parameter given to the puppet class' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_puppetserver_dir => '/etc/custom/puppetserver', server_ip => '127.0.0.1', }" end it 'should put the correct ip address in webserver.conf' do - should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf').with_content(/ssl-host:\s127\.0\.0\.1/) + should contain_hocon_setting('webserver.ssl-host'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-host'). + with_value('127.0.0.1'). + with_ensure('present') end end describe 'with server_certname parameter' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_puppetserver_dir => '/etc/custom/puppetserver', 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('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(%r{ssl-key: /etc/custom/puppet/ssl/private_keys/puppetserver43\.example\.com\.pem}) + should contain_hocon_setting('webserver.ssl-key'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-key'). + with_value('/etc/custom/puppet/ssl/private_keys/puppetserver43.example.com.pem'). + with_ensure('present') end it 'should put the correct ssl cert path in webserver.conf' do - should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(%r{ssl-cert: /etc/custom/puppet/ssl/certs/puppetserver43\.example\.com\.pem}) + should contain_hocon_setting('webserver.ssl-cert'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.ssl-cert'). + with_value('/etc/custom/puppet/ssl/certs/puppetserver43.example.com.pem'). + with_ensure('present') end end describe 'with server_http parameter set to true for the puppet class' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_puppetserver_dir => '/etc/custom/puppetserver', server_http => true, }" end - it { should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(/ host:\s0\.0\.0\.0/). - with_content(/ port:\s8139/). - with({}) + it { should contain_hocon_setting('webserver.host'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.host'). + with_value('0.0.0.0') + } + it { should contain_hocon_setting('webserver.port'). + with_path('/etc/custom/puppetserver/conf.d/webserver.conf'). + with_setting('webserver.port'). + with_value('8139') } it { should contain_file('/etc/custom/puppetserver/conf.d/auth.conf'). with_content(/allow-header-cert-info: true/). with({}) } end describe 'with server_allow_header_cert_info parameter set to true for the puppet class' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_puppetserver_dir => '/etc/custom/puppetserver', server_allow_header_cert_info => true, }" end it { should contain_file('/etc/custom/puppetserver/conf.d/auth.conf'). with_content(/allow-header-cert-info: true/). with({}) } end describe 'with server_http_allow parameter set for the puppet class' do let :pre_condition do "class {'puppet': server => true, server_implementation => 'puppetserver', server_puppetserver_dir => '/etc/custom/puppetserver', server_http => true, server_http_allow => ['1.2.3.4'], }" end it { should raise_error(Puppet::Error, /setting \$server_http_allow is not supported for puppetserver as it would have no effect/) } end end end end diff --git a/spec/classes/puppet_server_puppetserver_spec.rb b/spec/classes/puppet_server_puppetserver_spec.rb index 9054d3e..df11310 100644 --- a/spec/classes/puppet_server_puppetserver_spec.rb +++ b/spec/classes/puppet_server_puppetserver_spec.rb @@ -1,761 +1,773 @@ 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 if Puppet.version < '4.0' additional_facts = {} else additional_facts = {:rubysitedir => '/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.1.0'} end let(:facts) do facts.merge(additional_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_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, :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, } 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') } 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') } it { should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf') } - it { should contain_file('/etc/custom/puppetserver/conf.d/webserver.conf'). - with_content(/ssl-host:\s0\.0\.0\.0/). - with_content(/ssl-port:\s8140/). - without_content(/ host:\s/). - without_content(/ port:\s8139/). - with({}) + 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({}) } 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 context 'when server_puppetserver_version < 2.2' do let(:params) do default_params.merge({ :server_puppetserver_version => '2.1.2', :server_puppetserver_dir => '/etc/custom/puppetserver', }) end it 'should not have a use-legacy-auth-conf setting in puppetserver.conf' do content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content] expect(content).not_to include('use-legacy-auth-conf') 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 '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 end describe 'server_ca related settings' do context 'when server_puppetserver_version >= 2.2' do let(:params) do default_params.merge({ :server_puppetserver_version => '2.2.0', :server_puppetserver_dir => '/etc/custom/puppetserver', }) end it { should contain_file('/etc/custom/puppetserver/conf.d/auth.conf'). 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 } it { should contain_file('/etc/custom/puppetserver/conf.d/ca.conf'). with_ensure('absent'). with({}) # So we can use a trailing dot on each with_content line } 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 } end context 'when server_puppetserver_version < 2.2' do let(:params) do default_params.merge({ :server_puppetserver_version => '2.1.1', :server_puppetserver_dir => '/etc/custom/puppetserver', }) end it { should contain_file('/etc/custom/puppetserver/conf.d/auth.conf'). without_content(/^\s+path: "\/puppet-ca\/v1\/certificate_status\/"/). without_content(/^\s+name: "certificate_status"/). without_content(/^\s+path: "\/puppet-ca\/v1\/certificate_statuses\/"/). without_content(/^\s+name: "certificate_statuses"/). without_content(/^\s+path: "\/puppet-admin-api\/v1\/environment-cache"/). without_content(/^\s+name: "environment-cache"/). without_content(/^\s+path: "\/puppet-admin-api\/v1\/jruby-pool"/). without_content(/^\s+name: "jruby-pool"/). with({}) # So we can use a trailing dot on each with_content line } it { should contain_file('/etc/custom/puppetserver/conf.d/ca.conf'). with_content(/^\s+authorization-required: true$/). with_content(/^\s+client-whitelist: \[$/). with_content(/^\s+"localhost"\,$/). with_content(/^\s+"puppetserver123.example.com"\,$/). with({}) # So we can use a trailing dot on each with_content line } it { should contain_file('/etc/custom/puppetserver/conf.d/puppetserver.conf'). with_content(/^# Settings related to the puppet-admin HTTP API$/). with_content(/^puppet-admin: \{$/). with_content(/^\s+client-whitelist: \[$/). with_content(/^\s+"localhost"\,$/). with_content(/^\s+"puppetserver123.example.com"\,$/). with({}) # So we can use a trailing dot on each with_content line } 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('server_check_for_updates'). + 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_value(false). + with_ensure('present') + } 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('server_check_for_updates') + 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}) } 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}) } 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}) } 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}) } 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 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'). with({}) } 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 end end end diff --git a/templates/server/puppetserver/conf.d/webserver.conf.erb b/templates/server/puppetserver/conf.d/webserver.conf.erb deleted file mode 100644 index f8c20c6..0000000 --- a/templates/server/puppetserver/conf.d/webserver.conf.erb +++ /dev/null @@ -1,20 +0,0 @@ -webserver: { - access-log-config: <%= @server_puppetserver_dir %>/request-logging.xml - client-auth: want -<%- if @server_http -%> - host: <%= @server_ip %> - port: <%= @server_http_port %> -<%- end -%> - ssl-host: <%= @server_ip %> - ssl-port: <%= @server_port %> - ssl-cert: <%= @server_ssl_cert %> - ssl-key: <%= @server_ssl_cert_key %> - ssl-ca-cert: <%= @server_ssl_ca_cert %> -<%- if @server_crl_enable -%> - ssl-crl-path: <%= @server_ssl_ca_crl %> -<%- end -%> -<%- if @server_ca -%> - ssl-cert-chain: <%= @server_ssl_chain %> -<%- end -%> - idle-timeout-milliseconds: <%= @server_web_idle_timeout %> -}