--- loncom/loncron 2018/11/24 16:19:09 1.115 +++ loncom/loncron 2024/07/28 12:47:31 1.132 @@ -2,7 +2,7 @@ # Housekeeping program, started by cron, loncontrol and loncron.pl # -# $Id: loncron,v 1.115 2018/11/24 16:19:09 raeburn Exp $ +# $Id: loncron,v 1.132 2024/07/28 12:47:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,7 @@ use lib '/home/httpd/lib/perl/'; use LONCAPA::Configuration; use LONCAPA::Checksumming; use LONCAPA; +use LONCAPA::LWPReq; use Apache::lonnet; use Apache::loncommon; @@ -41,9 +42,12 @@ use IO::File; use IO::Socket; use HTML::Entities; use Getopt::Long; -use GDBM_File; +use GDBM_File qw(GDBM_READER); use Storable qw(thaw); use File::ReadBackwards; +use File::Copy; +use Sys::Hostname::FQDN(); + #globals use vars qw (%perlvar %simplestatus $errors $warnings $notices $totalcount); @@ -76,14 +80,14 @@ sub rotate_logfile { rename("$file.2","$file.3"); rename("$file.1","$file.2"); rename("$file","$file.1"); - } + } } sub start_daemon { my ($fh,$daemon,$pidfile,$args) = @_; my $progname=$daemon; if ($daemon eq 'lonc') { - $progname='loncnew'; + $progname='loncnew'; } my $error_fname="$perlvar{'lonDaemons'}/logs/${daemon}_errors"; &rotate_logfile($error_fname,$fh,'error logs'); @@ -117,7 +121,7 @@ sub checkon_daemon { if ($fh) { if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){ if (open(DFH,"tail -n25 $perlvar{'lonDaemons'}/logs/$daemon.log|")) { - while (my $line=) { + while (my $line=) { &log($fh,"$line"); if ($line=~/INFO/) { $notices++; } if ($line=~/WARNING/) { $notices++; } @@ -128,9 +132,9 @@ sub checkon_daemon { } &log($fh,"

"); } - + my $pidfile="$perlvar{'lonDaemons'}/logs/$daemon.pid"; - + my $restartflag=1; my $daemonpid; if (-e $pidfile) { @@ -213,7 +217,7 @@ sub checkon_daemon { } } } - + my $fname="$perlvar{'lonDaemons'}/logs/$daemon.log"; &rotate_logfile($fname,$fh,'logs'); @@ -226,19 +230,34 @@ sub log_machine_info { my ($fh)=@_; &log($fh,'

Machine Information

'); &log($fh,"

loadavg

"); - + + my $cpucount; + if (open(PIPE,"lscpu |grep '^CPU(s)' 2>&1 |")) { + my $info = ; + chomp($info); + ($cpucount) = ($info =~ /^\QCPU(s):\E\s+(\d+)$/); + close(PIPE); + } + if (!$cpucount) { + $cpucount = 1; + } + my %loadtarget = ( + error => 4.0*$cpucount, + warn => 2.0*$cpucount, + note => 1.0*$cpucount, + ); open (LOADAVGH,"/proc/loadavg"); my $loadavg=; close (LOADAVGH); - + &log($fh,"$loadavg"); - + my @parts=split(/\s+/,$loadavg); - if ($parts[1]>4.0) { + if ($parts[1]>$loadtarget{'error'}) { $errors++; - } elsif ($parts[1]>2.0) { + } elsif ($parts[1]>$loadtarget{'warn'}) { $warnings++; - } elsif ($parts[1]>1.0) { + } elsif ($parts[1]>$loadtarget{'note'}) { $notices++; } @@ -246,14 +265,14 @@ sub log_machine_info { &log($fh,"
");
 
     open (DFH,"df|");
-    while (my $line=) { 
-	&log($fh,&encode_entities($line,'<>&"')); 
+    while (my $line=) {
+	&log($fh,&encode_entities($line,'<>&"'));
 	@parts=split(/\s+/,$line);
 	my $usage=$parts[4];
 	$usage=~s/\W//g;
-	if ($usage>90) { 
+	if ($usage>90) {
 	    $warnings++;
-	    $notices++; 
+	    $notices++;
 	} elsif ($usage>80) {
 	    $warnings++;
 	} elsif ($usage>60) {
@@ -270,8 +289,8 @@ sub log_machine_info {
     my $psproc=0;
 
     open (PSH,"ps aux --cols 140 |");
-    while (my $line=) { 
-	&log($fh,&encode_entities($line,'<>&"')); 
+    while (my $line=) {
+	&log($fh,&encode_entities($line,'<>&"'));
 	$psproc++;
     }
     close (PSH);
@@ -293,7 +312,7 @@ sub start_logging {
     my %simplestatus=();
     my $now=time;
     my $date=localtime($now);
-    
+ 
 
     &log($fh,(<
@@ -318,6 +337,7 @@ sub start_logging {
 
  • lonc
  • lonnet
  • Connections
  • +
  • bash readline config
  • Delayed Messages
  • Error Count
  • @@ -409,12 +429,12 @@ sub recursive_clean_tmp { ($cleaned,$old,$removed) = &recursive_clean_tmp($innerdir,$cleaned,$old,$removed,$errors); my @doms = &Apache::lonnet::current_machine_domains(); - + if (open(my $dirhandle,$fname)) { unless (($innerdir eq 'helprequests') || (($innerdir =~ /^addcourse/) && ($innerdir !~ m{/\d+$}))) { my @contents = grep {!/^\.\.?$/} readdir($dirhandle); - join('&&',@contents)."\n"; + join('&&',@contents)."\n"; if (scalar(grep {!/^\.\.?$/} readdir($dirhandle)) == 0) { closedir($dirhandle); if ($fname =~ m{^\Q$perlvar{'lonDaemons'}\E/tmp/}) { @@ -467,7 +487,7 @@ sub recursive_clean_tmp { } } } elsif (ref($errors->{failopen}) eq 'ARRAY') { - push(@{$errors->{failopen}},$fname); + push(@{$errors->{failopen}},$fname); } } else { if (unlink($fname)) { @@ -493,19 +513,38 @@ sub clean_lonIDs { my $cleaned=0; my $active=0; while (my $fname=<$perlvar{'lonIDsDir'}/*>) { - my ($dev,$ino,$mode,$nlink, - $uid,$gid,$rdev,$size, - $atime,$mtime,$ctime, - $blksize,$blocks)=stat($fname); - my $now=time; - my $since=$now-$mtime; - if ($since>$perlvar{'lonExpire'}) { - $cleaned++; - &log($fh,"Unlinking $fname
    "); - unlink("$fname"); - } else { - $active++; - } + my $now=time; + if (-l $fname) { + my $linkfname = readlink($fname); + if (-f $linkfname) { + if ($linkfname =~ m{^$perlvar{'lonIDsDir'}/[^/]+\.id$}) { + my @data = stat($linkfname); + my $mtime = $data[9]; + my $since=$now-$mtime; + if ($since>$perlvar{'lonExpire'}) { + if (unlink($linkfname)) { + $cleaned++; + &log($fh,"Unlinking $linkfname
    "); + unlink($fname); + } + } + } + } else { + unlink($fname); + } + } elsif (-f $fname) { + my @data = stat($fname); + my $mtime = $data[9]; + my $since=$now-$mtime; + if ($since>$perlvar{'lonExpire'}) { + if (unlink($fname)) { + $cleaned++; + &log($fh,"Unlinking $fname
    "); + } + } else { + $active++; + } + } } &log($fh,"

    Cleaned up ".$cleaned." stale session token(s).

    "); &log($fh,"

    $active open session(s)

    "); @@ -519,7 +558,7 @@ sub clean_balanceIDs { my $cleaned=0; my $active=0; if (-d $perlvar{'lonBalanceDir'}) { - while (my $fname=<$perlvar{'balanceDir'}/*.id>) { + while (my $fname=<$perlvar{'lonBalanceDir'}/*.id>) { my ($dev,$ino,$mode,$nlink, $uid,$gid,$rdev,$size, $atime,$mtime,$ctime, @@ -565,6 +604,34 @@ sub clean_webDAV_sessionIDs { } } +# ------------------------------------------------------------ clean out ltiIDs + +sub clean_ltiIDs { + my ($fh)=@_; + &log($fh,'

    LTI Session Pointers

    '); + my $cleaned=0; + my $active=0; + if (-d $perlvar{'ltiIDsDir'}) { + while (my $fname=<$perlvar{'ltiIDsDir'}/*>) { + my ($dev,$ino,$mode,$nlink, + $uid,$gid,$rdev,$size, + $atime,$mtime,$ctime, + $blksize,$blocks)=stat($fname); + my $now=time; + my $since=$now-$mtime; + if ($since>$perlvar{'lonExpire'}) { + $cleaned++; + &log($fh,"Unlinking $fname
    "); + unlink("$fname"); + } else { + $active++; + } + } + } + &log($fh,"

    Cleaned up ".$cleaned." old LTI session pointers.

    "); + &log($fh,"

    $active unexpired LTI session pointers

    "); +} + # ----------------------------------------------------------- clean out sockets sub clean_sockets { my ($fh)=@_; @@ -602,16 +669,16 @@ sub rotate_lonnet_logs { print "Checking logs.\n"; if (-e "$perlvar{'lonDaemons'}/logs/lonnet.log"){ open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|"); - while (my $line=) { + while (my $line=) { &log($fh,&encode_entities($line,'<>&"')); } close (DFH); } &log($fh,"

    Perm Log

    ");
    -    
    +
         if (-e "$perlvar{'lonDaemons'}/logs/lonnet.perm.log") {
     	open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");
    -	while (my $line=) { 
    +	while (my $line=) {
     	    &log($fh,&encode_entities($line,'<>&"'));
     	}
     	close (DFH);
    @@ -981,7 +1048,7 @@ sub write_serverhomeIDs {
                     eval {
                         local $SIG{ ALRM } = sub { die "TIMEOUT" };
                         alarm(10);
    -                    $serverhomeID = 
    +                    $serverhomeID =
                             &Apache::lonnet::get_server_homeID($name,1,'loncron');
                         alarm(0);
                     };
    @@ -1026,9 +1093,97 @@ sub write_checksums {
         return;
     }
     
    +sub write_hostips {
    +    my $lontabdir = $perlvar{'lonTabDir'};
    +    my $defdom = $perlvar{'lonDefDomain'};
    +    my $lonhost = $perlvar{'lonHostID'};
    +    my $newfile = "$lontabdir/currhostips.tab";
    +    my $oldfile = "$lontabdir/prevhostips.tab";
    +    my (%prevhosts,%currhosts,%ipchange);
    +    if ((-e $newfile) && (-s $newfile)) {
    +        move($newfile,$oldfile);
    +        chmod(0644,$oldfile);
    +        if (open(my $fh,'<',$oldfile)) {
    +            while (my $line=<$fh>) {
    +                chomp($line);
    +                if ($line =~ /^([^:]+):([\d.]+)$/) {
    +                    $prevhosts{$1} = $2;
    +                }
    +            }
    +            close($fh);
    +        }
    +    }
    +    my ($ip_info,$cached) =
    +        &Apache::lonnet::is_cached_new('iphost','iphost');
    +    if (!$cached) {
    +        &Apache::lonnet::get_iphost();
    +        ($ip_info,$cached) =
    +        &Apache::lonnet::is_cached_new('iphost','iphost');
    +    }
    +    if (ref($ip_info) eq 'ARRAY') {
    +        %currhosts = %{$ip_info->[1]};
    +        if (open(my $fh,'>',$newfile)) {
    +            foreach my $key (keys(%currhosts)) {
    +                print $fh "$key:$currhosts{$key}\n";
    +            }
    +            close($fh);
    +            chmod(0644,$newfile);
    +        }
    +    }
    +    if (keys(%prevhosts) && keys(%currhosts)) {
    +        foreach my $key (keys(%prevhosts)) {
    +            unless ($currhosts{$key} eq $prevhosts{$key}) {
    +                $ipchange{$key} = $prevhosts{$key}.' | '.$currhosts{$key};
    +            }
    +        }
    +        foreach my $key (keys(%currhosts)) {
    +            unless ($currhosts{$key} eq $prevhosts{$key}) {
    +                $ipchange{$key} = $prevhosts{$key}.' | '.$currhosts{$key};
    +            }
    +        }
    +    }
    +    if (&Apache::lonnet::domain($defdom,'primary') eq $lonhost) {
    +        if (keys(%ipchange)) {
    +            if (open(my $fh,'>>',$perlvar{'lonDaemons'}.'/logs/hostip.log')) {
    +               print $fh "********************\n".localtime(time).' Changes --'."\n".
    +                         "| Hostname | Previous IP | New IP |\n".
    +                         " --------------------------------- \n";
    +               foreach my $hostname (sort(keys(%ipchange))) {
    +                    print $fh "| $hostname | $ipchange{$hostname} |\n";
    +                }
    +                print $fh "\n*******************\n\n";
    +                close($fh);
    +            }
    +            my $emailto = &Apache::loncommon::build_recipient_list(undef,
    +                                   'hostipmail',$defdom);
    +            if ($emailto) {
    +                my $subject = "LON-CAPA Hostname to IP change ($perlvar{'lonHostID'})";
    +                my $chgmail = "To: $emailto\n".
    +                              "Subject: $subject\n".
    +                              "Content-type: text/plain\; charset=UTF-8\n".
    +                              "MIME-Version: 1.0\n\n".
    +                              "Host/IP changes\n".
    +                              " \n".
    +                              "| Hostname | Previous IP | New IP |\n".
    +                              " --------------------------------- \n";
    +                foreach my $hostname (sort(keys(%ipchange))) {
    +                    $chgmail .= "| $hostname | $ipchange{$hostname} |\n";
    +                }
    +                $chgmail .= "\n\n";
    +                if (open(my $mailh, "|/usr/lib/sendmail -oi -t -odb")) {
    +                    print $mailh $chgmail;
    +                    close($mailh);
    +                    print "Sending mail notification of hostname/IP changes.\n";
    +                }
    +            }
    +        }
    +    }
    +    return;
    +}
    +
     sub clean_nosslverify {
         my ($fh) = @_;
    -    my %unlinked; 
    +    my %unlinked;
         if (-d "$perlvar{'lonSockDir'}/nosslverify") {
             if (opendir(my $dh,"$perlvar{'lonSockDir'}/nosslverify")) {
                 while (my $fname=readdir($dh)) {
    @@ -1123,7 +1278,7 @@ sub get_domain_config {
             unless ($protocol eq 'https') {
                 $protocol = 'http';
             }
    -        $url = $protocol.'://'.$hostname.'/cgi-bin/listdomconfig.pl';
    +        $url = $protocol.'://'.$hostname.'/cgi-bin/listdomconfig.pl?primary='.$primlibserv.'&format=raw';
         }
         if ($isprimary) {
             my $lonusersdir = $perlvar{'lonUsersDir'};
    @@ -1144,14 +1299,12 @@ sub get_domain_config {
                 }
             }
         } else {
    -        if (open(PIPE,"wget --no-check-certificate '$url?primary=$primlibserv&format=raw' |")) {
    -            my $config = '';
    -            while () {
    -                $config .= $_;
    -            }
    -            close(PIPE);
    -            if ($config) {
    -                my @pairs=split(/\&/,$config);
    +        my $request=new HTTP::Request('GET',$url);
    +        my $response=&LONCAPA::LWPReq::makerequest($primlibserv,$request,'',\%perlvar,5);
    +        unless ($response->is_error()) {
    +            my $content = $response->content;
    +            if ($content) {
    +                my @pairs=split(/\&/,$content);
                     foreach my $item (@pairs) {
                         my ($key,$value)=split(/=/,$item,2);
                         my $what = &LONCAPA::unescape($key);
    @@ -1192,7 +1345,7 @@ sub write_hosttypes {
                     foreach my $lonid (sort(keys(%hostdom))) {
                         my $type = 'other';
                         if ($hostdom{$lonid} eq $dom) {
    -                        $type = 'dom'; 
    +                        $type = 'dom';
                         } elsif ($intdom{$lonid} eq $internetdom) {
                             $type = 'intdom';
                         }
    @@ -1339,6 +1492,159 @@ sub read_serverhomeIDs {
         return %server;
     }
     
    +sub check_bash_settings {
    +    my $distro = &LONCAPA::distro();
    +    my ($check_bracketed_paste,$bracketed_warning);
    +    if ($distro  =~ /^debian(\d+)$/) {
    +        if ($1 >= 12) {
    +            $check_bracketed_paste = 1;
    +        }
    +    } elsif ($distro =~ /^ubuntu(\d+)$/) {
    +        if ($1 >= 22) {
    +            $check_bracketed_paste = 1;
    +        }
    +    } elsif ($distro =~ /^(?:redhat|oracle|alma|rocky|centos-stream)(\d+)$/) {
    +        if ($1 >= 9) {
    +            $check_bracketed_paste = 1;
    +        }
    +    } elsif ($distro =~ /^fedora(\d+)/) {
    +        if ($1 >= 34) {
    +            $check_bracketed_paste = 1;
    +        }
    +    }
    +    if ($check_bracketed_paste) {
    +        if (open(PIPE,"bind -V 2>&1 | grep enable-bracketed-paste |")) {
    +            my $info = ;
    +            chomp($info);
    +            my ($bracketed) = ($info =~ /^\Qenable-bracketed-paste\E\s+is\s+set\s+to\s+\W(on|off)\W$/);
    +            close(PIPE);
    +            if ($bracketed eq 'on') {
    +                $bracketed_warning = 1;
    +            }
    +        } else {
    +            print "Unable to check if bracketed paste is set to off for www user's shell\n"; 
    +        }
    +    }
    +    return ($bracketed_warning,$check_bracketed_paste);
    +}
    +
    +sub set_bracketed_paste_off {
    +    my $bash_www_cnf = '/home/www/.inputrc';
    +    my $result;
    +    if (!-e $bash_www_cnf) {
    +        system("touch $bash_www_cnf");
    +        if (open(my $cfh,'>',$bash_www_cnf)) {
    +            print $cfh <<'END';
    +$if R
    +    set enable-bracketed-paste off
    +$endif
    +
    +$if maxima
    +    set enable-bracketed-paste off
    +$endif
    +END
    +            close($cfh);
    +            $result = "Updated $bash_www_cnf so enable-bracketed-paste is off for R bash shell";
    +        } else {
    +            $result = "Could not open $bash_www_cnf to add 'set enable-bracketed-paste to off'";
    +        }
    +        my $wwwuid = getpwnam('www');
    +        my $wwwgid = getgrnam('www');
    +        if ($wwwuid!=$<) {
    +            chown($wwwuid,$wwwgid,$bash_www_cnf);
    +        }
    +    } else {
    +        my (%bracketed_paste_on,%bracketed_paste_off,@preserve,$condition);
    +        $condition = '';
    +        if (open(my $cfh,'<',$bash_www_cnf)) {
    +            while (my $line=<$cfh>) {
    +                chomp($line);
    +                if ($line =~ /^\$if\s+(\w+)\s*$/) {
    +                    if ($1 eq 'R') {
    +                        $condition = 'r';
    +                    } elsif ($1 eq 'maxima') {
    +                        $condition = 'maxima';
    +                    } else {
    +                        $condition = 'other';
    +                    }
    +                } elsif ($line =~ /^\$endif\s*$/) {
    +                    $condition = '';
    +                }
    +                if ($line =~ /^\s*set\s+enable\-bracketed\-paste\s+(off|on)\s*$/) {
    +                    if ($1 eq 'off') {
    +                        if ($condition ne '') {
    +                            $bracketed_paste_off{$condition} = 1;
    +                        } else {
    +                            $bracketed_paste_off{all} = 1;
    +                        }
    +                        push(@preserve,$line);
    +                    } else {
    +                        if ($condition ne '') {
    +                            $bracketed_paste_on{$condition} = 1;
    +                            if (($condition eq 'r') || ($condition eq 'maxima')) {
    +                                push(@preserve,'    set enable-bracketed-paste off');
    +                            } else {
    +                                push(@preserve,$line);
    +                            }
    +                        } else {
    +                            $bracketed_paste_on{all} = 1;
    +                            push(@preserve,$line);
    +                        }
    +                    }
    +                } else {
    +                    push(@preserve,$line);
    +                }
    +            }
    +            close($cfh);
    +        } else {
    +            $result = "Could not open $bash_www_cnf to check if a value is included for 'enable-bracketed-paste'.";
    +        }
    +        if (($bracketed_paste_on{r} || $bracketed_paste_on{maxima}) ||
    +            (!exists($bracketed_paste_off{r}) && !exists($bracketed_paste_on{r}) &&
    +             !exists($bracketed_paste_off{maxima}) && !exists($bracketed_paste_on{maxima}))) {
    +            if (open(my $cfh,'>',$bash_www_cnf)) {
    +                if (@preserve) {
    +                    foreach my $entry (@preserve) {
    +                        print $cfh "$entry\n";
    +                    }
    +                    if (!exists($bracketed_paste_off{r}) && !exists($bracketed_paste_on{r})) {
    +print $cfh <<'END';
    +$if R
    +    set enable-bracketed-paste off
    +$endif
    +END
    +                    }
    +                    if (!exists($bracketed_paste_off{r}) && !exists($bracketed_paste_on{r})) {
    +print $cfh <<'END';
    +$if maxima
    +    set enable-bracketed-paste off
    +$endif
    +END
    +                    }
    +
    +                } else {
    +print $cfh <<'END';
    +$if R
    +    set enable-bracketed-paste off
    +$endif
    +
    +$if maxima
    +    set enable-bracketed-paste off
    +$endif
    +END
    +                }
    +                close($cfh);
    +                $result = "Updated $bash_www_cnf";
    +            } else {
    +                $result = "Could not open $bash_www_cnf to add 'set enable-bracketed-paste to off'";
    +            }
    +        } else {
    +            $result = "No action needed; $bash_www_cnf already includes 'set enable-bracketed-paste to off'";
    +        }
    +    }
    +    return $result;
    +}
    +
     sub send_mail {
         my ($sysmail,$reportstatus) = @_;
         my $defdom = $perlvar{'lonDefDomain'};
    @@ -1398,19 +1704,23 @@ Options:
     				do not send emails do not
                                     check if the daemons are running, do not
                                     generate lon-status
    -                           
    +   --justiptables          Only update the dynamic iptables rules for the
    +                                lond port; do not send emails, do not
    +                                check if the daemons are running, do not
    +                                generate lon-status
     USAGE
     }
     
     # ================================================================ Main Program
     sub main () {
         my ($help,$justcheckdaemons,$noemail,$justcheckconnections,
    -	$justreload);
    +	$justreload,$justiptables);
         &GetOptions("help"                 => \$help,
     		"justcheckdaemons"     => \$justcheckdaemons,
     		"noemail"              => \$noemail,
     		"justcheckconnections" => \$justcheckconnections,
    -		"justreload"           => \$justreload
    +		"justreload"           => \$justreload,
    +                "justiptables"         => \$justiptables
     		);
         if ($help) { &usage(); return; }
     # --------------------------------- Read loncapa_apache.conf and loncapa.conf
    @@ -1425,9 +1735,10 @@ sub main () {
         if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
     	print("Unconfigured machine.\n");
     	my $emailto=$perlvar{'lonSysEMail'};
    -	my $hostname=`/bin/hostname`;
    -	chop $hostname;
    -	$hostname=~s/[^\w\.]//g; # make sure is safe to pass through shell
    +	my $hostname = Sys::Hostname::FQDN::fqdn();
    +	$hostname=~s/\.+/./g;
    +	$hostname=~s/\-+/-/g;
    +	$hostname=~s/[^\w\.-]//g; # make sure is safe to pass through shell
     	my $subj="LON: Unconfigured machine $hostname";
     	system("echo 'Unconfigured machine $hostname.' |".
                    " mail -s '$subj' $emailto > /dev/null");
    @@ -1438,7 +1749,7 @@ sub main () {
         my $wwwid=getpwnam('www');
         if ($wwwid!=$<) {
     	print("User ID mismatch. This program must be run as user 'www'.\n");
    -	my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
    +	my $emailto="$perlvar{'lonAdmEMail'} $perlvar{'lonSysEMail'}";
     	my $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
     	system("echo 'User ID mismatch. loncron must be run as user www.' |".
                    " mail -s '$subj' $emailto > /dev/null");
    @@ -1460,11 +1771,13 @@ sub main () {
                 }
             }
         }
    -    &Apache::lonnet::load_hosts_tab(1,$nomemcache);
    -    &Apache::lonnet::load_domain_tab(1,$nomemcache);
    -    &Apache::lonnet::get_iphost(1,$nomemcache);
    +    if (!$justiptables) {
    +        &Apache::lonnet::load_hosts_tab(1,$nomemcache);
    +        &Apache::lonnet::load_domain_tab(1,$nomemcache);
    +        &Apache::lonnet::get_iphost(1,$nomemcache);
    +    }
     
    -# ----------------------------------------- Force firewall update for lond port  
    +# ----------------------------------------- Force firewall update for lond port
     
         if ((!$justcheckdaemons) && (!$justreload)) {
             my $now = time;
    @@ -1479,7 +1792,7 @@ sub main () {
                 if (&LONCAPA::try_to_lock('/tmp/lock_lciptables')) {
                     my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
                     system("$execpath $tmpfile");
    -                unlink('/tmp/lock_lciptables');  # Remove the lock file. 
    +                unlink('/tmp/lock_lciptables');  # Remove the lock file.
                 }
                 unlink($tmpfile);
             }
    @@ -1491,9 +1804,9 @@ sub main () {
         $warnings=0;
         $notices=0;
     
    -	
    +
         my $fh;
    -    if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
    +    if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
     	$fh=&start_logging();
     
     	&log_machine_info($fh);
    @@ -1501,11 +1814,12 @@ sub main () {
     	&clean_lonIDs($fh);
             &clean_balanceIDs($fh);
             &clean_webDAV_sessionIDs($fh);
    +        &clean_ltiIDs($fh);
     	&check_httpd_logs($fh);
     	&rotate_lonnet_logs($fh);
     	&rotate_other_logs($fh);
         }
    -    if (!$justcheckconnections && !$justreload) {
    +    if (!$justcheckconnections && !$justreload && !$justiptables) {
     	&checkon_daemon($fh,'lonmemcached',40000);
     	&checkon_daemon($fh,'lonsql',200000);
     	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
    @@ -1526,7 +1840,33 @@ sub main () {
         if ($justcheckconnections) {
     	&test_connections($fh);
         }
    -    if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
    +    if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
    +        my ($bracketed_warning,$check_bracketed_paste) = &check_bash_settings();
    +        if ($check_bracketed_paste) {
    +           &log($fh,'

    bash readline config

    Bracketed Paste

    '. + '

    Distros using bash readline library 8.1 or later need bracketed paste disabled for the R bash shell for the www user so R commands sent to lonr daemon will be processed.

    '); + my $bash_www_cnf = '/home/www/.inputrc'; + my $non_empty_conffile; + unless ($bracketed_warning) { + if (-e $bash_www_cnf) { + my $filesize = (stat($bash_www_cnf))[7]; + if ($filesize > 0) { + $non_empty_conffile = 1; + } + } + } + if (($bracketed_warning) || ($non_empty_conffile)) { + my $bash_update = &set_bracketed_paste_off(); + if ($bash_update) { + &log($fh,'

    '.$bash_update.'

    '."\n"); + } + } else { + &log($fh,'

    No action needed; /home/www/.inputrc already set.

    '."\n"); + } + } else { + &log($fh,'

    bash readline config

    Bracketed Paste

    '. + '

    No action needed for distros using pre-8.1 bash readline library

    '."\n"); + } my $domconf = &get_domain_config(); my ($threshold,$sysmail,$reportstatus,$weightsref,$exclusionsref) = &get_permcount_settings($domconf); @@ -1534,6 +1874,7 @@ sub main () { &write_loncaparevs(); &write_serverhomeIDs(); &write_checksums(); + &write_hostips(); my %sslrem = &clean_nosslverify($fh); my %conchgs = &write_connection_config(); my %hosttypechgs = &write_hosttypes();