--- doc/loncapafiles/updatequery.piml	2002/06/06 15:36:41	1.13
+++ doc/loncapafiles/updatequery.piml	2002/12/09 21:10:44	1.22
@@ -1,7 +1,7 @@
 <!-- updatequery.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: updatequery.piml,v 1.13 2002/06/06 15:36:41 harris41 Exp $ -->
+<!-- $Id: updatequery.piml,v 1.22 2002/12/09 21:10:44 albertel Exp $ -->
 
 <!--
 
@@ -52,9 +52,74 @@ sleep(3);
 </perlscript>
 </file>
 <file>
+<target dist='default'>loncom/hosts.tab</target>
+<perlscript mode='fg'>
+unless (-l "<TARGET />") {
+  print(&lt;&lt;END);
+
+===============================================================================
+What hosts.tab would you like to have installed?
+(hosts.tab is a listing of all other internet machines
+that a server system considers to be valid server systems
+on the LON-CAPA network)
+
+1) PRODUCTION - you want to deliver courses today or sometime very soon
+                on this machine
+2) STAND-ALONE - you want this machine to run in 'stand-alone' mode and
+                 not be connected to other LON-CAPA machines for now
+3) DEVELOPMENT - you want to play with or explore LON-CAPA
+4) PRESERVE the existing hosts.tab (/home/httpd/lonTabs/hosts.tab)
+
+END
+# Option number 26 will install rawhide_hosts.tab, but
+# the typical user does not want to be part of an intensive
+# machine test cluster.
+
+# get input
+# if valid then process, otherwise loop
+$flag=0;
+while (!$flag) {
+  print "ENTER 1, 2, 3, or 4:\n";
+  my $choice=&lt;&gt;;
+  chomp($choice);
+  if ($choice==1) {
+    $lonCluster='production'; $flag=1;
+  }
+  elsif ($choice==2) {
+	die("FIXME Broken!!!");
+    $lonCluster='standalone'; $flag=1;
+    open(OUT,'&gt;../'.$lonCluster.'_hosts.tab') or
+      die('file generation error');
+      print(OUT $line2insert);
+    close(OUT);
+  }
+  elsif ($choice==3) {
+    $lonCluster='development'; $flag=1;
+  }
+  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('');
+    }
+  }
+  elsif ($choice==26) {
+    $lonCluster='rawhide'; $flag=1;
+  }
+}
+}
+</perlscript>
+</file>
+<file>
 <target dist='default'>/home/httpd/lonTabs/hosts.tab</target>
 <perlscript mode='fg'>
 $|=1;
+my $domainDescription;
 unless (-e "<TARGET />") {
   print(&lt;&lt;END);
            WELCOME TO LON-CAPA!
@@ -145,6 +210,11 @@ END
 }
   my $choice=&lt;&gt;;
   chomp($choice);
+  my $bad_domain_flag=0;
+  my @bad_domain_names=('raw','userfiles','priv','adm','uploaded');
+  foreach my $bad (@bad_domain_names) {
+    $bad_domain_flag=1 if $choice eq $bad;
+  }
   if ($ipdomain and $choice=~/^\s*$/) {
     $choice=$ipdomain;
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
@@ -161,11 +231,43 @@ END
     $r='l';
     $flag=1;
   }
+  elsif ($bad_domain_flag) {
+    print "Invalid input ('$choice' conflicts with LON-CAPA namespace).\n";
+    print "Please try something different than '$choice'\n";
+  }
   else {
     print "Invalid input (only alphanumeric characters supported).\n";
   }
 }
 
+
+# get domain description
+# accept if valid, if not valid, tell user and repeat
+$flag=0;
+
+while (!$flag) {
+  print(&lt;&lt;END);
+
+**** Domain Description ****
+String describing the domain, to be shown to users.
+[Example, msu is Michigan State University]
+ENTER DOMAIN DESCRIPTION:
+END
+
+  my $choice=&lt;&gt;;
+  chomp($choice);
+  if ($choice!~/:/) {
+    open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
+    print(OUT 'domainDescription'."\t".$choice."\n");
+    close(OUT);
+    $domainDescription=$choice;
+    $flag=1;
+  }
+  else {
+    print "Invalid input (no ':' allowed).\n";
+  }
+}
+
 my $lonHostID;
 if ($lonDefDomain) {
   $lonHostID=$lonDefDomain.$r.int(1+rand(9)); # should be probably also detect
@@ -264,16 +366,13 @@ my %perlvar;
     $perlvar{'lonDefDomain'}=$lonDefDomain;
     $perlvar{'lonAdmEMail'}=$lonAdmEMail;
     $perlvar{'lonRole'}=$lonRole;
-    unless ($perlvar{'lonSqlAccess'}) {
-       $perlvar{'lonSqlAccess'}='localhostkey';
-    }
-    unless ($perlvar{'lonLoadLim'}) {
+    unless ($perlvar{'lonLoadLim'} and $perlvar{'lonLoadLim'}!~/\{\[\[\[\[/) {
        $perlvar{'lonLoadLim'}='2.00';
     }
-    unless ($perlvar{'lonExpire'}) {
+    unless ($perlvar{'lonExpire'} and $perlvar{'lonExpire'}!~/\{\[\[\[\[/) {
        $perlvar{'lonExpire'}='86400';
     }
-    unless ($perlvar{'lonReceipt'}) {
+    unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
        my $lonReceipt='';
        srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
        my @alnum=(0..9,a..z);
@@ -299,7 +398,6 @@ END
 <perlscript mode='fg'>
 # read values from loncapa.conf
 my $confdir='/etc/httpd/conf/';
-#my $confdir='';
 my $filename='loncapa.conf';
 my %perlvar;
     if (-e "$confdir$filename") {
@@ -314,6 +412,21 @@ my %perlvar;
 	}
 	close(CONFIG);
     }
+    unless ($perlvar{'lonLoadLim'} and $perlvar{'lonLoadLim'}!~/\{\[\[\[\[/) {
+       $perlvar{'lonLoadLim'}='2.00';
+    }
+    unless ($perlvar{'lonExpire'} and $perlvar{'lonExpire'}!~/\{\[\[\[\[/) {
+       $perlvar{'lonExpire'}='86400';
+    }
+    unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
+       my $lonReceipt='';
+       srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
+       my @alnum=(0..9,a..z);
+       foreach my $i (1..20) {
+	 $lonReceipt.=$alnum[int(rand(36))];
+       }
+       $perlvar{'lonReceipt'}=$lonReceipt;
+    }
 my %perlvarstatic;
     if (-e "${confdir}loncapa_apache.conf") {
 	open(CONFIG,'&lt;'.$confdir.'loncapa_apache.conf') or 
@@ -327,32 +440,72 @@ my %perlvarstatic;
 	}
 	close(CONFIG);
     }
+    unless ($domainDescription) {
+       open(IN,'&lt;../'.$lonCluster.'_hosts.tab');
+       while(&lt;IN&gt;) {
+          if (/^$perlvar{'lonHostID'}\:/) {
+	     (undef,undef,undef,undef,undef,$domainDescription)=split(/:/,$_);
+	     chomp($domainDescription);
+             last;
+          }
+       }
+       close(IN);	
+    }
 # implement editing logic below, interactively
-# update loncapa.conf until 7 is entered
+# update loncapa.conf until 8 is entered
 
 $flag=0;
+
 while (!$flag) {
   print(&lt;&lt;END);
 
 ===============================================================================
 This is now the current configuration of your machine.
 1) Domain Name: $perlvar{'lonDefDomain'}
-2) Machine Name: $perlvar{'lonHostID'}
-3) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
-4) Role: $perlvar{'lonRole'}
-5) Cache Expiration Time: $perlvar{'lonExpire'}
-6) Server Load: $perlvar{'lonLoadLim'}
-7) Everything is correct up above
-END
+2) Domain Description: $domainDescription
+3) Machine Name: $perlvar{'lonHostID'}
+4) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
+5) Role: $perlvar{'lonRole'}
+6) Cache Expiration Time: $perlvar{'lonExpire'}
+7) Server Load: $perlvar{'lonLoadLim'}
+8) Everything is correct up above
+END
+my $hbug=-1;
+my $dbug=-1;
+{
+  my $v=$perlvar{'lonHostID'};
+  $hbug=0;
+  $hbug=1 if $v=~/\W/;
+  $hbug=1 if $v=~/\_/;
+}
+{
+  my $v=$1;
+  $dbug=0;
+  $dbug=1 if $v=~/\W/;
+  $dbug=1 if $v=~/\_/;
+}
+
+if ($hbug) {
+  print "**** ERROR **** ".
+	"Invalid lonHostID (should only be letters and/or digits)\n";
+}
+if ($dbug) {
+  print "**** ERROR **** ".
+	"Invalid lonDefDomain (should only be letters and/or digits)\n";
+}
+
   print(&lt;&lt;END);
-ENTER A CHOICE OF 1-6 TO CHANGE, otherwise ENTER 7:
+ENTER A CHOICE OF 1-7 TO CHANGE, otherwise ENTER 8:
 END
 my $choice=&lt;&gt;;
 chomp($choice);
   if ($choice==1) {
   print(&lt;&lt;END);
-2) Domain Name: $perlvar{'lonDefDomain'}
-ENTER NEW VALUE:
+1) Domain Name: $perlvar{'lonDefDomain'}
+ENTER NEW VALUE (this is an internal value used to identify a group of
+                 LON-CAPA machines, it must be alphanumerical, we suggest
+                 using a part of your actual DNS domain. For example, for
+                 the machine loncapa.msu.edu, we set the Domain to msu):
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
@@ -360,50 +513,64 @@ END
   }
   elsif ($choice==2) {
   print(&lt;&lt;END);
-1) Machine Name: $perlvar{'lonHostID'}
-ENTER NEW VALUE:
+2) Domain Description: $domainDescription
+ENTER NEW VALUE (this should be a string that describes your domain, spaces
+                 and punctuation are fine except for ':'):
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
-    $perlvar{'lonHostID'}=$choice2;
+    $domainDescription=$choice2;
   }
   elsif ($choice==3) {
   print(&lt;&lt;END);
-3) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
-ENTER NEW VALUE:
+3) Machine Name: $perlvar{'lonHostID'}
+ENTER NEW VALUE (this will be the name of the machine in the LON-CAPA network
+                 it cannot contain any of '_' '-' '.' or ':'. We suggest that
+                 if you are in the domain 'example' and are the first library
+                 server you enter 'examplel1') :
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
-    $perlvar{'lonAdmEMail'}=$choice2;
+    $perlvar{'lonHostID'}=$choice2;
   }
   elsif ($choice==4) {
   print(&lt;&lt;END);
-4) Role: $perlvar{'lonRole'}
+4) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
-    $perlvar{'lonRole'}=$choice2;
+    $perlvar{'lonAdmEMail'}=$choice2;
   }
   elsif ($choice==5) {
   print(&lt;&lt;END);
-5) Cache Expiration Time: $perlvar{'lonExpire'}
-ENTER NEW VALUE:
+5) Role: $perlvar{'lonRole'}
+ENTER NEW VALUE (this should be either 'access' or 'library' 
+                 if in doubt select 'library'):
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
-    $perlvar{'lonExpire'}=$choice2;
+    $perlvar{'lonRole'}=$choice2;
   }
   elsif ($choice==6) {
   print(&lt;&lt;END);
-6) Server Load: $perlvar{'lonLoadLim'}
+6) 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==7) {
+  print(&lt;&lt;END);
+7) Server Load: $perlvar{'lonLoadLim'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
     $perlvar{'lonLoadLim'}=$choice2;
   }
-  elsif ($choice==7) {
+  elsif ($choice==8) {
     $flag=1;
   }
   else {
@@ -425,52 +592,25 @@ END
 <target dist='default'>loncom/hosts.tab</target>
 <perlscript mode='fg'>
 unless (-l "<TARGET />") {
-  print(&lt;&lt;END);
-
-===============================================================================
-What hosts.tab would you like to have installed?
-(hosts.tab is a listing of all other internet machines
-that a server system considers to be valid server systems
-on the LON-CAPA network)
-
-1) PRODUCTION - you want to deliver courses today or sometime very soon
-                on this machine
-2) STAND-ALONE - you want this machine to run in 'stand-alone' mode and
-                 not be connected to other LON-CAPA machines for now
-3) DEVELOPMENT - you want to play with or explore LON-CAPA
-4) PRESERVE the existing hosts.tab (/home/httpd/lonTabs/hosts.tab)
-
-END
-# Option number 26 will install rawhide_hosts.tab, but
-# the typical user does not want to be part of an intensive
-# machine test cluster.
-
-# get input
-# if valid then process, otherwise loop
-my $hostname=`hostname`;chomp($hostname);
-my $hostaddress=`hostname -i $hostname`;chomp($hostaddress);
-$flag=0;
-while (!$flag) {
-  print "ENTER 1, 2, 3, or 4:\n";
-  my $choice=&lt;&gt;;
-  chomp($choice);
-    $line2insert=&lt;&lt;END;
-$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$hostaddress
+  my $hostname=`hostname`;chomp($hostname);
+  my $hostaddress=`hostname -i $hostname`;chomp($hostaddress);
+  $hostaddress=~s/\s//;
+  $date=`date -I`; chomp($date);
+  $lonHostID=$perlvar{'lonHostID'};
+  $lonHostID=~s/\W//g;
+  $lineexistflag=0;
+  $hostidexistflag=0;
+  $line2insert=&lt;&lt;END;
+$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$hostaddress:$domainDescription
 END
-    $date=`date -I`; chomp($date);
-    $lonHostID=$perlvar{'lonHostID'};
-    $lonHostID=~s/\W//g;
-    $lineexistflag=0;
-    $hostidexistflag=0;
-  if ($choice==1) {
-    $lonCluster='production';
+  if ($flag==1) {
     `rm -f ../hosts.tab`;
-    open(IN,'&lt;../production_hosts.tab');
+    open(IN,'&lt;../'.$lonCluster.'_hosts.tab');
     while(&lt;IN&gt;) {
       if (/^$line2insert$/) {
         $lineexistflag=1;
       }
-      if (/^$perlvar{'lonHostID'}\:/) {
+      if (/^$lonHostID\:/) {
         $hostidexistflag=1;
       }
     }
@@ -478,73 +618,43 @@ END
     if ($hostidexistflag and !$lineexistflag) {
       print &lt;&lt;END;
 WARNING: $lonHostID already exists inside
-loncapa/loncom/production_hosts.tab.  The entry inside
-production_hosts.tab does not match your settings.
-The entry inside production_hosts.tab is being replaced
+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
 with your new values.
 END
-      `grep -v "$lonHostID:" ../production_hosts.tab &gt; ../new_production_hosts.tab`;
-       open(OUT,'&gt;&gt;../new_production_hosts.tab') or
-         die("cannot open loncom/standalone_hosts.tab for output\n");
-         print(OUT &lt;&lt;END);
-$line2insert
-END
+      `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_production_hosts.tab ../hosts.tab`;
+      `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
       # email appropriate message
-#      `echo "$date" | mail -s "REPLACE:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
-      `echo "REPLACE:$lonHostID:date:$line2insert" | mail -s "REPLACE:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
-      # "REPLACE:hostid:date"
-      # "REPLACE:hostid:date:line"
+      system('ping -c 1 www.lon-capa.org > /dev/null || ping -c 1 www.msu.edu > /dev/null || ping -c 1 www.mit.edu > /dev/null');
+      `echo "REPLACE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "REPLACE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org` unless $?;
     }
     elsif ($hostidexistflag and $lineexistflag) {
-      `ln -s production_hosts.tab ../hosts.tab`;
-    }
-    elsif (!$$hostidexistflag and !$lineexistflag) {
-      `cat ../production_hosts.tab &gt; ../new_production_hosts.tab`;
-      `ln -s new_production_hosts.tab &gt; ../hosts.tab`;
+      print &lt;&lt;END;
+Entry exists in ${lonCluster}_hosts.tab.
+END
+      `ln -s ${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`;
     }
-    $flag=1;
-  }
-  elsif ($choice==2) {
-    $lonCluster='standalone';
-    open(OUT,'&gt;../standalone_hosts.tab') or
-      die("cannot open loncom/standalone_hosts.tab for output\n");
-    print(OUT &lt;&lt;END);
-$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$hostaddress
+    elsif (!$hostidexistflag and !$lineexistflag) {
+      print &lt;&lt;END;
+New entry for $lonCluster.
 END
-    close(OUT);
-    `rm -f ../hosts.tab`;
-    `ln -s standalone_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  elsif ($choice==3) {
-    $lonCluster='development';
-    `rm -f loncom/hosts.tab`;
-    `ln -s development_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  elsif ($choice==4) {
-    $lonCluster='existing';
-    `rm -f ../hosts.tab`;
-    `touch existing_hosts.tab`;
-    if (-e '/home/httpd/lonTabs/hosts.tab') {
-      `cp /home/httpd/lonTabs/hosts.tab ../existing_hosts.tab`;
+      `cat ../${lonCluster}_hosts.tab &gt; ../new_${lonCluster}_hosts.tab`;
+       open(OUT,'&gt;&gt;../new_'.$lonCluster.'_hosts.tab') or
+         die("cannot open loncom/new_${lonCluster}_hosts.tab for output\n");
+         print(OUT $line2insert);
+       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`;
     }
-    `ln -s existing_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  elsif ($choice==26) {
-    $lonCluster='rawhide';
-    `rm -f ../hosts.tab`;
-    `ln -s rawhide_hosts.tab ../hosts.tab`;
-    $flag=1;
   }
-  else {
-
-  }
-}
-
 }
 </perlscript>
 </file>