aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-04 21:21:40 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-04 21:21:40 -0200
commit6a5a4ca4c9ab0eae983bbab0a4e4cf10653da76e (patch)
treebe811b332d09eb58f20aa740d08cc8bdd8217891
parentf265853abd975d76e2668d74becc3642307a11c1 (diff)
downloadpuppet-nodo-6a5a4ca4c9ab0eae983bbab0a4e4cf10653da76e.tar.gz
puppet-nodo-6a5a4ca4c9ab0eae983bbab0a4e4cf10653da76e.tar.bz2
Adding database class
-rw-r--r--manifests/database.pp21
-rw-r--r--manifests/init.pp4
2 files changed, 24 insertions, 1 deletions
diff --git a/manifests/database.pp b/manifests/database.pp
new file mode 100644
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 18602b1..36c7413 100644
--- 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: