fix tests

This commit is contained in:
Walter Heck 2012-04-16 15:19:12 +08:00
parent 789d8d3f3b
commit 273f94d321
2 changed files with 7 additions and 3 deletions

View File

@ -4,8 +4,8 @@
NameVirtualHost *:80 NameVirtualHost *:80
<VirtualHost *:80> <VirtualHost *:80>
ServerName testvhost ServerName testvhost
DocumentRoot /tmp/testvhost DocumentRoot <%= docroot %>
<Directory /tmp/testvhost> <Directory <%= docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny

View File

@ -1,2 +1,6 @@
include apache include apache
apache::vhost { 'test.vhost': source => 'puppet:///modules/apache/test.vhost' } apache::vhost { 'test.vhost':
port => 80,
docroot => '/tmp/testvhost',
template => 'apache/test.vhost.erb'
}