aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-05 01:01:29 +0000
committerMichael Scherer <misc@mageia.org>2010-11-05 01:01:29 +0000
commitf6c39c6f7b324825e5704d4b9f897cec39d047be (patch)
tree31a4cbc24d55e854431ebc16b44e0b268c206aa4
parent92d21a733d273bc596f02cb8128a648fe84483f2 (diff)
downloadpuppet-f6c39c6f7b324825e5704d4b9f897cec39d047be.tar
puppet-f6c39c6f7b324825e5704d4b9f897cec39d047be.tar.gz
puppet-f6c39c6f7b324825e5704d4b9f897cec39d047be.tar.bz2
puppet-f6c39c6f7b324825e5704d4b9f897cec39d047be.tar.xz
puppet-f6c39c6f7b324825e5704d4b9f897cec39d047be.zip
- use the refactored vhost
- remove the directive NameVirtualHost, as we are already taking care of it elsewhere
-rw-r--r--modules/epoll/templates/epoll_vhost.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/epoll/templates/epoll_vhost.conf b/modules/epoll/templates/epoll_vhost.conf
index 3b6e133c..272aaa28 100644
--- a/modules/epoll/templates/epoll_vhost.conf
+++ b/modules/epoll/templates/epoll_vhost.conf
@@ -1,6 +1,5 @@
-NameVirtualHost *:80
<VirtualHost *:80>
- ServerName epoll.<%= domain %>
+ ServerName <%= vhost %>
# Serve static content directly
DocumentRoot /dev/null