Update apache config files for 2.4.6

diff --git a/templates/apache2/eg.conf b/templates/apache2/eg.conf
index a8594de..87f0c26 100644 (file)
--- 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,7 +110,6 @@ 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
 

diff --git a/templates/apache2/eg_startup b/templates/apache2/eg_startup
index 259d817..070c370 100755 (executable)
--- a/templates/apache2/eg_startup
+++ b/templates/apache2/eg_startup
@@ -11,9 +11,9 @@ 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;
-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: