[LON-CAPA-cvs] cvs: doc(version_2_10_X) /loncapafiles loncapafiles.lpml

[raeburn]

raeburn		Thu May 26 16:24:02 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - Backport 1.749.
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.675.4.34 doc/loncapafiles/loncapafiles.lpml:1.675.4.35
--- doc/loncapafiles/loncapafiles.lpml:1.675.4.34	Thu May 26 16:16:33 2011
+++ doc/loncapafiles/loncapafiles.lpml	Thu May 26 16:24:01 2011
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.675.4.34 2011/05/26 16:16:33 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.675.4.35 2011/05/26 16:24:01 raeburn Exp $ -->
 
 <!--
 
@@ -242,10 +242,22 @@
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/httpd/conf</targetdir>
+  <targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4'>etc/apache2</targetdir>
   <categoryname>standard</categoryname>
   <description>web configuration files</description>
 </directory>
 <directory dist='default'>
+  <protectionlevel>modest_delete</protectionlevel>
+  <targetdir dist='default'>etc/httpd/conf/rewrites</targetdir>
+  <targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd/rewrites</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4'>etc/apache2/rewrites</targetdir>
+  <categoryname>standard</categoryname>
+  <description>
+  default configuration files to enable/disable http:// -> https:// rewrites
+  </description>
+</directory>
+<directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/pam.d</targetdir>
   <categoryname>standard</categoryname>
@@ -1011,6 +1023,28 @@
 </description>
 </link>
 <file>
+<source>loncom/rewrites/loncapa_rewrite_on.conf</source>
+<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_on.conf</target>
+<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_on.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
+<categoryname>static conf</categoryname>
+<description>
+File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to  /etc/httpd/conf/loncapa_rewrite.conf to enable rewriting of
+external requests for http:// to https://
+</description>
+</file>
+<file>
+<source>loncom/rewrites/loncapa_rewrite_off.conf</source>
+<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_off.conf</target>
+<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_off.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target>
+<categoryname>static conf</categoryname>
+<description>
+File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to  /etc/httpd/conf/loncapa_rewrite.conf to disable rewriting of
+external requests for http:// to https://
+</description>
+</file>
+<file>
 <source>loncom/thesaurus/thesaurus.db</source>
 <target dist='default'>home/httpd/lonTabs/thesaurus.db</target>
 <categoryname>system file</categoryname>