Fixing database definitions

diff --git a/manifests/init.pp b/manifests/init.pp
index a467472fd48a066cc1ce022e2b98046379aae123..927be2dc46bc6dab27718f3bca17612b46c97489 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,8 +3,19 @@ class etherpad {
     '': { fail("You need to define etherpad database password! Please set \$etherpad_db_password in your site.pp or host config") }
   }
 
-  database::instance { "etherpad":
-    password => $etherpad_db_password,
+  mysql_database { 'etherpad':
+    ensure => present,
+  }
+
+  mysql_user { "etherpad@%":
+    ensure        => present,
+    password_hash => mysql_password($etherpad_db_password),
+    require       => Mysql_database['etherpad'],
+  }
+
+  mysql_grant { "etherpad@%/etherpad":
+    privileges => 'all',
+    require    => Mysql_user["etherpad@%"],
   }
 
   user { "etherpad-lite":
@@ -74,7 +85,6 @@ class etherpad {
     hasrestart => true,
     hasstatus  => true,
     require    => [ File['/etc/init.d/etherpad-lite', '/var/lib/etherpad-lite/settings.json'],
-                    Mysql_database['etherpad'], Mysql_user['etherpad'],
-                    Mysql_grant['etherpad'], Package['npm'] ],
+                    Mysql_grant['etherpad@%/etherpad'], Package['npm'] ],
   }
 }