From d687de65069e6080df6f02f2c06ca7f4929ffbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Thu, 10 May 2012 11:12:47 +0200
Subject: [PATCH] Apache-frontend uses Apache 2.2 again
---
slapos/recipe/apache_frontend/template/apache.conf.in | 11 ++++++++---
software/apache-frontend/software.cfg | 4 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/slapos/recipe/apache_frontend/template/apache.conf.in b/slapos/recipe/apache_frontend/template/apache.conf.in
index 43b4876ab..406ac6024 100644
--- a/slapos/recipe/apache_frontend/template/apache.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.conf.in
@@ -32,6 +32,8 @@ CustomLog "%(access_log)s" common
%(path_enable)s
# Rewrite part
+ProxyVia On
+ProxyTimeout 600
RewriteEngine On
# Define the two rewritemaps : one for zope, one generic
@@ -51,9 +53,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 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
@@ -67,8 +69,11 @@ LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule negotiation_module modules/mod_negotiation.so
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so
+LoadModule cache_module modules/mod_cache.so
LoadModule antiloris_module modules/mod_antiloris.so
+CacheDefaultExpire 3600
+
# The following directives modify normal HTTP response behavior to
# handle known problems with browser implementations.
BrowserMatch "Mozilla/2" nokeepalive
diff --git a/software/apache-frontend/software.cfg b/software/apache-frontend/software.cfg
index 90df60953..c2f10f1b3 100644
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -17,8 +17,8 @@ parts =
template
binutils
gcc-java-minimal
- apache
- apache-antiloris
+ apache-2.2
+ apache-antiloris-apache-2.2
stunnel
varnish-2.1
--
2.30.9