--- doc/loncapafiles/updatequery.piml	2006/12/10 23:38:35	1.51
+++ doc/loncapafiles/updatequery.piml	2016/07/29 17:26:44	1.83
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.51 2006/12/10 23:38:35 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.83 2016/07/29 17:26:44 raeburn Exp $ -->
 
 <!--
 
@@ -33,6 +33,7 @@ http://www.lon-capa.org/
 <target dist='default'>/</target>
 <perlscript mode='fg'>
 $|=1;
+  use strict;
   print(&lt;&lt;END);
 
 
@@ -47,26 +48,27 @@ $|=1;
 *********************************************
 
 END
-sleep(3);
+#sleep(3);
 </perlscript>
 </file>
 <file>
 <target dist='default'>loncom/hosts.tab</target>
 <perlscript mode='fg'>
+my $lonCluster;
 unless (-l "<TARGET />") {
   print(&lt;&lt;END);
 
 ===============================================================================
 Which cluster option would you like to have installed?
 IMPORTANT: to take advantage of the cluster options 1) and 3),
-you must contact lon-capa\@lon-capa.org.
+you must contact loncapa\@loncapa.org.
 
 1) PRODUCTION - you want to eventually connect this machine to the
                 LON-CAPA content sharing network. This setting is for
                 schools, colleges, and universities, that currently
-                are running - or in the future will run - courses
+                are running - or in the future will run - courses.
 2) STAND-ALONE - you want this machine to run in 'stand-alone' mode and
-                 not be connected to other LON-CAPA machines for now
+                 not be connected to other LON-CAPA machines for now.
 3) DEVELOPMENT - you want to do software (not content!) development with
                  this workstation and eventually link it with the
                  workstations of other LON-CAPA software developers.
@@ -81,7 +83,7 @@ END
 
 # get input
 # if valid then process, otherwise loop
-$flag=0;
+my $flag=0;
 while (!$flag) {
   print "ENTER 1, 2, 3, or 4:\n";
   my $choice=&lt;&gt;;
@@ -97,23 +99,17 @@ while (!$flag) {
   }
   elsif ($choice==4) {
     $lonCluster='existing'; $flag=1;
-    if (-e '/home/httpd/lonTabs/hosts.tab') {
-      `cp /home/httpd/lonTabs/hosts.tab ../existing_hosts.tab`;
-    }
-    else {
-      print &lt;&lt;END;
-There is no existing /home/httpd/lonTabs/hosts.tab
-END
-      die('');
-    }
-    if (-e '/home/httpd/lonTabs/domain.tab') {
-      `cp /home/httpd/lonTabs/domain.tab ../existing_domain.tab`;
-    }
-    else {
-      print &lt;&lt;END;
-There is no existing /home/httpd/lonTabs/domain.tab
+    foreach my $file ('hosts.tab','dns_hosts.tab',
+                      'domain.tab','dns_domain.tab') {
+        if (-e '/home/httpd/lonTabs/'.$file) {
+	    `cp /home/httpd/lonTabs/$file ../existing_$file`;
+        }
+        else {
+	    print &lt;&lt;END;
+There is no existing /home/httpd/lonTabs/$file
 END
-      die('');
+            die('');
+        }
     }
   }
   elsif ($choice==26) {
@@ -130,20 +126,25 @@ $|=1;
 my $domainDescription;
 my $domainTabExtras;
 my $primaryLibServer;
+my $protocol;
+my $intdom;
 my @libservers = ();
 unless (-e "<TARGET />") {
   print(&lt;&lt;END);
            WELCOME TO LON-CAPA!
 
-If you have questions, please visit http://install.lon-capa.org
-or contact helpdesk\@lon-capa.org.
+If you have questions, please visit http://install.loncapa.org
+or contact helpdesk\@loncapa.org.
 
 ===============================================================================
-The following 4 values are needed to configure LON-CAPA:
+The following 7 values are needed to configure LON-CAPA:
 * Machine Role
 * LON-CAPA Domain Name
-* LON-CAPA Machine ID Name, and
-* Server Administration E-mail Address.
+* LON-CAPA Machine ID Name
+* Server Administration E-mail Address
+* LON-CAPA Domain's Primary Library Server Machine ID
+* Web Server Protocol
+* Internet Domain Name of Your Institution
 ===============================================================================
 
 In addition, a Support E-mail Address can also be included. If
@@ -161,8 +162,8 @@ close(OUT);
 **** Machine Role ****
 Library server (recommended if first-time installation of LON-CAPA):
    Servers that are repositories of authoritative educational resources.
-   These servers also provide the construction space by which instructors
-   assemble their classroom online material.
+   These servers also provide the authoring spaces in which content
+   creators (e.g., faculty instructors) create their learning content.
 Access server:
    Servers that load-balance high-traffic delivery of educational resources
    over the world-wide web.
@@ -207,13 +208,13 @@ if ($hostname=~/([^\.]*)\.([^\.]*)$/) {
   print(&lt;&lt;END);
 
 **** Domain ****
-[This does NOT need to correspond to internet address domains.
+[This does NOT need to correspond to an internet address domain.
  Please make this name short AND descriptive of your organization.
  Domain names are close to impossible to change later!!!
  Good examples might be "msu" or "bionet" or "vermontcc".
  Bad examples are "physics" (too general)
    or "michiganstateuniversity" (too long)
-   or "msuedu" (internet domain, just make it "msu")
+   or "msuedu" (just make it "msu", or else make it msu.edu)
    or "msuphysics" (only if there is a good reason to limit to department
                     - we don't know of one)
    or "mydomain" (what is that?)
@@ -221,10 +222,12 @@ if ($hostname=~/([^\.]*)\.([^\.]*)$/) {
  have to actually work together with your colleagues. You can still run
  multiple library servers within the same domain.
  If this domain is eventually going to be part of the main production
- cluster, you MUST contact the LON-CAPA group at MSU (loncapa@loncapa.org)
+ cluster, you MUST contact the LON-CAPA group at MSU (loncapa\@loncapa.org)
  to have a domain name assigned, and then use it exactly as given. This is
  also true for test installs that might eventually turn into production setups.
- Stop now if you didn't do so.]
+ The short domain name needs to be unique, if your aim is to join a cluster 
+ containing existing domains. Stop now if you have not yet contacted the 
+ MSU LON-CAPA group.] 
 END
 
 # get domain name
@@ -372,6 +375,8 @@ if ($lonRole eq 'library') {
         $primaryLibServer = $libservers[0];
     }
 }
+
+$flag=0;
 while (!$flag) {
   print(&lt;&lt;END);
 **** Domain's Primary Library Server ID ****
@@ -379,8 +384,8 @@ This should be the LON-CAPA machine ID o
 domain.  If you only have a single library server in your domain, then
 the Primary Library server ID will be the machine ID of that server. 
 This server will be where domain data which are not associated with any
-specific home library server will be stored (e.g., e-mail broadcast by
-administrators to users in the domain).
+specific home library server will be stored (e.g., configurations that
+apply to all nodes in the domain).
 END
     if (defined($primaryLibServer)) {
         print(&lt;&lt;END);
@@ -427,7 +432,7 @@ my $lonAdmEMail;
 while (!$flag) {
   print(&lt;&lt;END);
 
-**** Server Administrator's E-mail ****
+**** Server Administrators E-mail ****
 E-mail address of the person who will manage this machine
 [should be in the form somebody\@somewhere]
 ENTER ADMIN E-MAIL ADDRESS:
@@ -480,10 +485,72 @@ END
   }
 }
 
+# get protocol
+# accept if valid, if not valid, tell user and repeat
+$flag=0;
+while (!$flag) {
+  print(&lt;&lt;END);
+
+****  Web Server Protocol ****
+If you plan to run the Apache server with SSL enabled, 
+the protocol should be: https; otherwise it should be http.
+ENTER WEB SERVER PROTOCOL [http]:
+END
+
+  my $choice=&lt;&gt;;
+  chomp($choice);
+  if ($choice =~ /^https?$/) {
+    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+    print(OUT 'protocol'."\t".$choice."\n");
+    close(OUT);
+    $protocol=$choice;
+    $flag=1;
+  } elsif ($choice eq '') {
+    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+    print(OUT 'protocol'."\t".'http'."\n");
+    close(OUT);
+    $protocol = 'http';
+    $flag = 1;
+  } else {
+    print "Invalid input (only http or https allowed).\n";
+  }
+}
+
+# get internet domain
+# accept if valid, if not valid, tell user and repeat
+$flag=0;
+while (!$flag) {
+  print(&lt;&lt;END);
+
+****  Internet Domain Name of Your Institution ****
+
+The internet domain name used for servers at your institution 
+should be provided.  This will be similar to: ustate.edu or
+topcollege.ac.uk or myhostingcompany.com, i.e., the part of
+a server hostname which indicates to which organization the 
+server belongs.
+
+ENTER INTERNET DOMAIN NAME:
+END
+
+  my $choice=&lt;&gt;;
+  chomp($choice);
+  if ($choice =~/[^.]+\.[^.]+/) {
+    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+    print(OUT 'internet domain'."\t".$choice."\n");
+    close(OUT);
+    $intdom=$choice;
+    $flag=1;
+  }
+  else {
+    print "Invalid input (must be at least two levels separated by .  - e.g., ustate.edu).\n";
+  }
+}
+
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
+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') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -516,7 +583,7 @@ my %perlvar;
     unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
        my $lonReceipt='';
        srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
-       my @alnum=(0..9,a..z);
+       my @alnum=(0..9,"a".."z");
        foreach my $i (1..20) {
 	 $lonReceipt.=$alnum[int(rand(36))];
        }
@@ -540,7 +607,7 @@ END
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 suse10.1'>/etc/apache2/</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>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
@@ -593,7 +660,7 @@ my ($securestatus,$securenum);
     unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
        my $lonReceipt='';
        srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
-       my @alnum=(0..9,a..z);
+       my @alnum=(0..9,"a".."z");
        foreach my $i (1..20) {
 	 $lonReceipt.=$alnum[int(rand(36))];
        }
@@ -612,85 +679,97 @@ my %perlvarstatic;
 	}
 	close(CONFIG);
     }
-    if (!$domainDescription && $lonCluster ne 'existing') {
-       open(IN,'&lt;../'.$lonCluster.'_domain.tab');
-       while(&lt;IN&gt;) {
-          if (/^$perlvar{'lonDefDomain'}\:/) {
-	     (undef,$domainDescription,$domainTabExtras)=split(/:/,$_,3);
-	     chomp($domainDescription);
-	     chomp($domainTabExtras);
-	     # the remianing field (primary lib server) is handled later
-	     $domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]);
-             last;
-          }
-       }
-       close(IN);
-    }
+
+    my (@hosts_files, @domain_files);
+    if ( $lonCluster ne 'existing') {
+	push(@domain_files,'../'.$lonCluster.'_domain.tab',
+	     '../'.$lonCluster.'_dns_domain.tab');
+	push(@hosts_files,'../'.$lonCluster.'_hosts.tab',
+	     '../'.$lonCluster.'_dns_hosts.tab');
+    }
+    push(@domain_files,'/home/httpd/lonTabs/domain.tab',
+         '/home/httpd/lonTabs/dns_domain.tab');
+    push(@hosts_files,'/home/httpd/lonTabs/hosts.tab',
+         '/home/httpd/lonTabs/dns_hosts.tab');
+
     if (!$domainDescription) {
-       open(IN,'&lt;/home/httpd/lonTabs/domain.tab');
-       while(&lt;IN&gt;) {
-          if (/^$perlvar{'lonDefDomain'}\:/) {
-	     (undef,$domainDescription,$domainTabExtras)=split(/:/,$_,3);
-	     chomp($domainDescription);
-	     chomp($domainTabExtras);
-	     # the remianing field (primary lib server) is handled later
-	     $domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]);
-             last;
-          }
-       }
-       close(IN);
+	foreach my $file (@domain_files) {
+	    open(IN,'&lt;'.$file);
+	    while(my $line = &lt;IN&gt;) {
+		if ($line =~ /^\Q$perlvar{'lonDefDomain'}\E\:/) {
+		    (undef,$domainDescription,$domainTabExtras)=split(/:/,$line,3);
+		    chomp($domainDescription);
+		    chomp($domainTabExtras);
+		    # the remaining field (primary lib server) is handled later
+		    $domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]);
+		    last;
+		}
+	    }
+	    close(IN);
+	    last if ($domainDescription);
+	}
     }
-    if (!$primaryLibServer and $lonCluster ne 'existing') {
-        open(IN,'&lt;../'.$lonCluster.'_domain.tab');
-        while(&lt;IN&gt;) {
-            if (/^$perlvar{'lonDefDomain'}\:/) {
-                (undef,undef,undef,undef,undef,undef,undef,undef,
-                                              $primaryLibServer)=split(/:/,$_);
-                chomp($primaryLibServer);
+
+    if (!$protocol) {
+        foreach my $file (@hosts_files) {
+            open(IN,'&lt;'.$file);
+            while(my $line = &lt;IN&gt;) {
+                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:[^:]+\:(https?)/) {
+                    $protocol = $1;
+                    chomp($protocol);
+                    last;
+                }
             }
         }
-        close(IN);
-        if (!$primaryLibServer) {
-            open(IN,'&lt;../'.$lonCluster.'_hosts.tab');
-            while(&lt;IN&gt;) {
-                if (/^([^\:]+)\:\Q$perlvar{'lonDefDomain'}\E\:library\:/) {
-                    push(@libservers,$1);
+    }
+
+    if (!$protocol) {
+        $protocol = 'http';
+    }
+
+    if (!$intdom) {
+        foreach my $file (@hosts_files) {
+            open(IN,'&lt;'.$file);
+            while(my $line = &lt;IN&gt;) {
+                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:[^:]+\:https?\:([^:]+)/) {
+                    $intdom = $1;
+                    chomp($intdom);
+                    last;
                 }
             }
-            close(IN);
-            if (@libservers == 1) {
-                $primaryLibServer = $libservers[0];
-            }
         }
     }
-    if (!$primaryLibServer) {
-        open(IN,'&lt;/home/httpd/lonTabs/domain.tab');
-        while(&lt;IN&gt;) {
-            if (/^$perlvar{'lonDefDomain'}\:/) {
-                (undef,undef,undef,undef,undef,undef,undef,undef,
-                                              $primaryLibServer)=split(/:/,$_);
+
+    while(!$primaryLibServer && (@hosts_files || @domain_files)) {
+	my $file = shift(@domain_files);
+        open(IN,'&lt;'.$file);
+        while(my $line = &lt;IN&gt;) {
+            if ($line =~ /^\Q$perlvar{'lonDefDomain'}\E\:/) {
+		$primaryLibServer=(split(/:/,$line))[8];
                 chomp($primaryLibServer);
             }
-            close(IN);
-        }
-        if (!$primaryLibServer) {
-            open(IN,'&lt;/home/httpd/lonTabs/hosts.tab');
-            while(&lt;IN&gt;) {
-                if (/^([^\:]+)\:\Q$perlvar{'lonDefDomain'}\E\:library\:/) {
-                    push(@libservers,$1);
-                }
-            }
-            close(IN);
-            if (@libservers == 1) {
-                $primaryLibServer = $libservers[0];
-            }
         }
+        close(IN);
+	last if ($primaryLibServer);
+	$file = shift(@hosts_files);
+	open(IN,'&lt;'.$file);
+	while(my $line = &lt;IN&gt;) {
+	    if ($line =~ /^([^\:]+)\:\Q$perlvar{'lonDefDomain'}\E\:library\:/) {
+		push(@libservers,$1);
+	    }
+	}
+	# make list unique
+	@libservers = keys(%{{ map { $_ => 1 } (@libservers) }});
+	close(IN);
+	if (@libservers == 1) {
+	    $primaryLibServer = $libservers[0];
+	}
     }
    
 # implement editing logic below, interactively
-# update loncapa.conf until 12 is entered
+# update loncapa.conf until 14 is entered
 
-$flag=0;
+my $flag=0;
 
 while (!$flag) {
   print(&lt;&lt;END);
@@ -703,66 +782,80 @@ This is now the current configuration of
  4) ID of primary library server for domain: $primaryLibServer
  5) Server Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
  6) Support E-mail Address: $perlvar{'lonSupportEMail'}
- 7) Role: $perlvar{'lonRole'}
- 8) Cache Expiration Time: $perlvar{'lonExpire'}
- 9) Server Load: $perlvar{'lonLoadLim'}
-10) User Load: $perlvar{'lonUserLoadLim'}
-11) Allow only secure connections: $securestatus 
-12) Everything is correct up above
+ 7) Web Server Protocol (http or https): $protocol 
+ 8) Internet Domain Name: $intdom 
+ 9) Role: $perlvar{'lonRole'}
+10) Cache Expiration Time: $perlvar{'lonExpire'}
+11) Server Load: $perlvar{'lonLoadLim'}
+12) User Load: $perlvar{'lonUserLoadLim'}
+13) Allow only secure connections: $securestatus 
+14) Everything is correct up above
 END
 
-my $error='';
+my @error;
 foreach my $v ($perlvar{'lonDefDomain'},$perlvar{'lonHostID'}) {
-   if (length($v)>35) { $error.="\nName $v too long"; }		
-   if (length($v)<2) { $error.="\nName $v too short"; }
+   if (length($v)>35) { push(@error,"Name $v too long"); }		
+   if (length($v)<2) { push(@error,"Name $v too short"); }
    if ($v=~/capa/i) {
 	if ($v!~/^oucapa\d+$/ && 
 	    ($v!~/^capa\d+$/ && $perlvar{'lonDefDomain'} eq 'uwsp')) {
-		 $error.="\nName $v contains 'capa'"; 
+		 push(@error,"Name $v contains 'capa'");
 	}
    }
    foreach my $bad ('res','raw','userfiles','priv','adm','uploaded',
 	'editupload') {
-      $error.="\nName $v reserved." if $v eq $bad;
+      push(@error,"\nName $v reserved.") if $v eq $bad;
    }
-   if ($v=~/[^\w\-.]/) { $error.="\nName $v contains special characters"; }
+   if ($v=~/[^\w\-.]/) { push(@error,"Name $v contains special characters"); }
 }
-if ($domainDescription!~/^[\(\)\-\w\s,]+$/) {
-   $error.="\nDomain Description contains special characters";
+if ($domainDescription =~ /^\s*$/) {
+   push(@error,"Domain Description is blank.");
+} elsif ($domainDescription!~/^[\(\)\-\w\s,]+$/) {
+   push(@error,"Domain Description contains special characters.");
 } 
 foreach my $v ($perlvar{'lonExpire'},$perlvar{'lonLoadLim'}) {
-   unless ($v=~/^[\d+\.]+$/) { $error.="\nNumber expected instead of $v"; }
+   unless ($v=~/^[\d+\.]+$/) { push(@error,"Number expected instead of $v"); }
 }
 unless (($perlvar{'lonRole'} eq 'library') || ($perlvar{'lonRole'} eq 'access')) {
-   $error.="\nInvalid Role";
+   push(@error,"Invalid Role");
+}
+
+unless (($protocol eq 'http') || ($protocol eq 'https')) {
+   push(@error,"Invalid Protocol (must be http or https");
+}
+
+if (!defined($intdom)) { 
+   push(@error,"No internet domain name designated. Enter something like ustate.edu"); 
+} elsif ($intdom !~ /[^.]+\.\w{2,6}$/) {
+   push(@error,"Invalid Internet domain name (must be at least two levels separated by .  - e.g., ustate.edu");
 }
 
 if (!defined($primaryLibServer)) {
    if (@libservers > 0) {
-       $error .= "No primary library server ID designated. Choose from: ".join(',',sort(@libservers));
+       push(@error,"No primary library server ID designated. Choose from: ".join(',',sort(@libservers)));
    } else {
-       $error .= "No library servers in this domain (including current server)";
+       push(@error,"No library servers in this domain (including current server)");
    }
 } else {
-   if (length($primaryLibServer)>35) { $error.="\nPrimary Library Server ID:  $primaryLibServer too long"; }
-   if (length($primaryLibServer)<2) { $error.="\nPrimary Library Server ID:  $primaryLibServer too short"; }
+   if (length($primaryLibServer)>35) { push(@error,"Primary Library Server ID:  $primaryLibServer too long"); }
+   if (length($primaryLibServer)<2) { push(@error,"Primary Library Server ID:  $primaryLibServer too short"); }
    if ($primaryLibServer =~/capa/i) {
         if ($primaryLibServer!~/^oucapa\d+$/ &&
             ($primaryLibServer!~/^capa\d+$/ && $perlvar{'lonDefDomain'} eq 'uwsp')) {
-                 $error.="\nPrimary library server ID $primaryLibServer contains 'capa'";
+                 push(@error,"Primary library server ID $primaryLibServer contains 'capa'")
         }
    }
    foreach my $bad ('res','raw','userfiles','priv','adm','uploaded',
         'editupload') {
-      $error.="\nPrimary library server ID $primaryLibServer reserved." if $primaryLibServer eq $bad;
+      push(@error,"Primary library server ID $primaryLibServer reserved.") if $primaryLibServer eq $bad;
    }
-   if ($primaryLibServer=~/[^\w\-.]/) { $error.="\nPrimary library server ID $primaryLibServer contains special characters"; }
+   if ($primaryLibServer=~/[^\w\-.]/) { push(@error,"Primary library server ID $primaryLibServer contains special characters"); }
 }
 
 
-if ($error) { print "\n*** ERRORS: $error\n"; }
+if (@error) { print "\n*** ERRORS: \n\t".join("\n\t",@error)."\n"; }
   print(&lt;&lt;END);
-ENTER A CHOICE OF 1-11 TO CHANGE, otherwise ENTER 12:
+ENTER A CHOICE OF 1-13 TO CHANGE, otherwise ENTER 14:
 END
 my $choice=&lt;&gt;;
 chomp($choice);
@@ -834,7 +927,27 @@ END
   }
   elsif ($choice==7) {
   print(&lt;&lt;END);
-7) Role: $perlvar{'lonRole'}
+7) Server Protocol (http or https): 
+ENTER NEW VALUE: (this should be either 'http' or 'https'
+                 if in doubt set to 'http'):
+END
+    my $choice2=&lt;&gt;;
+    chomp($choice2);
+    $protocol=$choice2;
+  }
+  elsif ($choice==8) {
+  print(&lt;&lt;END);
+8) Internet Domain Name of Institution
+ENTER NEW VALUE: 
+
+END
+    my $choice2=&lt;&gt;;
+    chomp($choice2);
+    $intdom=$choice2;
+  }
+  elsif ($choice==9) {
+  print(&lt;&lt;END);
+9) Role: $perlvar{'lonRole'}
 ENTER NEW VALUE (this should be either 'access' or 'library' 
                  if in doubt select 'library'):
 END
@@ -842,27 +955,27 @@ END
     chomp($choice2);
     $perlvar{'lonRole'}=$choice2;
   }
-  elsif ($choice==8) {
+  elsif ($choice==10) {
   print(&lt;&lt;END);
-8) Cache Expiration Time: $perlvar{'lonExpire'}
+10) Cache Expiration Time: $perlvar{'lonExpire'}
 ENTER NEW VALUE (in seconds, 86400 is a reasonable value):
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
     $perlvar{'lonExpire'}=$choice2;
   }
-  elsif ($choice==9) {
+  elsif ($choice==11) {
   print(&lt;&lt;END);
-9) Server Load: $perlvar{'lonLoadLim'}
+11) Server Load: $perlvar{'lonLoadLim'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
     $perlvar{'lonLoadLim'}=$choice2;
   }
-  elsif ($choice==10) {
+  elsif ($choice==12) {
   print(&lt;&lt;END);
-10) User Load: $perlvar{'lonUserLoadLim'}
+12) User Load: $perlvar{'lonUserLoadLim'}
 Numer of users that can login before machine is 'overloaded'
 ENTER NEW VALUE (integer value, 0 means there is no limit):
 END
@@ -870,9 +983,9 @@ END
     chomp($choice2);
     $perlvar{'lonUserLoadLim'}=$choice2;
   }
-  elsif ($choice==11) {
+  elsif ($choice==13) {
   print(&lt;&lt;END);
-11) Allow only secure connections: $securestatus 
+13) Allow only secure connections: $securestatus 
 The Lon-CAPA communication daemons lonc and lond can be configured to
 allow only secure connections by default.
 
@@ -884,7 +997,7 @@ POSSIBLE CHOICES:
 3) allow insecure connections to this machine but only allow connections
     to machines that support secure connections
 4) allow insecure connections
-ENTER NEW VALUE (currenly $securenum):
+ENTER NEW VALUE (currently $securenum):
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
@@ -899,7 +1012,7 @@ END
     }
     ($securestatus,$securenum)=&securesetting(%perlvar);
   }
-  elsif (($choice==12) && (!$error)) {
+  elsif (($choice==14) && (!@error)) {
     $flag=1;
   }
   else {
@@ -926,33 +1039,47 @@ END
 <perlscript mode='fg'>
 unless (-l "<TARGET />") {
   my $hostname=`hostname -f`;chomp($hostname);
-  $date=`date -I`; chomp($date);
-  $lonHostID=$perlvar{'lonHostID'};
+  my $date=`date -I`; chomp($date);
+  my $lonHostID=$perlvar{'lonHostID'};
   $lonHostID=~s/[^\w\-.]//g;
-  $lineexistflag=0;
-  $hostidexistflag=0;
-  $line2insert=&lt;&lt;END;
-$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname
+  my $lineexistflag=0;
+  my $hostidexistflag=0;
+  my $line2insert=&lt;&lt;END;
+$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$protocol:$intdom
 END
-  $domaininsert="$perlvar{'lonDefDomain'}:$domainDescription:$domainTabExtras:$primaryLibServer\n";
+  if (!$domainTabExtras) {
+	$domainTabExtras=':::::';
+  }
+  my $domaininsert="$perlvar{'lonDefDomain'}:$domainDescription:$domainTabExtras:$primaryLibServer\n";
   if ($lonCluster eq 'standalone') {
     open(OUT,'&gt;../'.$lonCluster.'_hosts.tab') or
       die('file generation error');
       print(OUT $line2insert);
+      print OUT ("^$hostname:$protocol\n");
+    close(OUT);
+    open(OUT,'&gt;../'.$lonCluster.'_dns_hosts.tab') or
+      die('file generation error');
+      print(OUT $line2insert);
     close(OUT);
     open(OUT,'&gt;../'.$lonCluster.'_domain.tab') or
       die('file generation error');
       print(OUT $domaininsert);
     close(OUT);
+    open(OUT,'&gt;../'.$lonCluster.'_dns_domain.tab') or
+      die('file generation error');
+      print(OUT $domaininsert);
+    close(OUT);
   }
   if ($flag==1) {
     `rm -f ../hosts.tab`;
-    open(IN,'&lt;../'.$lonCluster.'_hosts.tab');
-    while(&lt;IN&gt;) {
-      if (/^$line2insert$/) {
+    `rm -f ../dns_hosts.tab`;
+    `ln -s ${lonCluster}_dns_hosts.tab ../dns_hosts.tab`;
+    open(IN,'&lt;../'.$lonCluster.'_dns_hosts.tab');
+    while(my $line = &lt;IN&gt;) {
+      if ($line =~ /^\Q$line2insert\E$/) {
         $lineexistflag=1;
       }
-      if (/^$lonHostID\:/) {
+      if ($line =~ /^\Q$lonHostID\E\:/) {
         $hostidexistflag=1;
       }
     }
@@ -960,9 +1087,9 @@ END
     if ($hostidexistflag and !$lineexistflag) {
       print &lt;&lt;END;
 WARNING: $lonHostID already exists inside
-loncapa/loncom/${lonCluster}_hosts.tab.  The entry inside
-${lonCluster}_hosts.tab does not match your settings.
-The entry inside ${lonCluster}_hosts.tab is being replaced
+loncapa/loncom/${lonCluster}_dns_hosts.tab.  The entry inside
+${lonCluster}_dns_hosts.tab does not match your settings.
+An entry inside ${lonCluster}_hosts.tab will be made
 with your new values.
 END
       `grep -v "$lonHostID:" ../${lonCluster}_hosts.tab &gt; ../new_${lonCluster}_hosts.tab`;
@@ -972,15 +1099,20 @@ END
        close(OUT);
       `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
       # email appropriate message
-      `echo "REPLACE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "REPLACE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
+      `echo "REPLACE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "REPLACE:$lonCluster:$lonHostID:$protocol:$intdom:$date" installrecord\@mail.lon-capa.org`;
     }
     elsif ($hostidexistflag and $lineexistflag) {
       print &lt;&lt;END;
-Entry exists in ${lonCluster}_hosts.tab.
+Entry exists in ${lonCluster}_dns_hosts.tab. Making duplicate entry in ${lonCluster}_hosts.tab
 END
-      `ln -s ${lonCluster}_hosts.tab ../hosts.tab`;
+      `grep -v "$lonHostID:" ../${lonCluster}_hosts.tab &gt; ../new_${lonCluster}_hosts.tab`;
+       open(OUT,'&gt;&gt;../new_'.$lonCluster.'_hosts.tab') or
+         die("cannot open loncom/${lonCluster}_hosts.tab for output\n");
+         print(OUT $line2insert);
+       close(OUT);
+      `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
       # email appropriate message
-      `echo "STABLEUPDATE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "STABLEUPDATE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
+      `echo "STABLEUPDATE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "STABLEUPDATE:$lonCluster:$lonHostID:$protocol:$intdom:$date" installrecord\@mail.lon-capa.org`;
     }
     elsif (!$hostidexistflag and !$lineexistflag) {
       print &lt;&lt;END;
@@ -993,18 +1125,21 @@ END
        close(OUT);
       `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
       # email appropriate message
-      `echo "INSERT:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "INSERT:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
+      `echo "INSERT:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "INSERT:$lonCluster:$lonHostID:$protocol:$intdom:$date" installrecord\@mail.lon-capa.org`;
     }
   }
   $lineexistflag=0;
+  my $domainexistflag=0;
   if ($flag==1) {
     `rm -f ../domain.tab`;
-    open(IN,'&lt;../'.$lonCluster.'_domain.tab');
-    while(&lt;IN&gt;) {
-      if (/^$domaininsert$/) {
+    `rm -f ../dns_domain.tab`;
+    `ln -s ${lonCluster}_dns_domain.tab ../dns_domain.tab`;
+    open(IN,'&lt;../'.$lonCluster.'_dns_domain.tab');
+    while(my $line = &lt;IN&gt;) {
+      if ($line =~/^\Q$domaininsert\E$/) {
         $lineexistflag=1;
       }
-      if (/^$perlvar{'lonDefDomain'}\:/) {
+      if ($line =~/^\Q$perlvar{'lonDefDomain'}\E\:/) {
         $domainexistflag=1;
       }
     }
@@ -1012,9 +1147,9 @@ END
     if ($domainexistflag and !$lineexistflag) {
       print &lt;&lt;END;
 WARNING: $perlvar{'lonDefDomain'} already exists inside
-loncapa/loncom/${lonCluster}_domain.tab.  The entry inside
-${lonCluster}_domain.tab does not match your settings.
-The entry inside ${lonCluster}_domain.tab is being replaced
+loncapa/loncom/${lonCluster}_dns_domain.tab.  The entry inside
+${lonCluster}_dns_domain.tab does not match your settings.
+An entry will be made in inside ${lonCluster}_domain.tab
 with your new values.
 END
       `grep -v "$perlvar{'lonDefDomain'}:" ../${lonCluster}_domain.tab &gt; ../new_${lonCluster}_domain.tab`;
@@ -1024,13 +1159,18 @@ END
        close(OUT);
       `ln -s new_${lonCluster}_domain.tab ../domain.tab`;
       # email appropriate message
-      `echo "REPLACEdom:$lonCluster:$lonHostID:$date:$domaninsert" | mail -s "REPLACEdom:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
+      `echo "REPLACEdom:$lonCluster:$lonHostID:$date:$domaininsert" | mail -s "REPLACEdom:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
     }
     elsif ($domainexistflag and $lineexistflag) {
+      `grep -v "$perlvar{'lonDefDomain'}:" ../${lonCluster}_domain.tab &gt; ../new_${lonCluster}_domain.tab`;
+       open(OUT,'&gt;&gt;../new_'.$lonCluster.'_domain.tab') or
+         die("cannot open loncom/${lonCluster}_domain.tab for output\n");
+         print(OUT $domaininsert);
+       close(OUT);
       print &lt;&lt;END;
-Entry exists in ${lonCluster}_domain.tab.
+Entry exists in ${lonCluster}_dns_domain.tab. Making duplicate entry in ${lonCluster}_domain.tab
 END
-      `ln -s ${lonCluster}_domain.tab ../domain.tab`;
+      `ln -s new_${lonCluster}_domain.tab ../domain.tab`;
       # email appropriate message
       `echo "STABLEUPDATEdom:$lonCluster:$lonHostID:$date:$domaininsert" | mail -s "STABLEUPDATEdom:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
     }