other/Puppet: modules/apache/spec/acceptance/vhost

comparison modules/apache/spec/acceptance/vhost_spec.rb @ 36:37675581a273 puppet-3.6

Update Puppet module for Apache (pulls in concat module)

author	IBBoard <dev@ibboard.co.uk>
date	Sat, 14 Mar 2015 20:07:04 +0000
parents	956e484adc12
children	675c1cc61eaf

comparison

equal deleted inserted replaced

-:1bb941522ebf
+:37675581a273
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/15-default.conf") do
-it { should_not be_file }
+it { is_expected.not_to be_file }
 end
 describe file("#{$vhost_dir}/15-default-ssl.conf") do
-it { should_not be_file }
+it { is_expected.not_to be_file }
 end
 end
 context "default vhost without ssl" do
 it 'should create a default vhost config' do
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/15-default.conf") do
-it { should contain '<VirtualHost \*:80>' }
+it { is_expected.to contain '<VirtualHost \*:80>' }
 end
 describe file("#{$vhost_dir}/15-default-ssl.conf") do
-it { should_not be_file }
+it { is_expected.not_to be_file }
 end
 end
 context 'default vhost with ssl' do
 it 'should create default vhost configs' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/15-default.conf") do
-it { should contain '<VirtualHost \*:80>' }
+it { is_expected.to contain '<VirtualHost \*:80>' }
 end
 describe file("#{$vhost_dir}/15-default-ssl.conf") do
-it { should contain '<VirtualHost \*:443>' }
+it { is_expected.to contain '<VirtualHost \*:443>' }
-it { should contain "SSLEngine on" }
+it { is_expected.to contain "SSLEngine on" }
 end
 end
 context 'new vhost on port 80' do
 it 'should configure an apache vhost' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-first.example.com.conf") do
-it { should contain '<VirtualHost \*:80>' }
+it { is_expected.to contain '<VirtualHost \*:80>' }
-it { should contain "ServerName first.example.com" }
+it { is_expected.to contain "ServerName first.example.com" }
 end
 end
 context 'new proxy vhost on port 80' do
 it 'should configure an apache proxy vhost' do
 port    => '80',
 docroot => '/var/www/proxy',
 proxy_pass => [
 { 'path' => '/foo', 'url' => 'http://backend-foo/'},
 ],
+proxy_preserve_host   => true,
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
-it { should contain '<VirtualHost \*:80>' }
+it { is_expected.to contain '<VirtualHost \*:80>' }
-it { should contain "ServerName proxy.example.com" }
+it { is_expected.to contain "ServerName proxy.example.com" }
-it { should contain "ProxyPass" }
+it { is_expected.to contain "ProxyPass" }
-it { should_not contain "<Proxy \*>" }
+it { is_expected.to contain "ProxyPreserveHost On" }
+it { is_expected.not_to contain "<Proxy \*>" }
 end
 end
 context 'new vhost on port 80' do
 it 'should configure two apache vhosts' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe service($service_name) do
-it { should be_enabled }
+it { is_expected.to be_enabled }
-it { should be_running }
+it { is_expected.to be_running }
 end
 it 'should answer to first.example.com' do
 shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-r.stdout.should == "Hello from first\n"
+expect(r.stdout).to eq("Hello from first\n")
 end
 end
 it 'should answer to second.example.com' do
 shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-r.stdout.should == "Hello from second\n"
+expect(r.stdout).to eq("Hello from second\n")
 end
 end
 end
 context 'apache_directories' do
 describe 'readme example, adapted' do
 it 'should configure a vhost with Files' do
 pp = <<-EOS
 class { 'apache': }
-if $apache::apache_version >= 2.4 {
+if versioncmp($apache::apache_version, '2.4') >= 0 {
 $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
 } else {
 $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe service($service_name) do
-it { should be_enabled }
+it { is_expected.to be_enabled }
-it { should be_running }
+it { is_expected.to be_running }
 end
 it 'should answer to files.example.net' do
-shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
+expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n")
-shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
+expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/)
 end
 end
 describe 'other Directory options' do
 it 'should configure a vhost with multiple Directory sections' do
 pp = <<-EOS
 class { 'apache': }
-if $apache::apache_version >= 2.4 {
+if versioncmp($apache::apache_version, '2.4') >= 0 {
 $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
 } else {
-$_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' }
+$_files_match_directory = [
+{ 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
+{ 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
+]
 }
 $_directories = [
 { 'path' => '/var/www/files', },
 { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
 }
 file { '/var/www/files/private.html':
 ensure  => file,
 content => "Hello World\\n",
 }
+file { '/var/www/files/bar':
+ensure => directory,
+}
+file { '/var/www/files/bar/bar.html':
+ensure  => file,
+content => "Hello Bar\\n",
+}
 host { 'files.example.net': ip => '127.0.0.1', }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe service($service_name) do
-it { should be_enabled }
+it { is_expected.to be_enabled }
-it { should be_running }
+it { is_expected.to be_running }
 end
 it 'should answer to files.example.net' do
-shell("/usr/bin/curl -sSf files.example.net:80/").stdout.should eq("Hello World\n")
+expect(shell("/usr/bin/curl -sSf files.example.net:80/").stdout).to eq("Hello World\n")
-shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout.should eq("Hello Foo\n")
+expect(shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout).to eq("Hello Foo\n")
-shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
+expect(shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/)
+expect(shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout).to eq("Hello Bar\n")
 end
 end
 describe 'SetHandler directive' do
 it 'should configure a vhost with a SetHandler directive' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe service($service_name) do
+it { is_expected.to be_enabled }
+it { is_expected.to be_running }
+end
+it 'should answer to files.example.net' do
+expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n")
+expect(shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout).to match(/Scoreboard: /)
+end
+end
+describe 'Satisfy and Auth directive', :unless => $apache_version == '2.4' do
+it 'should configure a vhost with Satisfy and Auth directive' do
+pp = <<-EOS
+class { 'apache': }
+host { 'files.example.net': ip => '127.0.0.1', }
+apache::vhost { 'files.example.net':
+docroot     => '/var/www/files',
+directories => [
+{
+path => '/var/www/files/foo',
+auth_type => 'Basic',
+auth_name => 'Basic Auth',
+auth_user_file => '/var/www/htpasswd',
+auth_require => "valid-user",
+},
+{
+path => '/var/www/files/bar',
+auth_type => 'Basic',
+auth_name => 'Basic Auth',
+auth_user_file => '/var/www/htpasswd',
+auth_require => 'valid-user',
+satisfy => 'Any',
+},
+{
+path => '/var/www/files/baz',
+allow => 'from 10.10.10.10',
+auth_type => 'Basic',
+auth_name => 'Basic Auth',
+auth_user_file => '/var/www/htpasswd',
+auth_require => 'valid-user',
+satisfy => 'Any',
+},
+],
+}
+file { '/var/www/files/foo':
+ensure => directory,
+}
+file { '/var/www/files/bar':
+ensure => directory,
+}
+file { '/var/www/files/baz':
+ensure => directory,
+}
+file { '/var/www/files/foo/index.html':
+ensure  => file,
+content => "Hello World\\n",
+}
+file { '/var/www/files/bar/index.html':
+ensure  => file,
+content => "Hello World\\n",
+}
+file { '/var/www/files/baz/index.html':
+ensure  => file,
+content => "Hello World\\n",
+}
+file { '/var/www/htpasswd':
+ensure  => file,
+content => "login:IZ7jMcLSx0oQk", # "password" as password
+}
+EOS
+apply_manifest(pp, :catch_failures => true)
+end
+describe service($service_name) do
 it { should be_enabled }
 it { should be_running }
 end
 it 'should answer to files.example.net' do
-shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
+shell("/usr/bin/curl -sSf files.example.net:80/foo/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/)
-shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout.should match(/Scoreboard: /)
+shell("/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html").stdout.should eq("Hello World\n")
+shell("/usr/bin/curl -sSf files.example.net:80/bar/index.html").stdout.should eq("Hello World\n")
+shell("/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html").stdout.should eq("Hello World\n")
+shell("/usr/bin/curl -sSf files.example.net:80/baz/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/)
+shell("/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html").stdout.should eq("Hello World\n")
 end
 end
 end
 case fact('lsbdistcodename')
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe service($service_name) do
-it { should be_enabled }
+it { is_expected.to be_enabled }
-it { should be_running }
+it { is_expected.to be_running }
 end
 it 'should answer to fallback.example.net' do
 shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
-r.stdout.should == "Hello World\n"
+expect(r.stdout).to eq("Hello World\n")
 end
 end
 end
 else
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe service($service_name) do
-it { should be_enabled }
+it { is_expected.to be_enabled }
-it { should be_running }
+it { is_expected.to be_running }
 end
 it 'should answer to a.virt.example.com' do
 shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-r.stdout.should == "Hello from a.virt\n"
+expect(r.stdout).to eq("Hello from a.virt\n")
 end
 end
 it 'should answer to b.virt.example.com' do
 shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-r.stdout.should == "Hello from b.virt\n"
+expect(r.stdout).to eq("Hello from b.virt\n")
 end
 end
 end
 context 'proxy_pass for alternative vhost' do
 file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
 file { '/var/www/local/subdir/index.html':
 ensure  => file,
 content => "Hello from localhost\\n",
 }
 }, :catch_failures => true)
 end
 describe service($service_name) do
-it { should be_enabled }
+it { is_expected.to be_enabled }
-it { should be_running }
+it { is_expected.to be_running }
 end
 it 'should get a response from the back end' do
 shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
-r.stdout.should == "Hello from localhost\n"
+expect(r.stdout).to eq("Hello from localhost\n")
-r.exit_code.should == 0
+expect(r.exit_code).to eq(0)
 end
 end
 end
 describe 'ip_based' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file($ports_file) do
-it { should be_file }
+it { is_expected.to be_file }
-it { should_not contain 'NameVirtualHost test.server' }
+it { is_expected.not_to contain 'NameVirtualHost test.server' }
 end
 end
 describe 'add_listen' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file($ports_file) do
-it { should be_file }
+it { is_expected.to be_file }
-it { should_not contain 'Listen 80' }
+it { is_expected.not_to contain 'Listen 80' }
-it { should contain 'Listen 81' }
+it { is_expected.to contain 'Listen 81' }
 end
 end
 describe 'docroot' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file('/tmp/test') do
-it { should be_directory }
+it { is_expected.to be_directory }
-it { should be_owned_by 'test_owner' }
+it { is_expected.to be_owned_by 'test_owner' }
-it { should be_grouped_into 'test_group' }
+it { is_expected.to be_grouped_into 'test_group' }
-it { should be_mode 750 }
+it { is_expected.to be_mode 750 }
 end
 end
 describe 'default_vhost' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file($ports_file) do
-it { should be_file }
+it { is_expected.to be_file }
 if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-it { should_not contain 'NameVirtualHost test.server' }
+it { is_expected.not_to contain 'NameVirtualHost test.server' }
 elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
-it { should_not contain 'NameVirtualHost test.server' }
+it { is_expected.not_to contain 'NameVirtualHost test.server' }
 else
-it { should contain 'NameVirtualHost test.server' }
+it { is_expected.to contain 'NameVirtualHost test.server' }
 end
 end
 describe file("#{$vhost_dir}/10-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
 end
 end
 describe 'options' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'Options Indexes FollowSymLinks ExecCGI' }
+it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' }
 end
 end
 describe 'override' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'AllowOverride All' }
+it { is_expected.to contain 'AllowOverride All' }
 end
 end
 describe 'logroot' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain '  CustomLog "/tmp' }
+it { is_expected.to contain '  CustomLog "/tmp' }
 end
 end
 ['access', 'error'].each do |logtype|
 case logtype
 class { 'apache': }
 host { 'test.server': ip => '127.0.0.1' }
 apache::vhost { 'test.server':
 docroot    => '/tmp',
 logroot    => '/tmp',
 #{logtype}_log => false,
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should_not contain "  #{logname} \"/tmp" }
+it { is_expected.not_to contain "  #{logname} \"/tmp" }
 end
 end
 describe "#{logtype}_log_pipe" do
 it 'applies cleanly' do
 class { 'apache': }
 host { 'test.server': ip => '127.0.0.1' }
 apache::vhost { 'test.server':
 docroot    => '/tmp',
 logroot    => '/tmp',
 #{logtype}_log_pipe => '|/bin/sh',
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain "  #{logname} \"|/bin/sh" }
+it { is_expected.to contain "  #{logname} \"|/bin/sh" }
 end
 end
 describe "#{logtype}_log_syslog" do
 it 'applies cleanly' do
 class { 'apache': }
 host { 'test.server': ip => '127.0.0.1' }
 apache::vhost { 'test.server':
 docroot    => '/tmp',
 logroot    => '/tmp',
 #{logtype}_log_syslog => 'syslog',
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain "  #{logname} \"syslog\"" }
+it { is_expected.to contain "  #{logname} \"syslog\"" }
 end
 end
 end
 describe 'access_log_format' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'CustomLog "syslog" "%h %l"' }
+it { is_expected.to contain 'CustomLog "syslog" "%h %l"' }
 end
 end
 describe 'access_log_env_var' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'CustomLog "syslog" combined env=admin' }
+it { is_expected.to contain 'CustomLog "syslog" combined env=admin' }
+end
+end
+describe 'multiple access_logs' do
+it 'applies cleanly' do
+pp = <<-EOS
+class { 'apache': }
+host { 'test.server': ip => '127.0.0.1' }
+apache::vhost { 'test.server':
+docroot            => '/tmp',
+logroot            => '/tmp',
+access_logs => [
+{'file' => 'log1'},
+{'file' => 'log2', 'env' => 'admin' },
+{'file' => '/var/tmp/log3', 'format' => '%h %l'},
+{'syslog' => 'syslog' }
+]
+}
+EOS
+apply_manifest(pp, :catch_failures => true)
+end
+describe file("#{$vhost_dir}/25-test.server.conf") do
+it { is_expected.to be_file }
+it { is_expected.to contain 'CustomLog "/tmp/log1" combined' }
+it { is_expected.to contain 'CustomLog "/tmp/log2" combined env=admin' }
+it { is_expected.to contain 'CustomLog "/var/tmp/log3" "%h %l"' }
+it { is_expected.to contain 'CustomLog "syslog" combined' }
 end
 end
 describe 'aliases' do
 it 'applies cleanly' do
 pp = <<-EOS
 class { 'apache': }
 host { 'test.server': ip => '127.0.0.1' }
 apache::vhost { 'test.server':
 docroot    => '/tmp',
-aliases => [{ alias => '/image', path => '/ftp/pub/image' }],
+aliases => [
-}
+{ alias       => '/image'    , path => '/ftp/pub/image' }   ,
-EOS
+{ scriptalias => '/myscript' , path => '/usr/share/myscript' }
-apply_manifest(pp, :catch_failures => true)
+],
-end
+}
+EOS
-describe file("#{$vhost_dir}/25-test.server.conf") do
+apply_manifest(pp, :catch_failures => true)
-it { should be_file }
+end
-it { should contain 'Alias /image "/ftp/pub/image"' }
+describe file("#{$vhost_dir}/25-test.server.conf") do
+it { is_expected.to be_file }
+it { is_expected.to contain 'Alias /image "/ftp/pub/image"' }
+it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
 end
 end
 describe 'scriptaliases' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
+it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' }
 end
 end
 describe 'proxy' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'ProxyPass          / test2/' }
+it { is_expected.to contain 'ProxyPass          / test2/' }
 end
 end
 describe 'actions' do
 it 'applies cleanly' do
 pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian'
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'Action php-fastcgi /cgi-bin virtual' }
+it { is_expected.to contain 'Action php-fastcgi /cgi-bin virtual' }
 end
 end
 describe 'suphp' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain "suPHP_AddHandler #{$suphp_handler}" }
+it { is_expected.to contain "suPHP_AddHandler #{$suphp_handler}" }
-it { should contain 'suPHP_Engine on' }
+it { is_expected.to contain 'suPHP_Engine on' }
-it { should contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
+it { is_expected.to contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
 end
 end
 describe 'no_proxy_uris' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'ProxyPass          / http://test2/' }
+it { is_expected.to contain 'ProxyPass          / http://test2/' }
-it { should contain 'ProxyPass        http://test2/test !' }
+it { is_expected.to contain 'ProxyPass        http://test2/test !' }
 end
 end
 describe 'redirect' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'Redirect permanent /images http://test.server/' }
+it { is_expected.to contain 'Redirect permanent /images http://test.server/' }
 end
 end
 # Passenger isn't even in EPEL on el-5
 if default['platform'] !~ /^el-5/
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'RackBaseURI /test' }
+it { is_expected.to contain 'RackBaseURI /test' }
 end
 end
 end
 end
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'append MirrorID "mirror 12"' }
+it { is_expected.to contain 'append MirrorID "mirror 12"' }
 end
 end
 describe 'rewrite rules' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
+it { is_expected.to be_file }
+it { is_expected.to contain '#test' }
+it { is_expected.to contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
+it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' }
+end
+end
+describe 'directory rewrite rules' do
+it 'applies cleanly' do
+pp = <<-EOS
+class { 'apache': }
+host { 'test.server': ip => '127.0.0.1' }
+if ! defined(Class['apache::mod::rewrite']) {
+include ::apache::mod::rewrite
+}
+apache::vhost { 'test.server':
+docroot      => '/tmp',
+directories  => [
+{
+path => '/tmp',
+rewrites => [
+{
+comment => 'Permalink Rewrites',
+rewrite_base => '/',
+},
+{ rewrite_rule => [ '^index\\.php$ - [L]' ] },
+{ rewrite_cond => [
+'%{REQUEST_FILENAME} !-f',
+'%{REQUEST_FILENAME} !-d',                                                                                             ],                                                                                                                     rewrite_rule => [ '. /index.php [L]' ],                                                                              }
+],
+},
+],
+}
+EOS
+apply_manifest(pp, :catch_failures => true)
+end
+describe file("#{$vhost_dir}/25-test.server.conf") do
 it { should be_file }
-it { should contain '#test' }
+it { should contain '#Permalink Rewrites' }
-it { should contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
+it { should contain 'RewriteEngine On' }
-it { should contain 'RewriteRule ^index.html$ welcome.html' }
+it { should contain 'RewriteBase /' }
+it { should contain 'RewriteRule ^index\.php$ - [L]' }
+it { should contain 'RewriteCond %{REQUEST_FILENAME} !-f' }
+it { should contain 'RewriteCond %{REQUEST_FILENAME} !-d' }
+it { should contain 'RewriteRule . /index.php [L]' }
 end
 end
 describe 'setenv/setenvif' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'SetEnv TEST /test' }
+it { is_expected.to contain 'SetEnv TEST /test' }
-it { should contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
+it { is_expected.to contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
 end
 end
 describe 'block' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
+it { is_expected.to contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
 end
 end
 describe 'wsgi' do
 it 'import_script applies cleanly' do
 wsgi_application_group      => '%{GLOBAL}',
 wsgi_daemon_process         => 'wsgi',
 wsgi_daemon_process_options => {processes => '2'},
 wsgi_process_group          => 'nobody',
 wsgi_script_aliases         => { '/test' => '/test1' },
+wsgi_pass_authorization     => 'On',
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 wsgi_daemon_process_options => {processes => '2'},
 wsgi_import_script          => '/test1',
 wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
 wsgi_process_group          => 'nobody',
 wsgi_script_aliases         => { '/test' => '/test1' },
+wsgi_pass_authorization     => 'On',
+wsgi_chunked_request        => 'On',
 }
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
+it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
-it { should contain 'WSGIDaemonProcess wsgi processes=2' }
+it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' }
-it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
+it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-it { should contain 'WSGIProcessGroup nobody' }
+it { is_expected.to contain 'WSGIProcessGroup nobody' }
-it { should contain 'WSGIScriptAlias /test "/test1"' }
+it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' }
+it { is_expected.to contain 'WSGIPassAuthorization On' }
+it { is_expected.to contain 'WSGIChunkedRequest On' }
 end
 end
 describe 'custom_fragment' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain '#weird test string' }
+it { is_expected.to contain '#weird test string' }
 end
 end
 describe 'itk' do
 it 'applies cleanly' do
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'AssignUserId nobody nobody' }
+it { is_expected.to contain 'AssignUserId nobody nobody' }
 end
 end
 # So what does this work on?
 if default['platform'] !~ /^(debian-(6|7)|el-(5|6|7))/
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
+it { is_expected.to contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-it { should contain '<Directory "/tmp/fast">' }
+it { is_expected.to contain '<Directory "/tmp/fast">' }
 end
 end
 end
 describe 'additional_includes' do
 it 'applies cleanly' do
 pp = <<-EOS
-if $::osfamily == 'RedHat' and $::selinux == 'true' {
+if $::osfamily == 'RedHat' and $::selinux {
 $semanage_package = $::operatingsystemmajrelease ? {
 '5'     => 'policycoreutils',
 default => 'policycoreutils-python',
 }
 exec { 'set_apache_defaults':
 EOS
 apply_manifest(pp, :catch_failures => true)
 end
 describe file("#{$vhost_dir}/25-test.server.conf") do
-it { should be_file }
+it { is_expected.to be_file }
-it { should contain 'Include "/apache_spec/include"' }
+it { is_expected.to contain 'Include "/apache_spec/include"' }
 end
 end
+describe 'virtualhost without priority prefix' do
+it 'applies cleanly' do
+pp = <<-EOS
+class { 'apache': }
+apache::vhost { 'test.server':
+priority => false,
+docroot => '/tmp'
+}
+EOS
+apply_manifest(pp, :catch_failures => true)
+end
+describe file("#{$vhost_dir}/test.server.conf") do
+it { is_expected.to be_file }
+end
+end
 end

Mercurial > repos > other > Puppet

comparison modules/apache/spec/acceptance/vhost_spec.rb @ 36:37675581a273 puppet-3.6