Adding database class

diff --git a/manifests/database.pp b/manifests/database.pp
new file mode 100644 (file)
index 0000000..c2d1fc3
--- /dev/null
+++ b/manifests/database.pp
@@ -0,0 +1,21 @@
+class database {
+  include mysql::server
+
+  # Database definitions
+  define instance($password) {
+    mysql_database { "$name":
+      ensure => present,
+    }
+
+    mysql_user { "$name@%":
+      password_hash => mysql_password($password),
+      ensure        => present,
+      require       => Mysql_database["$name"],
+    }
+
+    mysql_grant { "$name@%/$name":
+      privileges => all,
+      require    => Mysql_user["$name@%"],
+    }
+  }
+}

diff --git a/manifests/init.pp b/manifests/init.pp
index 18602b1185ffa94975083603abceaacd3189ff94..36c7413410957b595a8f0755f0c4ae39befbf623 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,6 +11,7 @@ import "sudo.pp"
 import "sysctl.pp"
 import "ups.pp"
 import "utils.pp"
+import "database.pp"
 
 class nodo {
   include lsb
@@ -354,7 +355,7 @@ class nodo::vserver inherits nodo {
 class nodo::web inherits nodo::vserver {
   include git-daemon
   include websites
-  include mysql::server
+  include database
   include users::virtual
 
   backupninja::svn { "svn":
@@ -376,6 +377,7 @@ class nodo::master {
   # Puppetmaster should be included before nodo::vserver
   include puppetmasterd
   include nodo::vserver
+  include database
   include gitosis
   include trac
   # TODO: