Bug 12904: Apache configuration

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf
index 2117942..0fb4fdb 100644 (file)
--- a/debian/templates/apache-shared-intranet.conf
+++ b/debian/templates/apache-shared-intranet.conf
@@ -17,6 +17,8 @@ RewriteRule (.+) $1?%1%2 [N,R,NE]
 RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
 RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
 RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+RewriteRule ^(.*)_(.*).js$ $1.js [N,L]
+RewriteRule ^(.*)_(.*).css$ $1.css [N,L]
 
 Alias "/api" "/usr/share/koha/api"
 <Directory "/usr/share/koha/api">

diff --git a/debian/templates/apache-shared-opac.conf b/debian/templates/apache-shared-opac.conf
index 0e18bc2..e63ab1c 100644 (file)
--- a/debian/templates/apache-shared-opac.conf
+++ b/debian/templates/apache-shared-opac.conf
@@ -17,6 +17,8 @@ RewriteRule (.+) $1?%1%2 [N,R,NE]
 RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
 RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
 RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+RewriteRule ^(.*)_(.*).js$ $1.js [N,L]
+RewriteRule ^(.*)_(.*).css$ $1.css [N,L]
 
 <IfVersion >= 2.4>
     AliasMatch "^/sitemap(.*)" "/var/lib/koha/${instance}/sitemap/sitemap$1"

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index c3b55a4..e5a0b45 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -111,6 +111,8 @@
      RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
      RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
      RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+     RewriteRule ^(.*)_(.*).js$ $1.js [N,L]
+     RewriteRule ^(.*)_(.*).css$ $1.css [N,L]
 
      # REST API configuration
      Alias "/api" "__API_CGI_DIR__"
@@ -228,6 +230,8 @@
      RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
      RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
      RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+     RewriteRule ^(.*)_(.*).js$ $1.js [N,L]
+     RewriteRule ^(.*)_(.*).css$ $1.css [N,L]
 
 
      # REST API configuration