Merge branch 'frontend'

bc156ba1 · Cédric de Saint Martin · ce1afa34 · 89051815 · bc156ba1
Commit bc156ba1 authored Mar 29, 2013 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

slapos/recipe/apache_frontend/template/apache.conf.in slapos/recipe/apache_frontend/template/apache.conf.in +2 -1

No files found.
--- a/slapos/recipe/apache_frontend/template/apache.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.conf.in
@@ -22,7 +22,7 @@ ServerTokens Prod

 # Log configuration
 ErrorLog "%(error_log)s"
-LogLevel warn
+LogLevel info
 LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
 LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b" common
 CustomLog "%(access_log)s" common
@@ -130,6 +130,7 @@ Header append Vary User-Agent

 <VirtualHost *:%(plain_http_port)s>
  RewriteEngine On
+  SSLProxyEngine on
  ProxyPreserveHost On

  # Include configuration file not operated by slapos. This file won't be erased