[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Sat Jul  6 18:53:23 2019 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Support Oracle Linux.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.55 doc/install/linux/install.pl:1.56
--- doc/install/linux/install.pl:1.55	Tue Jul  2 19:40:35 2019
+++ doc/install/linux/install.pl	Sat Jul  6 18:53:23 2019
@@ -77,7 +77,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.55 2019/07/02 19:40:35 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.56 2019/07/06 18:53:23 raeburn Exp $'."\n";
 }
 
 #
@@ -451,7 +451,7 @@
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/sysconfig/i18n');
         }
-    } elsif ($distro =~ /^(?:rhes|centos|scientific)(\d+)/) {
+    } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
             if (!open($fh,"</etc/locale.conf")) {
                 print &mt('Failed to open: [_1], default locale not checked.',
@@ -607,7 +607,7 @@
         if ($1 >= 19) {
             $mysqldaemon ='mariadb';
         }
-    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
             $mysqldaemon ='mariadb';
             $process = 'mysqld';
@@ -748,7 +748,7 @@
         if ($version >= 19) {
             $daemon{'mysql'} = 'mariadb';
         }
-    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         my $version = $1;
         if ($version >= 7) {
             $uses_systemctl{'ntp'} = 1;
@@ -758,7 +758,7 @@
             $uses_systemctl{'cups'} = 1;
             $daemon{'mysql'} = 'mariadb';
         }
-        if ($version >= 8) {
+        if (($version >= 8) || ($distro eq 'oracle7')) {
             $daemon{'ntp'} = 'chronyd';
         }
     }
@@ -864,7 +864,7 @@
         if ($1 >= 18) {
             $checkfirewalld = 1;
         }
-    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
             $checkfirewalld = 1;
         }
@@ -1042,7 +1042,7 @@
         }
     } else {
         my $configfile = 'httpd.conf';
-        if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+        if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
             if ($1 >= 7) {
                 $configfile = 'apache2.4/httpd.conf';
             } elsif ($1 > 5) {
@@ -1819,7 +1819,7 @@
     print "\n".&mt('Linux distribution could not be verified as a supported distribution.')."\n".
           &mt('The following are supported: [_1].',
               'CentOS, RedHat Enterprise, Fedora, Scientific Linux, '.
-              'openSuSE, SLES, Ubuntu LTS, Debian')."\n\n".
+              'Oracle Linux, openSuSE, SLES, Ubuntu LTS, Debian')."\n\n".
           &mt('Stopping execution.')."\n";
     exit;
 }
@@ -2556,7 +2556,7 @@
 sub copy_httpd_conf {
     my ($instdir,$distro,$hostname) = @_;
     my $configfile = 'httpd.conf';
-    if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+    if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
         if ($1 >= 7) {
             $configfile = 'apache2.4/httpd.conf';
         } elsif ($1 > 5) {