aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch')
-rw-r--r--main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch b/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
new file mode 100644
index 0000000000..38cdab43a7
--- /dev/null
+++ b/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
@@ -0,0 +1,66 @@
+From 952a6b229f190aa6b46ecb1a47ec464a092f51b4 Mon Sep 17 00:00:00 2001
+From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+Date: Fri, 11 Sep 2015 11:40:22 +0300
+Subject: [PATCH 05/14] httpd.conf: ErrorLog/CustomLog/TransferLog
+
+---
+ docs/conf/extra/httpd-ssl.conf.in | 6 +++---
+ docs/conf/httpd.conf.in | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
+index f093b32..65dae32 100644
+--- a/docs/conf/extra/httpd-ssl.conf.in
++++ b/docs/conf/extra/httpd-ssl.conf.in
+@@ -124,8 +124,8 @@ SSLSessionCacheTimeout 300
+ DocumentRoot "@exp_htdocsdir@"
+ ServerName www.example.com:@@SSLPort@@
+ ServerAdmin you@example.com
+-ErrorLog "@exp_logfiledir@/error_log"
+-TransferLog "@exp_logfiledir@/access_log"
++ErrorLog logs/ssl_error.log
++TransferLog logs/ssl_access.log
+
+ # SSL Engine Switch:
+ # Enable/Disable SSL for this virtual host.
+@@ -284,7 +284,7 @@ BrowserMatch "MSIE [2-5]" \
+ # Per-Server Logging:
+ # The home of a custom SSL log file. Use this when you want a
+ # compact non-error SSL logfile on a virtual host basis.
+-CustomLog "@exp_logfiledir@/ssl_request_log" \
++CustomLog logs/ssl_request.log \
+ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+ </VirtualHost>
+diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
+index a1cf630..565fb01 100644
+--- a/docs/conf/httpd.conf.in
++++ b/docs/conf/httpd.conf.in
+@@ -201,7 +201,7 @@ DocumentRoot "@exp_htdocsdir@"
+ # logged here. If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog "@rel_logfiledir@/error_log"
++ErrorLog logs/error.log
+
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -230,13 +230,13 @@ LogLevel warn
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+- CustomLog "@rel_logfiledir@/access_log" common
++ #CustomLog logs/access.log common
+
+ #
+ # If you prefer a logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+- #CustomLog "@rel_logfiledir@/access_log" combined
++ CustomLog logs/access.log combined
+ </IfModule>
+
+ <IfModule alias_module>
+--
+2.5.0
+