Merge pull request #699 from melan/master

Adds default values for parameters and align assignments
xbezdick · Apr 16, 2015 · 873dea3 · 873dea3
2 parents 97c9eea + 6a79d26
commit 873dea3
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 49 deletions.
diff --git a/manifests/backup/mysqlbackup.pp b/manifests/backup/mysqlbackup.pp
@@ -1,21 +1,21 @@
 # See README.me for usage.
 class mysql::backup::mysqlbackup (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupdirmode = '0700',
-  $backupdirowner = 'root',
-  $backupdirgroup = $mysql::params::root_group,
-  $backupcompress = true,
-  $backuprotate = 30,
-  $ignore_events = true,
+  $backupuser         = '',
+  $backuppassword     = '',
+  $backupdir          = '',
+  $backupdirmode      = '0700',
+  $backupdirowner     = 'root',
+  $backupdirgroup     = $mysql::params::root_group,
+  $backupcompress     = true,
+  $backuprotate       = 30,
+  $ignore_events      = true,
   $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-  $postscript = false,
-  $execpath   = '/usr/bin:/usr/sbin:/bin:/sbin',
+  $backupdatabases    = [],
+  $file_per_database  = false,
+  $ensure             = 'present',
+  $time               = ['23', '5'],
+  $postscript         = false,
+  $execpath           = '/usr/bin:/usr/sbin:/bin:/sbin',
 ) {
 
   mysql_user { "${backupuser}@localhost":

diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp
@@ -1,21 +1,21 @@
 # See README.me for usage.
 class mysql::backup::mysqldump (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupdirmode = '0700',
-  $backupdirowner = 'root',
-  $backupdirgroup = $mysql::params::root_group,
-  $backupcompress = true,
-  $backuprotate = 30,
-  $ignore_events = true,
+  $backupuser         = '',
+  $backuppassword     = '',
+  $backupdir          = '',
+  $backupdirmode      = '0700',
+  $backupdirowner     = 'root',
+  $backupdirgroup     = $mysql::params::root_group,
+  $backupcompress     = true,
+  $backuprotate       = 30,
+  $ignore_events      = true,
   $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-  $postscript = false,
-  $execpath   = '/usr/bin:/usr/sbin:/bin:/sbin',
+  $backupdatabases    = [],
+  $file_per_database  = false,
+  $ensure             = 'present',
+  $time               = ['23', '5'],
+  $postscript         = false,
+  $execpath           = '/usr/bin:/usr/sbin:/bin:/sbin',
 ) {
 
   mysql_user { "${backupuser}@localhost":

diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp
@@ -1,22 +1,22 @@
 # See README.me for usage.
 class mysql::backup::xtrabackup (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupmethod = 'mysqldump',
-  $backupdirmode = '0700',
-  $backupdirowner = 'root',
-  $backupdirgroup = $mysql::params::root_group,
-  $backupcompress = true,
-  $backuprotate = 30,
-  $ignore_events = true,
+  $backupuser         = '',
+  $backuppassword     = '',
+  $backupdir          = '',
+  $backupmethod       = 'mysqldump',
+  $backupdirmode      = '0700',
+  $backupdirowner     = 'root',
+  $backupdirgroup     = $mysql::params::root_group,
+  $backupcompress     = true,
+  $backuprotate       = 30,
+  $ignore_events      = true,
   $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-  $postscript = false,
-  $execpath   = '/usr/bin:/usr/sbin:/bin:/sbin',
+  $backupdatabases    = [],
+  $file_per_database  = false,
+  $ensure             = 'present',
+  $time               = ['23', '5'],
+  $postscript         = false,
+  $execpath           = '/usr/bin:/usr/sbin:/bin:/sbin',
 ) {
 
   mysql_user { "${backupuser}@localhost":

diff --git a/manifests/client/install.pp b/manifests/client/install.pp
@@ -1,3 +1,4 @@
+# See README.md.
 class mysql::client::install {
 
   if $mysql::client::package_manage {

diff --git a/manifests/server/account_security.pp b/manifests/server/account_security.pp
@@ -1,3 +1,4 @@
+# See README.md.
 class mysql::server::account_security {
   mysql_user {
     [ 'root@127.0.0.1',

diff --git a/manifests/server/monitor.pp b/manifests/server/monitor.pp
@@ -1,8 +1,8 @@
 #This is a helper class to add a monitoring user to the database
 class mysql::server::monitor (
-  $mysql_monitor_username,
-  $mysql_monitor_password,
-  $mysql_monitor_hostname
+  $mysql_monitor_username = '',
+  $mysql_monitor_password = '',
+  $mysql_monitor_hostname = ''
 ) {
 
   Anchor['mysql::server::end'] -> Class['mysql::server::monitor']