--- doc/loncapafiles/updatequery.piml	2011/11/06 00:41:53	1.72
+++ doc/loncapafiles/updatequery.piml	2019/02/08 08:40:09	1.84.2.2
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.72 2011/11/06 00:41:53 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.84.2.2 2019/02/08 08:40:09 raeburn Exp $ -->
 
 <!--
 
@@ -33,6 +33,8 @@ http://www.lon-capa.org/
 <target dist='default'>/</target>
 <perlscript mode='fg'>
 $|=1;
+use strict;
+
   print(&lt;&lt;END);
 
 
@@ -53,20 +55,21 @@ END
 <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 +84,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;;
@@ -126,23 +129,25 @@ my $domainTabExtras;
 my $primaryLibServer;
 my $protocol;
 my $intdom;
+my $desiredhostname;
 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 7 values are needed to configure LON-CAPA:
+The following 8 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
+* Hostname
 ===============================================================================
 
 In addition, a Support E-mail Address can also be included. If
@@ -160,8 +165,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.
@@ -206,13 +211,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?)
@@ -220,10 +225,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
@@ -278,7 +285,6 @@ END
   }
 }
 
-
 # get domain description
 # accept if valid, if not valid, tell user and repeat
 $flag=0;
@@ -380,8 +386,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);
@@ -522,7 +528,7 @@ while (!$flag) {
 
 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 my.hostingcompany.com, i.e., the part of
+topcollege.ac.uk or myhostingcompany.com, i.e., the part of
 a server hostname which indicates to which organization the 
 server belongs.
 
@@ -543,10 +549,58 @@ END
   }
 }
 
+# get hostname
+# accept if valid, if not valid, tell user and repeat
+$flag=0;
+my $posshostname;
+if (($hostname =~ /^[A-Za-z0-9\-]+$/) && ($intdom ne '')) {
+    $posshostname = $hostname.'.'.$intdom;
+} 
+if (($hostname =~ /^[A-Za-z0-9\-]+\.[A-Za-z0-9\-]+/) &&
+    ($hostname =~ /^[A-Za-z0-9.\-]+$/)) {
+    $posshostname = $hostname;
+}
+while (!$flag) {
+  print(&lt;&lt;END);
+
+****** Hostname of the server/VM *****
+
+The hostname of the server/VM is required. This will be similar to:
+somename.ustate.edu or somename.department.ustate.edu, and would be 
+the web address which users would point their web browsers at to
+access the server.
+
+END
+
+if ($posshostname) {
+    print "ENTER HOSTNAME OF SERVER [$posshostname]:\n";
+} else {
+    print "ENTER HOSTNAME OF SERVER:\n";
+}
+
+  my $choice=&lt;&gt;;
+  chomp($choice);
+  if (($choice =~ /^[A-Za-z0-9\-]+\.[A-Za-z0-9\-]+/) &&
+      ($choice =~ /^[A-Za-z0-9.\-]+$/)) {
+    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+    print(OUT 'hostname'."\t".$choice."\n");
+    close(OUT);
+    $desiredhostname=$choice;
+    $flag=1;
+  } elsif (($choice eq '') && ($posshostname ne '')) {
+    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+    print(OUT 'hostname'."\t$posshostname\n");
+    close(OUT);
+    $desiredhostname = $posshostname;
+    $flag = 1;
+  } else {
+    print "Invalid input (only letters, numbers, - and . allowed, with at least one .).\n";
+  }
+}
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<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 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+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') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -579,7 +633,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))];
        }
@@ -603,7 +657,7 @@ END
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/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 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
@@ -656,7 +710,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))];
        }
@@ -706,13 +760,18 @@ my %perlvarstatic;
 	}
     }
 
-    if (!$protocol) {
+    if ((!$protocol) || (!$desiredhostname)) {
         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);
+                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:([^:]+)\:(https?)/) {
+                    if (!$desiredhostname) {
+                        $desiredhostname = $1;
+                    }
+                    if (!$protocol) { 
+                        $protocol = $2;
+                        chomp($protocol);
+                    }
                     last;
                 }
             }
@@ -736,7 +795,7 @@ my %perlvarstatic;
         }
     }
 
-    while(!$primaryLibServ && (@hosts_file || @domain_files)) {
+    while(!$primaryLibServer && (@hosts_files || @domain_files)) {
 	my $file = shift(@domain_files);
         open(IN,'&lt;'.$file);
         while(my $line = &lt;IN&gt;) {
@@ -763,9 +822,9 @@ my %perlvarstatic;
     }
    
 # implement editing logic below, interactively
-# update loncapa.conf until 14 is entered
+# update loncapa.conf until 15 is entered
 
-$flag=0;
+my $flag=0;
 
 while (!$flag) {
   print(&lt;&lt;END);
@@ -780,18 +839,19 @@ This is now the current configuration of
  6) Support E-mail Address: $perlvar{'lonSupportEMail'}
  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
+ 9) Hostname: $desiredhostname
+10) Role: $perlvar{'lonRole'}
+11) Cache Expiration Time: $perlvar{'lonExpire'}
+12) Server Load: $perlvar{'lonLoadLim'}
+13) User Load: $perlvar{'lonUserLoadLim'}
+14) Allow only secure connections: $securestatus 
+15) Everything is correct up above
 END
 
 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')) {
@@ -851,7 +911,7 @@ if (!defined($primaryLibServer)) {
 
 if (@error) { print "\n*** ERRORS: \n\t".join("\n\t",@error)."\n"; }
   print(&lt;&lt;END);
-ENTER A CHOICE OF 1-13 TO CHANGE, otherwise ENTER 14:
+ENTER A CHOICE OF 1-14 TO CHANGE, otherwise ENTER 15:
 END
 my $choice=&lt;&gt;;
 chomp($choice);
@@ -943,7 +1003,18 @@ END
   }
   elsif ($choice==9) {
   print(&lt;&lt;END);
-9) Role: $perlvar{'lonRole'}
+9) Hostname of Server/VM
+ENTER NEW VALUE:
+
+END
+    my $choice2=&lt;&gt;;
+    chomp($choice2);
+    $desiredhostname=$choice2;
+  }
+
+  elsif ($choice==10) {
+  print(&lt;&lt;END);
+10) Role: $perlvar{'lonRole'}
 ENTER NEW VALUE (this should be either 'access' or 'library' 
                  if in doubt select 'library'):
 END
@@ -951,27 +1022,27 @@ END
     chomp($choice2);
     $perlvar{'lonRole'}=$choice2;
   }
-  elsif ($choice==10) {
+  elsif ($choice==11) {
   print(&lt;&lt;END);
-10) Cache Expiration Time: $perlvar{'lonExpire'}
+11) 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==11) {
+  elsif ($choice==12) {
   print(&lt;&lt;END);
-11) Server Load: $perlvar{'lonLoadLim'}
+12) Server Load: $perlvar{'lonLoadLim'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
     $perlvar{'lonLoadLim'}=$choice2;
   }
-  elsif ($choice==12) {
+  elsif ($choice==13) {
   print(&lt;&lt;END);
-12) User Load: $perlvar{'lonUserLoadLim'}
+13) 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
@@ -979,9 +1050,9 @@ END
     chomp($choice2);
     $perlvar{'lonUserLoadLim'}=$choice2;
   }
-  elsif ($choice==13) {
+  elsif ($choice==14) {
   print(&lt;&lt;END);
-13) Allow only secure connections: $securestatus 
+14) Allow only secure connections: $securestatus 
 The Lon-CAPA communication daemons lonc and lond can be configured to
 allow only secure connections by default.
 
@@ -993,7 +1064,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);
@@ -1008,13 +1079,14 @@ END
     }
     ($securestatus,$securenum)=&securesetting(%perlvar);
   }
-  elsif (($choice==14) && (!$error)) {
+  elsif (($choice==15) && (!@error)) {
     $flag=1;
   }
   else {
     print "Invalid input.\n";
   }
 }
+
     open(OUT,"&gt;$confdir$filename") or
       die("Cannot output to $confdir$filename\n");
     foreach my $key (keys %perlvar) {
@@ -1034,24 +1106,27 @@ END
 <target dist='default'>loncom/hosts.tab</target>
 <perlscript mode='fg'>
 unless (-l "<TARGET />") {
-  my $hostname=`hostname -f`;chomp($hostname);
-  $date=`date -I`; chomp($date);
-  $lonHostID=$perlvar{'lonHostID'};
+  if ($desiredhostname eq '') { 
+      my $hostname=`hostname -f`;chomp($hostname);
+      $desiredhostname = $hostname;
+  }
+  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:$protocol:$intdom
+  my $lineexistflag=0;
+  my $hostidexistflag=0;
+  my $line2insert=&lt;&lt;END;
+$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$desiredhostname:$protocol:$intdom
 END
   if (!$domainTabExtras) {
 	$domainTabExtras=':::::';
   }
-  $domaininsert="$perlvar{'lonDefDomain'}:$domainDescription:$domainTabExtras:$primaryLibServer\n";
+  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");
+      print OUT ("^$desiredhostname:$protocol\n");
     close(OUT);
     open(OUT,'&gt;../'.$lonCluster.'_dns_hosts.tab') or
       die('file generation error');
@@ -1125,6 +1200,7 @@ END
     }
   }
   $lineexistflag=0;
+  my $domainexistflag=0;
   if ($flag==1) {
     `rm -f ../domain.tab`;
     `rm -f ../dns_domain.tab`;
@@ -1154,7 +1230,7 @@ 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`;