[LON-CAPA-cvs] cvs: doc /install/linux/debian-ubuntu apache2.conf /install/linux/sles-suse default-server.conf

raeburn raeburn@source.lon-capa.org
Sun, 24 Apr 2011 03:31:35 -0000


raeburn		Sun Apr 24 03:31:35 2011 EDT

  Modified files:              
    /doc/install/linux/debian-ubuntu	apache2.conf 
    /doc/install/linux/sles-suse	default-server.conf 
  Log:
  - Relative path to loncapa_apache.conf for consistency with webserver.piml
  
  
Index: doc/install/linux/debian-ubuntu/apache2.conf
diff -u doc/install/linux/debian-ubuntu/apache2.conf:1.1 doc/install/linux/debian-ubuntu/apache2.conf:1.2
--- doc/install/linux/debian-ubuntu/apache2.conf:1.1	Sun Apr 24 02:11:27 2011
+++ doc/install/linux/debian-ubuntu/apache2.conf	Sun Apr 24 03:31:31 2011
@@ -25,4 +25,4 @@
 
 </VirtualHost>
 
-Include /etc/apache2/conf/loncapa_apache.conf
+Include conf/loncapa_apache.conf
Index: doc/install/linux/sles-suse/default-server.conf
diff -u doc/install/linux/sles-suse/default-server.conf:1.1 doc/install/linux/sles-suse/default-server.conf:1.2
--- doc/install/linux/sles-suse/default-server.conf:1.1	Sun Apr 24 02:11:36 2011
+++ doc/install/linux/sles-suse/default-server.conf	Sun Apr 24 03:31:35 2011
@@ -103,5 +103,4 @@
 # The manual... if it is installed ('?' means it won't complain)
 Include /etc/apache2/conf.d/apache2-manual?conf
 
-Include /etc/apache2/loncapa_apache.conf
 Include conf/loncapa_apache.conf