[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf loncron /init.d loncontrol /interface loncommon.pm /license about.html doc/loncapafiles loncapafiles.lpml
www
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 04 Nov 2008 21:06:52 -0000
This is a MIME encoded message
--www1225832812
Content-Type: text/plain
www Tue Nov 4 21:06:52 2008 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom loncapa_apache.conf loncron
/loncom/init.d loncontrol
/loncom/interface loncommon.pm
/loncom/license about.html
Log:
Eliminate lonhttpd on port 8080 due to increasing number of user and
institutional firewall issues
--www1225832812
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20081104210652.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.613 doc/loncapafiles/loncapafiles.lpml:1.614
--- doc/loncapafiles/loncapafiles.lpml:1.613 Tue Oct 7 10:11:54 2008
+++ doc/loncapafiles/loncapafiles.lpml Tue Nov 4 21:06:10 2008
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.613 2008/10/07 10:11:54 foxr Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.614 2008/11/04 21:06:10 www Exp $ -->
<!--
@@ -1519,14 +1519,6 @@
</description>
</file>
<file>
-<source>loncom/lonhttpd</source>
-<target dist='default'>home/httpd/perl/lonhttpd</target>
-<categoryname>script</categoryname>
-<description>
-Small fry httpd on port 8080
-</description>
-</file>
-<file>
<source>loncom/lonmemcached</source>
<target dist='default'>home/httpd/perl/lonmemcached</target>
<categoryname>script</categoryname>
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.179 loncom/loncapa_apache.conf:1.180
--- loncom/loncapa_apache.conf:1.179 Thu Sep 11 07:48:13 2008
+++ loncom/loncapa_apache.conf Tue Nov 4 21:06:21 2008
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.179 2008/09/11 07:48:13 onken Exp $
+## $Id: loncapa_apache.conf,v 1.180 2008/11/04 21:06:21 www Exp $
##
#
@@ -1467,12 +1467,6 @@
PerlSetVar lonSqlAccess localhostkey
-# -----------------------------------------------------------------------------
-# lonttpdPort is the port used by the lightweight graphics httpd server
-# not the main Apache server
-PerlSetVar lonhttpdPort 8080
-
-
#----------------------------------------------------------------------------
#
# Parameters used by secure lond/lonc
Index: loncom/loncron
diff -u loncom/loncron:1.76 loncom/loncron:1.77
--- loncom/loncron:1.76 Fri Jun 22 00:20:27 2007
+++ loncom/loncron Tue Nov 4 21:06:21 2008
@@ -2,7 +2,7 @@
# Housekeeping program, started by cron, loncontrol and loncron.pl
#
-# $Id: loncron,v 1.76 2007/06/22 00:20:27 albertel Exp $
+# $Id: loncron,v 1.77 2008/11/04 21:06:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -304,7 +304,6 @@
<li><a href="#lonsql">lonsql</a></li>
<li><a href="#lond">lond</a></li>
<li><a href="#lonc">lonc</a></li>
-<li><a href="#lonhttpd">lonhttpd</a></li>
<li><a href="#lonnet">lonnet</a></li>
<li><a href="#connections">Connections</a></li>
<li><a href="#delayed">Delayed Messages</a></li>
@@ -696,7 +695,6 @@
&checkon_daemon($fh,'lond',40000,'USR2');
}
&checkon_daemon($fh,'lonc',40000,'USR1');
- &checkon_daemon($fh,'lonhttpd',40000);
&checkon_daemon($fh,'lonmaxima',40000);
}
if ($justreload) {
Index: loncom/init.d/loncontrol
diff -u loncom/init.d/loncontrol:1.32 loncom/init.d/loncontrol:1.33
--- loncom/init.d/loncontrol:1.32 Tue Jun 12 23:45:42 2007
+++ loncom/init.d/loncontrol Tue Nov 4 21:06:31 2008
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# $Id: loncontrol,v 1.32 2007/06/12 23:45:42 albertel Exp $
+# $Id: loncontrol,v 1.33 2008/11/04 21:06:31 www Exp $
#
# The LearningOnline Network with CAPA
#
@@ -64,7 +64,6 @@
}
}
my $lond_port = 5663;
- my $lonhttpd_port = 8080;
sub firewall_open_port {
return if (! &firewall_is_active);
@@ -74,7 +73,7 @@
# We could restrict the servers allowed to attempt to communicate
# here, but the logistics of updating the /home/httpd/lonTabs/host.tab
# file are likely to be a problem
- foreach my $port ($lond_port,$lonhttpd_port) {
+ foreach my $port ($lond_port) {
print "Opening firewall access on port $port.\n";
my $firewall_command =
@@ -115,7 +114,7 @@
sub firewall_close_port {
return if (! &firewall_is_active);
- foreach my $port ($lond_port,$lonhttpd_port) {
+ foreach my $port ($lond_port) {
print "Closing firewall access on port $port.\n";
my $firewall_command =
"$iptables -D $fw_chain -p tcp -d 0/0 --dport $port -j ACCEPT";
@@ -183,7 +182,7 @@
if ($command eq "restart") {
print 'Restarting LON-CAPA'."\n";
print 'Ending LON-CAPA client and daemon processes'."\n";
- foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
+ foreach my $daemon ('lonsql','lond','lonc','lonmemcached','lonmaxima') {
my $killallname=$daemon;
if ($daemon eq 'lonc') { $killallname='loncnew'; }
&stop_daemon($daemon,$killallname);
@@ -193,7 +192,7 @@
system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
} elsif ($command eq "stop") {
print 'Stopping LON-CAPA'."\n";
- foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
+ foreach my $daemon ('lonsql','lond','lonc','lonmemcached','lonmaxima') {
my $killallname=$daemon;
if ($daemon eq 'lonc') { $killallname='loncnew'; }
&stop_daemon($daemon,$killallname);
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.691 loncom/interface/loncommon.pm:1.692
--- loncom/interface/loncommon.pm:1.691 Fri Oct 24 16:23:00 2008
+++ loncom/interface/loncommon.pm Tue Nov 4 21:06:41 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.691 2008/10/24 16:23:00 bisitz Exp $
+# $Id: loncommon.pm,v 1.692 2008/11/04 21:06:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -9328,28 +9328,14 @@
return &lonhttpdurl($iconname);
}
-sub lonhttpd_port {
- my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
- if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
- # IE doesn't like a secure page getting images from a non-secure
- # port (when logging we haven't parsed the browser type so default
- # back to secure
- if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
- && $ENV{'SERVER_PORT'} == 443) {
- return 443;
- }
- return $lonhttpd_port;
-
-}
-
sub lonhttpdurl {
+#
+# Had been used for "small fry" static images on separate port 8080.
+# Modify here if lightweight http functionality desired again.
+# Currently eliminated due to increasing firewall issues.
+#
my ($url)=@_;
-
- my $lonhttpd_port = &lonhttpd_port();
- if ($lonhttpd_port == 443) {
- return 'https://'.$ENV{'SERVER_NAME'}.$url;
- }
- return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
+ return $url;
}
sub connection_aborted {
Index: loncom/license/about.html
diff -u loncom/license/about.html:1.27 loncom/license/about.html:1.28
--- loncom/license/about.html:1.27 Tue Jun 10 14:04:02 2008
+++ loncom/license/about.html Tue Nov 4 21:06:51 2008
@@ -65,105 +65,6 @@
the Code may not be distributed by the Licensee to any other parties
under any circumstances.</p>
-<p>
-<pre>
-
-HTTPi is (C)1998-2001 Cameron Kaiser. All rights reserved.
-
-** While HTTPi is free, it is NOT distributed under CopyLeft or GPL. Please **
-** read on to find out what the differences are. Licenses protect author **
-** rights -- please honour them, even with free software packages. **
-
-You can modify and tweak HTTPi to your heart's content. You don't need to
-pay me for using it, and you don't need my permission to make changes (though
-I or an authorised maintainer will be the only ones checking code back into
-HTTPi's code base for authorised patches and new versions).
-
-HTTPi must be free, and any and all distributions and derivatives must
-themselves be free. By free software I do not necessarily mean free in the
-way that Richard Stallman of GNU fame might -- merely that distributions
-be without cost. "Derivatives" shall constitute distributions with code
-added or removed from the base distribution, or distributions that are
-signficantly based on the source code (though may not necessarily include
-the source code itself), in the Author's sole judgement. This means a C port
-of HTTPi is still a derivative, or a Win32 version, or whatever. You do not
-have to provide source code, which is a deviation from GPL.
-
-You MAY NOT:
-
- * make changes and slap your copyright on the entire package. Your
- copyright extends only to the changes you've made. My copyright,
- and any copyrights asserted by HTTPi's contributors, remain.
-
- * supersede the license agreement here. You may not charge a fee for a
- HTTPi distribution, for example. Derivatives count as distributions.
- This license agreement, therefore, applies IN FULL to any
- distribution or derivative work.
-
- The exception: you MAY include HTTPi as part of an operating system
- distribution and sell that. Linux dists and FreeBSD dists are okay,
- for example.
-
- You also MAY NOT place your derivative work under GPL, because that
- is a different, though similar, licensing agreement, and the
- License here does reflect constraints that are mutually exclusive.
-
- * make a distribution of HTTPi that does not include ALL files,
- including this license, and ONLY these files. If not, it is a
- derivative work, and you may NOT call it an official distribution.
-
- * make or distribute a distribution of HTTPi that does not clearly
- state the copyright (i.e.
-
-Contains or is based on the HTTPi web server
-(C)1998-2001 Cameron Kaiser. All rights reserved.
-http://httpi.floodgap.com/
-
- would be just about perfect), or make or distribute a derivative of
- HTTPi that does not clearly state the copyright.
-
-You MUST:
-
- * copyright your derivative works. You may not make them public domain.
-
- * include this LICENSE agreement in any and all derivative
- works you create, as either a separate file or part of your
- non-mutually exclusive license (that is, does not conflict
- with these terms).
-
- * absolve the programmers of HTTPi (including yours truly :-) and
- any contributors) of any liability, real or imagined, and certify
- that you are using this program AT YOUR OWN RISK. While the
- programmers shall endeavour to make HTTPi as bug-free as possible,
- entomological phenomena can and do occur. Such is life.
-
- If you make a derivative work of HTTPi, you MAY decide that you
- wish to offer warranty support. You may do so, but your doing so
- does in no way make me, the programmers of HTTPi, or anyone else
- liable for the fulfillment of your warranty, and you and the users
- of your derivative work must agree to hold us legally blameless
- under ALL circumstances. (Remember, no mutually exclusive license
- terms in your derivative works, right?)
-
-Your usage of this program constitutes your binding acceptance of these
-terms. Don't even think about starting HTTPi up on your system if you don't
-agree to follow the terms detailed in this license IN THEIR ENTIRETY. Don't
-even think about modifying it, patching it or distributing it if you don't,
-either. Exceptions to these restrictions must be obtained from me, the
-copyright holder, IN WRITING.
-
-I reserve the right to interpret this document, and I also reserve the right
-to make license changes without notice effective on issue date. All legal
-issues shall be dealt with in accordance with the State of California, United
-States of America.
-
-Other than that, have a blast! Keep software free.
-
-Revised 12/24/2000
-
-</pre>
-</p>
-
<p>The
<a href="http://tango.freedesktop.org/Tango_Icon_Library">Tango icons</a> are covered by the <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution Share-Alike license</a>.
</p>
@@ -198,7 +99,7 @@
<h3>Code Contributors to Date</h3>
<p>Guy Albertelli II, Guy Askenazi, Ray Batchelor,
-Richard Banghart, Felicia Berryman, Stefan Bisitz, Jeremy Bowers, Phil Fazio, Ron Fox,
+Richard Banghart, Felicia Berryman, Stefan Bisitz, Jeremy Bowers, Stefan Dröschler, Phil Fazio, Ron Fox,
Matthew Hall, Harsha Jagasia, Robert McQueen, Gerd Kortemeyer,
Mark Lucas, Behrouz Minaei-Bidgoli,
Hon-Kie Ng, Stuart Raeburn, Peter Riegler,
--www1225832812--