Bug 18670: Remove RewriteLog and RewriteLogLevel from sample config files

It looks like RewriteLog will no longer work with Apache 2.4 and later.

RewriteLog
Those familiar with earlier versions of mod_rewrite will
no doubt be looking for the RewriteLog and RewriteLogLevel
directives. This functionality has been completely replaced
by the new per-module logging configuration mentioned above.
http://httpd.apache.org/docs/current/mod/mod_rewrite.html

All lines removed were commented out, so there should be
no change in behaviour or side effects.

To test.
- Verify every mention of RewriteLog has been removed from Koha
- Verify patch by reading it

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/debian/templates/apache-site-https.conf.in b/debian/templates/apache-site-https.conf.in
index b0f6883..196a415 100644 (file)
--- a/debian/templates/apache-site-https.conf.in
+++ b/debian/templates/apache-site-https.conf.in
@@ -34,7 +34,6 @@
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
 #  TransferLog /var/log/koha/__KOHASITE__/opac-access.log
-#  RewriteLog  /var/log/koha/__KOHASITE__/opac-rewrite.log
 </VirtualHost>
 
 # Intranet
@@ -62,5 +61,4 @@
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
 #  TransferLog /var/log/koha/__KOHASITE__/intranet-access.log
-#  RewriteLog  /var/log/koha/__KOHASITE__/intranet-rewrite.log
 </VirtualHost>

diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in
index 654674d..9e94f59 100644 (file)
--- a/debian/templates/apache-site.conf.in
+++ b/debian/templates/apache-site.conf.in
@@ -16,7 +16,6 @@
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
 #  TransferLog /var/log/koha/__KOHASITE__/opac-access.log
-#  RewriteLog  /var/log/koha/__KOHASITE__/opac-rewrite.log
 </VirtualHost>
 
 # Intranet
@@ -35,5 +34,4 @@
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
 #  TransferLog /var/log/koha/__KOHASITE__/intranet-access.log
-#  RewriteLog  /var/log/koha/__KOHASITE__/intranet-rewrite.log
 </VirtualHost>

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 2fe7df4..20a9b45 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -100,10 +100,6 @@
      # Rewrite Rules
      RewriteEngine On
 
-     # Uncomment to turn on rewrite logging
-     #RewriteLog __LOG_DIR__/koha-opac-rewrite.log
-     #RewriteLogLevel 1
-
      #The following two directives are unnecessary to proper Koha functioning.
      #RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)
      #RewriteRule (.+) $1?%1%2 [N,R,NE]
@@ -224,10 +220,6 @@
      # Rewrite Rules
      RewriteEngine On
 
-     # Uncomment to turn on rewrite logging
-     #RewriteLog __LOG_DIR__/koha-intranet-rewrite.log
-     #RewriteLogLevel 1
-
      #The following two directives are unnecessary to proper Koha functioning.
      #RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)
      #RewriteRule (.+) $1?%1%2 [N,R,NE]