summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2015-06-05 15:43:38 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-07-31 17:23:16 -0300
commite946eec81761bcf6f2495541fbec287bca9670fc (patch)
tree3f31c4941f7a293d2a0490610351b73d4cf882f5 /templates
parent37b13a9a980da09abea7e73082a82bd58860c520 (diff)
downloadpuppet-apache-e946eec81761bcf6f2495541fbec287bca9670fc.tar.gz
puppet-apache-e946eec81761bcf6f2495541fbec287bca9670fc.tar.bz2
update apache2.conf template to jessie
Diffstat (limited to 'templates')
-rw-r--r--templates/apache2.conf.erb4
1 files changed, 2 insertions, 2 deletions
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