Diff for /doc/loncapafiles/updatequery.piml between versions 1.7 and 1.8

version 1.7, 2002/05/13 09:05:18 version 1.8, 2002/05/13 17:56:29
Line 52  sleep(3); Line 52  sleep(3);
 </perlscript>  </perlscript>
 </file>  </file>
 <file>  <file>
 <target dist='default'>/home/httpd/lonUsers/</target>  <target dist='default'>/home/httpd/lonUsers2/</target>
 <perlscript mode='fg'>  <perlscript mode='fg'>
 $|=1;  $|=1;
 unless (-e "<TARGET />") {  unless (-e "<TARGET />") {
Line 65  or contact sharrison\@mail.lon-capa.org. Line 65  or contact sharrison\@mail.lon-capa.org.
 ===============================================================================  ===============================================================================
 The following 4 values are needed to configure LON-CAPA:  The following 4 values are needed to configure LON-CAPA:
 * Machine Role  * Machine Role
 * Machine ID Name  * LON-CAPA Domain Name
 * LON-CAPA Domain Name, and  * LON-CAPA Machine ID Name, and
 * System Administration E-mail Address.  * System Administration E-mail Address.
 END  END
   
Line 120  my $ipdomain=''; Line 120  my $ipdomain='';
 if ($hostname=~/([^\.]*)\.([^\.]*)$/) {  if ($hostname=~/([^\.]*)\.([^\.]*)$/) {
   $ipdomain=$1;    $ipdomain=$1;
 }  }
 my $lonHostID;  
 if ($ipdomain) {  
   $lonHostID=$ipdomain.$r.int(1+rand(9)); # should be probably detect against  
                                           # the hosts.tab  
 }  
   
   print(&lt;&lt;END);    print(&lt;&lt;END);
   
 **** Machine ID Name ****  **** Domain ****
 [this does NOT need to correspond to internet address names;  [this does NOT need to correspond to internet address domains,
  this name MUST be unique to the whole LON-CAPA network;   examples might be "msu" or "bionet" or "vermontcc"]
  we recommend that you use a name based off of your institution;  
  good examples: "msul1" or "bionetl1";  
  bad examples: "loncapabox" or "studentsinside"]  
 END  END
 # get machine name  
   # get domain name
 # accept if valid, if not valid, tell user and repeat  # accept if valid, if not valid, tell user and repeat
 $flag=0;  $flag=0;
   my $lonDefDomain;
 while (!$flag) {  while (!$flag) {
 if ($ipdomain) {  if ($ipdomain) {
 print(&lt;&lt;END);  print(&lt;&lt;END);
 ENTER LONCAPA MACHINE ID [$lonHostID]:  ENTER LONCAPA DOMAIN [$ipdomain]:
 END  END
 }  }
 else {  else {
   print(&lt;&lt;END);    print(&lt;&lt;END);
 ENTER LONCAPA MACHINE ID:  ENTER LONCAPA DOMAIN:
 END  END
 }  }
   my $choice=&lt;&gt;;    my $choice=&lt;&gt;;
   chomp($choice);    chomp($choice);
   if ($lonHostID and $choice=~/^\s*$/) {    if ($ipdomain and $choice=~/^\s*$/) {
     $choice=$lonHostID;      $choice=$ipdomain;
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');      open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonHostID'."\t".$choice."\n");      print(OUT 'lonDefDomain'."\t".$choice."\n");
     close(OUT);      close(OUT);
       $lonDefDomain=$choice;
     $flag=1;      $flag=1;
   }    }
   elsif ($choice!~/\_/ and $choice=~/^\w+$/) {    elsif ($choice!~/\_/ and $choice=~/^\w+$/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');      open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonHostID'."\t".$choice."\n");      print(OUT 'lonDefDomain'."\t".$choice."\n");
     close(OUT);      close(OUT);
       $lonDefDomain=$choice;
       $r='l';
     $flag=1;      $flag=1;
   }    }
   else {    else {
Line 169  END Line 166  END
   }    }
 }  }
   
   my $lonHostID;
   if ($lonDefDomain) {
     $lonHostID=$lonDefDomain.$r.int(1+rand(9)); # should be probably also detect
                                                 # against the hosts.tab
   }
   
   print(&lt;&lt;END);    print(&lt;&lt;END);
   
 **** Domain ****  **** Machine ID Name ****
 [this does NOT need to correspond to internet address domains,  [this does NOT need to correspond to internet address names;
  examples might be "msu" or "bionet" or "vermontcc"]   this name MUST be unique to the whole LON-CAPA network;
    we recommend that you use a name based off of your institution;
    good examples: "msul1" or "bionetl1";
    bad examples: "loncapabox" or "studentsinside"]
 END  END
   # get machine name
 # get domain name  
 # accept if valid, if not valid, tell user and repeat  # accept if valid, if not valid, tell user and repeat
 $flag=0;  $flag=0;
 my $lonDefDomain;  
 while (!$flag) {  while (!$flag) {
 if ($ipdomain) {  if ($ipdomain) {
 print(&lt;&lt;END);  print(&lt;&lt;END);
 ENTER LONCAPA DOMAIN [$ipdomain]:  ENTER LONCAPA MACHINE ID [$lonHostID]:
 END  END
 }  }
 else {  else {
   print(&lt;&lt;END);    print(&lt;&lt;END);
 ENTER LONCAPA DOMAIN:  ENTER LONCAPA MACHINE ID:
 END  END
 }  }
   my $choice=&lt;&gt;;    my $choice=&lt;&gt;;
   chomp($choice);    chomp($choice);
   if ($ipdomain and $choice=~/^\s*$/) {    if ($lonHostID and $choice=~/^\s*$/) {
     $choice=$ipdomain;      $choice=$lonHostID;
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');      open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonDefDomain'."\t".$choice."\n");      print(OUT 'lonHostID'."\t".$choice."\n");
     close(OUT);      close(OUT);
     $lonDefDomain=$choice;      $lonHostID=$choice;
     $flag=1;      $flag=1;
   }    }
   elsif ($choice!~/\_/ and $choice=~/^\w+$/) {    elsif ($choice!~/\_/ and $choice=~/^\w+$/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');      open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonDefDomain'."\t".$choice."\n");      print(OUT 'lonHostID'."\t".$choice."\n");
     close(OUT);      close(OUT);
     $lonDefDomain=$choice;      $lonHostID=$choice;
     $r='l';  
     $flag=1;      $flag=1;
   }    }
   else {    else {
Line 333  while (!$flag) { Line 336  while (!$flag) {
   
 ===============================================================================  ===============================================================================
 This is now the current configuration of your machine.  This is now the current configuration of your machine.
 1) Machine Name: $perlvar{'lonHostID'}  1) Domain Name: $perlvar{'lonDefDomain'}
 2) Domain Name: $perlvar{'lonDefDomain'}  2) Machine Name: $perlvar{'lonHostID'}
 3) System Administrator's E-mail Address: $perlvar{'lonAdmEmail'}  3) System Administrator's E-mail Address: $perlvar{'lonAdmEmail'}
 4) Role: $perlvar{'lonRole'}  4) Role: $perlvar{'lonRole'}
 5) Cache Expiration Time: $perlvar{'lonExpire'}  5) Cache Expiration Time: $perlvar{'lonExpire'}
Line 348  my $choice=&lt;&gt;; Line 351  my $choice=&lt;&gt;;
 chomp($choice);  chomp($choice);
   if ($choice==1) {    if ($choice==1) {
   print(&lt;&lt;END);    print(&lt;&lt;END);
 1) Machine Name: $perlvar{'lonHostID'}  2) Domain Name: $perlvar{'lonDefDomain'}
 ENTER NEW VALUE:  ENTER NEW VALUE:
 END  END
     my $choice2=&lt;&gt;;      my $choice2=&lt;&gt;;
     chomp($choice2);      chomp($choice2);
     $perlvar{'lonHostID'}=$choice2;      $perlvar{'lonDefDomain'}=$choice2;
   }    }
   elsif ($choice==2) {    elsif ($choice==2) {
   print(&lt;&lt;END);    print(&lt;&lt;END);
 2) Domain Name: $perlvar{'lonDefDomain'}  1) Machine Name: $perlvar{'lonHostID'}
 ENTER NEW VALUE:  ENTER NEW VALUE:
 END  END
     my $choice2=&lt;&gt;;      my $choice2=&lt;&gt;;
     chomp($choice2);      chomp($choice2);
     $perlvar{'lonDefDomain'}=$choice2;      $perlvar{'lonHostID'}=$choice2;
   }    }
   elsif ($choice==3) {    elsif ($choice==3) {
   print(&lt;&lt;END);    print(&lt;&lt;END);
Line 411  END Line 414  END
       die("Cannot output to $confdir$filename\n");        die("Cannot output to $confdir$filename\n");
     foreach my $key (keys %perlvar) {      foreach my $key (keys %perlvar) {
       my $value=$perlvar{$key};        my $value=$perlvar{$key};
       print(OUT &lt;&lt;END) unless $perlvarstat{$key};        print(OUT &lt;&lt;END) unless $perlvarstatic{$key};
 PerlSetVar     $key      $value  PerlSetVar     $key      $value
 END  END
     }      }

Removed from v.1.7  
changed lines
  Added in v.1.8


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>