--- doc/install/linux/install.pl 2014/06/30 00:18:11 1.29 +++ doc/install/linux/install.pl 2014/06/30 14:55:40 1.31 @@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.29 2014/06/30 00:18:11 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.31 2014/06/30 14:55:40 raeburn Exp $'."\n"; } # @@ -554,6 +554,7 @@ sub chkconfig { $uses_systemctl{'ntp'} = 1; $uses_systemctl{'mysql'} = 1; $uses_systemctl{'apache'} = 1; + $daemon{'mysql'} = 'mariadb'; } } my $nocheck; @@ -693,7 +694,7 @@ sub chkapache { $configfile = "/etc/apache2/conf-available/loncapa"; } 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 = ; close(PIPE); chomp($diffres);