Fix rights (always present)

README.md

@@ -168,7 +168,7 @@ For debian users, the config_include_dir has been defaulted to /etc/mysql/conf.d
     percona::rights {'userbar on dbfoo':
       priv => 'select_priv',
       host => 'localhost',
-      database => '*'
+      database => '*',
       password => 'default',
     }
 

manifests/adminpass.pp

@@ -50,7 +50,7 @@
   exec {"percona-adminpass-${name}":
     onlyif    => [
       'test -f /usr/bin/mysqladmin',
-      "mysqladmin -u${user} -h${host} --no-defaults status",
+      "mysqladmin --no-defaults -u${user} -h${host}  status",
     ],
     path      => ['/usr/bin','/bin',],
     command   => "mysqladmin -h ${host} -u${user} password ${password}",

manifests/config/server.pp

@@ -18,6 +18,7 @@
   $config_skip      = $::percona::config_skip
 
   $logdir           = $::percona::logdir
+  $logdir_link      = $::percona::logdir_link
   $server           = $::percona::server
   $service_name     = $::percona::service_name
   $service_restart  = $::percona::service_restart
@@ -27,6 +28,9 @@
   $configuration         = $::percona::configuration
   $default_configuration = $::percona::params::default_configuration
 
+  $daemon_group      = $::percona::daemon_group
+  $daemon_user       = $::percona::daemon_user
+
   File {
     owner   => $config_user,
     group   => $config_group,
@@ -131,11 +135,35 @@
     }
   }
 
-  file { $logdir :
-    ensure => 'directory',
-    mode   => $config_dir_mode,
+
+
+  if $logdir_link {
+    file { $logdir_link :
+      ensure => 'directory',
+      mode   => $config_dir_mode,
+      group  => $daemon_group,
+      owner  => $daemon_user,
+    }
+
+    file { $logdir :
+      ensure => 'link',
+      target => $logdir_link,
+      mode   => $config_dir_mode,
+      group  => $daemon_group,
+      owner  => $daemon_user,
+    }
+  }
+  else {
+    file { $logdir :
+      ensure => 'directory',
+      mode   => $config_dir_mode,
+      group  => $daemon_group,
+      owner  => $daemon_user,
+    }
   }
 
+
+
   if $config_skip != true {
     file { $config_file:
       ensure  => 'present',

manifests/init.pp

@@ -86,6 +86,7 @@
 
   $tmpdir           = $percona::params::tmpdir,
   $logdir           = $percona::params::logdir,
+  $logdir_link      = $percona::params::logdir_link,
   $socket           = $percona::params::socket,
   $datadir          = $percona::params::datadir,
   $targetdir        = $percona::params::targetdir,
@@ -100,11 +101,14 @@
   $pkg_version      = $percona::params::pkg_version,
 
   $mgmt_cnf         = $percona::params::mgmt_cnf,
+  $root_password    = undef,
 
   ## These options can NOT be defaulted in percona::params.
   # They are specific for this server instance.
   $configuration    = {},
   $servername       = $::fqdn,
+  $databases        = undef,
+  $users            = undef,
 
   ## These settings are defaulted distro specific ##
   $template         = $percona::params::template,
@@ -141,6 +145,7 @@
 
       'xtrabackup/datadir'               => $::percona::datadir,
       'xtrabackup/target_dir'            => $::percona::targetdir,
+      'xtrabackup/socket'                => $::percona::socket,
     },
   }
 
@@ -149,6 +154,26 @@
   include percona::config
   include percona::service
 
+  if $users {
+    create_resources('percona::rights', hiera_hash('percona::users', $users))
+  }
+
+  if $databases {
+    create_resources('percona::database', hiera_hash('percona::databases', $databases))
+  }
+
+  if $root_password {
+    percona::adminpass{ 'root':
+      password  => $root_password,
+    }
+
+    percona::mgmt_cnf { $mgmt_cnf:
+      password => $root_password,
+      user     => 'root',
+      socket   => $::percona::socket,
+    }
+  }
+
   Class['percona::preinstall'] ->
   Class['percona::install'] ->
   Class['percona::config'] ->

manifests/mgmt_cnf.pp

@@ -23,6 +23,7 @@
 #
 define percona::mgmt_cnf (
   $password,
+  $socket,
   $user      = 'root',
   $owner     = 'root',
   $group     = 'root',

manifests/params.pp

@@ -32,6 +32,12 @@
 # $config_file::            Location of the default mysql my.cnf config file
 #                           for your operatingsystem.
 #
+#
+# === Extra parameters:
+#
+# $logdir_link::            Location of the folder which holds the mysql logs
+#                           linked from original logs directory
+#
 # === Examples:
 #
 # ==== Setting global and default configuration options.
@@ -62,6 +68,7 @@
   $daemon_user       = 'mysql',
   $tmpdir            = undef,
   $logdir            = '/var/log/percona',
+  $logdir_link       = undef,
   $socket            = '/var/lib/mysql/mysql.sock',
   $datadir           = '/var/lib/mysql',
   $targetdir         = '/data/backups/mysql/',

manifests/rights.pp

@@ -133,7 +133,7 @@
     }
 
     mysql_user { "${_user}@${_host}":
-      ensure        => 'present',
+      ensure        => $ensure,
       password_hash => $pwhash,
       mgmt_cnf      => $mycnf,
       require       => [

manifests/security.pp

@@ -0,0 +1,38 @@
+# == Class: percona::security
+#
+# === Todo:
+#
+# TODO: Document class.
+#
+# Some installations have some default users which are not required.
+# We remove them here. You can subclass this class to overwrite this behavior.
+class percona::security (
+  $mgmt_cnf = undef
+) {
+  $mycnf = $mgmt_cnf ? {
+    undef   => $::percona::mgmt_cnf,
+    default => $mgmt_cnf,
+  }
+
+  $users = ["root@${::fqdn}", '[email protected]', 'root@::1', "@${::fqdn}", '@localhost', '@%']
+
+  mysql_user { $users:
+    ensure   => 'absent',
+    mgmt_cnf => $mycnf,
+    require  => [Service[$::percona::service_name], Percona::Mgmt_cnf[$mycnf]],
+  }
+
+  if ($::fqdn != $::hostname) {
+  mysql_user { ["root@${::hostname}", "@${::hostname}"]:
+      ensure   => 'absent',
+      mgmt_cnf => $mycnf,
+      require  => [Service[$::percona::service_name], Percona::Mgmt_cnf[$mycnf]],
+    }
+  }
+
+  mysql_database { 'test':
+    ensure   => 'absent',
+    mgmt_cnf => $mycnf,
+    require  => [Service[$::percona::service_name], Percona::Mgmt_cnf[$mycnf]],
+  }
+}

templates/mgmt_cnf.erb

@@ -2,14 +2,22 @@
 ## Served by:        '<%= scope.lookupvar('::servername') %>' 
 ## Module:           '<%= scope.to_hash['module_name'] %>' 
 ## Template source:  'MODULES<%= template_source.gsub(Regexp.new("^#{Puppet::Node::Environment.current[:modulepath].gsub(':','|')}"),"") %>'
+[client]
+  user = <%= user %>
+  password = <%= password %>
+  socket = <%= socket %>
+
 [mysql]
   user = <%= user %>
   password = <%= password %>
+  socket = <%= socket %>
 
 [mysqldump]
   user = <%= user %>
   password = <%= password %>
+  socket = <%= socket %>
 
 [mysqladmin]
   user = <%= user %>
   password = <%= password %>
+  socket = <%= socket %>