From 1f25165e6bea2060a60779becf8e8d948fdb9e0c Mon Sep 17 00:00:00 2001 From: Andy Witter Date: Tue, 15 Oct 2013 16:13:57 -0400 Subject: [PATCH] update apache2 config to 2.5-beta1 --- templates/apache2/eg.conf | 4 +++- templates/apache2/eg_startup | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/templates/apache2/eg.conf b/templates/apache2/eg.conf index aed73e4..a8594de 100644 --- a/templates/apache2/eg.conf +++ b/templates/apache2/eg.conf @@ -18,8 +18,8 @@ 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::PasswordReset::child_init PerlChildInitHandler OpenILS::WWW::AutoSuggest::child_init +PerlChildInitHandler OpenILS::WWW::PhoneList::child_init # ---------------------------------------------------------------------------------- # Set some defaults for our working directories @@ -110,6 +110,7 @@ NameVirtualHost *:443 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 @@ -118,6 +119,7 @@ NameVirtualHost *:443 # openssl req -new -x509 -nodes -out server.crt -keyout server.key SSLCertificateFile ssl/server.crt SSLCertificateKeyFile ssl/server.key + #SSLCACertificateFile ssl/ca.crt # - absorb the shared virtual host settings Include eg_vhost.conf diff --git a/templates/apache2/eg_startup b/templates/apache2/eg_startup index 9460258..259d817 100755 --- a/templates/apache2/eg_startup +++ b/templates/apache2/eg_startup @@ -4,24 +4,24 @@ 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::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 ('@sysconfdir@/opensrf_core.xml'); -use OpenILS::WWW::IDL2js ('@sysconfdir@/opensrf_core.xml'); +use OpenILS::WWW::IDL2js ('/openils/conf/opensrf_core.xml'); use OpenILS::WWW::FlatFielder; +use OpenILS::WWW::PhoneList ('/openils/conf/opensrf_core.xml'); # - 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'); +#use OpenILS::WWW::Redirect qw(/openils/conf/opensrf_core.xml); +#OpenILS::WWW::Redirect->parse_ips_file('/openils/conf/lib_ips.txt'); -- 2.11.0