From b87f9ce038916dfae43ae38aa2a4026fa7f93d1d Mon Sep 17 00:00:00 2001 From: Michael Peters Date: Fri, 4 Sep 2015 10:45:30 -0400 Subject: [PATCH] Include Apache 2.4 compatible eg.conf and eg_startup Ubuntu Trusty ships with Apache 2.4. Replace the old Apache 2.2 format files with files with properly formatted files since the syntax has changed. --- templates/apache2/eg.conf | 19 ++++++------------- templates/apache2/eg_startup | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/templates/apache2/eg.conf b/templates/apache2/eg.conf index a8594de..aa8a598 100644 --- a/templates/apache2/eg.conf +++ b/templates/apache2/eg.conf @@ -20,13 +20,13 @@ PerlChildInitHandler OpenILS::WWW::SuperCat::child_init PerlChildInitHandler OpenILS::WWW::AddedContent::child_init PerlChildInitHandler OpenILS::WWW::AutoSuggest::child_init PerlChildInitHandler OpenILS::WWW::PhoneList::child_init +PerlChildInitHandler OpenILS::WWW::EGWeb::child_init # ---------------------------------------------------------------------------------- # Set some defaults for our working directories # ---------------------------------------------------------------------------------- - Order allow,deny - Allow from all + Require all granted @@ -36,8 +36,7 @@ PerlChildInitHandler OpenILS::WWW::PhoneList::child_init Options Indexes FollowSymLinks AllowOverride None - Order allow,deny - Allow from all + Require all granted @@ -58,9 +57,7 @@ Alias /cgi-bin/offline/ "/openils/var/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 + Require host 10.0.0.0/8 Options FollowSymLinks ExecCGI Indexes @@ -84,8 +81,8 @@ Alias /updates/ "/openils/var/updates/pub/" AllowOverride None Options None - Allow from all Options ExecCGI + Require all granted @@ -104,7 +101,6 @@ ExpiresByType text/css "access plus 50 minutes" # Set up our SSL virtual host # ---------------------------------------------------------------------------------- #Listen 443 -NameVirtualHost *:443 DocumentRoot "/openils/var/web" ServerName localhost:443 @@ -119,7 +115,6 @@ 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 @@ -140,13 +135,11 @@ NameVirtualHost *:443 # errors, per http://wiki.apache.org/httpd/InternalDummyConnection # ---------------------------------------------------------------------------------- -# Commented to avoid warnings from duplicate "NameVirtualHost: *80" directives -#NameVirtualHost *:80 ServerName localhost:80 ServerAlias 127.0.0.1:80 DocumentRoot /openils/var/web/ - DirectoryIndex index.xml index.html index.xhtml + DirectoryIndex index.html index.xhtml # - absorb the shared virtual host settings Include eg_vhost.conf diff --git a/templates/apache2/eg_startup b/templates/apache2/eg_startup index 259d817..b19cafb 100755 --- a/templates/apache2/eg_startup +++ b/templates/apache2/eg_startup @@ -10,7 +10,7 @@ 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::EGWeb ('/openils/conf/opensrf_core.xml', 'OpenILS::WWW::EGCatLoader', 'en_us');; use OpenILS::WWW::IDL2js ('/openils/conf/opensrf_core.xml'); use OpenILS::WWW::FlatFielder; use OpenILS::WWW::PhoneList ('/openils/conf/opensrf_core.xml'); -- 2.11.0