[LON-CAPA-cvs] cvs: doc /loncapafiles webserver.piml
matthew
lon-capa-cvs@mail.lon-capa.org
Tue, 21 Dec 2004 18:37:22 -0000
matthew Tue Dec 21 13:37:22 2004 EDT
Modified files:
/doc/loncapafiles webserver.piml
Log:
Tell the user where httpd.conf is located when we complain about it.
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.16 doc/loncapafiles/webserver.piml:1.17
--- doc/loncapafiles/webserver.piml:1.16 Mon Aug 23 15:07:26 2004
+++ doc/loncapafiles/webserver.piml Tue Dec 21 13:37:22 2004
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.16 2004/08/23 19:07:26 matthew Exp $ -->
+<!-- $Id: webserver.piml,v 1.17 2004/12/21 18:37:22 matthew Exp $ -->
<!--
@@ -52,7 +52,7 @@
<perlscript mode='fg'>
# Generated from doc/loncapafiles/webserver.piml
unless (-e "<TARGET />") {
- print '**** ERROR! httpd.conf should exist! Are you missing the Apache '.
+ print '**** ERROR! /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.
'software package?';
exit(1);
}
@@ -104,7 +104,7 @@
# Generated from doc/loncapafiles/webserver.piml
# Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
unless (-e "<TARGET />") {
- print '**** ERROR **** httpd.conf should exist! Are you missing the Apache '.
+ print '**** ERROR **** /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.
'software package?';
exit(1);
}
@@ -131,12 +131,12 @@
}
close(IN);
if ($scriptalias_flag==1) {
- print('**** ERROR **** httpd.conf has an overlapping definition of '.
+ print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
'This conflicts with loncapa_apache.conf.'."\n");
}
if ($documentroot_flag==1) {
- print('**** ERROR **** httpd.conf has an overlapping definition of '.
+ print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
'This conflicts with loncapa_apache.conf.'."\n");
}