--- doc/install/linux/install.pl	2014/06/04 00:25:32	1.28
+++ doc/install/linux/install.pl	2014/06/30 00:18:11	1.29
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.28 2014/06/04 00:25:32 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.29 2014/06/30 00:18:11 raeburn Exp $'."\n";
 }
 
 #
@@ -330,6 +330,16 @@ sub check_locale {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/sysconfig/i18n');
         }
+    } elsif ($distro =~ /^(?:rhes|centos|scientific)(\d+)/) {
+        if ($1 >= 7) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/i18n');
+        }
     } else {
         if (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
@@ -437,6 +447,14 @@ sub check_mysql_running {
             $use_systemctl = 1;
         }
     }
+    if ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+        if ($1 >= 7) {
+            $mysqldaemon ='mariadb';
+            $process = 'mysqld';
+            $proc_owner = 'mysql';
+            $use_systemctl = 1;
+        }
+    }
     if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
         my $status = <PIPE>;
         close(PIPE);
@@ -530,6 +548,13 @@ sub chkconfig {
             $uses_systemctl{'mysql'} = 1;
             $uses_systemctl{'apache'} = 1;
         }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+        my $version = $1;
+        if ($version >= 7) {
+            $uses_systemctl{'ntp'} = 1;
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+        }
     }
     my $nocheck;
     if (! -x $checker_bin) {
@@ -720,11 +745,15 @@ sub chkapache {
     } else {
         my $configfile = 'httpd.conf';
         if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
-            if ($1 > 5) {
+            if ($1 >= 7) {
+                $configfile = 'apache2.4/httpd.conf';
+            } elsif ($1 > 5) {
                 $configfile = 'new/httpd.conf';
             }
         } elsif ($distro =~ /^fedora(\d+)$/) {
-            if ($1 > 10) {
+            if ($1 > 17) {
+                $configfile = 'apache2.4/httpd.conf'; 
+            } elsif ($1 > 10) {
                 $configfile = 'new/httpd.conf';
             }
         }
@@ -1767,11 +1796,15 @@ sub copy_httpd_conf {
     my ($instdir,$distro) = @_;
     my $configfile = 'httpd.conf';
     if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
-        if ($1 > 5) {
+        if ($1 >= 7) {
+            $configfile = 'apache2.4/httpd.conf';
+        } elsif ($1 > 5) {
             $configfile = 'new/httpd.conf';
         }
     } elsif ($distro =~ /^fedora(\d+)$/) {
-        if ($1 > 10) {
+        if ($1 > 17) {
+            $configfile = 'apache2.4/httpd.conf';
+        } elsif ($1 > 10) {
             $configfile = 'new/httpd.conf';
         }
     }