From aa9758ddf9c4d305654575786064af018d10a52d Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Tue, 6 May 2014 12:23:53 -0400
Subject: [PATCH] remove dupe deflate stanza; example locales

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/examples/apache/eg_vhost.conf.in    | 18 +++++-------------
 Open-ILS/examples/apache_24/eg_vhost.conf.in | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 7d8eb5de7f..18c6ed8f20 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -798,19 +798,11 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     Options -MultiViews
     PerlSetVar OILSWebStopAtIndex "true"
 
-    <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>
+    # sample staff-specific translation files
+    #PerlAddVar OILSWebLocale "en_ca"                                           
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"         
+    #PerlAddVar OILSWebLocale "fr_ca"                                           
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"   
 </LocationMatch>
 
 <Location /js/>
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 828dd90c7a..a44b9ada09 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -810,19 +810,11 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     Options -MultiViews
     PerlSetVar OILSWebStopAtIndex "true"
 
-    <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>
+    # sample staff-specific translation files
+    #PerlAddVar OILSWebLocale "en_ca"                                           
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"         
+    #PerlAddVar OILSWebLocale "fr_ca"                                           
+    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"   
 </LocationMatch>
 
 <Location /js/>
-- 
2.11.0