Diff for /doc/loncapafiles/webserver.piml between versions 1.16 and 1.17

version 1.16, 2004/08/23 19:07:26 version 1.17, 2004/12/21 18:37:22
Line 52  http://www.lon-capa.org/ Line 52  http://www.lon-capa.org/
 <perlscript mode='fg'>  <perlscript mode='fg'>
 # Generated from doc/loncapafiles/webserver.piml  # Generated from doc/loncapafiles/webserver.piml
 unless (-e "<TARGET />") {  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?';      'software package?';
   exit(1);    exit(1);
 }  }
Line 104  else { Line 104  else {
 # Generated from doc/loncapafiles/webserver.piml  # Generated from doc/loncapafiles/webserver.piml
 # Trying to check for overlapping DocumentRoot or ScriptAlias definitions.  # Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
 unless (-e "<TARGET />") {  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?';      'software package?';
   exit(1);    exit(1);
 }  }
Line 131  else { Line 131  else {
   }    }
   close(IN);    close(IN);
   if ($scriptalias_flag==1) {    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".            'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
   'This conflicts with loncapa_apache.conf.'."\n");    'This conflicts with loncapa_apache.conf.'."\n");
   }    }
   if ($documentroot_flag==1) {    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".            'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
   'This conflicts with loncapa_apache.conf.'."\n");    'This conflicts with loncapa_apache.conf.'."\n");
   }    }

Removed from v.1.16  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>