[LON-CAPA-cvs] cvs: loncom / loncapa_apache_local.conf doc/loncapafiles loncapafiles.lpml

[raeburn]

raeburn		Mon Feb  4 15:19:36 2013 EDT

  Added files:                 
    /loncom	loncapa_apache_local.conf 

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - Support for Apache 2.4
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.824 doc/loncapafiles/loncapafiles.lpml:1.825
--- doc/loncapafiles/loncapafiles.lpml:1.824	Sat Feb  2 19:52:52 2013
+++ doc/loncapafiles/loncapafiles.lpml	Mon Feb  4 15:19:32 2013
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.824 2013/02/02 19:52:52 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.825 2013/02/04 15:19:32 raeburn Exp $ -->
 
 <!--
 
@@ -1090,6 +1090,19 @@
 </description>
 </file>
 <file>
+<source>loncom/loncapa_apache_local.conf</source>
+<target dist='default'>etc/httpd/conf/loncapa_apache_local.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target>
+<categoryname>static conf</categoryname>
+<description>
+Documentation file describing how to add domain-specific Apache configuration
+files, e.g., (loncapa_apache_localmsu.conf).
+loncapa_apache_local.conf needs to exist if no domain-specific file has so far
+been created so that Apache 2.4 will start, given that loncapa_apache.conf has:
+Include conf/loncapa_apache_local*.conf
+</description>
+</file>
+<file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
 <target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target>

Index: loncom/loncapa_apache_local.conf
+++ loncom/loncapa_apache_local.conf
#
# $Id: loncapa_apache_local.conf,v 1.1 2013/02/04 15:19:36 raeburn Exp $
#
# Create your own loncapa_apache_local<domain>.conf
# e.g., loncapa_apache_localmsu.conf
#
# to contain Apache config file items specific to
# your domain, which will be left alone when you
# update LON-CAPA.
#
# Do not put them in this file (loncapa_apache_local.conf)
# as they will be overwritten by a LON-CAPA update.
#
# Leave this file in place, so Apache 2.4 will start in
# the case where you have not created any local config
# files, even though the main loncapa_apache.conf file
# contains a directive:
#
# Include conf/loncapa_apache_local*.conf
#