[open-ils-commits] [GIT] Evergreen ILS branch master updated. c6437c29fdeb0a922eac46aa1d4f2190e43e9307
Evergreen Git
git at git.evergreen-ils.org
Wed Sep 12 14:18:26 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via c6437c29fdeb0a922eac46aa1d4f2190e43e9307 (commit)
from 7567914437d0c0508d845f96c2677b29f9d411af (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c6437c29fdeb0a922eac46aa1d4f2190e43e9307
Author: Jason Stephenson <jason at sigio.com>
Date: Fri Sep 22 00:29:37 2017 -0400
Lp#1718459: Remove Debian 7 Wheezy Installation Support
Remove references to Debian 7 Wheezy in the installation and upgrade
documentation.
Remove debian-wheezy* targets from
Open-ILS/src/extras/Makefile.install and the supporting Makefiles.
Remove the example Apache 2.2 configuration files, since the supported
distributions all ship with Apache 2.4.
Move the eg_startup.in file from Open-ILS/example/apache to
Open-ILS/examples/apache_24.
Remove references to eg_wheezy_installer.sh in Perl live test
comments.
Remove Open-ILS/web/js/ui/default/staff/README.install, which is out
of date and entirely aimed at Debian 7 Wheezy.
To test: Simply install on a supported distribution other than Debian
7 Wheezy and do the usual tests.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/examples/apache/eg.conf.in b/Open-ILS/examples/apache/eg.conf.in
deleted file mode 100644
index f8c9729..0000000
--- a/Open-ILS/examples/apache/eg.conf.in
+++ /dev/null
@@ -1,154 +0,0 @@
-# :vim set syntax apache
-
-LogLevel info
-# - log locally
-# CustomLog /var/log/apache2/access.log combined
-# ErrorLog /var/log/apache2/error.log
-# - log to syslog
-CustomLog "|/usr/bin/logger -p local7.info" common
-ErrorLog syslog:local7
-
-
-# ----------------------------------------------------------------------------------
-# Set up Perl
-# ----------------------------------------------------------------------------------
-
-# - needed by CGIs
-PerlRequire /etc/apache2/eg_startup
-PerlChildInitHandler OpenILS::WWW::Reporter::child_init
-PerlChildInitHandler OpenILS::WWW::SuperCat::child_init
-PerlChildInitHandler OpenILS::WWW::AddedContent::child_init
-PerlChildInitHandler OpenILS::WWW::AutoSuggest::child_init
-PerlChildInitHandler OpenILS::WWW::PhoneList::child_init
-
-# ----------------------------------------------------------------------------------
-# Set some defaults for our working directories
-# ----------------------------------------------------------------------------------
-<Directory @localstatedir@/web>
- Order allow,deny
- Allow from all
-</Directory>
-
-
-# ----------------------------------------------------------------------------------
-# XUL directory
-# ----------------------------------------------------------------------------------
-<Directory @localstatedir@/web/xul>
- Options Indexes FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
-</Directory>
-
-
-# ----------------------------------------------------------------------------------
-# Remove the language portion from the URL
-# ----------------------------------------------------------------------------------
-AliasMatch ^/opac/.*/skin/(.*)/(.*)/(.*) @localstatedir@/web/opac/skin/$1/$2/$3
-AliasMatch ^/opac/.*/extras/slimpac/(.*) @localstatedir@/web/opac/extras/slimpac/$1
-AliasMatch ^/opac/.*/extras/selfcheck/(.*) @localstatedir@/web/opac/extras/selfcheck/$1
-
-
-
-# ----------------------------------------------------------------------------------
-# System config CGI scripts go here
-# ----------------------------------------------------------------------------------
-Alias /cgi-bin/offline/ "@localstatedir@/cgi-bin/offline/"
-<Directory "@localstatedir@/cgi-bin/offline">
- AddHandler cgi-script .cgi .pl
- AllowOverride None
- Options None
- Order deny,allow
- Deny from all
- Allow from 10.0.0.0/8
- Options FollowSymLinks ExecCGI Indexes
-</Directory>
-
-
-# ----------------------------------------------------------------------------------
-# Updates folder
-# ----------------------------------------------------------------------------------
-Alias /updates/ "@localstatedir@/updates/pub/"
-<Directory "@localstatedir@/updates/pub">
- <Files check>
- ForceType cgi-script
- </Files>
- <Files update.rdf>
- ForceType cgi-script
- </Files>
- <Files manualupdate.html>
- ForceType cgi-script
- </Files>
- <Files download>
- ForceType cgi-script
- </Files>
- AllowOverride None
- Options None
- Allow from all
- Options ExecCGI
-</Directory>
-
-# ----------------------------------------------------------------------------------
-# OPTIONAL: Set how long the client will cache our content.
-# We set a long expires time for CSS, JavaScript, and images (default) because
-# you can change the cache-key in opac/parts/config.tt2 to force browsers to
-# reload them immediately.
-# ----------------------------------------------------------------------------------
-ExpiresActive On
-ExpiresDefault "access plus 1 year"
-ExpiresByType text/html "access plus 18 hours"
-ExpiresByType application/xhtml+xml "access plus 18 hours"
-ExpiresByType application/x-javascript "access plus 1 year"
-ExpiresByType application/javascript "access plus 1 year"
-ExpiresByType text/css "access plus 1 year"
-
-# ----------------------------------------------------------------------------------
-# Set up our SSL virtual host
-# ----------------------------------------------------------------------------------
-#Listen 443
-NameVirtualHost *:443
-<VirtualHost *:443>
- DocumentRoot "@localstatedir@/web"
- ServerName localhost:443
- ServerAlias 127.0.0.1:443
- SSLEngine on
- SSLProxyEngine on # required for ErrorDocument 404 on SSL connections
- SSLHonorCipherOrder On
- SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
-
- # If you don't have an SSL cert, you can create self-signed
- # certificate and key with:
- # openssl req -new -x509 -nodes -out server.crt -keyout server.key
- SSLCertificateFile ssl/server.crt
- SSLCertificateKeyFile ssl/server.key
-
- # - absorb the shared virtual host settings
- Include eg_vhost.conf
-
- # help IE along with SSL pages
- SetEnvIf User-Agent ".*MSIE [1-5].*" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
-
- SetEnvIf User-Agent ".*MSIE [6-9].*" \
- ssl-unclean-shutdown
-
-</VirtualHost>
-
-# ----------------------------------------------------------------------------------
-# Set up our main virtual host
-# Port 80 comes after 443 to avoid "unknown protocol speaking not SSL to HTTPS port!?"
-# errors, per http://wiki.apache.org/httpd/InternalDummyConnection
-# ----------------------------------------------------------------------------------
-
-# Commented to avoid warnings from duplicate "NameVirtualHost: *80" directives
-#NameVirtualHost *:80
-<VirtualHost *:80>
- ServerName localhost:80
- ServerAlias 127.0.0.1:80
- DocumentRoot @localstatedir@/web/
- DirectoryIndex index.html index.xhtml
- # - absorb the shared virtual host settings
- Include eg_vhost.conf
-</VirtualHost>
-
diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
deleted file mode 100644
index f32e6fc..0000000
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ /dev/null
@@ -1,859 +0,0 @@
-# ----------------------------------------------------------------------------------
-# 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.
-# ----------------------------------------------------------------------------------
-
-# Since Apache 2.2 doesn't set REQUEST_SCHEME, work around it
-# by setting an environment variable, per
-# http://stackoverflow.com/a/23177714
-RewriteCond %{HTTPS} off
-RewriteRule .* - [E=REQUEST_SCHEME:http]
-
-RewriteCond %{HTTPS} on
-RewriteRule .* - [E=REQUEST_SCHEME:https]
-
-# ----------------------------------------------------------------------------------
-# Point / to the opac - if you have a custom skin or locale, point at it here
-# ----------------------------------------------------------------------------------
-RewriteRule ^/$ %{ENV:REQUEST_SCHEME}://%{HTTP_HOST}/eg/opac/home [R=301,L]
-
-# ----------------------------------------------------------------------------------
-# Redirect staff to the correct URL if they forget to include the final /
-# ----------------------------------------------------------------------------------
-RewriteRule ^/eg/staff$ https://%{HTTP_HOST}/eg/staff/ [R=301,L]
-
-# ----------------------------------------------------------------------------------
-# Point / to the IP address redirector
-# ----------------------------------------------------------------------------------
-#<LocationMatch ^/$>
-# 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
-#</LocationMatch>
-
-
-# ----------------------------------------------------------------------------------
-# Assign a default locale to the accessible OPAC
-# ----------------------------------------------------------------------------------
-RewriteRule ^/opac/extras/slimpac/start.html$ %{ENV:REQUEST_SCHEME}://%{HTTP_HOST}/opac/en-US/extras/slimpac/start.html [R=301,L]
-RewriteRule ^/opac/extras/slimpac/advanced.html$ %{ENV:REQUEST_SCHEME}://%{HTTP_HOST}/opac/en-US/extras/slimpac/advanced.html [R=301,L]
-
-# ----------------------------------------------------------------------------------
-# Configure the gateway and translator
-# ----------------------------------------------------------------------------------
-OSRFGatewayConfig @sysconfdir@/opensrf_core.xml
-OSRFTranslatorConfig @sysconfdir@/opensrf_core.xml
-# Translator memcache server. Default is localhost
-# OSRFTranslatorCacheServer 127.0.0.1:11211
-
-
-# ----------------------------------------------------------------------------------
-# Added content plugin
-# ----------------------------------------------------------------------------------
-<Location /opac/extras/ac/>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::AddedContent
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-
-# Lock clearing cache down to STAFF_LOGIN
-<Location /opac/extras/ac/clearcache/>
- PerlAccessHandler OpenILS::WWW::AccessHandler
- PerlSetVar OILSAccessHandlerPermission "STAFF_LOGIN"
-</Location>
-
-# Autosuggest for searches
-<Location /opac/extras/autosuggest>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::AutoSuggest
- PerlSendHeader On
- Allow from All
-</Location>
-
-# Flattener service
-<Location /opac/extras/flattener>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::FlatFielder
- PerlSendHeader On
- Allow from All
-</Location>
-
-# ----------------------------------------------------------------------------------
-# 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]
-
-<Location /opac/extras/ac/jacket>
- ErrorDocument 404 /opac/images/blank.png
-</Location>
-
-# Uncomment one or more of these to have a "no image" image other than the blank
-# image above.
-
-# Note: There are no default images provided for these, you will need to provide
-# your own "no image" image(s).
-
-#<Location /opac/extras/ac/jacket/small>
-# ErrorDocument 404 /opac/images/noimage_small.png
-#</Location>
-
-#<Location /opac/extras/ac/jacket/medium>
-# ErrorDocument 404 /opac/images/noimage_medium.png
-#</Location>
-
-#<Location /opac/extras/ac/jacket/large>
-# ErrorDocument 404 /opac/images/noimage_large.png
-#</Location>
-
-# ----------------------------------------------------------------------------------
-# 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
-# ----------------------------------------------------------------------------------
-# My Account
-RewriteRule /opac/[^/]*/skin/default/xml/myopac.xml %{ENV:REQUEST_SCHEME}://%{HTTP_HOST}/eg/opac/myopac/main?%{ENV:OILS_JSPAC_SEARCH_TYPE}%{ENV:OILS_JSPAC_SEARCH_TERMS}%{ENV:OILS_JSPAC_SEARCH_LOCATION} [NE,R,L]
-
-# -----------------------------------------------------------------------------$
-# Force HTTPS for /eg/circ/selfcheck
-# -----------------------------------------------------------------------------$
-RewriteCond %{HTTPS} off
-RewriteRule ^(/eg/circ/selfcheck) https://%{HTTP_HOST}%{REQUEST_URI} [NC,R=301,L]
-
-# ----------------------------------------------------------------------------------
-# For sanity reasons, default indexes to Off
-# ----------------------------------------------------------------------------------
-Options -Indexes
-
-# ----------------------------------------------------------------------------------
-# Configure the OPAC
-# ----------------------------------------------------------------------------------
-<LocationMatch /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
- #SetEnv OILS_NOVELIST_PROFILE
- #SetEnv OILS_NOVELIST_PASSWORD
-
- # 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
-
-</LocationMatch>
-
-<Location /opac/>
- # ----------------------------------------------------------------------------------
- # Some mod_deflate fun
- # ----------------------------------------------------------------------------------
- <IfModule mod_deflate.c>
- 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
-
- <IfModule mod_headers.c>
- Header append Vary User-Agent env=!dont-vary
- </IfModule>
- </IfModule>
-
-</Location>
-
-<Location //opac/>
- # ----------------------------------------------------------------------------------
- # Some mod_deflate fun
- # ----------------------------------------------------------------------------------
- <IfModule mod_deflate.c>
- 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
-
- <IfModule mod_headers.c>
- Header append Vary User-Agent env=!dont-vary
- </IfModule>
- </IfModule>
-
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Force SSL on the OPAC's "My Account" page
-# ----------------------------------------------------------------------------------
-<LocationMatch .*/myopac.xml>
- SSLRequireSSL
-</LocationMatch>
-
-RewriteCond %{QUERY_STRING} locale=([^&]*)
-RewriteRule ^/opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/(.*)$ %{ENV:REQUEST_SCHEME}://%{HTTP_HOST}/opac/%1/extras/slimpac/$1? [redirect]
-<LocationMatch /opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/>
- AddOutputFilter INCLUDES;XMLENT .html
-</LocationMatch>
-
-# ----------------------------------------------------------------------------------
-# 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}]
-
-<LocationMatch /xul/.*\.x?html$>
- 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
-</LocationMatch>
-
-
-<LocationMatch /xul/.*\.xul$>
- Options +Includes
- XMLEntContentType "application/vnd.mozilla.xul+xml"
- AddOutputFilter INCLUDES;XMLENT .xul
- SetEnv no-gzip
- allow from all
-</LocationMatch>
-
-# ----------------------------------------------------------------------------------
-# Supercat feeds
-# ----------------------------------------------------------------------------------
-<Location /opac/extras/oisbn>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::oisbn
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/supercat>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::supercat
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/unapi>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::unapi
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/feed/bookbag>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::bookbag_feed
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/opensearch>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::opensearch_feed
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/sru>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::sru_search
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/sru_auth>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::sru_auth_search
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/feed/freshmeat>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::changes_feed
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/browse>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::string_browse
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-<Location /opac/extras/startwith>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::SuperCat::string_startwith
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Module for displaying OpenSRF API documentation
-# ----------------------------------------------------------------------------------
-<Location /opac/extras/docgen.xsl>
- AddOutputFilter INCLUDES .xsl
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Module for processing staff-client offline scripts lives here
-# ----------------------------------------------------------------------------------
-<Directory "@localstatedir@/cgi-bin/offline">
- AddHandler cgi-script .pl
- AllowOverride None
- Options +ExecCGI
- allow from all
-</Directory>
-
-
-# ----------------------------------------------------------------------------------
-# 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
-# ----------------------------------------------------------------------------------
-<Location /gateway>
- SetHandler osrf_json_gateway_module
- OSRFGatewayLegacyJSON "true"
- allow from all
-</Location>
-# ----------------------------------------------------------------------------------
-# New-style OpenSRF JSON gateway
-# ----------------------------------------------------------------------------------
-<Location /osrf-gateway-v1>
- SetHandler osrf_json_gateway_module
- OSRFGatewayLegacyJSON "false"
- allow from all
-</Location>
-
-# ----------------------------------------------------------------------------------
-# OpenSRF-over-HTTP translator
-# (http://open-ils.org/dokuwiki/doku.php?id=opensrf_over_http)
-# ----------------------------------------------------------------------------------
-<Location /osrf-http-translator>
- SetHandler osrf_http_translator_module
- allow from all
-</Location>
-
-# ----------------------------------------------------------------------------------
-# The exporter lives here
-# ----------------------------------------------------------------------------------
-<Location /exporter>
- 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
-</Location>
-
-<Location /opac/extras/merge_template>
- 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
-</Location>
-
-<Location /opac/extras/circ>
- 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
-</Location>
-
-<Location /collections>
- 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
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Protect Standalone/Offline mode files from public view
-# ----------------------------------------------------------------------------------
-<Location /standalone/>
- AuthType Basic
- AuthName "Standalone Mode Login"
- PerlOptions +GlobalRequest
- PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
- PerlAuthenHandler OpenILS::WWW::Proxy::Authen
- require valid-user
- PerlSendHeader On
- allow from all
- SSLRequireSSL
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Reporting output lives here
-# ----------------------------------------------------------------------------------
-<Location /reporter/>
- 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
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Reports GUI
-# ----------------------------------------------------------------------------------
-<LocationMatch /reports.*\.x?html>
- Options +Includes
- XMLEntContentType "text/html; charset=utf-8"
- AddOutputFilter INCLUDES;XMLENT .xhtml
- AddOutputFilter INCLUDES;XMLENT .html
-</LocationMatch>
-
-<LocationMatch /reports>
- Options +Includes
- AddOutputFilter INCLUDES;XMLENT .xhtml
-</LocationMatch>
-
-# capture locale CGI param for /reports/fm_IDL.xml
-RewriteCond %{REQUEST_URI} ^/reports/fm_IDL.xml
-RewriteCond %{QUERY_STRING} locale=([^&;]*)
-RewriteRule . - [E=locale:%1]
-
-<LocationMatch /reports/fm_IDL.xml>
- IDLChunkStripPI "yes"
- IDLChunkEscapeScript "no"
- IDLChunkStripComments "yes"
- IDLChunkStripDoctype "yes"
- IDLChunkContentType "application/xml; charset=utf-8"
- AddOutputFilter INCLUDES;IDLCHUNK .xml
- SetEnv no-gzip
-</LocationMatch>
-
-# ----------------------------------------------------------------------------------
-# EDI Message viewer
-# ----------------------------------------------------------------------------------
-<Location /edi>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::EDI
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-</Location>
-
-# ----------------------------------------------------------------------------------
-# XML-RPC gateway
-# ----------------------------------------------------------------------------------
-<Location /xml-rpc>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::XMLRPCGateway
- Options +ExecCGI
- PerlSendHeader On
- allow from all
- <IfModule mod_headers.c>
- Header onsuccess set Cache-Control no-cache
- </IfModule>
-</Location>
-
-# ----------------------------------------------------------------------------------
-# Conify - next-generation Evergreen administration interface
-# ----------------------------------------------------------------------------------
-RewriteRule ^/conify/([a-z]{2}-[A-Z]{2})/global/(.*)$ /conify/global/$2 [E=locale:$1,L]
-<Location /conify>
- 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
-</Location>
-
-# ----------------------------------------------------------------------------------
-# The PhoneList lives here
-# ----------------------------------------------------------------------------------
-<Location /phonelist>
- SetHandler perl-script
- AuthType Basic
- AuthName "PhoneList Login"
- require valid-user
- PerlOptions +GlobalRequest
- PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
- PerlHandler OpenILS::WWW::PhoneList
- PerlAuthenHandler OpenILS::WWW::Proxy::Authen
- Options +ExecCGI
- PerlSendHeader On
- allow from all
- <IfModule mod_headers.c>
- Header onsuccess set Cache-Control no-cache
- </IfModule>
-</Location>
-<Location /vandelay-upload>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::Vandelay::spool_marc
- Options +ExecCGI
- allow from all
-</Location>
-
-# OpenURL 0.1 searching based on OpenSearch
-RewriteMap openurl prg:@bindir@/openurl_map.pl
-RewriteCond %{QUERY_STRING} (^.*$)
-RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
-
-
-
-# General Evergreen web template processor
-<Location /eg>
- SetHandler perl-script
- PerlHandler OpenILS::WWW::EGWeb
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-
- PerlSetVar OILSWebBasePath "/eg"
- PerlSetVar OILSWebWebDir "@localstatedir@/web"
- PerlSetVar OILSWebDefaultTemplateExtension "tt2"
-
- # Port Apache listens on for HTTP traffic. Used for HTTP requests
- # routed from Perl handlers back to the same Apache instance, like
- # added content requests. Use this when running Apache with a
- # non-standard port, typical with a proxy setup. Defaults to "80".
- # PerlSetVar OILSWebInternalHTTPPort "7080"
-
- # Enable Template-Toolkit error debugging messages (apache error log)
- PerlSetVar OILSWebDebugTemplate "false"
- # local cache of compiled Template Toolkit templates
- PerlSetVar OILSWebCompiledTemplateCache "/tmp/eg_template_cache"
- # template TTL - how long, in seconds, that Template Toolkit
- # waits to check for updated template files
- #PerlSetVar OILSWebTemplateStatTTL 60
-
- # -------------------------------------------------------
- # 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 "@localstatedir@/data/locale/opac/messages.en.po"
- #PerlAddVar OILSWebLocale "en_ca"
- #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/en-CA.po"
- #PerlAddVar OILSWebLocale "fr_ca"
- #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/opac/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 "@localstatedir@/templates"
- #PerlAddVar OILSWebTemplatePath "@localstatedir@/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
- #-------------------------------------------------
-
- <IfModule mod_deflate.c>
- 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
- <IfModule mod_headers.c>
- Header append Cache-Control "public"
- Header append Vary User-Agent env=!dont-vary
- </IfModule>
- </IfModule>
-</Location>
-<LocationMatch ^/(images|css|js)/>
- # should pick up the default expire time from eg.conf...
- <IfModule mod_deflate.c>
- 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
- <IfModule mod_headers.c>
- Header append Cache-Control "public"
- Header append Vary User-Agent env=!dont-vary
- </IfModule>
- </IfModule>
-</LocationMatch>
-<Location /eg/opac>
- 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"
-</Location>
-<Location /eg/kpac>
- PerlSetVar OILSWebContextLoader "OpenILS::WWW::EGKPacLoader"
- PerlSetVar KPacConfigFile "@sysconfdir@/kpac.xml.example"
- ExpiresActive On
- ExpiresByType text/html "access plus 5 seconds"
-</Location>
-
-# 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.
-<LocationMatch ^/eg/.*(\.js|\.html|\.xhtml|\.xml|\.jpg|\.png|\.gif)$>
- SetHandler None
-</LocationMatch>
-
-# ----------------------------------------------------------------------------------
-# Some mod_deflate setup
-# ----------------------------------------------------------------------------------
-<IfModule mod_deflate.c>
- ## optional logging for mod_deflate debugging
- ##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
- <LocationMatch /opac/.*\.xml$>
- SetEnv no-gzip
- </LocationMatch>
- <LocationMatch /opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/.*\.html$>
- SetEnv no-gzip
- </LocationMatch>
- <LocationMatch /reports/.*\.xhtml$>
- SetEnv no-gzip
- </LocationMatch>
- <LocationMatch /conify/.*\.html$>
- SetEnv no-gzip
- </LocationMatch>
-</IfModule>
-
-
-<Location /IDL2js>
-
- SetHandler perl-script
- PerlHandler OpenILS::WWW::IDL2js
- Options +ExecCGI
- PerlSendHeader On
- allow from all
-
- <IfModule mod_headers.c>
- Header append Cache-Control "public"
- </IFModule>
-
- <IfModule mod_deflate.c>
- 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
- <IfModule mod_headers.c>
- Header append Vary User-Agent env=!dont-vary
- </IfModule>
- </IfModule>
-</Location>
-
-<LocationMatch /eg/staff/>
- SSLRequireSSL
- Options -MultiViews
- PerlSetVar OILSWebStopAtIndex "true"
-
- RewriteCond %{HTTPS} off
- RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L]
-
- # sample staff-specific translation files
- #PerlAddVar OILSWebLocale "en_ca"
- #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/staff/en-CA.po"
- #PerlAddVar OILSWebLocale "fr_ca"
- #PerlAddVar OILSWebLocale "@localstatedir@/data/locale/staff/fr-CA.po"
-</LocationMatch>
-
-<Location /js/>
- <IfModule mod_headers.c>
- Header append Cache-Control "public"
- </IFModule>
- <IfModule mod_deflate.c>
- 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
- <IfModule mod_headers.c>
- Header append Vary User-Agent env=!dont-vary
- </IfModule>
- </IfModule>
-</Location>
-
-# 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]
-
-
-# ------------------------------------------------------------------------
-# /eg2/ client setup and locale configuration.
-#
-# If a valid locale cookie is present that does not match the current
-# path, redirect to the requested locale path.
-# Otherwise, if no locale is active, redirect to the default locale.
-
-# fr-CA
-#RewriteCond %{REQUEST_URI} ^/eg2/
-#RewriteCond %{REQUEST_URI} !^/eg2/fr-CA/
-#RewriteCond %{HTTP_COOKIE} eg_locale=fr_ca
-#RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/fr-CA/$1 [R=307,L]
-
-# Default / en-US.
-# No alternate supported cookie provided.
-RewriteCond %{REQUEST_URI} ^/eg2/
-RewriteCond %{REQUEST_URI} !^/eg2/([a-z]{2}-[A-Z]{2})/
-RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/en-US/$1 [R=307,L]
-
-# en-US build
-# This is the only required configuration when only using the default locale.
-<Directory "/openils/var/web/eg2/en-US">
- FallbackResource /eg2/en-US/index.html
-</Directory>
-
-# fr-CA build
-#<Directory "/openils/var/web/eg2/fr-CA">
-# FallbackResource /eg2/fr-CA/index.html
-#</Directory>
diff --git a/Open-ILS/examples/apache/eg_startup.in b/Open-ILS/examples/apache_24/eg_startup.in
similarity index 100%
rename from Open-ILS/examples/apache/eg_startup.in
rename to Open-ILS/examples/apache_24/eg_startup.in
diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index a9de4a9..d689388 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -137,9 +137,7 @@ gen_scripts = \
# config files that are generated from *.in files and can
# be deleted by a make clean
gen_docs = \
- $(examples)/apache/eg.conf \
- $(examples)/apache/eg_vhost.conf \
- $(examples)/apache/eg_startup \
+ $(examples)/apache_24/eg_startup \
$(examples)/apache_24/eg_24.conf \
$(examples)/apache_24/eg_vhost_24.conf
@@ -234,14 +232,8 @@ $(supportscr)/offline-blocked-list.pl: Makefile $(supportscr)/offline-blocked-li
$(do_subst) $(supportscr)/offline-blocked-list.pl.in > "$@"
chmod 755 "$@"
-$(examples)/apache/eg.conf: Makefile $(examples)/apache/eg.conf.in
- $(do_subst) $(examples)/apache/eg.conf.in > "$@"
-
-$(examples)/apache/eg_vhost.conf: Makefile $(examples)/apache/eg_vhost.conf.in
- $(do_subst) $(examples)/apache/eg_vhost.conf.in > "$@"
-
-$(examples)/apache/eg_startup: Makefile $(examples)/apache/eg_startup.in
- $(do_subst) $(examples)/apache/eg_startup.in > "$@"
+$(examples)/apache_24/eg_startup: Makefile $(examples)/apache_24/eg_startup.in
+ $(do_subst) $(examples)/apache_24/eg_startup.in > "$@"
$(examples)/apache_24/eg_24.conf: Makefile $(examples)/apache_24/eg.conf.in
$(do_subst) $(examples)/apache_24/eg.conf.in > "$@"
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index fde4423..60a4ea3 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,7 +4,7 @@
#
# Makefile to install prerequisites for OpenSRF and Evergreen
#
-# Currently supports Debian (stretch, jessie, wheezy),
+# Currently supports Debian (stretch, jessie),
# Ubuntu (14.04), Ubuntu (16.04).
#
# Installs Perl prereqs, libdbi, libdbi-drivers, and libyaz
@@ -14,8 +14,6 @@
# - or -
# make -f Makefile.install debian-jessie
# - or -
-# make -f Makefile.install debian-wheezy
-# - or -
# make -f Makefile.install ubuntu-trusty
# - or -
# make -f Makefile.install ubuntu-xenial
@@ -68,8 +66,6 @@ debian-stretch:
@make -f $(DIR)/Makefile.debian-stretch
debian-jessie:
@make -f $(DIR)/Makefile.debian-jessie
-debian-wheezy:
- @make -f $(DIR)/Makefile.debian-wheezy
ubuntu-xenial:
@make -f $(DIR)/Makefile.ubuntu-xenial
ubuntu-trusty:
@@ -81,8 +77,6 @@ postgres-server-debian-stretch:
@make -f $(DIR)/Makefile.debian-stretch install_postgres_server
postgres-server-debian-jessie:
@make -f $(DIR)/Makefile.debian-jessie install_postgres_server
-postgres-server-debian-wheezy:
- @make -f $(DIR)/Makefile.debian-wheezy install_postgres_server
postgres-server-ubuntu-xenial:
@make -f $(DIR)/Makefile.ubuntu-xenial install_postgres_server
postgres-server-ubuntu-trusty:
@@ -98,8 +92,6 @@ debian-stretch-developer:
@make -f $(DIR)/Makefile.debian-stretch install_developer
debian-jessie-developer:
@make -f $(DIR)/Makefile.debian-jessie install_developer
-debian-wheezy-developer:
- @make -f $(DIR)/Makefile.debian-wheezy install_developer
ubuntu-xenial-translator:
@make -f $(DIR)/Makefile.ubuntu-xenial install_translator
@@ -109,8 +101,6 @@ debian-stretch-translator:
@make -f $(DIR)/Makefile.debian-stretch install_translator
debian-jessie-translator:
@make -f $(DIR)/Makefile.debian-jessie install_translator
-debian-wheezy-translator:
- @make -f $(DIR)/Makefile.debian-wheezy install_translator
ubuntu-xenial-packager:
@make -f $(DIR)/Makefile.ubuntu-xenial install_packager
@@ -120,7 +110,5 @@ debian-stretch-packager:
@make -f $(DIR)/Makefile.debian-stretch install_packager
debian-jessie-packager:
@make -f $(DIR)/Makefile.debian-jessie install_packager
-debian-wheezy-packager:
- @make -f $(DIR)/Makefile.debian-wheezy install_packager
# vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index c72c9a8..16263df 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -1,4 +1,4 @@
-# install files for Debian Wheezy
+# install files for Debian Jessie
DIR = $(dir $(lastword $(MAKEFILE_LIST)))
diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy
deleted file mode 100644
index 0a200d5..0000000
--- a/Open-ILS/src/extras/install/Makefile.debian-wheezy
+++ /dev/null
@@ -1,159 +0,0 @@
-# install files for Debian Wheezy
-
-DIR = $(dir $(lastword $(MAKEFILE_LIST)))
-
-export DEB_PGSQL_COMMON_MODS = \
- gcc \
- libbusiness-isbn-perl \
- libjson-xs-perl \
- liblibrary-callnumber-lc-perl \
- libmarc-record-perl \
- libmarc-xml-perl \
- librose-uri-perl \
- libuuid-tiny-perl \
- libxml-libxml-perl \
- libxml-libxslt-perl
-
-export DEBS = \
- $(DEB_PGSQL_COMMON_MODS) \
- apache2-prefork-dev\
- aspell\
- aspell-en\
- libapache2-mod-perl2\
- libbusiness-creditcard-perl\
- libbusiness-isbn-data-perl\
- libbusiness-issn-perl\
- libbusiness-onlinepayment-authorizenet-perl\
- libbusiness-onlinepayment-payflowpro-perl\
- libbusiness-onlinepayment-perl\
- libdate-manip-perl\
- libdatetime-format-builder-perl\
- libdatetime-format-iso8601-perl\
- libdatetime-format-mail-perl\
- libdatetime-perl\
- libdatetime-set-perl\
- libdatetime-timezone-perl\
- libdbd-pg-perl\
- libemail-send-perl\
- libemail-simple-perl\
- libgd-graph3d-perl\
- liblocale-maketext-lexicon-perl\
- liblog-log4perl-perl\
- libmarc-charset-perl \
- libncurses5-dev\
- libnet-ip-perl\
- libnet-ldap-perl \
- libnet-server-perl\
- libnet-ssh2-perl\
- libnet-z3950-simple2zoom-perl\
- libnet-z3950-simpleserver-perl\
- libnet-z3950-zoom-perl \
- libnspr4-dev\
- libole-storage-lite-perl\
- libparent-perl\
- libpq5\
- libpq-dev\
- librpc-xml-perl\
- libsru-perl\
- libssh2-1-dev\
- libtest-warn-perl\
- libtest-output-perl\
- libtext-aspell-perl\
- libtext-csv-perl\
- libuniversal-require-perl\
- libunix-syslog-perl\
- libyaz-dev\
- postgresql-client-9.4\
- libsoap-lite-perl\
- libbz2-dev\
- libparse-recdescent-perl\
- libexcel-writer-xlsx-perl\
- yaz
-
-export DEB_APACHE_MODS = \
- expires\
- include\
- proxy\
- proxy_http\
- rewrite\
- cgi\
- perl
-
-export DEB_APACHE_DISMODS = \
- deflate
-
-export CPAN_MODULES = \
- Business::OnlinePayment::PayPal \
- Template::Plugin::POSIX \
-
-export CPAN_MODULES_FORCE = \
- Business::Stripe \
- Class::DBI::Frozen::301
-
-PGSQL_APT_REPO_DEBS = \
- wget \
- ca-certificates
-
-PGSQL_SERVER_DEBS_94 = \
- $(DEB_PGSQL_COMMON_MODS) \
- postgresql-9.4 \
- postgresql-contrib-9.4 \
- postgresql-plperl-9.4 \
- postgresql-server-dev-9.4
-
-# note: some prereqs are repeated in the developer/packager
-# sections to support building Evergreen packages on servers
-# where Evergreen and its prereqs are not installed.
-
-DEVELOPER_DEBS = \
- automake \
- autoconf \
- libtool
-
-PACKAGER_DEBS = \
- asciidoc \
- source-highlight \
- zip \
- unzip \
- nsis
-
-TRANSLATOR_DEBS = \
- translate-toolkit \
- python-dev \
- python-levenshtein \
- python-polib \
- python-setuptools \
- python-simplejson \
- python-lxml \
- libtemplate-perl \
- liblocale-maketext-lexicon-perl \
- bzr
-
-all:
- make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
- make -f $(DIR)/Makefile.debian debian_postgresql_repo
- make -f $(DIR)/Makefile.debian install_debs
- make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
- make -f $(DIR)/Makefile.common install_cpan
- make -f $(DIR)/Makefile.common install_cpan_force
- make -f $(DIR)/Makefile.common install_libdbi
- make -f $(DIR)/Makefile.debian debian_sys_config
-
-install_postgres_server:
- make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_94)"
-
-install_developer:
- make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)"
- make -f $(DIR)/Makefile.common install_nodejs_from_source
-
-install_translator: install_developer
- make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)"
-
-install_packager: install_developer install_translator
- make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
-
-clean:
- make -f $(DIR)/Makefile.common clean
- make -f $(DIR)/Makefile.debian clean
-
-# vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/perlmods/live_t/01-auth.t b/Open-ILS/src/perlmods/live_t/01-auth.t
index 75da00b..43b6fc8 100644
--- a/Open-ILS/src/perlmods/live_t/01-auth.t
+++ b/Open-ILS/src/perlmods/live_t/01-auth.t
@@ -10,8 +10,7 @@ use OpenILS::Utils::TestUtils;
my $script = OpenILS::Utils::TestUtils->new();
#----------------------------------------------------------------
-# The tests... assumes stock sample data, full-auto install by
-# eg_wheezy_installer.sh, etc.
+# The tests... assumes stock sample data
#----------------------------------------------------------------
$script->authenticate({
diff --git a/Open-ILS/src/perlmods/live_t/02-simple_circ.t b/Open-ILS/src/perlmods/live_t/02-simple_circ.t
index 820b6f0..d3ae3f5 100644
--- a/Open-ILS/src/perlmods/live_t/02-simple_circ.t
+++ b/Open-ILS/src/perlmods/live_t/02-simple_circ.t
@@ -15,8 +15,7 @@ use OpenILS::Utils::TestUtils;
my $script = OpenILS::Utils::TestUtils->new();
#----------------------------------------------------------------
-# The tests... assumes stock sample data, full-auto install by
-# eg_wheezy_installer.sh, etc.
+# The tests... assumes stock sample data
#----------------------------------------------------------------
my $storage_ses = $script->session('open-ils.storage');
diff --git a/Open-ILS/src/perlmods/live_t/03-overdue_circ.t b/Open-ILS/src/perlmods/live_t/03-overdue_circ.t
index fd83b2c..f803843 100644
--- a/Open-ILS/src/perlmods/live_t/03-overdue_circ.t
+++ b/Open-ILS/src/perlmods/live_t/03-overdue_circ.t
@@ -21,8 +21,7 @@ use OpenSRF::Utils qw/cleanse_ISO8601/;
our $apputils = 'OpenILS::Application::AppUtils';
#----------------------------------------------------------------
-# The tests... assumes stock sample data, full-auto install by
-# eg_wheezy_installer.sh, etc.
+# The tests... assumes stock sample data
#----------------------------------------------------------------
my $storage_ses = $script->session('open-ils.storage');
diff --git a/Open-ILS/src/perlmods/live_t/04-overdue_with_closed_dates.t b/Open-ILS/src/perlmods/live_t/04-overdue_with_closed_dates.t
index 1672921..780781c 100644
--- a/Open-ILS/src/perlmods/live_t/04-overdue_with_closed_dates.t
+++ b/Open-ILS/src/perlmods/live_t/04-overdue_with_closed_dates.t
@@ -60,8 +60,7 @@ sub delete_closed_date {
}
#----------------------------------------------------------------
-# The tests... assumes stock sample data, full-auto install by
-# eg_wheezy_installer.sh, etc.
+# The tests... assumes stock sample data
#----------------------------------------------------------------
my $storage_ses = $script->session('open-ils.storage');
diff --git a/Open-ILS/src/perlmods/live_t/05-pay_bills.t b/Open-ILS/src/perlmods/live_t/05-pay_bills.t
index 94d380d..c93a586 100644
--- a/Open-ILS/src/perlmods/live_t/05-pay_bills.t
+++ b/Open-ILS/src/perlmods/live_t/05-pay_bills.t
@@ -43,8 +43,7 @@ sub pay_bills {
}
#----------------------------------------------------------------
-# The tests... assumes stock sample data, full-auto install by
-# eg_wheezy_installer.sh, etc.
+# The tests... assumes stock sample data
#----------------------------------------------------------------
my $storage_ses = $script->session('open-ils.storage');
diff --git a/Open-ILS/src/perlmods/live_t/09-lp1198465_neg_balances.t b/Open-ILS/src/perlmods/live_t/09-lp1198465_neg_balances.t
index 318f52c..4702a33 100644
--- a/Open-ILS/src/perlmods/live_t/09-lp1198465_neg_balances.t
+++ b/Open-ILS/src/perlmods/live_t/09-lp1198465_neg_balances.t
@@ -80,8 +80,7 @@ sub void_bills {
}
#----------------------------------------------------------------
-# The tests... assumes stock sample data, full-auto install by
-# eg_wheezy_installer.sh, etc.
+# The tests... assumes stock sample data
#----------------------------------------------------------------
# Connect to Evergreen
diff --git a/docs/installation/server_installation.adoc b/docs/installation/server_installation.adoc
index ffca119..96642a3 100644
--- a/docs/installation/server_installation.adoc
+++ b/docs/installation/server_installation.adoc
@@ -56,8 +56,8 @@ Installing prerequisites
* **PostgreSQL**: The minimum supported version is 9.4.
* **Linux**: Evergreen has been tested on Debian Stretch (9),
- Debian Jessie (8), Debian Wheezy (7), Ubuntu Xenial Xerus (16.04),
- and Ubuntu Trusty Tahr (14.04).
+ Debian Jessie (8), Ubuntu Xenial Xerus (16.04), and Ubuntu
+ Trusty Tahr (14.04).
If you are running an older version of these distributions, you may want
to upgrade before upgrading Evergreen. For instructions on upgrading these
distributions, visit the Debian or Ubuntu websites.
@@ -72,39 +72,24 @@ before you can successfully configure, compile, and install Evergreen.
2. On some distributions, it is necessary to install PostgreSQL 9.4+ from external
repositories.
+
- * Debian (Wheezy) and Ubuntu (Trusty) comes with older versions of
- PostgreSQL, so steps are taken to automatically utilize the
- PostgreSQL community's apt sources.
+ * Ubuntu (Trusty) comes with an older version of PostgreSQL, so
+ steps are taken to automatically utilize the PostgreSQL
+ community's apt sources.
(For complete details, see: https://wiki.postgresql.org/wiki/Apt)
* Debian (Jessie/Stretch) and Ubuntu (Xenial) comes with PostgreSQL 9.4+,
so no additional steps are required.
+
3. Issue the following commands as the *root* Linux account to install
prerequisites using the `Makefile.install` prerequisite installer,
- substituting `debian-stretch`, `debian-jessie`, `debian-wheezy`,
- `ubuntu-xenial`, or `ubuntu-trusty` for <osname> below:
+ substituting `debian-stretch`, `debian-jessie`,`ubuntu-xenial`,
+ or `ubuntu-trusty` for <osname> below:
+
[source, bash]
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install <osname>
------------------------------------------------------------------------------
+
-4. Add the libdbi-libdbd libraries to the system dynamic library path by
- issuing the following commands as the *root* Linux account:
-+
-[NOTE]
-You should skip this step if installing on Ubuntu Trusty/Xenial or Debian Jessie/Stretch. The Ubuntu
-and Debian Jessie/Stretch targets use libdbd-pgsql from packages.
-+
-.Debian Wheezy
-[source, bash]
-------------------------------------------------------------------------------
-echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
-ldconfig
-------------------------------------------------------------------------------
-
-[[optional_developer_additions]]
-5. OPTIONAL: Developer additions
+4. OPTIONAL: Developer additions
+
To perform certain developer tasks from a Git source code checkout,
additional packages may be required. As the *root* Linux account:
@@ -305,23 +290,11 @@ versions 2.4 or greater) to configure your Web server for the Evergreen
catalog, web staff client, Web services, and administration interfaces. Issue the
following commands as the *root* Linux account:
+
-.Debian Wheezy
-[source,bash]
-------------------------------------------------------------------------------
-cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
-cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
-cp Open-ILS/examples/apache/eg_startup /etc/apache2/
-# Now set up SSL
-mkdir /etc/apache2/ssl
-cd /etc/apache2/ssl
-------------------------------------------------------------------------------
-+
-.Ubuntu Trusty/Xenial and Debian Jessie/Stretch
[source,bash]
------------------------------------------------------------------------------------
cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
-cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+cp Open-ILS/examples/apache_24/eg_startup /etc/apache2/
# Now set up SSL
mkdir /etc/apache2/ssl
cd /etc/apache2/ssl
@@ -343,10 +316,9 @@ place.
a. To enable access to the offline upload / execute interface from any
workstation on any network, make the following change (and note that
you *must* secure this for a production instance):
- * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
- * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+ * Replace `Require host 10.0.0.0/8` with `Require all granted`
. Change the user for the Apache server.
- * (Debian and Ubuntu): As the *root* Linux account, edit
+ * As the *root* Linux account, edit
`/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
`export APACHE_RUN_USER=opensrf`.
. As the *root* Linux account, configure Apache with KeepAlive settings
@@ -354,7 +326,7 @@ place.
single client by allowing multiple requests to be sent over the same TCP
connection, but increase the risk of using up all available Apache child
processes and memory.
- * (Debian and Ubuntu): Edit `/etc/apache2/apache2.conf`.
+ * Edit `/etc/apache2/apache2.conf`.
a. Change `KeepAliveTimeout` to `1`.
b. Change `MaxKeepAliveRequests` to `100`.
. As the *root* Linux account, configure the prefork module to start and keep
@@ -362,19 +334,7 @@ place.
running out of memory. The following settings are a good starting point for a
site that exposes the default Evergreen catalogue to the web:
+
-.Debian Wheezy (`/etc/apache2/apache2.conf`)
-[source,bash]
-------------------------------------------------------------------------------
-<IfModule mpm_prefork_module>
- StartServers 15
- MinSpareServers 5
- MaxSpareServers 15
- MaxClients 75
- MaxRequestsPerChild 500
-</IfModule>
-------------------------------------------------------------------------------
-+
-.Ubuntu Trusty/Xenial, Debian Jessie/Stretch (`/etc/apache2/mods-available/mpm_prefork.conf`)
+.`/etc/apache2/mods-available/mpm_prefork.conf`
[source,bash]
------------------------------------------------------------------------------
<IfModule mpm_prefork_module>
@@ -386,8 +346,7 @@ place.
</IfModule>
------------------------------------------------------------------------------
+
-. (Ubuntu Trusty/Xenial, Debian Jessie/Stretch) As the *root* user,
- enable the mpm_prefork module:
+. As the *root* user, enable the mpm_prefork module:
+
[source,bash]
------------------------------------------------------------------------------
@@ -395,15 +354,7 @@ a2dismod mpm_event
a2enmod mpm_prefork
------------------------------------------------------------------------------
+
-. (Debian Wheezy): As the *root* Linux account, enable the Evergreen site:
-+
-[source,bash]
-------------------------------------------------------------------------------
-a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
-a2ensite eg.conf
-------------------------------------------------------------------------------
-+
-(Ubuntu Trusty/Xenial, Debian Jessie/Stretch):
+. As the *root* Linux account, enable the Evergreen site:
+
[source,bash]
------------------------------------------------------------------------------
@@ -411,7 +362,7 @@ a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page
a2ensite eg.conf
------------------------------------------------------------------------------
+
-. (Debian and Ubuntu): As the *root* Linux account, enable Apache to write
+. As the *root* Linux account, enable Apache to write
to the lock directory; this is currently necessary because Apache
is running as the `opensrf` user:
+
@@ -483,7 +434,7 @@ by every Evergreen system. You can install the packages required by Debian or
Ubuntu on the machine of your choice using the following commands as the
*root* Linux account:
-.(Debian / Ubuntu) Installing PostgreSQL server packages
+. Installing PostgreSQL server packages
Each OS build target provides the postgres server installation packages
required for each operating system. To install Postgres server packages,
@@ -494,7 +445,6 @@ command below based on your operating system.
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch
make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
-make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
------------------------------------------------------------------------------
diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc
index c7c1bf0..a8ea00b 100644
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -8,8 +8,7 @@ Software Prerequisites
* **PostgreSQL**: The minimum supported version is 9.4.
* **Linux**: Evergreen 2.12.0 has been tested on Debian Stretch (9.0),
- Debian Jessie (8.0), Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04),
- and Ubuntu Trusty Tahr (14.04).
+ Debian Jessie (8.0), Ubuntu Xenial Xerus (16.04),and Ubuntu Trusty Tahr (14.04).
If you are running an older version of these distributions, you may want
to upgrade before upgrading Evergreen. For instructions on upgrading these
distributions, visit the Debian or Ubuntu websites.
@@ -67,8 +66,8 @@ distribution of Debian or Ubuntu:
indexterm:[Linux, Debian]
indexterm:[Linux, Ubuntu]
+
+ * `debian-stretch` for Debian Stretch (9.0) (EDI compatibility in progess)
* `debian-jessie` for Debian Jessie (8.0) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
- * `debian-wheezy` for Debian Wheezy (7.0)
* `ubuntu-xenial` for Ubuntu Xenial Xerus (16.04) (EDI compatibility in progress)
* `ubuntu-trusty` for Ubuntu Trusty Tahr (14.04) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/apache/eg.conf.in | 154 ----
Open-ILS/examples/apache/eg_vhost.conf.in | 859 --------------------
.../examples/{apache => apache_24}/eg_startup.in | 0
Open-ILS/src/Makefile.am | 14 +-
Open-ILS/src/extras/Makefile.install | 14 +-
Open-ILS/src/extras/install/Makefile.debian-jessie | 2 +-
Open-ILS/src/extras/install/Makefile.debian-wheezy | 159 ----
Open-ILS/src/perlmods/live_t/01-auth.t | 3 +-
Open-ILS/src/perlmods/live_t/02-simple_circ.t | 3 +-
Open-ILS/src/perlmods/live_t/03-overdue_circ.t | 3 +-
.../perlmods/live_t/04-overdue_with_closed_dates.t | 3 +-
Open-ILS/src/perlmods/live_t/05-pay_bills.t | 3 +-
.../perlmods/live_t/09-lp1198465_neg_balances.t | 3 +-
docs/installation/server_installation.adoc | 84 +--
docs/installation/server_upgrade.adoc | 5 +-
15 files changed, 30 insertions(+), 1279 deletions(-)
delete mode 100644 Open-ILS/examples/apache/eg.conf.in
delete mode 100644 Open-ILS/examples/apache/eg_vhost.conf.in
rename Open-ILS/examples/{apache => apache_24}/eg_startup.in (100%)
delete mode 100644 Open-ILS/src/extras/install/Makefile.debian-wheezy
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list