diff --git a/manifests/apache.pp b/manifests/apache.pp index 758d836..5df8fe1 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -152,9 +152,10 @@ class ethercalc::apache ( } file { '/etc/ssl/private': - ensure => directory, - owner => 'root', - mode => '0700', + ensure => directory, + owner => 'root', + mode => '0700', + require => Package['ssl-cert'], } if $ssl_cert_file_contents != '' { diff --git a/spec/acceptance/ethercalc_spec.rb b/spec/acceptance/ethercalc_spec.rb index aede7d0..e45bad3 100644 --- a/spec/acceptance/ethercalc_spec.rb +++ b/spec/acceptance/ethercalc_spec.rb @@ -49,6 +49,10 @@ describe 'puppet-ethercalc:: manifest', :if => ['debian', 'ubuntu'].include?(os[ describe command('curl http://localhost:8000 --verbose') do its(:stdout) { should contain('EtherCalc - Share the URL to your friends') } end + + describe command('curl -L -k http://localhost --verbose') do + its(:stdout) { should contain('EtherCalc - Share the URL to your friends') } + end end end diff --git a/spec/acceptance/fixtures/ethercalc.pp b/spec/acceptance/fixtures/ethercalc.pp index d721bd3..c86350c 100644 --- a/spec/acceptance/fixtures/ethercalc.pp +++ b/spec/acceptance/fixtures/ethercalc.pp @@ -3,3 +3,9 @@ $source_dir = '/opt/openstack-health' include ethercalc::redis class { '::ethercalc': } + +class { '::ethercalc::apache': + ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem', + ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key', + vhost_name => 'localhost', +}