[BACK]Return to install.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / doc / install / linux

Diff for /doc/install/linux/install.pl between versions 1.29 and 1.32

version 1.29, 2014/06/30 00:18:11 version 1.32, 2014/10/29 20:56:18
Line 554  sub chkconfig { Line 554  sub chkconfig {
             $uses_systemctl{'ntp'} = 1;              $uses_systemctl{'ntp'} = 1;
             $uses_systemctl{'mysql'} = 1;              $uses_systemctl{'mysql'} = 1;
             $uses_systemctl{'apache'} = 1;              $uses_systemctl{'apache'} = 1;
               $daemon{'mysql'} = 'mariadb';
         }          }
     }      }
     my $nocheck;      my $nocheck;
Line 693  sub chkapache { Line 694  sub chkapache {
                 $configfile = "/etc/apache2/conf-available/loncapa";                  $configfile = "/etc/apache2/conf-available/loncapa";
             }              }
             if (-e $configfile) {              if (-e $configfile) {
                 if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa /etc/apache2/sites-available/loncapa |")) {                  if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa $configfile |")) {
                     my $diffres = <PIPE>;                      my $diffres = <PIPE>;
                     close(PIPE);                      close(PIPE);
                     chomp($diffres);                      chomp($diffres);
Line 1848  sub copy_apache2_debconf { Line 1849  sub copy_apache2_debconf {
         unlink($defaultconfig);          unlink($defaultconfig);
     }      }
     if (($distname eq 'ubuntu') && ($version > 12)) {      if (($distname eq 'ubuntu') && ($version > 12)) {
         print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa symlink'")."\n");          print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa.conf symlink'")."\n");
         my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';          my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';
         my $apache2_conf_available_dir = '/etc/apache2/conf-available';          my $apache2_conf_available_dir = '/etc/apache2/conf-available';
         if (-e "$apache2_conf_available_dir/loncapa") {          if (-e "$apache2_conf_available_dir/loncapa") {
             copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");              copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
         }          }
         copy("$instdir/debian-ubuntu/loncapa","$apache2_conf_available_dir/loncapa");          my $defaultconf = $apache2_conf_available_dir.'/loncapa.conf';
           copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa");
         chmod(0444,"$apache2_conf_available_dir/loncapa");          chmod(0444,"$apache2_conf_available_dir/loncapa");
         symlink("$apache2_conf_available_dir/loncapa","$apache2_conf_enabled_dir/loncapa.conf");          if (-l $defaultconf) {
               unlink($defaultconf);
           }
           symlink("$apache2_conf_available_dir/loncapa","$defaultconf");
           print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default.conf symlink'")."\n");
           copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa");
           chmod(0444,"$apache2_sites_available_dir/loncapa");
           symlink("$apache2_sites_available_dir/loncapa","$defaultconfig");
     } else {      } else {
         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");
         if (-e "$apache2_sites_available_dir/loncapa") {          if (-e "$apache2_sites_available_dir/loncapa") {
Removed from v.1.29  
changed lines
  Added in v.1.32

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