--- doc/loncapafiles/updatequery.piml	2010/12/31 17:58:57	1.66
+++ doc/loncapafiles/updatequery.piml	2011/03/28 13:58:56	1.70
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.66 2010/12/31 17:58:57 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.70 2011/03/28 13:58:56 raeburn Exp $ -->
 
 <!--
 
@@ -135,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
@@ -368,6 +371,8 @@ if ($lonRole eq 'library') {
         $primaryLibServer = $libservers[0];
     }
 }
+
+$flag=0;
 while (!$flag) {
   print(&lt;&lt;END);
 **** Domain's Primary Library Server ID ****
@@ -476,13 +481,16 @@ 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:
+ENTER WEB SERVER PROTOCOL [http]:
 END
 
   my $choice=&lt;&gt;;
@@ -493,12 +501,20 @@ END
     close(OUT);
     $protocol=$choice;
     $flag=1;
-  }
-  else {
+  } 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);
 
@@ -517,7 +533,7 @@ END
   chomp($choice);
   if ($choice =~/[^.]+\.[^.]+/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-    print(OUT 'internet domain'."\t".$intdom."\n");
+    print(OUT 'internet domain'."\t".$choice."\n");
     close(OUT);
     $intdom=$choice;
     $flag=1;
@@ -530,7 +546,7 @@ END
 
 # 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 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+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 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -587,7 +603,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 debian5 ubuntu6 ubuntu8'>/etc/apache2/</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;