--- doc/loncapafiles/modify_config_files.piml	2006/09/15 20:54:31	1.5
+++ doc/loncapafiles/modify_config_files.piml	2017/03/29 20:48:25	1.33
@@ -1,9 +1,9 @@
 <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
-<!-- accesscount_seed.piml -->
+<!-- modify_config_files.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.5 2006/09/15 20:54:31 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.33 2017/03/29 20:48:25 raeburn Exp $ -->
 
 <!--
 
@@ -35,21 +35,37 @@ http://www.lon-capa.org/
 <file>
 <target dist="default">/</target>
 <perlscript mode="fg">
-my $mysqldaemon = 'mysqld';
 my $configfiles = 'yum and MySQL';
-if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10') {
-    $mysqldaemon = 'mysql';
+my $mysqlcmd = '/etc/init.d/mysqld restart';
+if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1') {
+    $mysqlcmd = '/etc/init.d/mysql restart';
+    $configfiles = 'MySQL';
+} elsif (('<DIST />' eq 'sles12') || ('<DIST />' eq 'suse13.2')) {
+    $mysqlcmd = '/bin/systemctl restart mysql.service';
     $configfiles = 'MySQL';
 } elsif ('<DIST />' eq 'rhes4') {
     $configfiles = 'MySQL';
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10'  || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
+    $configfiles = 'Apt and MySQL';
+    $mysqlcmd = '/etc/init.d/mysql restart';
+} elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
+         ('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
+         ('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21')) {
+    $mysqlcmd = '/bin/systemctl restart mysqld.service';  
+} elsif (('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'centos7')  ||
+         ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'fedora22') ||
+         ('<DIST />' eq 'fedora23')    || ('<DIST />' eq 'fedora24') ||
+         ('<DIST />' eq 'fedora25')) {
+    $mysqlcmd = '/bin/systemctl restart mariadb.service';
 }
+
 print "\nUpdating $configfiles configuration files\n";
 system("/home/httpd/perl/modify_config_files.pl");
 my $returnvalue = $?>>8;
 if ($returnvalue == 1) {
     ## the /etc/my.cnf file was modified.
     print "**** WARNING: You need to restart MySQL at this time.\n".
-        "    Use the command \"/etc/init.d/$mysqldaemon restart\"\n";
+        "    Use the command \"$mysqlcmd\"\n";
 }
 </perlscript>
 </file>