Merge pull request #539 from stevesaliman/master

igalic · igalic · commit 46643523cef7 · 2014-07-23T12:35:50.000+02:00
Grants for the backupuser should be conditional
diff --git a/manifests/server/backup.pp b/manifests/server/backup.pp
@@ -26,7 +26,7 @@
   }
 
   mysql_grant { "${backupuser}@localhost/*.*":
-    ensure     => present,
+    ensure     => $ensure,
     user       => "${backupuser}@localhost",
     table      => '*.*',
     privileges => [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS' ],

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`mysql_grant { "${backupuser}@localhost/.":`
`29`		`- ensure => present,`
	`29`	`+ ensure => $ensure,`
`30`	`30`	`user => "${backupuser}@localhost",`
`31`	`31`	`table => '.',`
`32`	`32`	`privileges => [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS' ],`