--- doc/loncapafiles/updatequery.piml	2017/02/25 20:31:03	1.86
+++ doc/loncapafiles/updatequery.piml	2024/07/06 16:00:22	1.98
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.86 2017/02/25 20:31:03 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.98 2024/07/06 16:00:22 raeburn Exp $ -->
 
 <!--
 
@@ -44,26 +44,25 @@ use Storable qw(thaw);
 use Term::ReadKey;
 use Locale::Country;
 
-  print(&lt;&lt;END);
-
-
-*********************************************
-*********************************************
-****                                     ****
-**** LON-CAPA SYSTEM INFORMATION REQUEST ****
-****                                     ****
-**** Please respond to the choices below ****
-****                                     ****
-*********************************************
-*********************************************
-
-END
-#sleep(3);
+sub get_new_sslkeypass {
+    my $sslkeypass;
+    my $flag=0;
+# get Password for SSL key
+    while (!$flag) {
+        $sslkeypass = &make_passphrase();
+        if ($sslkeypass) {
+            $flag = 1;
+        } else {
+            print "Invalid input (a password is required for the SSL key).\n";
+        }
+    }
+    return $sslkeypass;
+}
 
 sub get_static_config {
 # get LCperlvars from loncapa_apache.conf
     my $confdir = '/etc/httpd/conf/';
-    if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
+    if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'sles15' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' || '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24' || '<DIST />' eq 'debian10' || '<DIST />' eq 'debian11' || '<DIST />' eq 'debian12') {
         $confdir = '/etc/apache2/';
     }
     my $filename='loncapa_apache.conf';
@@ -135,7 +134,7 @@ sub make_passphrase {
     my $maxtries = 10;
     my $trial = 0;
     while ((!$got_passwd) && ($trial &lt; $maxtries)) {
-        $firstpass = &get_password('Enter password');
+        $firstpass = &get_password('Enter a password for the SSL key (at least 6 characters long)');
         if (length($firstpass) &lt; 6) {
             print('Password too short.'."\n".
               'Please choose a password with at least six characters.'."\n".
@@ -213,6 +212,467 @@ sub send_mail {
     return;
 }
 
+sub mail_csr {
+    my ($types,$lonCluster,$lonHostID,$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarref) = @_;
+    my ($camail,$flag);
+    if ($lonCluster eq 'production' || $lonCluster eq 'development') {
+        $camail = $perlvarref-&gt;{'SSLEmail'};
+    } else {
+        $flag=0;
+# get Certificate Authority E-mail
+        while (!$flag) {
+            print(&lt;&lt;END);
+
+ENTER EMAIL ADDRESS TO SEND CERTIFICATE SIGNING REQUESTS
+END
+
+            my $choice=&lt;&gt;;
+            chomp($choice);
+            if ($choice ne '') {
+                open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+                print(OUT 'Certificate Authority Email Address'."\t".$choice."\n");
+                close(OUT);
+                $camail=$choice;
+                $flag=1;
+            } else {
+                print "Invalid input (an email address is required).\n";
+            }
+        }
+    }
+    if ($camail) {
+        my $subj;
+        if (($types eq 'both') || ($types = 'host')) {
+            if (-e "$certsdir/$connectcsr") {
+                $subj = "Certificate Request ($lonHostID)";
+                print(&send_mail($desiredhostname,$camail,$subj,"$certsdir/$connectcsr"));
+            }
+        }
+        if (($types eq 'both') || ($types = 'hostname')) {
+            if (-e "$certsdir/$replicatecsr") {
+                $subj = "Certificate Request (internal-$desiredhostname)";
+                print(&send_mail($desiredhostname,$camail,$subj,"$certsdir/$replicatecsr"));
+            }
+        }
+    }
+}
+
+sub ssl_info {
+    print(&lt;&lt;END);
+
+****** Information about Country, State or Province and City *****
+
+A two-letter country code, e.g., US, CA, DE etc. as defined by ISO 3166,
+is required. A state or province, and a city are also required.
+This locality information is included in two SSL certificates used internally
+by LON-CAPA, unless you are running standalone.
+
+If your server will be part of either the production or development
+clusters, then the certificate will need to be signed by the official
+LON-CAPA Certificate Authority (CA).  If you will be running your own
+cluster then the cluster will need to create its own CA.
+
+END
+}
+
+sub get_country {
+    my ($desiredhostname) = @_;
+# get Country
+    my ($posscountry,$country);
+    if ($desiredhostname =~ /\.(edu|com|org)$/) {
+        $posscountry = 'us';
+    } else {
+        ($posscountry) = ($desiredhostname =~ /\.(a-z){2}$/);
+    }
+    if ($posscountry) {
+        my $countrydesc = &Locale::Country::code2country($posscountry);
+        if ($countrydesc eq '') {
+            undef($posscountry);
+        }
+    }
+
+    my $flag=0;
+    while (!$flag) {
+        if ($posscountry) {
+            $posscountry = uc($posscountry);
+            print "ENTER TWO-LETTER COUNTRY CODE [$posscountry]:\n";
+        } else {
+            print "ENTER TWO-LETTER COUNTRY CODE:\n";
+        }
+        my $choice=&lt;&gt;;
+        chomp($choice);
+        if ($choice ne '') {
+            if (&Locale::Country::code2country(lc($choice))) {
+                open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+                print(OUT 'country'."\t".uc($choice)."\n");
+                close(OUT);
+                $country=uc($choice);
+                $flag=1;
+            } else {
+                print "Invalid input -- a valid two letter country code is required\n";
+            }
+        } elsif (($choice eq '') && ($posscountry ne '')) {
+            open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+            print(OUT 'country'."\t".$posscountry."\n");
+            close(OUT);
+            $country = $posscountry;
+            $flag = 1;
+        } else {
+            print "Invalid input -- a country code is required\n";
+        }
+    }
+    return $country;
+}
+
+sub get_state {
+# get State or Province
+    my $flag=0;
+    my $state = '';
+    while (!$flag) {
+        print(&lt;&lt;END);
+
+ENTER STATE OR PROVINCE NAME:
+END
+
+        my $choice=&lt;&gt;;
+        chomp($choice);
+        if ($choice ne '') {
+            open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+            print(OUT 'state'."\t".$choice."\n");
+            close(OUT);
+            $state=$choice;
+            $flag=1;
+        } else {
+            print "Invalid input (a state or province name is required).\n";
+        }
+    }
+    return $state;
+}
+
+sub get_city {
+# get City
+    my $flag=0;
+    my $city = '';
+    while (!$flag) {
+        print(&lt;&lt;END);
+
+ENTER CITY NAME:
+END
+
+        my $choice=&lt;&gt;;
+        chomp($choice);
+        if ($choice ne '') {
+            open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+            print(OUT 'city'."\t".$choice."\n");
+            close(OUT);
+            $city=$choice;
+            $flag=1;
+        } else {
+            print "Invalid input (a city is required).\n";
+        }
+    }
+    return $city;
+}
+
+sub confirm_locality {
+    my ($domainDescription,$country,$state,$city) = @_;
+    my $flag = 0;
+    while (!$flag) {
+        print(&lt;&lt;END);
+
+The domain description, country, state and city will be
+used in the SSL certificates
+
+1) Domain Description: $domainDescription
+2) Country: $country
+3) State or Province: $state
+4) City: $city
+5) Everything is correct up above
+
+ENTER A CHOICE OF 1-4 TO CHANGE, otherwise ENTER 5:
+END
+        my $choice=&lt;&gt;;
+        chomp($choice);
+        if ($choice == 1) {
+            print(&lt;&lt;END);
+1) Domain Description: $domainDescription
+ENTER NEW VALUE
+END
+            my $choice2=&lt;&gt;;
+            chomp($choice2);
+            $domainDescription=$choice2;
+        } elsif ($choice == 2) {
+            print(&lt;&lt;END);
+2) Country: $country
+ENTER NEW VALUE (this should be a two-character code, e,g, US, CA, DE)
+END
+            my $choice2=&lt;&gt;;
+            chomp($choice2);
+            $country = uc($choice2);
+        } elsif ($choice == 3) {
+            print(&lt;&lt;END);
+3) State or Province: $state
+ENTER NEW VALUE:
+END
+            my $choice2=&lt;&gt;;
+            chomp($choice2);
+            $state=$choice2;
+        } elsif ($choice == 4) {
+            print(&lt;&lt;END);
+4) City: $city
+ENTER NEW VALUE:
+END
+            my $choice2=&lt;&gt;;
+            chomp($choice2);
+            $city=$choice2;
+        } elsif ($choice == 5) {
+            $flag=1;
+            $state =~ s{/}{ }g;
+            $city =~ s{/}{ }g;
+            $domainDescription =~ s{/}{ }g;
+        } else {
+            print "Invalid input.\n";
+        }
+    }
+    return ($domainDescription,$country,$state,$city);
+}
+
+sub make_key {
+    my ($certsdir,$privkey,$sslkeypass) = @_;
+# generate SSL key
+    if ($certsdir && $privkey) {
+        if (-f "$certsdir/lonKey.enc") {
+            my $mode = 0600;
+            chmod $mode, "$certsdir/lonKey.enc";
+        }
+        open(PIPE,"openssl genrsa -des3 -passout pass:$sslkeypass -out $certsdir/lonKey.enc 2048 2&gt;&1 |");
+        close(PIPE);
+        if (-f "$certsdir/$privkey") {
+            my $mode = 0600;
+            chmod $mode, "$certsdir/$privkey";
+        }
+        open(PIPE,"openssl rsa -in $certsdir/lonKey.enc -passin pass:$sslkeypass -out $certsdir/$privkey -outform PEM |");
+        close(PIPE);
+        if (-f "$certsdir/lonKey.enc") {
+            my $mode = 0400;
+            chmod $mode, "$certsdir/lonKey.enc";
+        }
+        if (-f "$certsdir/$privkey") {
+            my $mode = 0400;
+            chmod $mode, "$certsdir/$privkey";
+        }
+    } else {
+        print "Key creation failed.  Missing one or more of: certificates directory, key name\n";
+    }
+}
+
+sub encrypt_key {
+    my ($certsdir,$privkey,$sslkeypass) = @_;
+    if ($certsdir && $privkey) { 
+        if ((-f "$certsdir/$privkey") && (!-f "$certsdir/lonKey.enc")) {
+            open(PIPE,"openssl rsa -des3 -in $certsdir/$privkey -out $certsdir/lonKey.enc |");
+        }
+    }
+    return; 
+}
+
+sub make_host_csr {
+    my ($certsdir,$sslkeypass,$connectcsr,$connectsubj) = @_;
+# generate SSL csr for hostID
+    if ($certsdir && $connectcsr && $connectsubj) {
+        open(PIPE,"openssl req -key $certsdir/lonKey.enc -passin pass:$sslkeypass -new -batch -subj \"$connectsubj\" -out $certsdir/$connectcsr |");
+        close(PIPE);
+    } else {
+        print "Creation of certificate signing request failed.  Missing one or more of: certificates directory, CSR name, or locality information.\n";
+    }
+}
+
+sub make_hostname_csr {
+    my ($certsdir,$sslkeypass,$replicatecsr,$replicatesubj) = @_;
+# generate SSL csr for internal hostname
+    if ($certsdir && $replicatecsr && $replicatesubj) {
+        open(PIPE,"openssl req -key $certsdir/lonKey.enc -passin pass:$sslkeypass -new -batch -subj \"$replicatesubj\" -out $certsdir/$replicatecsr |");
+        close(PIPE);
+    } else {
+        print "Creation of certificate signing request failed.  Missing one or more of: certificates directory, CSR name, or locality information.\n";
+    }
+}
+
+sub securesetting {
+    my (%perlvar) = @_;
+    my ($securestatus,$securenum);
+    if (($perlvar{'loncAllowInsecure'}) && ($perlvar{'londAllowInsecure'})) {
+        $securenum = 4;
+        $securestatus = 'Allow insecure connections - inbound and outbound';
+    } elsif (($perlvar{'loncAllowInsecure'}) && (!$perlvar{'londAllowInsecure'})) {
+        $securenum = 3;
+        $securestatus = 'Outbound: allow insecure connections; Inbound: secure only';
+    } elsif ((!$perlvar{'loncAllowInsecure'}) && ($perlvar{'londAllowInsecure'})) {
+        $securenum = 2;
+        $securestatus = 'Outbound: secure connections only; Inbound: allow insecure';
+    } elsif ((!$perlvar{'loncAllowInsecure'}) && (!$perlvar{'londAllowInsecure'})) {
+        $securenum = 1;
+        $securestatus = 'Secure connections only - inbound and outbound ';
+    }
+    return ($securestatus,$securenum);
+}
+
+sub get_sslnames {
+    my %sslnames = (
+                      key      =&gt; 'lonnetPrivateKey',
+                      host     =&gt; 'lonnetCertificate',
+                      hostname =&gt; 'lonnetHostnameCertificate',
+                      ca       =&gt; 'lonnetCertificateAuthority',
+                   );
+    return %sslnames;
+}
+
+sub get_ssldesc {
+    my %ssldesc = (
+                    key      =&gt; 'Private Key',
+                    host     =&gt; 'Connections Certificate',
+                    hostname =&gt; 'Replication Certificate',
+                    ca       =&gt; 'LON-CAPA CA Certificate',
+                  );
+    return %ssldesc;
+}
+
+sub get_cert_status {
+    my ($lonHostID,$hostname,$perlvarstatic) = @_;
+    my $currcerts = &LONCAPA::SSL::print_certstatus({$lonHostID =&gt; $hostname,},'text','install');
+    my ($lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,%sslstatus);
+    my $output = '';
+    if ($currcerts eq "$lonHostID:error") {
+        $output .= "No information available for SSL certificates\n";
+        $sslstatus{'key'} = -1;
+        $sslstatus{'host'} = -1;
+        $sslstatus{'hostname'} = -1;
+        $sslstatus{'ca'} = -1;
+        $lonkeystatus = 'unknown status';
+        $lonhostcertstatus = 'unknown status';
+        $lonhostnamecertstatus = 'unknown status';
+    } else {
+        my %sslnames = &get_sslnames();
+        my %ssldesc = &get_ssldesc();
+        my %csr;
+        my ($lonhost,$info) = split(/\:/,$currcerts,2);
+        if ($lonhost eq $lonHostID) {
+            my @items = split(/\&/,$info);
+            foreach my $item (@items) {
+                my ($key,$value) = split(/=/,$item,2);
+                if ($key =~ /^(host(?:|name))\-csr$/) {
+                    $csr{$1} = $value;
+                }
+                my @data = split(/,/,$value);
+                if (grep(/^\Q$key\E$/,keys(%sslnames))) {
+                    my ($checkcsr,$comparecsr);
+                    if (lc($data[0]) eq 'yes') {
+                        $output .= "$ssldesc{$key} ".$perlvarstatic-&gt;{$sslnames{$key}}." available with status = $data[1]\n";
+                        if ($key eq 'key') {
+                            $lonkeystatus = "status: $data[1]";
+                            if ($data[1] =~ /ok$/) {
+                                $sslstatus{$key} = 1;
+                            }
+                        } else {
+                            my $setstatus;
+                            if (($key eq 'host') || ($key eq 'hostname')) { 
+                                if ($data[1] eq 'otherkey') {
+                                    $sslstatus{$key} = 4;
+                                    $setstatus = 1;
+                                    if ($key eq 'host') {
+                                        $lonhostcertstatus = "status: created with different key";
+                                    } elsif ($key eq 'hostname') {
+                                        $lonhostnamecertstatus = "status: created with different key"; 
+                                    }
+                                } elsif ($data[1] eq 'nokey') {
+                                    $sslstatus{$key} = 5;
+                                    $setstatus = 1;
+                                    if ($key eq 'host') {
+                                        $lonhostcertstatus = "status: created with missing key";
+                                    } elsif ($key eq 'hostname') {
+                                        $lonhostnamecertstatus = "status: created with missing key";
+                                    }
+                                }
+                                if ($setstatus) {
+                                    $comparecsr = 1;
+                                }
+                            }
+                            unless ($setstatus) {
+                                if ($data[1] eq 'expired') {
+                                    $sslstatus{$key} = 2;
+                                } elsif ($data[1] eq 'future') {
+                                    $sslstatus{$key} = 3;
+                                } else {
+                                    $sslstatus{$key} = 1;
+                                }
+                                if ($key eq 'host') {
+                                    $lonhostcertstatus = "status: $data[1]";
+                                } elsif ($key eq 'hostname') {
+                                    $lonhostnamecertstatus = "status: $data[1]";
+                                }
+                            }
+                        }
+                    } else {
+                        $sslstatus{$key} = 0;
+                        $output .= "$ssldesc{$key} ".$perlvarstatic-&gt;{$sslnames{$key}}." not available\n";
+                        if ($key eq 'key') {
+                            $lonkeystatus = 'still needed';
+                        } elsif (($key eq 'host') || ($key eq 'hostname')) {
+                            $checkcsr = 1;
+                        }
+                    }
+                    if (($checkcsr) || ($comparecsr)) {
+                        my $csrfile = $perlvarstatic-&gt;{$sslnames{$key}};
+                        $csrfile =~s /\.pem$/.csr/;
+                        my $csrstatus;
+                        if (-e $perlvarstatic-&gt;{'lonCertificateDirectory'}."/$csrfile") {
+                            open(PIPE,"openssl req -text -noout -verify -in ".$perlvarstatic-&gt;{'lonCertificateDirectory'}."/$csrfile 2&gt;&1 |");
+                            while(&lt;PIPE&gt;) {
+                                chomp();
+                                $csrstatus = $_;
+                                last;
+                            }
+                            close(PIPE);
+                            if ((($comparecsr) && ($csr{$key})) || ($checkcsr)) {
+                                $output .= "Certificate signing request for $ssldesc{$key} available with status = $csrstatus\n\n";
+                                if ($key eq 'host') {
+                                    $lonhostcertstatus = 'awaiting signature';
+                                } else {
+                                    $lonhostnamecertstatus = 'awaiting signature';
+                                }
+                                $sslstatus{$key} = 3;
+                            }
+                        } elsif ($checkcsr) {
+                            $output .= "No certificate signing request available for $ssldesc{$key}\n\n";
+                            if ($key eq 'host') {
+                                $lonhostcertstatus = 'still needed';
+                            } else {
+                                $lonhostnamecertstatus = 'still needed';
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($output,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,\%sslstatus);
+}
+
+  print(&lt;&lt;END);
+
+
+*********************************************
+*********************************************
+****                                     ****
+**** LON-CAPA SYSTEM INFORMATION REQUEST ****
+****                                     ****
+**** Please respond to the choices below ****
+****                                     ****
+*********************************************
+*********************************************
+
+END
+#sleep(3);
+
 </perlscript>
 </file>
 <file>
@@ -787,182 +1247,24 @@ if ($posshostname) {
   }
 }
 
-# get Country
-print(&lt;&lt;END);
-
-****** Information about Country, State or Province and City *****
+&ssl_info();
 
-A two-letter country code, e.g., US, CA, DE etc. as defined by ISO 3166,
-is required. A state or province, and a city are also required.
-This locality information is included in two SSL certificates used internally
-by LON-CAPA, unless you are running standalone.
+$country = &get_country($desiredhostname);
 
-If your server will be part of either the production or development 
-clusters, then the certificate will need to be signed by the official 
-LON-CAPA Certificate Authority (CA).  If you will be running your own 
-cluster then the cluster will need to create its own CA. 
+$state = &get_state();
 
-END
+$city = &get_city();
 
-my $posscountry;
-if ($desiredhostname =~ /\.(edu|com|org)$/) {
-    $posscountry = 'us';
+($domainDescription,$country,$state,$city) = &confirm_locality($domainDescription,$country,$state,$city);
 
-} else { 
-    ($posscountry) = ($desiredhostname =~ /\.(a-z){2}$/);
-}
-if ($posscountry) {
-    my $countrydesc = &Locale::Country::code2country($posscountry);
-    if ($countrydesc eq '') {
-        undef($posscountry);
-    }
-}
-
-$flag=0;
-while (!$flag) {
-  if ($posscountry) {
-     $posscountry = uc($posscountry);
-     print "ENTER TWO-LETTER COUNTRY CODE [$posscountry]:\n";
-  } else {
-     print "ENTER TWO-LETTER COUNTRY CODE:\n";
-  }
-  my $choice=&lt;&gt;;
-  chomp($choice);
-  if ($choice ne '') {
-    if (&Locale::Country::code2country(lc($choice))) {
-      open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-      print(OUT 'country'."\t".uc($choice)."\n");
-      close(OUT);
-      $country=uc($choice);
-      $flag=1;
-    } else {
-      print "Invalid input -- a valid two letter country code is required\n";
-    }
-  } elsif (($choice eq '') && ($posscountry ne '')) {
-    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-    print(OUT 'country'."\t".$posscountry."\n");
-    close(OUT);
-    $country = $posscountry;
-    $flag = 1;
-  } else {
-    print "Invalid input -- a country code is required\n";
-  }
-}
-
-$flag=0;
-# get State or Province
-while (!$flag) {
-  print(&lt;&lt;END);
-
-ENTER STATE OR PROVINCE NAME:
-END
-
-  my $choice=&lt;&gt;;
-  chomp($choice);
-  if ($choice ne '') {
-    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-    print(OUT 'state'."\t".$choice."\n");
-    close(OUT);
-    $state=$choice;
-    $flag=1;
-  }
-  else {
-    print "Invalid input (a state or province name is required).\n";
-  }
-}
-
-$flag=0;
-# get City
-while (!$flag) {
-  print(&lt;&lt;END);
-
-ENTER CITY NAME:
-END
-
-  my $choice=&lt;&gt;;
-  chomp($choice);
-  if ($choice ne '') {
-    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-    print(OUT 'city'."\t".$choice."\n");
-    close(OUT);
-    $city=$choice;
-    $flag=1;
-  }
-  else {
-    print "Invalid input (a city is required).\n";
-  }
-}
-
-$flag=0;
-while (!$flag) {
-  print(&lt;&lt;END);
-
-The domain description, country, state and city will be
-used in the SSL certificates
- 
-1) Domain Description: $domainDescription
-2) Country: $country
-3) State or Province: $state
-4) City: $city
-5) Everything is correct up above 
-
-ENTER A CHOICE OF 1-4 TO CHANGE, otherwise ENTER 5:
-END
-  my $choice=&lt;&gt;;
-  chomp($choice);
-  if ($choice == 1) {
-    print(&lt;&lt;END);
-1) Domain Description: $domainDescription
-ENTER NEW VALUE 
-END
-    my $choice2=&lt;&gt;;
-    chomp($choice2);
-    $domainDescription=$choice2;
-  }
-  elsif ($choice == 2) {
-    print(&lt;&lt;END);
-2) Country: $country
-ENTER NEW VALUE (this should be a two-character code, e,g, US, CA, DE)
-END
-    my $choice2=&lt;&gt;;
-    chomp($choice2);
-    $country = uc($choice2); 
-  }
-  elsif ($choice == 3) {
-    print(&lt;&lt;END);
-3) State or Province: $state
-ENTER NEW VALUE:
-END
-    my $choice2=&lt;&gt;;
-    chomp($choice2);
-    $state=$choice2;
-  }
-  elsif ($choice == 4) {
-    print(&lt;&lt;END);
-4) City: $city
-ENTER NEW VALUE:
-END
-    my $choice2=&lt;&gt;;
-    chomp($choice2);
-    $city=$choice2;
-  } elsif ($choice == 5) {
-    $flag=1;
-    $state =~ s{/}{ }g;
-    $city =~ s{/}{ }g;
-    $domainDescription =~ s{/}{ }g;
-  } else {
-    print "Invalid input.\n";
-  }
-}
-
-my $perlvarref = &get_static_config();
-if (ref($perlvarref) eq 'HASH') {
+my $perlstaticref = &get_static_config();
+if (ref($perlstaticref) eq 'HASH') {
   my ($certsdir,$privkey,$connectcsr,$replicatecsr);
-  $certsdir = $perlvarref-&gt;{'lonCertificateDirectory'};
-  $privkey = $perlvarref-&gt;{'lonnetPrivateKey'};  
-  $connectcsr = $perlvarref-&gt;{'lonnetCertificate'};
+  $certsdir = $perlstaticref-&gt;{'lonCertificateDirectory'};
+  $privkey = $perlstaticref-&gt;{'lonnetPrivateKey'};
+  $connectcsr = $perlstaticref-&gt;{'lonnetCertificate'};
   $connectcsr =~ s/\.pem$/.csr/;
-  $replicatecsr = $perlvarref-&gt;{'lonnetHostnameCertificate'};
+  $replicatecsr = $perlstaticref-&gt;{'lonnetHostnameCertificate'};
   $replicatecsr =~ s/\.pem$/.csr/;
 
   print(&lt;&lt;END);
@@ -975,97 +1277,31 @@ certificate signing requests: $connectcs
 
 END
 
-  my $sslkeypass;
-  $flag=0;
-# get Password for SSL key
-  while (!$flag) {
-    $sslkeypass = &make_passphrase();
-    if ($sslkeypass) {
-      $flag = 1;
-    } else {
-      print "Invalid input (a password is required for the SSL key).\n";
-    }
-  }
+  my $sslkeypass = &get_new_sslkeypass();
 
   if ($certsdir && $privkey) {
     my $connectsubj = "/C=$country/ST=$state/O=$domainDescription/L=$city/CN=$lonHostID/OU=LONCAPA/emailAddress=$lonAdmEMail";
     my $replicatesubj = "/C=$country/ST=$state/O=$domainDescription/L=$city/CN=internal-$desiredhostname/OU=LONCAPA/emailAddress=$lonAdmEMail";
 
 # generate SSL key
+    &make_key($certsdir,$privkey,$sslkeypass);
 # generate SSL csr for hostID
+    &make_host_csr($certsdir,$sslkeypass,$connectcsr,$connectsubj);
 # generate SSL csr for internal hostname
+    &make_hostname_csr($certsdir,$sslkeypass,$replicatecsr,$replicatesubj);
+# mail csr files to certificate@lon-capa.org (production or dev clusters).
+    &mail_csr('both',$lonCluster,$lonHostID,$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlstaticref);
 
-    if (-f "$certsdir/lonKey.enc") {
-        my $mode = 0600;
-        chmod $mode, "$certsdir/lonKey.enc";
-    }
-    open(PIPE,"openssl genrsa -des3 -passout pass:$sslkeypass -out $certsdir/lonKey.enc 2048 2&gt;&1 |");
-    close(PIPE);
-    if (-f "$certsdir/$privkey") {
-        my $mode = 0600;
-        chmod $mode, "$certsdir/$privkey";
-    }
-    open(PIPE,"openssl rsa -in $certsdir/lonKey.enc -passin pass:$sslkeypass -out $certsdir/$privkey -outform PEM |");
-    close(PIPE);
-    if ($connectcsr) {
-        open(PIPE,"openssl req -key $certsdir/lonKey.enc -passin pass:$sslkeypass -new -batch -subj \"$connectsubj\" -out $certsdir/$connectcsr |");
-        close(PIPE);
-    }
-    if ($replicatecsr) { 
-        open(PIPE,"openssl req -key $certsdir/lonKey.enc -passin pass:$sslkeypass -new -batch -subj \"$replicatesubj\" -out $certsdir/$replicatecsr |");
-        close(PIPE);
-    }
-    if (-f "$certsdir/lonKey.enc") {
-        my $mode = 0400;
-        chmod $mode, "$certsdir/lonKey.enc";
-    }
-    if (-f "$certsdir/$privkey") {
-        my $mode = 0400;
-        chmod $mode, "$certsdir/$privkey";
-    }
-  }
-
-  my $camail;
-  if ($lonCluster eq 'production' || $lonCluster eq 'development') {
-    $camail = $perlvarref-&gtl{'SSLEmail'};
-  } else {
-    $flag=0;
-# get Certificate Authority E-mail 
-    while (!$flag) {
-      print(&lt;&lt;END);
-
-ENTER EMAIL ADDRESS TO SEND CERTIFICATE SIGNING REQUESTS
-END
-
-      my $choice=&lt;&gt;;
-      chomp($choice);
-      if ($choice ne '') {
-        open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-        print(OUT 'Certificate Authority Email Address'."\t".$choice."\n");
-        close(OUT);
-        $camail=$choice;
-        $flag=1;
-      } else {
-        print "Invalid input (an email address is required).\n";
-      }
-    }
-  }
-  if ($camail) {
-    my $subj;
-    if (-e "$certsdir/$connectcsr") { 
-        $subj = "Certificate Request ($lonHostID)";
-        print(&send_mail($desiredhostname,$camail,$subj,"$certsdir/$connectcsr"));
-    }
-    if (-e "$certsdir/$replicatecsr") {
-        $subj = "Certificate Request (internal-$desiredhostname)";
-        print(&send_mail($desiredhostname,$camail,$subj,"$certsdir/$replicatecsr"));
+    } else {
+        print "Could not acquire standard names for SSL Certificate files from loncapa_apache.conf\n";
     }
-  }
+} else {
+    print "Could not acquire standard names for SSL Certificate files from loncapa_apache.conf\n";
 }
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'sles15' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' || '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24' || '<DIST />' eq 'debian10' || '<DIST />' eq 'debian11' || '<DIST />' eq 'debian12') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -1122,28 +1358,12 @@ END
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>/etc/apache2/</target>
+<target dist='sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 debian10 debian11 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/</target>
 <perlscript mode='fg'>
-sub securesetting {
-    my (%perlvar)=@_;
-    my $securestatus='unknown';
-    my $securenum='';
-    if      ( $perlvar{'loncAllowInsecure'}&&  $perlvar{'londAllowInsecure'}) {
-	$securestatus='no';                  $securenum='4';
-    } elsif ( $perlvar{'loncAllowInsecure'}&& !$perlvar{'londAllowInsecure'}) {
-	$securestatus='lond';                $securenum='3';
-    } elsif (!$perlvar{'loncAllowInsecure'}&&  $perlvar{'londAllowInsecure'}) {
-	$securestatus='lonc';                $securenum='2';
-    } elsif (!$perlvar{'loncAllowInsecure'}&& !$perlvar{'londAllowInsecure'}) {
-	$securestatus='yes (lond and lonc)'; $securenum='1';
-    }
-    return ($securestatus,$securenum);
-}
 # read values from loncapa.conf
 my $confdir = "<TARGET />";
 my $filename='loncapa.conf';
 my %perlvar;
-my ($securestatus,$securenum);
     if (-e "$confdir$filename") {
 	open(CONFIG,'&lt;'.$confdir.$filename) or 
           die("Can't read $confdir$filename");
@@ -1171,7 +1391,7 @@ my ($securestatus,$securenum);
     unless ($perlvar{'loncAllowInsecure'} and $perlvar{'loncAllowInsecure'}!~/\{\[\[\[\[/) {
        $perlvar{'loncAllowInsecure'}='1';
     }
-    ($securestatus,$securenum)=&securesetting(%perlvar);
+    my ($securestatus,$securenum)=&securesetting(%perlvar);
     unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
        my $lonReceipt='';
        srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
@@ -1181,19 +1401,7 @@ my ($securestatus,$securenum);
        }
        $perlvar{'lonReceipt'}=$lonReceipt;
     }
-my %perlvarstatic;
-    if (-e "${confdir}loncapa_apache.conf") {
-	open(CONFIG,'&lt;'.$confdir.'loncapa_apache.conf') or 
-          die("Can't read ${confdir}loncapa_apache.conf");
-	while (my $configline=&lt;CONFIG&gt;) {
-	    if ($configline =~ /^[^\#]*PerlSetVar/) {
-		my ($unused,$varname,$varvalue)=split(/\s+/,$configline);
-		chomp($varvalue);
-		$perlvarstatic{$varname}=$varvalue;
-	    }
-	}
-	close(CONFIG);
-    }
+    my $perlvarstatic = &get_static_config();
 
     my (@hosts_files, @domain_files);
     if ( $lonCluster ne 'existing') {
@@ -1314,14 +1522,14 @@ my %perlvarstatic;
     }
    
 # implement editing logic below, interactively
-# update loncapa.conf until 17 is entered
+# update loncapa.conf until 18 is entered
 
 my $flag=0;
 
 #
 # Changes to 5, 6, and 14 not supported if configuration.db set on primary library server.
 # (requires either this machine to be primary library server or for LON-CAPA and Apache
-# to be running on primary library server.
+# to be running on primary library server).
 #
 
 my ($isprimary,$domconf,$url,$gotdomconf,$adminmail,$supportmail,$connectssl,%setbygui);
@@ -1333,8 +1541,12 @@ if ($primaryLibServer eq $perlvar{'lonHo
     } 
     $url = $primary_protocol.'://'.$primary_hostname.'/cgi-bin/listdomconfig.pl';
 }
+
+my %sslnames = &get_sslnames();
+my %ssldesc = &get_ssldesc();
+
 my $domconf = &get_domain_config($perlvar{'lonDefDomain'},$primaryLibServer,$isprimary,
-                                 $url,\%perlvarstatic);
+                                 $url,$perlvarstatic);
 if (ref($domconf)) {
     $gotdomconf = 1;
     if (ref($domconf-&gt;{'contacts'}) eq 'HASH') {
@@ -1376,7 +1588,7 @@ if (ref($domconf)) {
                     $currsetting =~ s/,$//;
                 }
                 if ($currsetting ne '') {
-                    $connectssl = $sslname{$connect}.' -- '.$currsetting.' | '; 
+                    $connectssl = $sslnames{$connect}.' -- '.$currsetting.' | '; 
                 }
             }
         }
@@ -1401,96 +1613,12 @@ if ($supportmail) {
 }
 
 print "\nRetrieving status information for SSL key and certificates ...\n\n";
-my ($lonhostcertstatus,$lonhostnamecertstatus,$lonkeystatus);
-my $currcerts = &LONCAPA::SSL::print_certstatus({$perlvar{'lonHostID'} =&gt; 1,},'text','cgi');
-chomp($currcerts);
+my ($certinfo,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,$sslref) = 
+    &get_cert_status($perlvar{'lonHostID'},$desiredhostname,$perlvarstatic);
+print $certinfo;
 my %sslstatus;
-
-if ($currcerts eq "$perlvar{'lonHostID'}:error") {
-    print "No information available for SSL certificates\n";
-    $sslstatus{'key'} = -1;
-    $sslstatus{'host'} = -1;
-    $sslstatus{'hostname'} = -1;
-    $sslstatus{'ca'} = -1;
-    $lonkeystatus = 'unknown status';
-    $lonhostcertstatus = 'unknown status';
-    $lonhostnamecertstatus = 'unknown status';
-} else {
-    my %sslnames = (
-                      key      =&gt; 'lonnetPrivateKey',
-                      host     =&gt; 'lonnetCertificate',
-                      hostname =&gt; 'lonnetHostnameCertificate',
-                      ca       =&gt; 'lonnetCertificateAuthority',
-                   );
-    my %ssldesc = (
-                    key      =&gt; 'Private Key',
-                    host     =&gt; 'Connections Certificate',
-                    hostname =&gt; 'Replication Certificate',
-                    ca       =&gt; 'LON-CAPA CA Certificate',
-                  );
-    my ($lonhost,$info) = split(/\:/,$currcerts,2);
-    if ($lonhost eq $perlvar{'lonHostID'}) {
-        my @items = split(/\&/,$info);
-        foreach my $item (@items) {
-            my ($key,$value) = split(/=/,$item,2);
-            my @data = split(/,/,$value);
-            if (grep(/^\Q$key\E$/,keys(%sslnames))) {
-                if (lc($data[0]) eq 'yes') { 
-                    print "$ssldesc{$key} $perlvarstatic{$sslnames{$key}} available with status = $data[1]\n";
-                    if ($key eq 'key') {
-                        $lonkeystatus = "status: $data[1]"; 
-                        if ($data[1] =~ /ok$/) {
-                            $sslstatus{$key} = 1;
-                        } 
-                    } else {
-                        if ($data[1] eq 'Expired') {
-                            $sslstatus{$key} = 2;
-                        } else {
-                            $sslstatus{$key} = 1;
-                        }
-                        if ($key eq 'host') {
-                            $lonhostcertstatus = "status: $data[1]";
-                        } elsif ($key eq 'hostname') {
-                            $lonhostnamecertstatus = "status: $data[1]";
-                        }
-                    }
-                } else {
-                    $sslstatus{$key} = 0;
-                    print "$ssldesc{$key} $perlvarstatic{$sslnames{$key}} not available\n";
-                    if (($key eq 'host') || ($key eq 'hostname')) {
-                        my $csr = $perlvarstatic{$sslnames{$key}};
-                        $csr =~s /\.pem$/.csr/;
-                        my $csrstatus;
-                        if (-e "$perlvarstatic{'lonCertificateDirectory'}/$csr") {
-                            open(PIPE,"openssl req -text -noout -verify -in $perlvarstatic{'lonCertificateDirectory'}/$csr 2&gt;&1 |");
-                            while(&lt;PIPE&gt;) {
-                                chomp();
-                                $csrstatus = $_;
-                                last;
-                            }
-                            close(PIPE);
-                            print "Certificate signing request for $ssldesc{$key} available with status = $csrstatus\n\n";
-                            if ($key eq 'host') {
-                                $lonhostcertstatus = 'awaiting signature';
-                            } else {
-                                $lonhostnamecertstatus = 'awaiting signature';
-                            }
-                            $sslstatus{$key} = 3;
-                        } else {
-                            print "No certificate signing request available for $ssldesc{$key}\n\n";
-                            if ($key eq 'host') {
-                                $lonhostcertstatus = 'still needed';
-                            } else {
-                                $lonhostnamecertstatus = 'still needed';
-                            }
-                        }
-                    } elsif ($key eq 'key') {
-                        $lonkeystatus = 'still needed';
-                    }
-                }
-            }
-        }
-    }
+if (ref($sslref) eq 'HASH') {
+    %sslstatus = %{$sslref};
 }
 
 while (!$flag) {
@@ -1511,7 +1639,7 @@ This is now the current configuration of
 11) Cache Expiration Time: $perlvar{'lonExpire'} (seconds)
 12) Server Load: $perlvar{'lonLoadLim'}
 13) User Load: $perlvar{'lonUserLoadLim'}
-14) Allow only secure connections: $securestatus
+14) LON-CAPA "internal" connections: $securestatus
 15) Private Key for SSL: $lonkeystatus
 16) SSL Certificate for LON-CAPA server connections: $lonhostcertstatus
 17) SSL Certificate for Content Replication: $lonhostnamecertstatus
@@ -1580,11 +1708,11 @@ if (!defined($primaryLibServer)) {
 
 
 my ($certsdir,$privkey,$connectcsr,$replicatecsr);
-$certsdir = $perlvarstatic{'lonCertificateDirectory'};
-$privkey = $perlvarstatic{'lonnetPrivateKey'};
-$connectcsr = $perlvarstatic{'lonnetCertificate'};
+$certsdir = $perlvarstatic-&gt;{'lonCertificateDirectory'};
+$privkey = $perlvarstatic-&gt;{'lonnetPrivateKey'};
+$connectcsr = $perlvarstatic-&gt;{'lonnetCertificate'};
 $connectcsr =~ s/\.pem$/.csr/;
-$replicatecsr = $perlvarstatic{'lonnetHostnameCertificate'};
+$replicatecsr = $perlvarstatic-&gt;{'lonnetHostnameCertificate'};
 $replicatecsr =~ s/\.pem$/.csr/;
 
 if (@error) { print "\n*** ERRORS: \n\t".join("\n\t",@error)."\n"; }
@@ -1655,10 +1783,11 @@ END
       my $choice2=&lt;&gt;;
       chomp($choice2);
       $perlvar{'lonAdmEMail'}=$choice2;
+      $adminmail=$perlvar{'lonAdmEMail'};
     }
   }
   elsif ($choice==6) {
-    if ($setbygui{'lonAdmEMail'}) {
+    if ($setbygui{'lonSupportEMail'}) {
       print(&lt;&lt;END);
 6) Support E-mail Address: $supportmail
 Use the web GUI (as domain coordinator) to make changes after completing the UPDATE.
@@ -1671,6 +1800,7 @@ END
       my $choice2=&lt;&gt;;
       chomp($choice2);
       $perlvar{'lonSupportEMail'}=$choice2;
+      $supportmail=$perlvar{'lonSupportEMail'};
     }
   }
   elsif ($choice==7) {
@@ -1778,23 +1908,37 @@ END
       ($securestatus,$securenum)=&securesetting(%perlvar);
     }
   } elsif ($choice==15) {
-      if (($sslstatus{'key'} == 1) || ($sslstatus{'key'} == 2)) {
+      if ($sslstatus{'key'} == 1) {
           print(&lt;&lt;END);
 15) Private Key for SSL: $lonkeystatus
 
 POSSIBLE CHOICES:
 1) overwrite existing key
-2) create new key for use later
-3) make no change
+2) make no change
 ENTER NEW VALUE
 END
-      } elsif ($sslstatus{'key'} == ) {
-      my $choice2=&lt;&gt;;
-      chomp($choice2);
+          my $choice2=&lt;&gt;;
+          chomp($choice2);
+          if ($choice2 eq '1') {
+              my $sslkeypass = &get_new_sslkeypass();
+              &make_key($certsdir,$privkey,$sslkeypass);
+          }
+      } elsif ($sslstatus{'key'} == 0) {
+          print(&lt;&lt;END);
+15) Private Key for SSL: $lonkeystatus
+END
+          my $sslkeypass = &get_new_sslkeypass();
+          &make_key($certsdir,$privkey,$sslkeypass);
+          print "\nRetrieving status information for SSL key and certificates ...\n\n";
+          ($certinfo,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,$sslref) =
+             &get_cert_status($perlvar{'lonHostID'},$desiredhostname,$perlvarstatic);
+          if (ref($sslref) eq 'HASH') {
+              %sslstatus = %{$sslref};
+          }
+      }
   } elsif ($choice==16) {
-      if ($sslstatus{'key'} == 1) || ($sslstatus{'key'} == 2)) {
-      #$sslstatus{'host'};
-      print(&lt;&lt;END);
+      if (($sslstatus{'host'} == 1) || ($sslstatus{'host'} == 2) || ($sslstatus{'host'} == 3)) {
+          print(&lt;&lt;END);
 16) SSL Certificate for LON-CAPA server connections: $lonhostcertstatus
 
 POSSIBLE CHOICES:
@@ -1804,11 +1948,81 @@ POSSIBLE CHOICES:
 4) make no change
 ENTER NEW VALUE
 END
-      my $choice2=&lt;&gt;;
-      chomp($choice2);
+
+          my $choice2=&lt;&gt;;
+          chomp($choice2);
+          if (($choice2 eq '1') || ($choice2 eq '2')) {
+              &ssl_info();
+              my $country = &get_country($desiredhostname);
+              my $state = &get_state();
+              my $city = &get_city();
+              my $connectsubj = "/C=$country/ST=$state/O=$domainDescription/L=$city/CN=$perlvar{'lonHostID'}/OU=LONCAPA/emailAddress=$adminmail";
+              ($domainDescription,$country,$state,$city) = &confirm_locality($domainDescription,$country,$state,$city);
+              my $sslkeypass;
+              if ($choice2 eq '1') {
+                  $sslkeypass = &get_new_sslkeypass();
+                  &make_key($certsdir,$privkey,$sslkeypass);
+              } elsif ($choice2 eq '2') {
+                  $sslkeypass = &get_password('Enter existing password for SSL key');
+                  &encrypt_key($certsdir,$privkey,$sslkeypass);
+              }
+              &make_host_csr($certsdir,$sslkeypass,$connectcsr,$connectsubj);
+              &mail_csr('host',$lonCluster,$perlvar{'lonHostID'},$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarstatic);
+              print "\nRetrieving status information for SSL key and certificates ...\n\n";
+              ($certinfo,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,$sslref) =
+                  &get_cert_status($perlvar{'lonHostID'},$desiredhostname,$perlvarstatic);
+              if (ref($sslref) eq 'HASH') {
+                  %sslstatus = %{$sslref};
+              }
+          } elsif ($choice2 eq '3') {
+              if (-e "$certsdir/$connectcsr") {
+                  &mail_csr('host',$lonCluster,$perlvar{'lonHostID'},$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarstatic);
+              }
+          }
+      } elsif (($sslstatus{'host'} == 0) || ($sslstatus{'host'} == 4) || ($sslstatus{'host'} == 5)) {
+          my $sslkeypass;
+          if ($sslstatus{'key'} == 1) {
+              print(&lt;&lt;END);
+16) SSL Certificate for LON-CAPA server connections: $lonhostcertstatus
+
+POSSIBLE CHOICES:
+1) create new certificate signing request with new key
+2) create new certificate signing request with existing key
+3) make no change
+ENTER NEW VALUE
+END
+              my $choice2=&lt;&gt;;
+              chomp($choice2);
+              if ($choice2 eq '1') {
+                  $sslkeypass = &get_new_sslkeypass();
+                  &make_key($certsdir,$privkey,$sslkeypass);
+              } elsif ($choice2 eq '2') {
+                  $sslkeypass = &get_password('Enter existing password for SSL key');
+                  &encrypt_key($certsdir,$privkey,$sslkeypass);
+              }
+          } else {
+              print(&lt;&lt;END);
+16) SSL Certificate for LON-CAPA server connections: $lonhostcertstatus
+END
+              $sslkeypass = &get_new_sslkeypass();
+          }
+          &ssl_info();
+          my $country = &get_country($desiredhostname);
+          my $state = &get_state();
+          my $city = &get_city();
+          my $connectsubj = "/C=$country/ST=$state/O=$domainDescription/L=$city/CN=$perlvar{'lonHostID'}/OU=LONCAPA/emailAddress=$adminmail";
+          &make_host_csr($certsdir,$sslkeypass,$connectcsr,$connectsubj);
+          &mail_csr('host',$lonCluster,$perlvar{'lonHostID'},$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarstatic);
+          print "\nRetrieving status information for SSL key and certificates ...\n\n";
+          ($certinfo,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,$sslref) =
+              &get_cert_status($perlvar{'lonHostID'},$desiredhostname,$perlvarstatic);
+          if (ref($sslref) eq 'HASH') {
+              %sslstatus = %{$sslref};
+          }
+      }
   } elsif ($choice==17) {
-      #$sslstatus{'hostname'}
-      print(&lt;&lt;END);
+      if (($sslstatus{'hostname'} == 1) || ($sslstatus{'hostname'} == 2) || ($sslstatus{'hostname'} == 3)) {
+          print(&lt;&lt;END);
 17) SSL Certificate for Content Replication: $lonhostnamecertstatus
 
 POSSIBLE CHOICES:
@@ -1818,8 +2032,76 @@ POSSIBLE CHOICES:
 4) make no change
 ENTER NEW VALUE
 END
-      my $choice2=&lt;&gt;;
-      chomp($choice2);
+          my $choice2=&lt;&gt;;
+          chomp($choice2);
+          if (($choice2 eq '1') || ($choice2 eq '2')) {
+              &ssl_info();
+              my $country = &get_country($desiredhostname);
+              my $state = &get_state();
+              my $city = &get_city();
+              my $replicatesubj = "/C=$country/ST=$state/O=$domainDescription/L=$city/CN=internal-$desiredhostname/OU=LONCAPA/emailAddress=$adminmail";
+              my $sslkeypass;
+              if ($choice2 eq '1') {
+                  $sslkeypass = &get_new_sslkeypass();
+                  &make_key($certsdir,$privkey,$sslkeypass);
+              } elsif ($choice2 eq '2') {
+                  $sslkeypass = &get_password('Enter existing password for SSL key');
+                  &encrypt_key($certsdir,$privkey,$sslkeypass);
+              }
+              &make_hostname_csr($certsdir,$sslkeypass,$replicatecsr,$replicatesubj);
+              &mail_csr('hostname',$lonCluster,$perlvar{'lonHostID'},$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarstatic);
+              print "\nRetrieving status information for SSL key and certificates ...\n\n";
+              ($certinfo,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,$sslref) =
+                  &get_cert_status($perlvar{'lonHostID'},$desiredhostname,$perlvarstatic);
+              if (ref($sslref) eq 'HASH') {
+                  %sslstatus = %{$sslref};
+              }
+          } elsif ($choice2 eq '3') {
+              if (-e "$certsdir/$replicatecsr") {
+                  &mail_csr('hostname',$lonCluster,$perlvar{'lonHostID'},$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarstatic);
+              }
+          }
+      } elsif (($sslstatus{'hostname'} == 0) || ($sslstatus{'hostname'} == 4) || ($sslstatus{'hostname'} == 5)) {
+          my $sslkeypass;
+          if ($sslstatus{'key'} == 1) {
+              print(&lt;&lt;END);
+17) SSL Certificate for Content Replication: $lonhostnamecertstatus
+
+POSSIBLE CHOICES:
+1) create new certificate signing request with new key
+2) create new certificate signing request with existing key
+3) make no change
+ENTER NEW VALUE
+END
+              my $choice2=&lt;&gt;;
+              chomp($choice2);
+              if ($choice2 eq '1') {
+                  $sslkeypass = &get_new_sslkeypass();
+                  &make_key($certsdir,$privkey,$sslkeypass);
+              } elsif ($choice2 eq '2') {
+                  $sslkeypass = &get_password('Enter existing password for SSL key');
+                  &encrypt_key($certsdir,$privkey,$sslkeypass);
+              }
+          } else {
+              print(&lt;&lt;END);
+17) SSL Certificate for Content Replication: $lonhostnamecertstatus
+END
+              $sslkeypass = &get_new_sslkeypass();
+          }
+          &ssl_info();
+          my $country = &get_country($desiredhostname);
+          my $state = &get_state();
+          my $city = &get_city();
+          my $replicatesubj = "/C=$country/ST=$state/O=$domainDescription/L=$city/CN=internal-$desiredhostname/OU=LONCAPA/emailAddress=$adminmail";
+          &make_hostname_csr($certsdir,$sslkeypass,$replicatecsr,$replicatesubj);
+          &mail_csr('hostname',$lonCluster,$perlvar{'lonHostID'},$desiredhostname,$certsdir,$connectcsr,$replicatecsr,$perlvarstatic);
+          print "\nRetrieving status information for SSL key and certificates ...\n\n";
+          ($certinfo,$lonkeystatus,$lonhostcertstatus,$lonhostnamecertstatus,$sslref) =
+              &get_cert_status($perlvar{'lonHostID'},$desiredhostname,$perlvarstatic);
+          if (ref($sslref) eq 'HASH') {
+              %sslstatus = %{$sslref};
+          }
+      }
   } elsif (($choice==18) && (!@error)) {
     $flag=1;
   } else {
@@ -1835,7 +2117,7 @@ END
       if ($value eq '') {
           $line = '#'.$line;
       }
-      print(OUT &lt;&lt;END) unless $perlvarstatic{$key};
+      print(OUT &lt;&lt;END) unless ($perlvarstatic-&gt;{$key});
 $line
 END
     }