Merge pull request #558 from paramite/manage_service

Fixes manage_service feature
xbezdick · Sep 10, 2014 · fbef97d · fbef97d
2 parents f8dca35 + 293d35d
commit fbef97d
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -1,23 +1,24 @@
 #
 class mysql::server::service {
 
-  if $mysql::server::real_service_enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
-  }
-
   if $mysql::server::real_service_manage {
-    file { $mysql::params::log_error:
-      owner => 'mysql',
-      group => 'mysql',
-    }
-    service { 'mysqld':
-      ensure   => $service_ensure,
-      name     => $mysql::server::service_name,
-      enable   => $mysql::server::real_service_enabled,
-      provider => $mysql::server::service_provider,
+    if $mysql::server::real_service_enabled {
+      $service_ensure = 'running'
+    } else {
+      $service_ensure = 'stopped'
     }
   }
 
+  file { $mysql::params::log_error:
+    owner => 'mysql',
+    group => 'mysql',
+  }
+
+  service { 'mysqld':
+    ensure   => $service_ensure,
+    name     => $mysql::server::service_name,
+    enable   => $mysql::server::real_service_enabled,
+    provider => $mysql::server::service_provider,
+  }
+
 }