Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet

Conflicts:
	files/master/config.ru
	files/master/puppet.conf
	manifests/base.pp
	manifests/centos.pp
	manifests/cron.pp
	manifests/cron/base.pp
	manifests/cron/linux.pp
	manifests/debian.pp
	manifests/init.pp
	manifests/linux.pp
	manifests/master/linux.pp
	manifests/master/package/debian.pp
	manifests/puppetmaster/base.pp
	manifests/puppetmaster/centos.pp
	manifests/puppetmaster/checklastrun.pp
	manifests/puppetmaster/checklastrun/disable.pp
	manifests/puppetmaster/cleanup_reports.pp
	manifests/puppetmaster/cleanup_reports/disable.pp
	manifests/puppetmaster/debian.pp
	manifests/puppetmaster/package.pp
	manifests/puppetmaster/package/base.pp
	manifests/puppetmaster/passenger.pp

1 files changed, 32 insertions, 0 deletions

diff --git a/manifests/master/hasdb/mysql.pp b/manifests/master/hasdb/mysql.pp
new file mode 100644
index 0000000..5f4985a
--- /dev/null
+++ b/manifests/master/hasdb/mysql.pp
@@ -0,0 +1,32 @@
+# don't use this define use the general interface
+define puppet::master::hasdb::mysql (
+  $dbname = 'puppet',
+  $dbhost = 'localhost',
+  $dbhostfqdn = $::fqdn,
+  $dbuser = 'puppet',
+  $dbpwd,
+  $dbconnectinghost = 'localhost' )
+{
+  @@mysql_database { $dbname:
+    tag => "mysql_${dbhostfqdn}",
+  }
+
+  @@mysql_user { "${dbuser}@${dbconnectinghost}":
+    password_hash => mysql_password("$dbpwd"),
+    require => Mysql_database[$dbname],
+    tag => "mysql_${dbhostfqdn}",
+  }
+
+  @@mysql_grant { "${dbuser}@${dbconnectinghost}/${dbname}":
+    privileges => all,
+    require => Mysql_user["${dbuser}@${dbconnectinghost}"],
+    tag => "mysql_${dbhostfqdn}",
+  }
+
+  if $puppet::master::manage_munin {
+    munin::plugin::deploy { 'puppetresources':
+      source => "puppet/munin/puppetresources.mysql",
+      config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname",
+    }
+  }
+}