From: drebs <drebs@riseup.net>
Date: Fri, 5 Jun 2015 18:43:38 +0000 (-0300)
Subject: update apache2.conf template to jessie
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e946eec81761bcf6f2495541fbec287bca9670fc;p=puppet-apache.git

update apache2.conf template to jessie
---

diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index 122beee..1918048 100644
--- a/templates/apache2.conf.erb
+++ b/templates/apache2.conf.erb
@@ -55,7 +55,7 @@ ServerRoot "/etc/apache2"
 #
 #<IfModule !mpm_winnt.c>
 #<IfModule !mpm_netware.c>
-LockFile /var/lock/apache2/accept.lock
+Mutex sem
 #</IfModule>
 #</IfModule>
 
@@ -192,7 +192,7 @@ Include /etc/apache2/mods-enabled/*.conf
 Include /etc/apache2/ports.conf
 
 # Include generic snippets of statements
-Include /etc/apache2/conf.d/
+Include /etc/apache2/conf.d/*
 
 #
 # The following directives define some format nicknames for use with