diff options
author | drebs <drebs@riseup.net> | 2015-06-05 15:43:38 -0300 |
---|---|---|
committer | drebs <drebs@riseup.net> | 2015-06-05 15:43:38 -0300 |
commit | ca107c5730b6882cc55cd17ac0f7fd706b09e198 (patch) | |
tree | f0deab0451907db87e75091c217e496d35e5dcf1 | |
parent | 2c32f1c0cfe326bf888b49091242aa57b8ad6f87 (diff) | |
download | puppet-apache-ca107c5730b6882cc55cd17ac0f7fd706b09e198.tar.gz puppet-apache-ca107c5730b6882cc55cd17ac0f7fd706b09e198.tar.bz2 |
update apache2.conf template to jessie
-rw-r--r-- | templates/apache2.conf.erb | 4 |
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 |