Revision

122

Author

misc

Date

2010-11-05 02:01:29 +0100 (Fri, 05 Nov 2010)

Log Message

- use the refactored vhost
- remove the directive NameVirtualHost, as we are already taking care of it elsewhere

Modified Paths

• puppet/modules/epoll/templates/epoll_vhost.conf

Modified: puppet/modules/epoll/templates/epoll_vhost.conf
===================================================================
--- puppet/modules/epoll/templates/epoll_vhost.conf	2010-11-05 00:58:36 UTC (rev 121)
+++ puppet/modules/epoll/templates/epoll_vhost.conf	2010-11-05 01:01:29 UTC (rev 122)
@@ -1,6 +1,5 @@
-NameVirtualHost *:80
 <VirtualHost *:80>
-        ServerName epoll.<%= domain %>
+        ServerName <%= vhost %>
         # Serve static content directly
         DocumentRoot  /dev/null