Permalink
Browse files

Merge branch 'dev/apache_vhost_ssl' into dev/travis

  • Loading branch information...
2 parents c4698d8 + 648b927 commit ec3c7941bd70553fa4cd42ce7f6a1b698834f90f @raphink committed Jul 20, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 manifests/master/passenger.pp
  2. +3 −3 spec/classes/puppet_master_passenger_spec.rb
@@ -50,7 +50,7 @@
apache::module {'passenger': require => Class['ruby::passenger::apache']}
}
- apache::vhost-ssl {'puppetmasterd':
+ apache::vhost::ssl {'puppetmasterd':
config_content => template('puppet/vhost-passenger.conf.erb'),
mode => '2755',
user => 'root',
@@ -3,7 +3,7 @@
describe 'puppet::master::passenger' do
let(:pre_condition) { "
class apache::params {}
-define apache::vhost-ssl($ensure='present', $config_content, $mode, $user) {}
+define apache::vhost::ssl($ensure='present', $config_content, $mode, $user) {}
define apache::module($ensure='present') {}
define apache::listen($ensure='present') {}
@@ -24,7 +24,7 @@ class ruby::passenger::apache {}
it { should contain_apache__module('passenger') }
- it do should contain_apache__vhost-ssl('puppetmasterd').with(
+ it do should contain_apache__vhost__ssl('puppetmasterd').with(
'mode' => '2755',
'user' => 'root'
) end
@@ -87,7 +87,7 @@ class ruby::passenger::apache {}
it { should contain_apache__module('passenger') }
- it do should contain_apache__vhost-ssl('puppetmasterd').with(
+ it do should contain_apache__vhost__ssl('puppetmasterd').with(
'mode' => '2755',
'user' => 'root'
) end

0 comments on commit ec3c794

Please sign in to comment.