From: Andy Witter Date: Wed, 15 May 2013 20:23:02 +0000 (-0400) Subject: update to OpenSRF 2.2.0 # Evergreen ILS 2.4.0 X-Git-Tag: GenaSYS-2.4.0~18 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b5b78da9747fbb74e980412c416fa8cbe8038918;p=contrib%2Fpines%2Fgenasys.git update to OpenSRF 2.2.0 # Evergreen ILS 2.4.0 Signed-off-by: Andy Witter --- diff --git a/templates/apache2/eg_startup b/templates/apache2/eg_startup new file mode 100755 index 0000000..9460258 --- /dev/null +++ b/templates/apache2/eg_startup @@ -0,0 +1,29 @@ +#!/usr/bin/perl +use OpenSRF::AppSession; + +# default ingress value for all Apache/mod_perl clients +OpenSRF::AppSession->ingress('apache'); + +use OpenILS::WWW::Exporter qw( @sysconfdir@/opensrf_core.xml ); +use OpenILS::WWW::SuperCat qw( @sysconfdir@/opensrf_core.xml ); +use OpenILS::WWW::AddedContent qw( @sysconfdir@/opensrf_core.xml ); +use OpenILS::WWW::Proxy ('@sysconfdir@/opensrf_core.xml'); +use OpenILS::WWW::Vandelay qw( @sysconfdir@/opensrf_core.xml ); +use OpenILS::WWW::TemplateBatchBibUpdate qw( @sysconfdir@/opensrf_core.xml ); +use OpenILS::WWW::EGWeb; +use OpenILS::WWW::PasswordReset ('@sysconfdir@/opensrf_core.xml'); +use OpenILS::WWW::IDL2js ('@sysconfdir@/opensrf_core.xml'); +use OpenILS::WWW::FlatFielder; + +# - Uncomment the following 2 lines to make use of the IP redirection code +# - The IP file should to contain a map with the following format: +# - actor.org_unit.shortname +# - e.g. LIB123 10.0.0.1 10.0.0.254 + +#use OpenILS::WWW::Redirect qw(@sysconfdir@/opensrf_core.xml); +#OpenILS::WWW::Redirect->parse_ips_file('@sysconfdir@/lib_ips.txt'); + + + +1; + diff --git a/templates/apache2/eg_vhost.conf-2.3.6 b/templates/apache2/eg_vhost.conf-2.3.6 new file mode 100644 index 0000000..3039438 --- /dev/null +++ b/templates/apache2/eg_vhost.conf-2.3.6 @@ -0,0 +1,763 @@ +# ---------------------------------------------------------------------------------- +# This is the global Evergreen virtual host config. Anything you want published +# through all virtual hosts (port 80, port 443, etc.) should live in here. +# ---------------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------------- +# Point / to the opac - if you have a custom skin or locale, point at it here +# ---------------------------------------------------------------------------------- +RedirectMatch 301 ^/$ /eg/opac/home + +# ---------------------------------------------------------------------------------- +# Point / to the IP address redirector +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + PerlHandler OpenILS::WWW::Redirect + Options +ExecCGI + PerlSendHeader On +# #PerlSetVar OILSRedirectSkin "default" +# # OILSRedirectDepth defaults to the depth of the branch that the OPAC was directed to +# #PerlSetVar OILSRedirectDepth "0" +# #PerlSetVar OILSRedirectLocale "en-US" +# # Use the template-toolkit opac + PerlSetVar OILSRedirectTpac "true" + allow from all + + + +# ---------------------------------------------------------------------------------- +# Assign a default locale to the accessible OPAC +# ---------------------------------------------------------------------------------- +RedirectMatch 301 ^/opac/extras/slimpac/start.html$ /opac/en-US/extras/slimpac/start.html +RedirectMatch 301 ^/opac/extras/slimpac/advanced.html$ /opac/en-US/extras/slimpac/advanced.html + +# ---------------------------------------------------------------------------------- +# Configure the gateway +# ---------------------------------------------------------------------------------- +OSRFGatewayConfig /openils/conf/opensrf_core.xml +# Translator memcache server. Default is localhost +OSRFTranslatorCacheServer 10.30.30.151:11211 + + +# ---------------------------------------------------------------------------------- +# Added content plugin +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + PerlHandler OpenILS::WWW::AddedContent + Options +ExecCGI + PerlSendHeader On + allow from all + + +# Autosuggest for searches + + SetHandler perl-script + PerlHandler OpenILS::WWW::AutoSuggest + PerlSendHeader On + Allow from All + + +# Flattener service + + SetHandler perl-script + PerlHandler OpenILS::WWW::FlatFielder + PerlSendHeader On + Allow from All + + +# ---------------------------------------------------------------------------------- +# Replace broken cover images with a transparent GIF by default +# ---------------------------------------------------------------------------------- +RewriteEngine ON +RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \ + /opac/images/blank.png [P,L] + +# ---------------------------------------------------------------------------------- +# Add the row ID (RID) and date so we can make unAPI happy +# ---------------------------------------------------------------------------------- +RewriteCond %{QUERY_STRING} (^r|&r)=(\d+) +RewriteRule . - [E=OILS_OPAC_RID:%2,E=OILS_TIME_YEAR:%{TIME_YEAR}] + +# ---------------------------------------------------------------------------------- +# Pull the locale from the URL +# ---------------------------------------------------------------------------------- +RewriteCond %{REQUEST_URI} ^/opac/(.*?)/ +RewriteRule . - [E=locale:%1] + +# ---------------------------------------------------------------------------------- +# Rewrite JSPac->TPac with redirects +# ---------------------------------------------------------------------------------- + +# First things first, extract useful data +# And we are going to start with a "this is the JSPac" check on each of these: +# RewriteCond %{REQUEST_URI} ^/?opac/ + +# Basic (overall) search type, if present +# I am cheating and grabbing RT or TP because I dunno the difference between them. +RewriteCond %{REQUEST_URI} ^/opac/ +RewriteCond %{QUERY_STRING} (^|[^0-9a-zA-Z])(rt|tp)=([^;&]*) +RewriteRule . - [E=OILS_JSPAC_SEARCH_TYPE:qtype=%3;] + +# Basic (overall) search term(s), if present - NOTE: Not doing advanced search. +RewriteCond %{REQUEST_URI} ^/opac/ +RewriteCond %{QUERY_STRING} (^|[^0-9a-zA-Z])t=([^;&]*) +RewriteRule . - [E=OILS_JSPAC_SEARCH_TERMS:query=%2;] + +# Search Location, if present +RewriteCond %{REQUEST_URI} ^/opac/ +RewriteCond %{QUERY_STRING} (^|[^0-9a-zA-Z])l=([^;&]*) +RewriteRule . - [E=OILS_JSPAC_SEARCH_LOCATION:locg=%2;] + +# My Account +RewriteRule /opac/[^/]*/skin/default/xml/myopac.xml /eg/opac/myopac/main?%{ENV:OILS_JSPAC_SEARCH_TYPE}%{ENV:OILS_JSPAC_SEARCH_TERMS}%{ENV:OILS_JSPAC_SEARCH_LOCATION} [NE,R,L] + +# Record Pages +# /opac/en-US/skin/default/xml/rdetail.xml?r=32 -> /eg/opac/record/32 +RewriteCond %{QUERY_STRING} (^|[^0-9a-zA-Z])r=([^;&]*) +RewriteRule /opac/.*/rdetail.xml /eg/opac/record/%2?%{ENV:OILS_JSPAC_SEARCH_TYPE}%{ENV:OILS_JSPAC_SEARCH_TERMS}%{ENV:OILS_JSPAC_SEARCH_LOCATION} [NE,R,L] + +# Bookbag Pages +# /opac/extras/feed/bookbag/html-full/1 -> /eg/opac/results?bookbag=1;page=0;locg=1;depth=0 +RewriteRule /opac/extras/feed/bookbag/html-full/(\d*) /eg/opac/results?bookbag=$1;%{ENV:OILS_JSPAC_SEARCH_TYPE}%{ENV:OILS_JSPAC_SEARCH_TERMS}%{ENV:OILS_JSPAC_SEARCH_LOCATION} [NE,R,L] + +# Search Results Pages +RewriteRule /opac/[^/]*/skin/[^/]*/xml/rresult.xml /eg/opac/results?%{ENV:OILS_JSPAC_SEARCH_TYPE}%{ENV:OILS_JSPAC_SEARCH_TERMS}%{ENV:OILS_JSPAC_SEARCH_LOCATION} [NE,R,L] + +# Basic Search (STILL not doing advanced) +# Fallback! But only for things that end in xml, htm, or html +# Images, CSS, etc can stick around. +RewriteRule /opac/[^/]*/skin/.*(xml|htm|html|/)$ /eg/opac/home?%{ENV:OILS_JSPAC_SEARCH_TYPE}%{ENV:OILS_JSPAC_SEARCH_TERMS}%{ENV:OILS_JSPAC_SEARCH_LOCATION} [NE,R,L] + +# ---------------------------------------------------------------------------------- +# For sanity reasons, default indexes to Off +# ---------------------------------------------------------------------------------- +Options -Indexes + +# ---------------------------------------------------------------------------------- +# Configure the OPAC +# ---------------------------------------------------------------------------------- + + AddType application/xhtml+xml .xml + + # - configure mod_xmlent + XMLEntStripPI "yes" + XMLEntEscapeScript "no" + XMLEntStripComments "yes" + XMLEntContentType "text/html; charset=utf-8" + # forces quirks mode which we want for now + XMLEntStripDoctype "yes" + + # - set up the include handlers + Options +Includes + AddOutputFilter INCLUDES .xsl + AddOutputFilter INCLUDES;XMLENT .xml + + SetEnvIf Request_URI ".*" OILS_OPAC_BASE=/opac/ + + # This gives you the option to configure a different host to serve OPAC images from + # Specify the hostname (without protocol) and path to the images. Protocol will + # be determined at runtime + #SetEnvIf Request_URI ".*" OILS_OPAC_IMAGES_HOST=static.example.org/opac/ + + # In addition to loading images from a static host, you can also load CSS and/or + # Javascript from a static host or hosts. Protocol will be determined at runtime + # and/or by configuration options immediately following. + #SetEnvIf Request_URI ".*" OILS_OPAC_CSS_HOST=static.example.org/opac/ + #SetEnvIf Request_URI ".*" OILS_OPAC_JS_HOST=static.example.org/opac/ + + # If you are not able to serve static content via https and + # wish to force http:// (and are comfortable with mixed-content + # warnings in client browsers), set this: + #SetEnvIf Request_URI ".*" OILS_OPAC_STATIC_PROTOCOL=http + + # If you would prefer to fall back to your non-static servers for + # https pages, avoiding mixed-content warnings in client browsers + # and are willing to accept some increased server load, set this: + #SetEnvIf Request_URI ".*" OILS_OPAC_BYPASS_STATIC_FOR_HTTPS=yes + + # Specify a ChiliFresh account to integrate their services with the OPAC + #SetEnv OILS_CHILIFRESH_ACCOUNT + #SetEnv OILS_CHILIFRESH_PROFILE + #SetEnv OILS_CHILIFRESH_URL http://chilifresh.com/on-site/js/evergreen.js + #SetEnv OILS_CHILIFRESH_HTTPS_URL https://secure.chilifresh.com/on-site/js/evergreen.js + + # Specify the initial script URL for Novelist (containing account credentials, etc.) + SetEnv OILS_NOVELIST_URL http://imageserver.ebscohost.com/eit/eitinit.js?auth=profile&profile=dou1.main.novsel&pwd=dGJyMOPY8Uy1r7EA&cfg=Y + # + + # Uncomment to force SSL any time a patron is logged in. This protects + # authentication tokens. Left commented out for backwards compat for now. + #SetEnv OILS_OPAC_FORCE_LOGIN_SSL 1 + + # If set, the skin uses the combined JS file at $SKINDIR/js/combined.js + #SetEnv OILS_OPAC_COMBINED_JS 1 + + + + + # ---------------------------------------------------------------------------------- + # Some mod_deflate fun + # ---------------------------------------------------------------------------------- + + SetOutputFilter DEFLATE + + BrowserMatch ^Mozilla/4 gzip-only-text/html + BrowserMatch ^Mozilla/4\.0[678] no-gzip + BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html + + SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary + + + Header append Vary User-Agent env=!dont-vary + + + + + + + # ---------------------------------------------------------------------------------- + # Some mod_deflate fun + # ---------------------------------------------------------------------------------- + + SetOutputFilter DEFLATE + + BrowserMatch ^Mozilla/4 gzip-only-text/html + BrowserMatch ^Mozilla/4\.0[678] no-gzip + BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html + + SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary + + + Header append Vary User-Agent env=!dont-vary + + + + + +# ---------------------------------------------------------------------------------- +# Force SSL on the OPAC's "My Account" page +# ---------------------------------------------------------------------------------- + + SSLRequireSSL + + + + # Force to en-US for now to satisfy bbags.xml + SetEnv locale en-US + Options +Includes + AddOutputFilter INCLUDES .xml + AddType application/xhtml+xml .xml + + +RewriteCond %{QUERY_STRING} locale=([^&]*) +RewriteRule ^/opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect] + + AddOutputFilter INCLUDES;XMLENT .html + + +# ---------------------------------------------------------------------------------- +# Run server-side XUL and XHTML through xmlent to load the correct XML entities +# ---------------------------------------------------------------------------------- +RewriteCond %{HTTP:Accept-Language} ^([a-z]{2}-[A-Z]{2})$ +# Default to en-US if we haven't matched a locale of the form xx-YY +RewriteRule .? - [S=4] +RewriteRule ^/xul/ - [E=locale:en-US] +RewriteRule ^/reports/ - [E=locale:en-US] +RewriteRule .? - [E=locale:en-US] +RewriteRule .? - [S=3] +# Otherwise, set our real locale +RewriteRule ^/xul/ - [E=locale:%{HTTP:Accept-Language}] +RewriteRule ^/reports/ - [E=locale:%{HTTP:Accept-Language}] +RewriteRule .? - [E=locale:%{HTTP:Accept-Language}] + + + Options +Includes + XMLEntEscapeScript "no" + XMLEntStripComments "yes" + XMLEntStripPI "yes" + XMLEntStripDoctype "yes" + XMLEntContentType "text/html; charset=utf-8" + AddOutputFilter INCLUDES;XMLENT .xhtml + AddOutputFilter INCLUDES;XMLENT .html + SetEnv no-gzip + allow from all + + + + + Options +Includes + XMLEntContentType "application/vnd.mozilla.xul+xml" + AddOutputFilter INCLUDES;XMLENT .xul + SetEnv no-gzip + allow from all + + +# ---------------------------------------------------------------------------------- +# Self-serve password interface +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + PerlHandler OpenILS::WWW::PasswordReset::password_reset + Options +ExecCGI + PerlSendHeader On + allow from all + + # Force clients to use HTTPS + RewriteCond %{HTTPS} !=on [NC] + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [R,L] + + +# ---------------------------------------------------------------------------------- +# Supercat feeds +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::oisbn + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::supercat + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::unapi + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::bookbag_feed + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::opensearch_feed + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::sru_search + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::sru_auth_search + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::changes_feed + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::string_browse + Options +ExecCGI + PerlSendHeader On + allow from all + + + SetHandler perl-script + PerlHandler OpenILS::WWW::SuperCat::string_startwith + Options +ExecCGI + PerlSendHeader On + allow from all + + +# ---------------------------------------------------------------------------------- +# Module for displaying OpenSRF API documentation +# ---------------------------------------------------------------------------------- + + AddOutputFilter INCLUDES .xsl + + +# ---------------------------------------------------------------------------------- +# Module for processing staff-client offline scripts lives here +# ---------------------------------------------------------------------------------- + + AddHandler cgi-script .pl + AllowOverride None + Options +ExecCGI + allow from all + + + +# ---------------------------------------------------------------------------------- +# XXX Note, it's important to explicitly set the JSON encoding style +# (OSRFGatewayLegacyJSON), since the default encoding style will likely change +# with OpenSRF 1.0 +# ---------------------------------------------------------------------------------- +# OpenSRF JSON legacy gateway +# ---------------------------------------------------------------------------------- + + SetHandler osrf_json_gateway_module + OSRFGatewayLegacyJSON "true" + allow from all + +# ---------------------------------------------------------------------------------- +# New-style OpenSRF JSON gateway +# ---------------------------------------------------------------------------------- + + SetHandler osrf_json_gateway_module + OSRFGatewayLegacyJSON "false" + allow from all + + +# ---------------------------------------------------------------------------------- +# OpenSRF-over-HTTP translator +# (http://open-ils.org/dokuwiki/doku.php?id=opensrf_over_http) +# ---------------------------------------------------------------------------------- + + SetHandler osrf_http_translator_module + allow from all + + +# ---------------------------------------------------------------------------------- +# The exporter lives here +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + AuthType Basic + AuthName "Exporter Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "STAFF_LOGIN" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + PerlHandler OpenILS::WWW::Exporter + Options +ExecCGI + PerlSendHeader On + allow from all + + + + SetHandler perl-script + AuthType Basic + AuthName "Batch Update Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "STAFF_LOGIN" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + PerlHandler OpenILS::WWW::TemplateBatchBibUpdate + PerlSendHeader On + Options +ExecCGI + allow from all + + + + AuthType Basic + AuthName "Circ Extras Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "STAFF_LOGIN" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + Options +ExecCGI + PerlSendHeader On + allow from all + + + + SetHandler perl-script + AuthType Basic + AuthName "Collections Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "money.collections_tracker.create" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + Options +ExecCGI + PerlSendHeader On + allow from all + + + +# ---------------------------------------------------------------------------------- +# Reporting output lives here +# ---------------------------------------------------------------------------------- + + AuthType Basic + AuthName "Report Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "VIEW_REPORT_OUTPUT" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + Options +ExecCGI + PerlSendHeader On + allow from all + + +# ---------------------------------------------------------------------------------- +# Selfcheck interface +# ---------------------------------------------------------------------------------- + + AuthType Basic + AuthName "Self-check Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "STAFF_LOGIN" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + Options +ExecCGI + PerlSendHeader On + allow from all + + + +# ---------------------------------------------------------------------------------- +# Reports GUI +# ---------------------------------------------------------------------------------- + + Options +Includes + AddOutputFilter INCLUDES;XMLENT .xhtml + + + + IDLChunkStripPI "yes" + IDLChunkEscapeScript "no" + IDLChunkStripComments "yes" + IDLChunkStripDoctype "yes" + IDLChunkContentType "application/xml; charset=utf-8" + AddOutputFilter INCLUDES;IDLCHUNK .xml + + +# ---------------------------------------------------------------------------------- +# EDI Message viewer +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + PerlHandler OpenILS::WWW::EDI + Options +ExecCGI + PerlSendHeader On + allow from all + + +# ---------------------------------------------------------------------------------- +# XML-RPC gateway +# ---------------------------------------------------------------------------------- + + SetHandler perl-script + PerlHandler OpenILS::WWW::XMLRPCGateway + Options +ExecCGI + PerlSendHeader On + allow from all + + +# ---------------------------------------------------------------------------------- +# Conify - next-generation Evergreen administration interface +# ---------------------------------------------------------------------------------- +RewriteRule ^/conify/([a-z]{2}-[A-Z]{2})/global/(.*)$ /conify/global/$2 [E=locale:$1,L] + + Options +Includes + XMLEntStripPI "yes" + XMLEntEscapeScript "no" + XMLEntStripComments "no" + XMLEntContentType "text/html; charset=utf-8" + AddOutputFilter INCLUDES;XMLENT .html + + AuthType Basic + AuthName "Dojo Admin Login" + PerlOptions +GlobalRequest + PerlSetVar OILSProxyPermissions "STAFF_LOGIN" + PerlAuthenHandler OpenILS::WWW::Proxy::Authen + require valid-user + Options +ExecCGI + PerlSendHeader On + allow from all + + + + SetHandler perl-script + PerlHandler OpenILS::WWW::Vandelay::spool_marc + Options +ExecCGI + allow from all + + +# OpenURL 0.1 searching based on OpenSearch +RewriteMap openurl prg:/openils/bin/openurl_map.pl +RewriteCond %{QUERY_STRING} (^.*$) +RewriteRule ^/openurl$ ${openurl:%1} [NE,PT] + + + +# General Evergreen web template processor + + SetHandler perl-script + PerlHandler OpenILS::WWW::EGWeb + Options +ExecCGI + PerlSendHeader On + allow from all + + PerlSetVar OILSWebBasePath "/eg" + PerlSetVar OILSWebWebDir "/openils/var/web" + PerlSetVar OILSWebDefaultTemplateExtension "tt2" + + # Enable Template-Toolkit error debugging messages (apache error log) + PerlSetVar OILSWebDebugTemplate "true" + + # ------------------------------------------------------- + # Media Prefix. In the 3rd example, the protocol (http) is enforced + #PerlSetVar OILSWebMediaPrefix "/media" + #PerlSetVar OILSWebMediaPrefix "static.example.com/media" + #PerlSetVar OILSWebMediaPrefix "http://static.example.com/media" + + # Locale messages files: + # + # These appear in pairs; the first represents the user agent + # Accept-Language header locale, and the second represents + # the fully-qualified path for the corresponding PO file that + # contains the messages. + # + # If you enable two or more locales, then users will be able to + # select their preferred locale from a locale picker in the TPAC. + # + #PerlAddVar OILSWebLocale "en" + #PerlAddVar OILSWebLocale "/openils/var/data/locale/messages.en.po" + #PerlAddVar OILSWebLocale "en_ca" + #PerlAddVar OILSWebLocale "/openils/var/data/locale/en-CA.po" + #PerlAddVar OILSWebLocale "fr_ca" + #PerlAddVar OILSWebLocale "/openils/var/data/locale/fr-CA.po" + + # Set the default locale: defaults to en-US + #PerlAddVar OILSWebDefaultLocale "fr_ca" + + # Templates will be loaded from the following paths in reverse order. + PerlAddVar OILSWebTemplatePath "/openils/var/templates" + #PerlAddVar OILSWebTemplatePath "/openils/var/templates_localskin" + + #------------------------------------------------- + # Added Content Configuration + #------------------------------------------------- + # Content Cafe + #SetEnv OILS_CONTENT_CAFE_USER MYUSER + #SetEnv OILS_CONTENT_CAFE_PASS MYPASS + + # LibraryThing + #SetEnv OILS_LIBRARYTHING_URL http://ltfl.librarything.com/forlibraries/widget.js?id=MYID + #SetEnv OILS_LIBRARYTHING_HTTPS_URL https://ltfl.librarything.com/forlibraries/widget.js?id=MYID + + # ChiliFresh + #SetEnv OILS_CHILIFRESH_ACCOUNT + #SetEnv OILS_CHILIFRESH_URL http://chilifresh.com/on-site/js/evergreen.js + #SetEnv OILS_CHILIFRESH_HTTPS_URL https://secure.chilifresh.com/on-site/js/evergreen.js + #------------------------------------------------- + + + SetOutputFilter DEFLATE + BrowserMatch ^Mozilla/4 gzip-only-text/html + BrowserMatch ^Mozilla/4\.0[678] no-gzip + BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html + SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary + + Header append Cache-Control "public" + Header append Vary User-Agent env=!dont-vary + + + + + # should pick up the default expire time from eg.conf... + + SetOutputFilter DEFLATE + BrowserMatch ^Mozilla/4 gzip-only-text/html + BrowserMatch ^Mozilla/4\.0[678] no-gzip + BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html + SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary + + Header append Cache-Control "public" + Header append Vary User-Agent env=!dont-vary + + + + + PerlSetVar OILSWebContextLoader "OpenILS::WWW::EGCatLoader" + # Expire the HTML quickly since we're loading dynamic data for each page + ExpiresActive On + ExpiresByType text/html "access plus 5 seconds" + + + PerlSetVar OILSWebContextLoader "OpenILS::WWW::EGKPacLoader" + PerlSetVar KPacConfigFile "/openils/conf/kpac.xml" + ExpiresActive On + ExpiresByType text/html "access plus 5 seconds" + + +# Note: the template processor will decline handling anything it does not +# have an explicit configuration for, which means it will fall back to +# Apache to serve the file. However, in the interest of speed, go ahead +# and tell Apache to avoid asking OpenILS::WWW::EGWeb for static content. +# Add more exemptions as needed. + + SetHandler None + + +# ---------------------------------------------------------------------------------- +# Some mod_deflate logging setup +# ---------------------------------------------------------------------------------- + + DeflateFilterNote Input instream + DeflateFilterNote Output outstream + DeflateFilterNote Ratio ratio + + LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate + CustomLog /var/log/apache2/deflate_log deflate + + # There are problems with XMLENT and mod_deflate - so lets disable it + # This is where we don't have a pre-existing LocationMatch directive earlier + + SetEnv no-gzip + + + SetEnv no-gzip + + + SetEnv no-gzip + + + SetEnv no-gzip + + + + + + + SetHandler perl-script + PerlHandler OpenILS::WWW::IDL2js + Options +ExecCGI + PerlSendHeader On + allow from all + + + Header append Cache-Control "public" + + + + SetOutputFilter DEFLATE + BrowserMatch ^Mozilla/4 gzip-only-text/html + BrowserMatch ^Mozilla/4\.0[678] no-gzip + BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html + SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary + + Header append Vary User-Agent env=!dont-vary + + + + +# Uncomment the following to force SSL for everything. Note that this defeats caching +# and you will suffer a performance hit. +#RewriteCond %{HTTPS} off +#RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L] diff --git a/templates/apache2/startup.pl b/templates/apache2/startup.pl deleted file mode 100755 index 532e736..0000000 --- a/templates/apache2/startup.pl +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/perl -use OpenSRF::AppSession; - -# default ingress value for all Apache/mod_perl clients -OpenSRF::AppSession->ingress('apache'); - -use OpenILS::WWW::Exporter qw( /openils/conf/opensrf_core.xml ); -use OpenILS::WWW::SuperCat qw( /openils/conf/opensrf_core.xml ); -use OpenILS::WWW::AddedContent qw( /openils/conf/opensrf_core.xml ); -use OpenILS::WWW::Proxy ('/openils/conf/opensrf_core.xml'); -use OpenILS::WWW::Vandelay qw( /openils/conf/opensrf_core.xml ); -use OpenILS::WWW::TemplateBatchBibUpdate qw( /openils/conf/opensrf_core.xml ); -use OpenILS::WWW::EGWeb; -use OpenILS::WWW::PasswordReset ('/openils/conf/opensrf_core.xml'); -use OpenILS::WWW::IDL2js ('/openils/conf/opensrf_core.xml'); -use OpenILS::WWW::FlatFielder; - -# - Uncomment the following 2 lines to make use of the IP redirection code -# - The IP file should contain a map with the following format: -# - actor.org_unit.shortname -# - e.g. LIB123 10.0.0.1 10.0.0.254 - -#use OpenILS::WWW::Redirect qw(/openils/conf/opensrf_core.xml); -#OpenILS::WWW::Redirect->parse_ips_file('/openils/conf/lib_ips.txt'); - - - -1; - diff --git a/templates/debs/evergreen-ils_2.3.6_amd64.deb b/templates/debs/evergreen-ils_2.3.6_amd64.deb deleted file mode 100644 index e8f1146..0000000 Binary files a/templates/debs/evergreen-ils_2.3.6_amd64.deb and /dev/null differ diff --git a/templates/debs/evergreen-ils_2.4.0_amd64.deb b/templates/debs/evergreen-ils_2.4.0_amd64.deb new file mode 100644 index 0000000..a1b9809 Binary files /dev/null and b/templates/debs/evergreen-ils_2.4.0_amd64.deb differ diff --git a/templates/debs/opensrf_2.1.2_amd64.deb b/templates/debs/opensrf_2.1.2_amd64.deb deleted file mode 100644 index 27cbe2f..0000000 Binary files a/templates/debs/opensrf_2.1.2_amd64.deb and /dev/null differ diff --git a/templates/debs/opensrf_2.2.0_amd64.deb b/templates/debs/opensrf_2.2.0_amd64.deb new file mode 100644 index 0000000..b14c2d2 Binary files /dev/null and b/templates/debs/opensrf_2.2.0_amd64.deb differ diff --git a/templates/opensrf.xml/opensrf.xml-drone b/templates/opensrf.xml/opensrf.xml-drone index cbcd13b..33fa51f 100644 --- a/templates/opensrf.xml/opensrf.xml-drone +++ b/templates/opensrf.xml/opensrf.xml-drone @@ -25,6 +25,7 @@ open-ils.permacrud open-ils.pcrud open-ils.trigger + open-ils.url_verify open-ils.fielder open-ils.vandelay open-ils.serial diff --git a/templates/opensrf.xml/opensrf.xml-full b/templates/opensrf.xml/opensrf.xml-full index f6cc632..9d829c3 100644 --- a/templates/opensrf.xml/opensrf.xml-full +++ b/templates/opensrf.xml/opensrf.xml-full @@ -26,6 +26,7 @@ open-ils.permacrud open-ils.pcrud open-ils.trigger + open-ils.url_verify open-ils.fielder open-ils.vandelay open-ils.serial diff --git a/templates/opensrf.xml/opensrf.xml-header b/templates/opensrf.xml/opensrf.xml-header index 252bad2..4d03397 100644 --- a/templates/opensrf.xml/opensrf.xml-header +++ b/templates/opensrf.xml/opensrf.xml-header @@ -324,16 +324,14 @@ vim:et:ts=4:sw=4: - memcache01_IP:11211 - memcache02_IP:11211 + memcache01_IP:11211memcache02_IP:11211 86400 - memcache01_IP:11211 - memcache02_IP:11211 + memcache01_IP:11211memcache02_IP:11211 1800 @@ -700,6 +698,27 @@ vim:et:ts=4:sw=4: + + 5 + 1 + perl + OpenILS::Application::URLVerify + 199 + + open-ils.url_verify_unix.sock + open-ils.url_verify_unix.pid + 1000 + open-ils.url_verify_unix.log + 1 + 15 + 1 + 5 + + + Evergreen %s Link Checker + + + 3 1 @@ -814,64 +833,6 @@ vim:et:ts=4:sw=4: circ/circ_permit_hold.js - - art - atlas - audiobook - av - new-av - bestseller - bestsellernh - book - cd - dvd - dvd-long - e-book - equipment - filmstrip - kit - magazine - map - microform - music - record - software - softwrlong - equip-long - talking book - toy - video - video-long - - - - Miscellaneous - Overdue materials - Fee for placing a hold - Fee for checking out a book - Fee for library card - Miscellaneous charges - Lost materials - Damaged material - Overdue Reserves charge - Recall overdue - Fee for processing lost library materials - Fee for sending patron bills to collection agency - Fee for interlibrary loan - Fee for copies - Money advanced to pay for telephone use - Deposit fee - Fee for disk - Fee for faxing - Fee for laminating - Fee for room cleaning - Deposit returned; fee refund - Sale items - Fee for lost card - Long overdue items - Lost/Replacement Cassette - Returned Check - diff --git a/templates/setup-head.sh b/templates/setup-head.sh index 63e6fc1..d61ae4a 100755 --- a/templates/setup-head.sh +++ b/templates/setup-head.sh @@ -282,8 +282,8 @@ if [ -e lib_ips.txt ] then cp -f lib_ips.txt /openils/conf chown opensrf:opensrf /openils/conf/lib_ips.txt - sed -i 's^#OpenILS::WWW::Redirect^OpenILS::WWW::Redirect^g' /etc/apache2/startup.pl - sed -i 's^#use OpenILS::WWW::Redirect^use OpenILS::WWW::Redirect^g' /etc/apache2/startup.pl + sed -i 's^#OpenILS::WWW::Redirect^OpenILS::WWW::Redirect^g' /etc/apache2/eg_startup + sed -i 's^#use OpenILS::WWW::Redirect^use OpenILS::WWW::Redirect^g' /etc/apache2/eg_startup sed -i 's+RedirectMatch 301 ^/$ /opac/en-US/skin/default/xml/index.xml+#RedirectMatch 301 ^/$ /opac/en-US/skin/default/xml/index.xml+g' /etc/apache2/eg_vhost.conf sed -i 's+#++g' /etc/apache2/eg_vhost.conf sed -i 's^# SetHandler perl-script^ SetHandler perl-script^g' /etc/apache2/eg_vhost.conf