update apache2.conf template to jessie

diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index 122beee18b8a4b67f1ecbdb5ed0a0b7ff150c55a..1918048d31903c69770decaa3a2f09c626e04d14 100644 (file)
--- 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