From 735572fac73a710321b2bc469be2cbdf17c46b11 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 28 Nov 2010 13:01:46 -0500 Subject: Fix whitespace and coding standards to use standard formatting styles (I believe that this Closes #2353) --- manifests/puppetmaster/hasdb/mysql.pp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'manifests/puppetmaster/hasdb') diff --git a/manifests/puppetmaster/hasdb/mysql.pp b/manifests/puppetmaster/hasdb/mysql.pp index 22e6434..322bf69 100644 --- a/manifests/puppetmaster/hasdb/mysql.pp +++ b/manifests/puppetmaster/hasdb/mysql.pp @@ -1,30 +1,29 @@ # don't use this define use the general interface -define puppet::puppetmaster::hasdb::mysql( +define puppet::puppetmaster::hasdb::mysql ( $dbname = 'puppet', $dbhost = 'localhost', $dbhostfqdn = "${fqdn}", $dbuser = 'puppet', $dbpwd, - $dbconnectinghost = 'localhost' -){ - @@mysql_database{$dbname: + $dbconnectinghost = 'localhost' ) +{ + @@mysql_database { $dbname: tag => "mysql_${dbhostfqdn}", } - @@mysql_user{"${dbuser}@${dbconnectinghost}": + @@mysql_user { "${dbuser}@${dbconnectinghost}": password_hash => mysql_password("$dbpwd"), require => Mysql_database[$dbname], tag => "mysql_${dbhostfqdn}", } - - @@mysql_grant{"${dbuser}@${dbconnectinghost}/${dbname}": + @@mysql_grant { "${dbuser}@${dbconnectinghost}/${dbname}": privileges => all, require => Mysql_user["${dbuser}@${dbconnectinghost}"], tag => "mysql_${dbhostfqdn}", } - munin::plugin::deploy{'puppetresources': + munin::plugin::deploy { 'puppetresources': source => "puppet/munin/puppetresources.mysql", config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname", } -- cgit v1.2.3