doc/loncapafiles/webserver.piml - diff

Return to webserver.piml CVS log

Up to [LON-CAPA] / doc / loncapafiles

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

version 1.16, 2004/08/23 19:07:26	version 1.20, 2006/09/15 21:02:15
Line 45 http://www.lon-capa.org/	Line 45 http://www.lon-capa.org/
<files>	<files>
<file>	<file>
<target dist='default'>/etc/httpd/conf/httpd.conf</target>	<target dist='default'>/etc/httpd/conf/httpd.conf</target>
<note>This is always expected for any version of Apache</note>	<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
	<target dist='sles10'>/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 SuSE 10.1 and SLES 10 distribtions</note>
<dependencies dist='default'>	<dependencies dist='default'>
/etc/httpd/conf/httpd.conf	/etc/httpd/conf/httpd.conf
</dependencies>	</dependencies>
<perlscript mode='fg'>	<dependencies dist='suse9.2 suse9.3 sles9'>
	/etc/httpd/httpd.conf
	</dependencies>
	<dependencies dist='sles10'>
	/etc/apache2/default-server.conf
	</dependencies>
	<perlscript mode='fg' dist="default">
# 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! <TARGET /> should exist! Are you missing the Apache '.
'software package?';	'software package?';
exit(1);	exit(1);
}	}
Line 91 else {	Line 99 else {
print(OUT $in."\n");	print(OUT $in."\n");
close(OUT);	close(OUT);
}	}
}
</perlscript>	# Checking for overlapping ScriptAlias and DocumentRoot definitions.
</file>
<file>
<target dist='default'>/etc/httpd/conf/httpd.conf</target>
<note>This is always expected for any version of Apache</note>
<dependencies dist='default'>
/etc/httpd/conf/httpd.conf
</dependencies>
<perlscript mode='fg'>
# 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 '.
'software package?';
exit(1);
}
else {
# Append loncapa_apache.conf inclusion to httpd.conf if not present.
$scriptalias_flag=0;	$scriptalias_flag=0;
$documentroot_flag=0;	$documentroot_flag=0;
my $scriptalias;	my $scriptalias;
my $documentroot;	my $documentroot;
open(IN,'<<TARGET />');	open(IN,'<<TARGET />');
while (<IN>) {	while (<IN>) {
if (m!^\sScriptAlias\s+/cgi-bin/\s+(.)$!) {	if (m!^\sScriptAlias\s+/cgi-bin/\s+(.)$!) {
$scriptalias = $1;	$scriptalias = $1;
if ($scriptalias !~ m!home/httpd/cgi-bin!) {	if ($scriptalias !~ m!home/httpd/cgi-bin!) {
$scriptalias_flag = 1;	$scriptalias_flag = 1;
}	}
}	}
if (m!^\sDocumentRoot\s+(.)$!) {	if (m!^\sDocumentRoot\s+(.)$!) {
$documentroot = $1;	$documentroot = $1;
if ($documentroot !~ m!home/httpd/html!) {	if ($documentroot !~ m!home/httpd/html!) {
$documentroot_flag = 1;	$documentroot_flag = 1;
}	}
}	}
}	}
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");
}	}
}	}
</perlscript>	</perlscript>

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

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