summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-07 10:49:23 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-07 10:49:23 -0200
commitbdd3735b6d71966077e9b40d77b03f1b52d8d472 (patch)
tree6121d75dd050f243cedb1e8d6cf282473d870f9d /templates
parent9537004b1a8e46a8fe875015535bf20d9d8a002d (diff)
downloadpuppet-apache-bdd3735b6d71966077e9b40d77b03f1b52d8d472.tar.gz
puppet-apache-bdd3735b6d71966077e9b40d77b03f1b52d8d472.tar.bz2
Do not include /etc/apache2/httpd.conf
Diffstat (limited to 'templates')
-rw-r--r--templates/apache2.conf.erb2
1 files changed, 1 insertions, 1 deletions
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