[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm doc/loncapafiles updatequery.piml

[raeburn]

raeburn		Thu Nov  1 04:33:12 2018 EDT

  Modified files:              
    /doc/loncapafiles	updatequery.piml 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Display key and certificate status when running ./UPDATE. 
  
  
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.91 doc/loncapafiles/updatequery.piml:1.92
--- doc/loncapafiles/updatequery.piml:1.91	Sun Oct 28 03:07:37 2018
+++ doc/loncapafiles/updatequery.piml	Thu Nov  1 04:33:08 2018
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.91 2018/10/28 03:07:37 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.92 2018/11/01 04:33:08 raeburn Exp $ -->
 
 <!--
 
@@ -538,7 +538,7 @@
 
 sub get_cert_status {
     my ($lonHostID,$hostname,$perlvarstatic) = @_;
-    my $currcerts = &LONCAPA::SSL::print_certstatus({$lonHostID => $hostname,},'text','cgi');
+    my $currcerts = &LONCAPA::SSL::print_certstatus({$lonHostID => $hostname,},'text','install');
     my ($lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,%sslstatus);
     my $output = '';
     if ($currcerts eq "$lonHostID:error") {
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1386 loncom/lonnet/perl/lonnet.pm:1.1387
--- loncom/lonnet/perl/lonnet.pm:1.1386	Fri Oct 19 16:54:58 2018
+++ loncom/lonnet/perl/lonnet.pm	Thu Nov  1 04:33:11 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1386 2018/10/19 16:54:58 raeburn Exp $
+# $Id: lonnet.pm,v 1.1387 2018/11/01 04:33:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,10 +237,12 @@
     }
     return if ($hostname eq '');
     my ($rep,$uselocal);
-    if (grep { $_ eq $lonhost } &current_machine_ids()) {
+    if (context eq 'install') {
+        $uselocal = 1;
+    } elsif (grep { $_ eq $lonhost } &current_machine_ids()) {
         $uselocal = 1;
     }
-    if (($context ne 'cgi') && ($uselocal)) {
+    if (($context ne 'cgi') && ($context ne 'install') && ($uselocal)) {
         my $distro = (split(/\:/,&get_server_distarch($lonhost)))[0];
         if ($distro eq '') {
             $uselocal = 0;