Diff for /doc/install/linux/install.pl between versions 1.3 and 1.5

version 1.3, 2011/03/18 17:53:34 version 1.5, 2011/03/23 15:01:34
Line 316  sub check_required { Line 316  sub check_required {
         return ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow);          return ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow);
     }      }
     my ($mysqlon,$mysqlsetup,$dbh,$has_pass,$has_lcdb,%recommended,$downloadstatus,      my ($mysqlon,$mysqlsetup,$dbh,$has_pass,$has_lcdb,%recommended,$downloadstatus,
         $filetouse,$production,$testing);          $filetouse,$production,$testing,$apachefw,$tostop);
     my $wwwuid = &uid_of_www();      my $wwwuid = &uid_of_www();
     my $wwwgid = getgrnam('www');      my $wwwgid = getgrnam('www');
     if (($wwwuid eq '') || ($wwwgid eq '')) {      if (($wwwuid eq '') || ($wwwgid eq '')) {
Line 344  sub check_required { Line 344  sub check_required {
             $recommended{'mysql'} = 1;              $recommended{'mysql'} = 1;
         }          }
     }      }
     my $tostop;      ($recommended{'firewall'},$apachefw) = &chkfirewall($distro);
     $recommended{'firewall'} = &chkfirewall($distro);   
     ($recommended{'runlevels'},$tostop) = &chkconfig($distro);      ($recommended{'runlevels'},$tostop) = &chkconfig($distro);
     $recommended{'apache'} = &chkapache($distro,$instdir);      $recommended{'apache'} = &chkapache($distro,$instdir);
     $recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);      $recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
Line 353  sub check_required { Line 352  sub check_required {
         = &need_download();          = &need_download();
     return ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow,      return ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow,
             \%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,              \%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
             $filetouse,$production,$testing);              $filetouse,$production,$testing,$apachefw);
 }  }
   
 sub check_mysql_running {  sub check_mysql_running {
Line 362  sub check_mysql_running { Line 361  sub check_mysql_running {
     if ($distro =~ /^(suse|sles|debian|ubuntu)/) {      if ($distro =~ /^(suse|sles|debian|ubuntu)/) {
         $mysqldaemon = 'mysql';          $mysqldaemon = 'mysql';
     }      }
     if (open(PIPE,"/etc/init.d/$mysqldaemon status 2>&1 |")) {      if (open(PIPE,"ps -ef |grep mysqld_safe |grep -v grep 2>&1 |")) {
         my $status = <PIPE>;          my $status = <PIPE>;
         close(PIPE);          close(PIPE);
         chomp($status);          chomp($status);
         if ($status =~ /\(pid\s+\d+\)/) {          if ($status =~ /^root\s+\d+\s+/) {
             print_and_log(&mt('MySQL is running.')."\n");              print_and_log(&mt('MySQL is running.')."\n");
             return 1;              return 1;
         } else {          } else {
Line 400  sub chkconfig { Line 399  sub chkconfig {
     my $mysqldaemon ='mysqld';      my $mysqldaemon ='mysqld';
     my $webserver = 'httpd';      my $webserver = 'httpd';
     my $cupsdaemon = 'cups';      my $cupsdaemon = 'cups';
       my $ntpdaemon = 'ntpd';
     my @runlevels = qw/3 4 5/;      my @runlevels = qw/3 4 5/;
     my @norunlevels = qw/0 1 6/;      my @norunlevels = qw/0 1 6/;
     if ($distro =~ /^(suse|sles)/) {      if ($distro =~ /^(suse|sles)/) {
Line 416  sub chkconfig { Line 416  sub chkconfig {
         $checker_bin = '/usr/sbin/sysv-rc-conf';          $checker_bin = '/usr/sbin/sysv-rc-conf';
         $mysqldaemon = 'mysql';          $mysqldaemon = 'mysql';
         $webserver = 'apache2';          $webserver = 'apache2';
           $ntpdaemon = 'ntp';
     }      }
     if (! -x $checker_bin) {      if (! -x $checker_bin) {
         print &mt('Could not check runlevel status for MySQL or Apache.')."\n";          print &mt('Could not check runlevel status for MySQL or Apache.')."\n";
Line 423  sub chkconfig { Line 424  sub chkconfig {
     }      }
     my $rlstr = join('',@runlevels);      my $rlstr = join('',@runlevels);
     my $nrlstr = join('',@norunlevels);      my $nrlstr = join('',@norunlevels);
     foreach my $type ('apache','mysql','cups') {      foreach my $type ('apache','mysql','ntp','cups') {
         my $service;          my $service;
         if ($type eq 'apache') {          if ($type eq 'apache') {
             $service = $webserver;              $service = $webserver;
Line 431  sub chkconfig { Line 432  sub chkconfig {
             $service = $mysqldaemon;               $service = $mysqldaemon; 
         } elsif ($type eq 'cups') {          } elsif ($type eq 'cups') {
             $service = $cupsdaemon;              $service = $cupsdaemon;
           } elsif ($type eq 'ntp') {
               $service = $ntpdaemon;
         }          }
         my $command = $checker_bin.' --list '.$service;          my $command = $checker_bin.' --list '.$service;
         my $results = `$command`;          my $results = `$command`;
Line 448  sub chkconfig { Line 451  sub chkconfig {
             for (my $rl=0; $rl<=6; $rl++) {              for (my $rl=0; $rl<=6; $rl++) {
                 if ($results =~ /$rl:on/) { $curr_runlevels{$rl}++; }                  if ($results =~ /$rl:on/) { $curr_runlevels{$rl}++; }
             }              }
             if (($type eq 'apache') || ($type eq 'mysql')) {              if (($type eq 'apache') || ($type eq 'mysql') || ($type eq 'ntp')) {
                 my $warning;                  my $warning;
                 foreach my $rl (@runlevels) {                  foreach my $rl (@runlevels) {
                     if (!exists($curr_runlevels{$rl})) {                      if (!exists($curr_runlevels{$rl})) {
Line 464  sub chkconfig { Line 467  sub chkconfig {
         }          }
         if ($tofix) {          if ($tofix) {
             $needfix{$type} = $tofix;              $needfix{$type} = $tofix;
         }              }
     }      }
     if ($distro =~ /^(suse|sles)([\d\.]+)$/) {      if ($distro =~ /^(suse|sles)([\d\.]+)$/) {
         my $name = $1;          my $name = $1;
Line 483  sub chkconfig { Line 486  sub chkconfig {
 }  }
   
 sub chkfirewall {  sub chkfirewall {
       my ($distro) = @_;
     my $configfirewall = 1;      my $configfirewall = 1;
     my %ports = (      my %ports = (
                     http  =>  80,                      http  =>  80,
                     https => 443,                      https => 443,
                 );                  );
       my %activefw;
     if (&firewall_is_active()) {      if (&firewall_is_active()) {
         my $iptables = &get_pathto_iptables();          my $iptables = &get_pathto_iptables();
         if ($iptables eq '') {          if ($iptables eq '') {
             print &mt('Firewall not checked as path to iptables not determined.')."\n";              print &mt('Firewall not checked as path to iptables not determined.')."\n";
         } else {          } else {
             my @fwchains = &get_fw_chains($iptables);              my @fwchains = &get_fw_chains($iptables,$distro);
             if (@fwchains) {              if (@fwchains) {
                 my %activefw;  
                 foreach my $service ('http','https') {                  foreach my $service ('http','https') {
                     foreach my $fwchain (@fwchains) {                      foreach my $fwchain (@fwchains) {
                         if (&firewall_is_port_open($iptables,$fwchain,$ports{$service})) {                          if (&firewall_is_port_open($iptables,$fwchain,$ports{$service})) {
Line 514  sub chkfirewall { Line 518  sub chkfirewall {
     } else {      } else {
         print &mt('Firewall not enabled.')."\n";          print &mt('Firewall not enabled.')."\n";
     }      }
     return $configfirewall;      return ($configfirewall,\%activefw);
 }  }
   
 sub chkapache {  sub chkapache {
Line 561  sub chkapache { Line 565  sub chkapache {
                 my $diffres = <PIPE>;                  my $diffres = <PIPE>;
                 close(PIPE);                  close(PIPE);
                 chomp($diffres);                  chomp($diffres);
                 print "Diff is ||$diffres||\n";  
                 unless ($diffres) {                  unless ($diffres) {
                     $fixapache = 0;                      $fixapache = 0;
                 }                  }
Line 614  sub need_download { Line 617  sub need_download {
                 if ($version eq 'current') {                  if ($version eq 'current') {
                     my @stats = stat("$rootdir/$file");                      my @stats = stat("$rootdir/$file");
                     $localcurrent = $stats[7];                      $localcurrent = $stats[7];
                     if ($localcurrent eq $stdsizes->{$production}) {                      if ($localcurrent == $stdsizes->{$production}) {
                         $needs_download = 0;                          $needs_download = 0;
                         $filetouse = $file;                          $filetouse = $file;
                     }                      }
                 } elsif ($version eq 'testing') {                  } elsif ($version eq 'testing') {
                     my @stats = stat("$rootdir/$file");                      my @stats = stat("$rootdir/$file");
                     $localtesting = $stats[7];                      $localtesting = $stats[7];
                     if ($localtesting eq $stdsizes->{$testing}) {                      if ($localtesting == $stdsizes->{$testing}) {
                         $needs_download = 0;                          $needs_download = 0;
                         $filetouse = $file;                          $filetouse = $file;
                     }                      }
Line 774  sub firewall_is_active { Line 777  sub firewall_is_active {
 }  }
   
 sub get_fw_chains {  sub get_fw_chains {
     my ($iptables) = @_;      my ($iptables,$distro) = @_;
     my @fw_chains;      my @fw_chains;
     my $suse_config = "/etc/sysconfig/SuSEfirewall2";      my $suse_config = "/etc/sysconfig/SuSEfirewall2";
     my $ubuntu_config = "/etc/ufw/ufw.conf";      my $ubuntu_config = "/etc/ufw/ufw.conf";
Line 784  sub get_fw_chains { Line 787  sub get_fw_chains {
         my @posschains;          my @posschains;
         if (-e $ubuntu_config) {          if (-e $ubuntu_config) {
             @posschains = ('ufw-user-input','INPUT');              @posschains = ('ufw-user-input','INPUT');
           } elsif ($distro =~ /^debian5/) {
               @posschains = ('INPUT');
         } else {          } else {
             @posschains = ('RH-Firewall-1-INPUT','INPUT');              @posschains = ('RH-Firewall-1-INPUT','INPUT');
             if (!-e '/etc/sysconfig/iptables') {              if (!-e '/etc/sysconfig/iptables') {
Line 918  print " Line 923  print "
   
 ".&mt('The following actions are available:')."  ".&mt('The following actions are available:')."
   
 &mt('1.')." ".&mt('Create the www user/group.')."  ".&mt('1.')." ".&mt('Create the www user/group.')."
    ".&mt('This is the user/group ownership under which Apache child processes run.')."     ".&mt('This is the user/group ownership under which Apache child processes run.')."
    ".&mt('It also owns most directories within the /home/httpd directory.')."      ".&mt('It also owns most directories within the /home/httpd directory.')." 
    ".&mt('This directory is where most LON-CAPA files and directories are stored.')."     ".&mt('This directory is where most LON-CAPA files and directories are stored.')."
 &mt('2.')." ".&mt('Install the package LON-CAPA uses to authenticate users.')."  ".&mt('2.')." ".&mt('Install the package LON-CAPA uses to authenticate users.')."
 &mt('3.')." ".&mt('Set-up the MySQL database.')."  ".&mt('3.')." ".&mt('Set-up the MySQL database.')."
 &mt('4.')." ".&mt('Set-up MySQL permissions.')."  ".&mt('4.')." ".&mt('Set-up MySQL permissions.')."
 &mt('5.')." ".&mt('Configure Apache web server.')."  ".&mt('5.')." ".&mt('Configure Apache web server.')."
 &mt('6.')." ".&mt('Configure start-up of services.')."  ".&mt('6.')." ".&mt('Configure start-up of services.')."
 &mt('7.')." ".&mt('Check firewall settings.')."  ".&mt('7.')." ".&mt('Check firewall settings.')."
 &mt('8.')." ".&mt('Stop services not used by LON-CAPA,')."  ".&mt('8.')." ".&mt('Stop services not used by LON-CAPA,')."
    ".&mt('i.e., services for a print server: [_1] daemon.',"'cups'")."     ".&mt('i.e., services for a print server: [_1] daemon.',"'cups'")."
 &mt('9.')." ".&mt('Download LON-CAPA source code in readiness for installation.')."  ".&mt('9.')." ".&mt('Download LON-CAPA source code in readiness for installation.')."
   
 ".&mt('Typically, you will run this script only once, when you first install LON-CAPA.')."   ".&mt('Typically, you will run this script only once, when you first install LON-CAPA.')." 
   
Line 978  print "\n".&mt('Checking system status . Line 983  print "\n".&mt('Checking system status .
 my $dsn = "DBI:mysql:database=mysql";  my $dsn = "DBI:mysql:database=mysql";
 my ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow,$recommended,  my ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow,$recommended,
     $dbh,$has_pass,$has_lcdb,$downloadstatus,$filetouse,$production,      $dbh,$has_pass,$has_lcdb,$downloadstatus,$filetouse,$production,
     $testing) = &check_required($instdir,$dsn);       $testing,$apachefw) = &check_required($instdir,$dsn);
 if ($distro eq '') {  if ($distro eq '') {
     print "\n".&mt('Linux distribution could not be verified as a supported distribution.')."\n".      print "\n".&mt('Linux distribution could not be verified as a supported distribution.')."\n".
           &mt('The following are supported: [_1].',            &mt('The following are supported: [_1].',
Line 1008  if (!$gotprereqs) { Line 1013  if (!$gotprereqs) {
                 } else {                  } else {
                     ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow,                      ($distro,$gotprereqs,$packagecmd,$updatecmd,$installnow,
                      $recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,                       $recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
                      $filetouse) = &check_required($instdir,$dsn);                       $filetouse,$production,$testing,$apachefw) = 
                        &check_required($instdir,$dsn);
                 }                  }
             } else {              } else {
                 print &mt('Failed to run command to install LONCAPA-prequisites')."\n";                  print &mt('Failed to run command to install LONCAPA-prequisites')."\n";
Line 1032  foreach my $action (@actions) { Line 1038  foreach my $action (@actions) {
     $num ++;      $num ++;
     my ($yesno,$defaultrun);      my ($yesno,$defaultrun);
     if (ref($recommended) eq 'HASH') {      if (ref($recommended) eq 'HASH') {
         if (($action eq 'runlevels') || ($action eq 'services')) {          if (($action eq 'runlevels') || ($action eq 'stopsrvcs')) {
             $yesno = '[y/N]';              $yesno = '[y/N]';
             if (ref($recommended->{$action}) eq 'HASH') {              if (ref($recommended->{$action}) eq 'HASH') {
                 if (keys(%{$recommended->{$action}}) > 0) {                  if (keys(%{$recommended->{$action}}) > 0) {
Line 1069  if ($callsub{'download'}) { Line 1075  if ($callsub{'download'}) {
                   &mt('2.').' '.&mt('A testing release - version: [_1].',$testing)."\n\n".                    &mt('2.').' '.&mt('A testing release - version: [_1].',$testing)."\n\n".
                   &mt('Download the production release? ~[Y/n~]');                    &mt('Download the production release? ~[Y/n~]');
             if (&get_user_selection(1)) {              if (&get_user_selection(1)) {
                 $sourcetarball = $production.'tar.gz';                  $sourcetarball = 'loncapa-'.$production.'.tar.gz';
             } else {              } else {
                 print "\n".&mt('Download the testing release? ~[Y/n~]');                  print "\n".&mt('Download the testing release? ~[Y/n~]');
                 if (&get_user_selection(1)) {                  if (&get_user_selection(1)) {
                     $sourcetarball = $testing.'.tar.gz';                      $sourcetarball = 'loncapa-'.$testing.'.tar.gz';
                 }                  }
             }              }
         }          }
Line 1098  if ($callsub{'wwwuser'}) { Line 1104  if ($callsub{'wwwuser'}) {
 }  }
   
 if ($callsub{'pwauth'}) {  if ($callsub{'pwauth'}) {
     &build_and_install_mod_auth_external();      &build_and_install_mod_auth_external($instdir);
 } else {  } else {
     &print_and_log(&mt('Skipping [_1] installation.',"'pwauth'")."\n");      &print_and_log(&mt('Skipping [_1] installation.',"'pwauth'")."\n");
 }  }
Line 1166  if ($callsub{'runlevels'}) { Line 1172  if ($callsub{'runlevels'}) {
   
 if ($callsub{'firewall'}) {  if ($callsub{'firewall'}) {
     if ($distro =~ /^(suse|sles)/) {      if ($distro =~ /^(suse|sles)/) {
         print &mt('Use [_1].','yast')."\n";          print &mt('Use [_1] to configure the firewall to allow access for [_2].',
     } elsif ($distro = /^(debian|ubuntu)/) {                    'yast -- Security and Users -> Firewall -> Interfaces',
         print &mt('Use [_1].','ufw')."\n";                     'ssh, http, https')."\n";
       } elsif ($distro =~ /^(debian|ubuntu)(\d+)/) {
           if (($1 eq 'ubuntu') || ($2 > 5)) {
               print &mt('Use [_1] to configure the firewall to allow access for [_2].',
                         'ufw','ssh, http, https')."\n";
           } else {
               my $fwadded = &get_iptables_rules($distro,$instdir,$apachefw);
               if ($fwadded) {
                   print &mt('Enable firewall? ~[Y/n~]');
                   my $enable_iptables = &get_user_selection(1);
                   if ($enable_iptables) {
                       system('/etc/network/if-pre-up.d/iptables');
                       print &mt('Firewall enabled using rules defined in [_1].',
                                 '/etc/iptables.loncapa.rules'); 
                   }
               }
           }
     } else {      } else {
         print &mt('Use [_1].','setup')."\n";          print &mt('Use [_1] to configure the firewall to allow access for [_2].',
                     'setup -- Firewall confiuration -> Customize',
                     'ssh, http, https')."\n";
     }      }
 } else {  } else {
     if ($distro =~ /^(suse|sles)/) {      &print_and_log(&mt('Skipping Firewall configuration.')."\n");
         &print_and_log(&mt('Skipping Firewall configuration.')."\n");  
     }  
 }  }
   
 if ($callsub{'stopsrvcs'}) {  if ($callsub{'stopsrvcs'}) {
     &kill_extra_services($distro,$recommended->{'stopsrvcs'});      &kill_extra_services($distro,$recommended->{'stopsrvcs'});
 } else {  } else {
     &print_and_log(&mt('Skipping stopping unnecessary services ([_1] and [_2] daemons).',"'cups'","'sendmail'")."\n");      &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemon).',"'cups'")."\n");
 }  }
   
 my ($have_tarball,$updateshown);  my ($have_tarball,$updateshown);
Line 1345  END Line 1367  END
             # Install patched pwauth              # Install patched pwauth
             print_and_log(&mt('Copying pwauth to [_1]',' /usr/local/sbin')."\n");              print_and_log(&mt('Copying pwauth to [_1]',' /usr/local/sbin')."\n");
             if (copy "$dir/pwauth","/usr/local/sbin/pwauth") {              if (copy "$dir/pwauth","/usr/local/sbin/pwauth") {
                 if (chmod (06755, "/usr/local/sbin/pwauth")) {                  if (chmod(06755, "/usr/local/sbin/pwauth")) {
                     print_and_log(&mt('[_1] copied successfully',"'pwauth'").                      print_and_log(&mt('[_1] copied successfully',"'pwauth'").
                                   "\n");                                    "\n");
                 } else {                  } else {
Line 1381  sub kill_extra_services { Line 1403  sub kill_extra_services {
                     if ($daemon eq 'cupsd') {                      if ($daemon eq 'cupsd') {
                         $service = 'cups';                          $service = 'cups';
                     }                      }
                     if ($distro =~ /^(debian|ubuntu)$/) {                      if ($distro =~ /^(debian|ubuntu)/) {
                         &print_and_log(`/usr/sbin/sysv-rc-conf $service off`);                          &print_and_log(`/usr/sbin/sysv-rc-conf $service off`);
                     } else {                      } else {
                 &print_and_log(`chkconfig --del $service`);                  &print_and_log(`chkconfig --del $service`);
Line 1395  sub kill_extra_services { Line 1417  sub kill_extra_services {
   
 sub setup_mysql {  sub setup_mysql {
     my ($setup_mysql_permissions,$distro,$dbh,$has_pass,$has_lcdb) = @_;      my ($setup_mysql_permissions,$distro,$dbh,$has_pass,$has_lcdb) = @_;
     my $mysql_lc_command = "\n";      my @mysql_lc_commands;
     unless ($has_lcdb) {      unless ($has_lcdb) {
         $mysql_lc_command .= "CREATE DATABASE loncapa;\n";          push(@mysql_lc_commands,"CREATE DATABASE loncapa");
     }      }
     $mysql_lc_command .= <<"ENDMYSQL";      push(@mysql_lc_commands,"USE loncapa");
 USE loncapa;      push(@mysql_lc_commands,qq{
 CREATE TABLE IF NOT EXISTS metadata (title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, creationdate DATETIME, lastrevisiondate DATETIME, owner TEXT, copyright TEXT, FULLTEXT idx_title (title), FULLTEXT idx_author (author), FULLTEXT idx_subject (subject), FULLTEXT idx_url (url), FULLTEXT idx_keywords (keywords), FULLTEXT idx_version (version), FULLTEXT idx_notes (notes), FULLTEXT idx_abstract (abstract), FULLTEXT idx_mime (mime), FULLTEXT idx_language (language), FULLTEXT idx_owner (owner), FULLTEXT idx_copyright (copyright)) TYPE=MYISAM;  CREATE TABLE IF NOT EXISTS metadata (title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, creationdate DATETIME, lastrevisiondate DATETIME, owner TEXT, copyright TEXT, FULLTEXT idx_title (title), FULLTEXT idx_author (author), FULLTEXT idx_subject (subject), FULLTEXT idx_url (url), FULLTEXT idx_keywords (keywords), FULLTEXT idx_version (version), FULLTEXT idx_notes (notes), FULLTEXT idx_abstract (abstract), FULLTEXT idx_mime (mime), FULLTEXT idx_language (language), FULLTEXT idx_owner (owner), FULLTEXT idx_copyright (copyright)) TYPE=MYISAM
 EXIT  });
 ENDMYSQL  
     if ($setup_mysql_permissions) {      if ($setup_mysql_permissions) {
         &setup_mysql_permissions($dbh,$has_pass,$mysql_lc_command);          &setup_mysql_permissions($dbh,$has_pass,@mysql_lc_commands);
     } else {      } else {
         print_and_log(&mt('Skipping MySQL permissions setup.')."\n");          print_and_log(&mt('Skipping MySQL permissions setup.')."\n");
         if ($dbh) {          if ($dbh) {
             $dbh->do($mysql_lc_command);              if (@mysql_lc_commands) {
                   foreach my $lccmd (@mysql_lc_commands) { 
                       $dbh->do($lccmd) || print $dbh->errstr."\n";
                   }
               }
             print_and_log(&mt('MySQL database set up complete.')."\n");              print_and_log(&mt('MySQL database set up complete.')."\n");
         } else {          } else {
             print_and_log(&mt('Problem accessing MySQL.')."\n");              print_and_log(&mt('Problem accessing MySQL.')."\n");
Line 1418  ENDMYSQL Line 1443  ENDMYSQL
 }  }
   
 sub setup_mysql_permissions {  sub setup_mysql_permissions {
     my ($dbh,$has_pass,$mysql_lc_command) = @_;      my ($dbh,$has_pass,@mysql_lc_commands) = @_;
     my $mysqlversion = &get_mysql_version();      my $mysqlversion = &get_mysql_version();
     my $mysql_commands = <<"BLOCKONE";      my @mysql_commands = ("INSERT user (Host, User, Password) VALUES('localhost','www',password('localhostkey'));");
 INSERT INTO user (Host, User, Password)  
 VALUES ('localhost','www',password('localhostkey'));  
 BLOCKONE  
     if ($mysqlversion < 4) {      if ($mysqlversion < 4) {
         $mysql_commands .= <<"BLOCKTWO";          push (@mysql_commands,"
 INSERT INTO db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv) VALUES ('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');  INSERT db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv) VALUES('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y')");
 BLOCKTWO      } else {
     } else {          push (@mysql_commands,"
         $mysql_commands .= <<"BLOCKTHREE";  INSERT db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv,Create_tmp_table_priv,Lock_tables_priv) VALUES('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y')");
 INSERT INTO db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv,Create_tmp_table_priv,Lock_tables_priv) VALUES ('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');  
 BLOCKTHREE  
     }      }
     $mysql_commands .= <<"END";      push(@mysql_commands,"DELETE FROM user WHERE host<>'localhost'");
 DELETE FROM user WHERE host<>'localhost';  
 END  
     if ($has_pass) {      if ($has_pass) {
         if ($dbh) {          if ($dbh) {
             $mysql_commands .= <<"END";              push(@mysql_commands,"FLUSH PRIVILEGES");
 FLUSH PRIVILEGES;              if (@mysql_commands) {
 END                  foreach my $cmd (@mysql_commands) {
             $dbh->do($mysql_commands.$mysql_lc_command);                      $dbh->do($cmd) || print $dbh->errstr."\n";
                   }
               }
               if (@mysql_lc_commands) {
                   foreach my $lccmd (@mysql_lc_commands) {
                       $dbh->do($lccmd) || print $dbh->errstr."\n";
                   }
               }
             print_and_log(&mt('Permissions set for LON-CAPA MySQL user: [_1]',"'www'")."\n");              print_and_log(&mt('Permissions set for LON-CAPA MySQL user: [_1]',"'www'")."\n");
         } else {          } else {
             print_and_log(&mt('Problem accessing MySQL.')."\n".              print_and_log(&mt('Problem accessing MySQL.')."\n".
Line 1470  END Line 1495  END
             }              }
         }          }
         if ($got_passwd) {          if ($got_passwd) {
             $mysql_commands .= &new_mysqlrootpasswd($newmysqlpass);              my (@newpass_cmds) = &new_mysql_rootpasswd($newmysqlpass);
               push(@mysql_commands,@newpass_cmds);
         } else {          } else {
             print_and_log(&mt('Failed to get MySQL root password from user input.')."\n");              print_and_log(&mt('Failed to get MySQL root password from user input.')."\n");
         }          }
         if ($dbh) {          if ($dbh) {
             $dbh->do($mysql_commands.$mysql_lc_command);              if (@mysql_commands) {
                   foreach my $cmd (@mysql_commands) {
                       $dbh->do($cmd) || print $dbh->errstr."\n";
   
                   }
               }
               if (@mysql_lc_commands) {
                   foreach my $lccmd (@mysql_lc_commands) {
                       $dbh->do($lccmd) || print $dbh->errstr."\n";
                   }
               }
             if ($got_passwd) {              if ($got_passwd) {
                 print_and_log(&mt('MySQL root password stored.')."\n".                  print_and_log(&mt('MySQL root password stored.')."\n".
                               &mt('Permissions set for LON-CAPA MySQL user: [_1].',"'www'")."\n");                                &mt('Permissions set for LON-CAPA MySQL user: [_1].',"'www'")."\n");
Line 1491  END Line 1527  END
   
 sub new_mysql_rootpasswd {  sub new_mysql_rootpasswd {
     my ($currmysqlpass) = @_;      my ($currmysqlpass) = @_;
     return <<"END";      return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')",
 SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass');              "FLUSH PRIVILEGES;");
 FLUSH PRIVILEGES;  
 END  
 }  }
   
 sub get_mysql_version {  sub get_mysql_version {
Line 1524  sub copy_httpd_conf { Line 1558  sub copy_httpd_conf {
                   "'/etc/httpd/conf/httpd.conf'")."\n");                    "'/etc/httpd/conf/httpd.conf'")."\n");
     copy "/etc/httpd/conf/httpd.conf","/etc/httpd/conf/httpd.conf.original";      copy "/etc/httpd/conf/httpd.conf","/etc/httpd/conf/httpd.conf.original";
     copy "$instdir/httpd.conf","/etc/httpd/conf/httpd.conf";      copy "$instdir/httpd.conf","/etc/httpd/conf/httpd.conf";
     chmod 0444,"/etc/httpd/conf/httpd.conf";      chmod(0444,"/etc/httpd/conf/httpd.conf");
     print_and_log("\n");      print_and_log("\n");
 }  }
   
Line 1537  sub copy_httpd_conf { Line 1571  sub copy_httpd_conf {
   
 sub copy_apache2_debconf {  sub copy_apache2_debconf {
     my ($instdir) = @_;      my ($instdir) = @_;
     print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","']000-default symlink'")."\n");      print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n");
     my $apache2_enabled_dir = '/etc/apache2/sites-enabled';      my $apache2_enabled_dir = '/etc/apache2/sites-enabled';
     my $apache2_available_dir = '/etc/apache2/sites-available';      my $apache2_available_dir = '/etc/apache2/sites-available';
     if (-l "$apache2_enabled_dir/000-default") {      if (-l "$apache2_enabled_dir/000-default") {
Line 1569  sub copy_apache2_suseconf { Line 1603  sub copy_apache2_suseconf {
         copy "/etc/apache2/default-server.conf","/etc/apache2/default-server.conf.original";          copy "/etc/apache2/default-server.conf","/etc/apache2/default-server.conf.original";
     }      }
     copy "$instdir/default-server.conf","/etc/apache2/default-server.conf";      copy "$instdir/default-server.conf","/etc/apache2/default-server.conf";
     chmod 0444,"/etc/apache2/default-server.conf";      chmod(0444,"/etc/apache2/default-server.conf");
     # Make symlink for conf directory (included in loncapa_apache.conf)      # Make symlink for conf directory (included in loncapa_apache.conf)
     my $can_symlink = (eval { symlink('/etc/apache2','/srv/www/conf'); }, $@ eq '');      my $can_symlink = (eval { symlink('/etc/apache2','/srv/www/conf'); }, $@ eq '');
     if ($can_symlink) {      if ($can_symlink) {
Line 1596  sub copy_apache2_conf_files { Line 1630  sub copy_apache2_conf_files {
         copy "/etc/apache2/uid.conf","/etc/apache2/uid.conf.original";          copy "/etc/apache2/uid.conf","/etc/apache2/uid.conf.original";
     }      }
     copy "$instdir/uid.conf","/etc/apache2/uid.conf";      copy "$instdir/uid.conf","/etc/apache2/uid.conf";
     chmod 0444,"/etc/apache2/uid.conf";      chmod(0444,"/etc/apache2/uid.conf");
 }  }
   
 ###############################################  ###############################################
Line 1611  sub copy_sysconfig_apache2_file { Line 1645  sub copy_sysconfig_apache2_file {
         copy "/etc/sysconfig/apache2","/etc/sysconfig/apache2.original";          copy "/etc/sysconfig/apache2","/etc/sysconfig/apache2.original";
     }      }
     copy "$instdir/sysconfig_apache2","/etc/sysconfig/apache2";      copy "$instdir/sysconfig_apache2","/etc/sysconfig/apache2";
     chmod 0444,"/etc/sysconfig/apache2";      chmod(0444,"/etc/sysconfig/apache2");
 }  }
   
 ###############################################  ###############################################
Line 1634  sub update_SuSEfirewall2_setup { Line 1668  sub update_SuSEfirewall2_setup {
         copy "/etc/insserv/overrides/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup.original"          copy "/etc/insserv/overrides/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup.original"
     }      }
     copy "$instdir/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup";      copy "$instdir/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup";
     chmod 0444,"/etc/insserv/overrides/SuSEfirewall2_setup";      chmod(0444,"/etc/insserv/overrides/SuSEfirewall2_setup");
   }
   
   sub get_iptables_rules {
       my ($distro,$instdir,$apachefw) = @_;
       my (@fwchains,@ports);
       if (&firewall_is_active()) {
           my $iptables = &get_pathto_iptables();
           if ($iptables ne '') {
               @fwchains = &get_fw_chains($iptables,$distro);
           }
       }
       if (ref($apachefw) eq 'HASH') {
           foreach my $service ('http','https') {
               unless ($apachefw->{$service}) {
                   push (@ports,$service); 
               }
           }
       } else {
           @ports = ('http','https');
       }
       if (@ports == 0) {
           return;
       }
       my $ask_to_enable;
       if (-e "/etc/iptables.loncapa.rules") {
           if (open(PIPE, "diff --brief $instdir/debian/iptables.loncapa.rules /etc/iptables.loncapa.rules |")) {
               my $diffres = <PIPE>;
               close(PIPE);
               chomp($diffres);
               if ($diffres) {
                   print &mt('Warning: [_1] exists but differs from LON-CAPA supplied file.','/etc/iptables.loncapa.rules')."\n";
               }
           } else {
               print &mt('Error: unable to open [_1] to compare contents with LON-CAPA supplied file.','/etc/iptables.loncapa.rules')."\n";
           }
       } else {
           if (-e "$instdir/debian/iptables.loncapa.rules") {
               copy "$instdir/debian/iptables.loncapa.rules","/etc/iptables.loncapa.rules";
               chmod(0600,"/etc/iptables.loncapa.rules");
           }
       }
       if (-e "/etc/iptables.loncapa.rules") {
           if (-e "/etc/network/if-pre-up.d/iptables") {
               if (open(PIPE, "diff --brief $instdir/debian/iptables /etc/network/if-pre-up/iptables |")) {
                   my $diffres = <PIPE>;
                   close(PIPE);
                   chomp($diffres);
                   if ($diffres) {
                       print &mt('Warning: [_1] exists but differs from LON-CAPA supplied file.','/etc/network/if-pre-up.d/iptables')."\n";
                   }
               } else {
                   print &mt('Error: unable to open [_1] to compare contents with LON-CAPA supplied file.','/etc/network/if-pre-up.d/iptables')."\n";
               }
           } else {
               copy "$instdir/debian/iptables","/etc/network/if-pre-up.d/iptables";
               chmod(0755,"/etc/network/if-pre-up.d/iptables");
               print_and_log(&mt('Installed script "[_1]" to add iptables rules to block all ports except 22, 80, and 443 when network is enabled during boot.','/etc/network/if-pre-up.d/iptables'));
               $ask_to_enable = 1;
           }
       }
       return $ask_to_enable;
 }  }
   
 sub download_loncapa {  sub download_loncapa {

Removed from v.1.3  
changed lines
  Added in v.1.5


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