From 2e3e405ab57c6d7c1d0fb4b9b262d2759dd106c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Tue, 3 Apr 2012 17:07:28 +0200
Subject: [PATCH] Update apache_frontend configuration to be compatible with
apache 2.4
---
.../recipe/apache_frontend/template/apache.conf.in | 12 +++---------
.../template/apache.ssl-snippet.conf.in | 2 ++
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/slapos/recipe/apache_frontend/template/apache.conf.in b/slapos/recipe/apache_frontend/template/apache.conf.in
index 0a6adb235..5fe2274d6 100644
--- a/slapos/recipe/apache_frontend/template/apache.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.conf.in
@@ -3,7 +3,6 @@
# Basic server configuration
PidFile "%(pid_file)s"
-LockFile "%(lock_file)s"
ServerName %(server_name)s
DocumentRoot %(document_root)s
@@ -28,14 +27,6 @@ LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"
LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
CustomLog "%(access_log)s" common
-# Directory protection
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
-</Directory>
-
%(path_enable)s
# Rewrite part
@@ -58,6 +49,9 @@ RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
ErrorDocument 404 /notfound.html
# List of modules
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
diff --git a/slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in b/slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in
index 67e6766ef..317769069 100644
--- a/slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in
@@ -4,3 +4,5 @@ SSLCertificateFile %(login_certificate)s
SSLCertificateKeyFile %(login_key)s
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerExpire off
\ No newline at end of file
--
2.30.9