Merge remote-tracking branch 'origin/new/bug_5211'

[koha.git] / etc / koha-httpd.conf

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 542e2e6..bf8cdc7 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -10,14 +10,76 @@
 #  ServerAlias opac.mydomain.com
    ScriptAlias /cgi-bin/koha/ "__OPAC_CGI_DIR__/opac/"
    ScriptAlias /index.html "__OPAC_CGI_DIR__/opac/opac-main.pl"
-   ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/search"
-   ScriptAlias /search "__OPAC_CGI_DIR__/opac/search"
+   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
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
+
+   <IfModule mod_gzip.c>
+     mod_gzip_on yes
+     mod_gzip_dechunk yes
+     mod_gzip_keep_workfiles No
+     mod_gzip_can_negotiate yes
+     mod_gzip_update_static No
+     mod_gzip_temp_dir /tmp
+     mod_gzip_minimum_file_size 512
+     mod_gzip_maximum_file_size 1000000
+     mod_gzip_maximum_inmem_size 1000000
+     mod_gzip_handle_methods GET POST
+     mod_gzip_item_exclude reqheader "User-Agent: .*Mozilla/4\..*\["
+     mod_gzip_item_exclude mime ^image/.*
+     mod_gzip_item_exclude rspheader Content-Type:image/*
+     mod_gzip_item_include file \.js$
+     mod_gzip_item_include mime ^application/javascript$
+     mod_gzip_item_include mime ^application/x-javascript$
+     mod_gzip_item_include file \.php$
+     mod_gzip_item_include mime ^text/html$
+     mod_gzip_item_include file \.css$
+     mod_gzip_item_include mime ^text/css$
+  </IfModule>
+
+  <IfModule mod_deflate.c>
+
+    # Compress content with type html, text, and css, ...
+    AddOutputFilterByType DEFLATE text/plain text/html text/xml text/css
+    AddOutputFilterByType DEFLATE application/xml application/xhtml+xml application/rss+xml application/javascript application/x-javascript
+
+    DeflateCompressionLevel 9
+
+    # Properly handle old browsers that do not support compression
+    BrowserMatch ^Mozilla/4 gzip-only-text/html
+    BrowserMatch ^Mozilla/4\.0[678] no-gzip
+    BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+
+    DeflateFilterNote Input instream
+    DeflateFilterNote Output outstream
+    DeflateFilterNote Ratio ratio
+
+    LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate
+    <IfModule mod_headers.c>
+       #properly handle requests coming from behind proxies
+       Header append Vary User-Agent
+    </IfModule>
+  </IfModule>
+
+
+#  Repeat this virtualhost stanza changing the following environment vars to
+#  create multiple OPAC interfaces with custom css and/or search limits:
+#  SetEnv OPAC_CSS_OVERRIDE mystyle.css
+#  SetEnv OPAC_SEARCH_LIMIT branch:CODE
+#  SetEnv OPAC_LIMIT_OVERRIDE 1
+
    Options +FollowSymLinks
 
+   ErrorDocument 400 /cgi-bin/koha/errors/400.pl
+   ErrorDocument 401 /cgi-bin/koha/errors/401.pl
+   ErrorDocument 403 /cgi-bin/koha/errors/403.pl
+   ErrorDocument 404 /cgi-bin/koha/errors/404.pl
+   ErrorDocument 500 /cgi-bin/koha/errors/500.pl
+
 #  Rewrite Rules
    RewriteEngine On
 
@@ -46,6 +108,60 @@
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    Options +FollowSymLinks
+
+   ErrorDocument 400 /cgi-bin/koha/errors/400.pl
+   ErrorDocument 401 /cgi-bin/koha/errors/401.pl
+   ErrorDocument 403 /cgi-bin/koha/errors/403.pl
+   ErrorDocument 404 /cgi-bin/koha/errors/404.pl
+   ErrorDocument 500 /cgi-bin/koha/errors/500.pl
+
+   <IfModule mod_gzip.c>
+     mod_gzip_on yes
+     mod_gzip_dechunk yes
+     mod_gzip_keep_workfiles No
+     mod_gzip_can_negotiate yes
+     mod_gzip_update_static No
+     mod_gzip_temp_dir /tmp
+     mod_gzip_minimum_file_size 512
+     mod_gzip_maximum_file_size 1000000
+     mod_gzip_maximum_inmem_size 1000000
+     mod_gzip_handle_methods GET POST
+     mod_gzip_item_exclude reqheader "User-Agent: .*Mozilla/4\..*\["
+     mod_gzip_item_exclude mime ^image/.*
+     mod_gzip_item_exclude rspheader Content-Type:image/*
+     mod_gzip_item_include file \.js$
+     mod_gzip_item_include mime ^application/javascript$
+     mod_gzip_item_include mime ^application/x-javascript$
+     mod_gzip_item_include file \.php$
+     mod_gzip_item_include mime ^text/html$
+     mod_gzip_item_include file \.css$
+     mod_gzip_item_include mime ^text/css$
+   </IfModule>
+
+   <IfModule mod_deflate.c>
+
+     # Compress content with type html, text, and css, ...
+     AddOutputFilterByType DEFLATE text/plain text/html text/xml text/css
+     AddOutputFilterByType DEFLATE application/xml application/xhtml+xml application/rss+xml application/javascript application/x-javascript
+
+     DeflateCompressionLevel 9
+
+     # Properly handle old browsers that do not support compression
+     BrowserMatch ^Mozilla/4 gzip-only-text/html
+     BrowserMatch ^Mozilla/4\.0[678] no-gzip
+     BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+
+     DeflateFilterNote Input instream
+     DeflateFilterNote Output outstream
+     DeflateFilterNote Ratio ratio
+
+     LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate
+     <IfModule mod_headers.c>
+       #properly handle requests coming from behind proxies
+       Header append Vary User-Agent
+     </IfModule>
+  </IfModule>
+
    RewriteEngine On    
 #  Uncomment to turn on rewrite logging
 #  RewriteLog __LOG_DIR__/koha-intranet-rewrite.log