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.38 and 1.39

version 1.38, 2014/05/03 15:31:17	version 1.39, 2014/06/03 20:35:04
Line 47 http://www.lon-capa.org/	Line 47 http://www.lon-capa.org/
<target dist='default'>/etc/httpd/conf/httpd.conf</target>	<target dist='default'>/etc/httpd/conf/httpd.conf</target>
<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>	<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>/etc/apache2/default-server.conf</target>	<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>/etc/apache2/default-server.conf</target>
<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/etc/apache2/sites-available/loncapa</target>	<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
	<target dist='ubuntu14'>/etc/apache2/conf-available/loncapa</target>
<note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, Scientific Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>	<note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, Scientific Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>
<dependencies dist='default'>	<dependencies dist='default'>
/etc/httpd/conf/httpd.conf	/etc/httpd/conf/httpd.conf
Line 55 http://www.lon-capa.org/	Line 56 http://www.lon-capa.org/
<dependencies dist='suse9.2 suse9.3 sles9'>	<dependencies dist='suse9.2 suse9.3 sles9'>
/etc/httpd/httpd.conf	/etc/httpd/httpd.conf
</dependencies>	</dependencies>
<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>	<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
/etc/apache2/sites-available/loncapa	/etc/apache2/sites-available/loncapa
</dependencies>	</dependencies>
	<dependencies dist='ubuntu14'>
	/etc/apache2/conf-available/loncapa
	</dependencies>
<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>	<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>
/etc/apache2/default-server.conf	/etc/apache2/default-server.conf
</dependencies>	</dependencies>
Line 70 unless (-e "<TARGET />") {	Line 74 unless (-e "<TARGET />") {
}	}
else {	else {
# Append loncapa_apache.conf inclusion to httpd.conf	# Append loncapa_apache.conf inclusion to httpd.conf
# (or sites-available/loncapa) if not present.	# (or sites-available/loncapa or conf-available/loncapa) if not present.
$flag=0;	$flag=0;
open(IN,'<<TARGET />');	open(IN,'<<TARGET />');
while (<IN>) {	while (<IN>) {
Line 84 else {	Line 88 else {
print(OUT 'Include conf/loncapa_apache.conf'."\n");	print(OUT 'Include conf/loncapa_apache.conf'."\n");
close(OUT);	close(OUT);
}	}
# Remove loncapa.conf inclusion from httpd.conf if present.	# Remove loncapa.conf inclusion from httpd.conf
	# (or sites-available/loncapa or conf-available/loncapa) if present.
$flag=0;	$flag=0;
open(IN,'<<TARGET />');	open(IN,'<<TARGET />');
while (<IN>) {	while (<IN>) {

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

Removed from v.1.38
changed lines
	Added in v.1.39