Change default proxy configs to Authen variant

Also, because Authen causes Indexes to function, turn them off by default.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index cf593ed..82872da 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -71,6 +71,11 @@ RewriteCond %{REQUEST_URI} ^/opac/(.*?)/
 RewriteRule . - [E=locale:%1]
 
 # ----------------------------------------------------------------------------------
+# For sanity reasons, default indexes to Off
+# ----------------------------------------------------------------------------------
+Options -Indexes
+
+# ----------------------------------------------------------------------------------
 # Configure the OPAC
 # ----------------------------------------------------------------------------------
 <LocationMatch /opac/>
@@ -371,10 +376,13 @@ RewriteRule . - [E=locale:en-US]
 # ----------------------------------------------------------------------------------
 <Location /exporter>
     SetHandler perl-script
-    PerlSetVar OILSProxyTitle "Exporter Login"
-    PerlSetVar OILSProxyDescription "Please log in with an authorized staff account to export records"
+    AuthType Basic
+    AuthName "Exporter Login"
+    PerlOptions +GlobalRequest
     PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlHandler OpenILS::WWW::Proxy OpenILS::WWW::Exporter
+    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
+    require valid-user
+    PerlHandler OpenILS::WWW::Exporter
     Options +ExecCGI
     PerlSendHeader On
     allow from all
@@ -382,21 +390,25 @@ RewriteRule . - [E=locale:en-US]
 
 <Location /opac/extras/merge_template>
     SetHandler perl-script
-    PerlSetVar OILSProxyTitle "Batch Update Login"
-    PerlSetVar OILSProxyDescription "Please log in to update records in batch"
+    AuthType Basic
+    AuthName "Batch Update Login"
+    PerlOptions +GlobalRequest
     PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlHandler OpenILS::WWW::Proxy OpenILS::WWW::TemplateBatchBibUpdate
+    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
+    require valid-user
+    PerlHandler OpenILS::WWW::TemplateBatchBibUpdate
     PerlSendHeader On
     Options +ExecCGI
     allow from all
 </Location>
 
 <Location /opac/extras/circ>
-    SetHandler perl-script
-    PerlSetVar OILSProxyTitle "Circ Extras Login"
-    PerlSetVar OILSProxyDescription "Please log in with an authorized staff account to export records"
+    AuthType Basic
+    AuthName "Circ Extras Login"
+    PerlOptions +GlobalRequest
     PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlHandler OpenILS::WWW::Proxy
+    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
+    require valid-user
     Options +ExecCGI
     PerlSendHeader On
     allow from all
@@ -406,11 +418,12 @@ RewriteRule . - [E=locale:en-US]
 # Reporting output lives here
 # ----------------------------------------------------------------------------------
 <Location /reporter/>
-    SetHandler perl-script
-    PerlSetVar OILSProxyTitle "Report Login"
-    PerlSetVar OILSProxyDescription "Please log in with an authorized staff account to view this report"
+    AuthType Basic
+    AuthName "Report Login"
+    PerlOptions +GlobalRequest
     PerlSetVar OILSProxyPermissions "VIEW_REPORT_OUTPUT"
-    PerlHandler OpenILS::WWW::Proxy
+    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
+    require valid-user
     Options +ExecCGI
     PerlSendHeader On
     allow from all
@@ -420,11 +433,12 @@ RewriteRule . - [E=locale:en-US]
 # Selfcheck interface
 # ----------------------------------------------------------------------------------
 <LocationMatch .*/selfcheck.xml>
-    SetHandler perl-script
-    PerlSetVar OILSProxyTitle "Self-check Login"
-    PerlSetVar OILSProxyDescription "Please log in with an authorized staff account to activate the self-check interface"
+    AuthType Basic
+    AuthName "Self-check Login"
+    PerlOptions +GlobalRequest
     PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlHandler OpenILS::WWW::Proxy
+    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
+    require valid-user
     Options +ExecCGI
     PerlSendHeader On
     allow from all
@@ -482,11 +496,12 @@ RewriteRule ^/conify/([a-z]{2}-[A-Z]{2})/global/(.*)$ /conify/global/$2 [E=local
     XMLEntContentType "text/html; charset=utf-8"
     AddOutputFilter INCLUDES;XMLENT .html
  
-    SetHandler perl-script
-    PerlSetVar OILSProxyTitle "Dojo Admin Login"
-    PerlSetVar OILSProxyDescription "Please log in with an authorized staff account to administer Evergreen"
+    AuthType Basic
+    AuthName "Dojo Admin Login"
+    PerlOptions +GlobalRequest
     PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlHandler OpenILS::WWW::Proxy
+    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
+    require valid-user
     Options +ExecCGI
     PerlSendHeader On
     allow from all