[LON-CAPA-cvs] cvs: doc /loncapafiles webserver.piml

[raeburn]

raeburn		Tue Jul 14 04:11:11 2009 EDT

  Modified files:              
    /doc/loncapafiles	webserver.piml 
  Log:
  Statement including loncpa_apache.conf in sites-available/loncapa for Debian/Ubuntu.
  
  
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.24 doc/loncapafiles/webserver.piml:1.25
--- doc/loncapafiles/webserver.piml:1.24	Sun Jul  5 21:23:42 2009
+++ doc/loncapafiles/webserver.piml	Tue Jul 14 04:11:11 2009
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.24 2009/07/05 21:23:42 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.25 2009/07/14 04:11:11 raeburn Exp $ -->
 
 <!--
 
@@ -47,13 +47,17 @@
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
 <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
 <target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>/etc/apache2/default-server.conf</target>
-<note>This is for Apache 1.X for Red Hat, Fedora 2,3 and 4, and SusSE 9.2, 9.3 and SLES 9 distributions. This is for Apache 2.X for Fedora 5 and later, and SuSE 10.X and SLES 10 distribtions</note>
+<target dist='debuan5 ubuntu6 ubuntu8'>/etc/apache2/sites-available/loncapa
+<note>This is for Apache 1.X for Red Hat, Fedora 2,3 and 4, and SusSE 9.2, 9.3 and SLES 9 distributions. This is for Apache 2.X for Fedora 5 and later, and SuSE 10.X, 11.X and SLES 10 distributions, and Debian 5, Ubuntu 6 and Ubuntu 8 LTS distributions</note>
 <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf
 </dependencies>
 <dependencies dist='suse9.2 suse9.3 sles9'>
 /etc/httpd/httpd.conf
 </dependencies>
+<dependencies dist='debian5 ubuntu6 ubuntu8'>
+/etc/apache2/sites-available/loncapa
+</dependencies>
 <dependencies dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>
 /etc/apache2/default-server.conf
 </dependencies>
@@ -65,7 +69,7 @@
   exit(1);
 }
 else {
-  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
+  # Append loncapa_apache.conf inclusion to httpd.conf (or sites/available/loncapa) if not present.
   $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {