opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Update vhost.pp"

Browse source 
This reverts commit 5ee2f65.

Fixes #186
This commit is contained in:
Matthew Haughton 2013-11-21 22:23:44 -05:00
parent 962fa6672a
commit 4204dc908b
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/resource/vhost.pp
View file

@ -260,7 +260,7 @@ define nginx::resource::vhost (
undef => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.error.log",
default => $error_log,
}
file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-300-ssl":
file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl":
ensure => $ensure ? {
'absent' => absent,
default => 'file',

18
spec/defines/resource_vhost_spec.rb
View file

@ -403,10 +403,10 @@ describe 'nginx::resource::vhost' do
:ssl_key => 'dummy.key',
:ssl_cert => 'dummy.crt',
}) end
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_mode('0644') }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_mode('0644') }
it param[:title] do
verify_contents(subject, "/tmp/nginx.d/#{title}-300-ssl", Array(param[:match]))
lines = subject.resource('file', "/tmp/nginx.d/#{title}-300-ssl").send(:parameters)[:content].split("\n")
verify_contents(subject, "/tmp/nginx.d/#{title}-700-ssl", Array(param[:match]))
lines = subject.resource('file', "/tmp/nginx.d/#{title}-700-ssl").send(:parameters)[:content].split("\n")
(Array(param[:notmatch]).collect { |x| lines.grep x }.flatten).should be_empty
end
end
@ -555,7 +555,7 @@ describe 'nginx::resource::vhost' do
it { should contain_file("/tmp/nginx.d/#{title}-001").with_ensure('absent') }
it { should contain_file("/tmp/nginx.d/#{title}-699").with_ensure('absent') }
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_ensure('absent') }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_ensure('absent') }
it { should contain_file("/tmp/nginx.d/#{title}-999-ssl").with_ensure('absent') }
it { should contain_nginx__resource__location("#{title}-default").with_ensure('absent') }
end
@ -570,8 +570,8 @@ describe 'nginx::resource::vhost' do
}) end
it { should contain_nginx__resource__location("#{title}-default").with_ssl_only(true) }
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_content(%r{access_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.access\.log}) }
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_content(%r{error_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.error\.log}) }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_content(%r{access_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.access\.log}) }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_content(%r{error_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.error\.log}) }
it { should contain_file("/tmp/nginx.d/#{title}-999-ssl") }
it { should contain_file("/etc/nginx/#{title}.crt") }
it { should contain_file("/etc/nginx/#{title}.key") }
@ -595,9 +595,9 @@ describe 'nginx::resource::vhost' do
:ssl_cert => 'dummy.cert',
}) end
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_content( /passenger_set_cgi_param test1 test value 1;/ ) }
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_content( /passenger_set_cgi_param test2 test value 2;/ ) }
it { should contain_file("/tmp/nginx.d/#{title}-300-ssl").with_content( /passenger_set_cgi_param test3 test value 3;/ ) }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_content( /passenger_set_cgi_param test1 test value 1;/ ) }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_content( /passenger_set_cgi_param test2 test value 2;/ ) }
it { should contain_file("/tmp/nginx.d/#{title}-700-ssl").with_content( /passenger_set_cgi_param test3 test value 3;/ ) }
end
context 'when vhost_cfg_append is set and ssl => true' do