Bug 16777: Correct intranet search alias

A long-standing typo in our apache config files:
[intranet]/search refers to search.pl (which does not exist)

This patch refers it to catalogue/search.pl

Test plan:
Run an install or copy the change from apache-shared-intranet.conf or
koha-httpd.conf to your apache config. Restart Apache and check
if http://[your staff client]/search works.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by making manual changes according to the patch. Did not test a
new installation.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf
index 04bab25..06d2b18 100644 (file)
--- a/debian/templates/apache-shared-intranet.conf
+++ b/debian/templates/apache-shared-intranet.conf
@@ -9,7 +9,7 @@ DocumentRoot /usr/share/koha/intranet/htdocs
 
 ScriptAlias /cgi-bin/koha/ "/usr/share/koha/intranet/cgi-bin/"
 ScriptAlias /index.html "/usr/share/koha/intranet/cgi-bin/mainpage.pl"
-ScriptAlias /search "/usr/share/koha/intranet/cgi-bin/search.pl"
+ScriptAlias /search "/usr/share/koha/intranet/cgi-bin/catalogue/search.pl"
 
 
 RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 1e1e569..7c212d8 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -139,7 +139,7 @@
 #  ServerAlias intranet.mydomain.com
    ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__/"
    ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
-   ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
+   ScriptAlias /search "__INTRANET_CGI_DIR__/catalogue/search.pl"
    Alias /plugin/ "__PLUGINS_DIR__/"
    ErrorLog __LOG_DIR__/koha-error_log
 #  TransferLog __LOG_DIR__/koha-access.log