--- loncom/init.d/loncontrol	2006/01/28 11:21:42	1.27
+++ loncom/init.d/loncontrol	2007/06/02 03:40:02	1.31
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.27 2006/01/28 11:21:42 albertel Exp $
+# $Id: loncontrol,v 1.31 2007/06/02 03:40:02 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -32,11 +32,21 @@
 # chkconfig: 345 95 5
 # description: LON-CAPA is a "network of knowledge".  It is used to \
 # distribute knowledge resources and instructional management.
-# processnames: lonc, lond, lonsql
+# processnames: lonc, lond, lonsql, lonmaxima
 # pidfiles: /home/httpd/perl/logs/lon*.pid
 # config: /etc/httpd/conf/loncapa.conf
 # config: /home/httpd/lonTabs/hosts.tab
 # config: /home/httpd/lonTabs/spare.tab
+# SuSE chkconfig/insserv info
+### BEGIN INIT INFO
+# Provides:       loncapa
+# Required-Start: mysql apache2 $network $remote_fs
+# Required-Stop:
+# Default-Start:  3 4 5
+# Default-Stop:
+# Description:    Starts the LON-CAPA services
+### END INIT INFO
+
 
 $command=$ARGV[0]; $command=~s/[^a-z]//g;
 
@@ -158,20 +168,19 @@ sub stop_daemon {
     print("\n");
 }
 
-
-if (($command eq "restartold") or ($command eq "reloadold")) {
-    print 'Restarting LON-CAPA'."\n";
-    print 'Ending LON-CAPA client and daemon processes'."\n";
-    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
-	&stop_daemon($daemon,$daemon);
+sub clean_sockets {
+    opendir(SOCKETS,"/home/httpd/sockets/");
+    while (my $fname=readdir(SOCKETS)) {
+	next if (-d $fname
+		 || $fname=~/(mysqlsock|maximasock|\Q$perlvar{'lonSockDir'}\E)/);
+	unlink("/home/httpd/sockets/$fname");
     }
-    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
-	"\n";
-    system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
-} elsif ($command eq "restart") {
+}
+
+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') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
@@ -181,18 +190,13 @@ if (($command eq "restartold") or ($comm
     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') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
     }
     &firewall_close_port();
-} elsif ($command eq "startold") {
-    &firewall_open_port();
-    print 'Starting LON-CAPA'."\n";
-    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
-	"\n"; 
-    system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
+    &clean_sockets();
 } elsif ($command eq "start") {
     &firewall_open_port();
     print 'Starting LON-CAPA'."\n";