--- doc/loncapafiles/updatequery.piml	2007/05/22 22:49:27	1.57
+++ doc/loncapafiles/updatequery.piml	2015/01/01 00:24:17	1.79
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.57 2007/05/22 22:49:27 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.79 2015/01/01 00:24:17 raeburn Exp $ -->
 
 <!--
 
@@ -124,6 +124,8 @@ $|=1;
 my $domainDescription;
 my $domainTabExtras;
 my $primaryLibServer;
+my $protocol;
+my $intdom;
 my @libservers = ();
 unless (-e "<TARGET />") {
   print(&lt;&lt;END);
@@ -133,11 +135,14 @@ If you have questions, please visit http
 or contact helpdesk\@lon-capa.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 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
@@ -366,6 +371,8 @@ if ($lonRole eq 'library') {
         $primaryLibServer = $libservers[0];
     }
 }
+
+$flag=0;
 while (!$flag) {
   print(&lt;&lt;END);
 **** Domain's Primary Library Server ID ****
@@ -474,10 +481,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 my.hostingcompany.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' || '<DIST />' eq 'suse10.2') {
+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 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -534,7 +603,7 @@ END
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 suse10.1 suse10.2'>/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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
@@ -627,7 +696,7 @@ my %perlvarstatic;
 		    (undef,$domainDescription,$domainTabExtras)=split(/:/,$line,3);
 		    chomp($domainDescription);
 		    chomp($domainTabExtras);
-		    # the remianing field (primary lib server) is handled later
+		    # the remaining field (primary lib server) is handled later
 		    $domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]);
 		    last;
 		}
@@ -637,6 +706,36 @@ my %perlvarstatic;
 	}
     }
 
+    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;
+                }
+            }
+        }
+    }
+
+    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;
+                }
+            }
+        }
+    }
+
     while(!$primaryLibServ && (@hosts_file || @domain_files)) {
 	my $file = shift(@domain_files);
         open(IN,'&lt;'.$file);
@@ -655,6 +754,8 @@ my %perlvarstatic;
 		push(@libservers,$1);
 	    }
 	}
+	# make list unique
+	@libservers = keys(%{{ map { $_ => 1 } (@libservers) }});
 	close(IN);
 	if (@libservers == 1) {
 	    $primaryLibServer = $libservers[0];
@@ -662,7 +763,7 @@ my %perlvarstatic;
     }
    
 # implement editing logic below, interactively
-# update loncapa.conf until 12 is entered
+# update loncapa.conf until 14 is entered
 
 $flag=0;
 
@@ -677,12 +778,14 @@ 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;
@@ -713,6 +816,16 @@ unless (($perlvar{'lonRole'} eq 'library
    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) {
        push(@error,"No primary library server ID designated. Choose from: ".join(',',sort(@libservers)));
@@ -738,7 +851,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-11 TO CHANGE, otherwise ENTER 12:
+ENTER A CHOICE OF 1-13 TO CHANGE, otherwise ENTER 14:
 END
 my $choice=&lt;&gt;;
 chomp($choice);
@@ -810,7 +923,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
@@ -818,27 +951,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
@@ -846,9 +979,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.
 
@@ -875,7 +1008,7 @@ END
     }
     ($securestatus,$securenum)=&securesetting(%perlvar);
   }
-  elsif (($choice==12) && (!$error)) {
+  elsif (($choice==14) && (!$error)) {
     $flag=1;
   }
   else {
@@ -908,7 +1041,7 @@ unless (-l "<TARGET />") {
   $lineexistflag=0;
   $hostidexistflag=0;
   $line2insert=&lt;&lt;END;
-$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname
+$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$protocol:$intdom
 END
   if (!$domainTabExtras) {
 	$domainTabExtras=':::::';
@@ -918,7 +1051,7 @@ END
     open(OUT,'&gt;../'.$lonCluster.'_hosts.tab') or
       die('file generation error');
       print(OUT $line2insert);
-      print OUT ("^$hostname\n");
+      print OUT ("^$hostname:$protocol\n");
     close(OUT);
     open(OUT,'&gt;../'.$lonCluster.'_dns_hosts.tab') or
       die('file generation error');
@@ -962,7 +1095,7 @@ 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;
@@ -975,7 +1108,7 @@ END
        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;
@@ -988,7 +1121,7 @@ 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;