Merge pull request #654 from NoodlesNZ/logbindir

Check for full path for log-bin to stop puppet from managing directory “."
xbezdick · Feb 24, 2015 · e323f69 · e323f69
2 parents efcf2ed + dc71156
commit e323f69
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -22,12 +22,16 @@
   $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false)
 
   if $logbin {
-    $logbindir = mysql_dirname($logbin)
-    file { $logbindir:
-      ensure => directory,
-      mode   => '0755',
-      owner  => $options['mysqld']['user'],
-      group  => $options['mysqld']['user'],
+    $logbindir = dirname($logbin)
+
+    #Stop puppet from managing directory if just a filename/prefix is specified
+    if $logbindir != '.' {
+      file { $logbindir:
+        ensure => directory,
+        mode   => '0755',
+        owner  => $options['mysqld']['user'],
+        group  => $options['mysqld']['user'],
+      }
     }
   }