From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 7 Jan 2013 12:49:23 +0000 (-0200)
Subject: Do not include /etc/apache2/httpd.conf
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bdd3735b6d71966077e9b40d77b03f1b52d8d472;p=puppet-apache.git

Do not include /etc/apache2/httpd.conf
---

diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index 776cadc..26760b6 100644
--- a/templates/apache2.conf.erb
+++ b/templates/apache2.conf.erb
@@ -187,7 +187,7 @@ Include /etc/apache2/mods-enabled/*.load
 Include /etc/apache2/mods-enabled/*.conf
 
 # Include all the user configurations:
-Include /etc/apache2/httpd.conf
+#Include /etc/apache2/httpd.conf
 
 # Include ports listing
 Include /etc/apache2/ports.conf