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

[raeburn]

raeburn		Tue Jun 19 11:35:13 2018 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Support Ubuntu 18 LTS, Fedora 27 and 28.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.43 doc/install/linux/install.pl:1.44
--- doc/install/linux/install.pl:1.43	Sun Jun 10 00:59:11 2018
+++ doc/install/linux/install.pl	Tue Jun 19 11:35:12 2018
@@ -75,7 +75,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.43 2018/06/10 00:59:11 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.44 2018/06/19 11:35:12 raeburn Exp $'."\n";
 }
 
 #
@@ -564,7 +564,15 @@
         my $version = $1;
         @runlevels = qw/2 3 4 5/;
         @norunlevels = qw/0 1 6/;
-        $checker_bin = '/usr/sbin/sysv-rc-conf';
+        if (($distro =~ /^ubuntu/) && ($version <= 16)) {
+            $checker_bin = '/usr/sbin/sysv-rc-conf';
+        } else {
+            $uses_systemctl{'ntp'} = 1;
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+            $uses_systemctl{'memcached'} = 1;
+            $uses_systemctl{'cups'} = 1;
+        }
         $daemon{'mysql'}  = 'mysql';
         $daemon{'apache'} = 'apache2';
         $daemon{'ntp'}    = 'ntp';
@@ -1807,7 +1815,7 @@
         }
     }
     if ($usesauth) {
-        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject) VALUES('localhost','www','','','')",
+        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')",
                          "ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
     } elsif ($hasauthcol) {
         @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');");