Bug 7885 - Change filename of TransferLog suggested by packages to fit with logrotate

The apache accesslogs suggested by the default config files are called
*_log, which results in them not getting picked up by logrotate, which
looks for *.log. This patch changes the suggested filenames to *.log.

To test:
Not much to test here, just apply the patch and check that all
occurences of TransferLog and CustomLog are now on the form *.log

All the lines where these occur are commented out, so this will
not actually change any behaviour.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>

diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in
index e9dbf93..42bdbcd 100644 (file)
--- a/debian/templates/apache-site.conf.in
+++ b/debian/templates/apache-site.conf.in
@@ -11,7 +11,7 @@
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
-#  TransferLog /var/log/koha/__KOHASITE__/opac-access_log
+#  TransferLog /var/log/koha/__KOHASITE__/opac-access.log
 #  RewriteLog  /var/log/koha/__KOHASITE__/opac-rewrite.log
 </VirtualHost>
 
@@ -26,6 +26,6 @@
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
-#  TransferLog /var/log/koha/__KOHASITE__/intranet-access_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 2b986ac..dc82d08 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -13,8 +13,8 @@
    ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/opac-search.pl"
    ScriptAlias /search "__OPAC_CGI_DIR__/opac/opac-search.pl"
    ErrorLog __LOG_DIR__/koha-opac-error_log
-#  CustomLog __LOG_DIR__/koha-opac-access_log combined
-#  TransferLog __LOG_DIR__/koha-opac-access_log
+#  CustomLog __LOG_DIR__/koha-opac-access.log combined
+#  TransferLog __LOG_DIR__/koha-opac-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
@@ -106,7 +106,7 @@
    ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
    ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
    ErrorLog __LOG_DIR__/koha-error_log
-#  TransferLog __LOG_DIR__/koha-access_log
+#  TransferLog __LOG_DIR__/koha-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"