Merge branch 'release/1.2.1'

.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+/pkg/

Gemfile

@@ -1,18 +1,25 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'puppet-lint', '>=0.2.0'
-gem 'rspec'
-gem 'rspec-expectations'
-gem 'rspec-puppet', '>=0.1.3'
+group :rake do
+  gem 'rake'
+  gem 'puppet-lint', '>=0.2.0'
+  gem 'rspec'
+  gem 'rspec-expectations'
+  gem 'rspec-puppet', '>=0.1.3'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>=0.2.0'
+  puppetversion = ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+  gem 'puppet', puppetversion
+  gem 'puppetlabs_spec_helper', '>=0.2.0'
 
-gem 'guard'
-gem 'guard-shell', '>= 0.4.0'
-gem 'libnotify' if RUBY_PLATFORM.downcase.include?("linux")
-gem 'growl' if RUBY_PLATFORM.downcase.include?("darwin")
+  gem 'diff_matcher'
+
+  gem 'puppet-blacksmith'
+end
+
+group :vagrant do
+  gem 'guard'
+  gem 'guard-shell', '>= 0.4.0'
+  gem 'libnotify' if RUBY_PLATFORM.downcase.include?("linux")
+  gem 'growl' if RUBY_PLATFORM.downcase.include?("darwin")
+end
 
-gem 'diff_matcher'

Modulefile

@@ -0,0 +1,9 @@
+name 'vstone-percona'
+version '1.2.1'
+
+author 'Jan Vansteenkiste <jan@vstone.eu>'
+license 'Apache License Version 2.0'
+project_page 'https://github.com/vStone/puppet-percona'
+source 'git://github.com/vStone/puppet-percona.git'
+summary 'Manage mysql/percona server configuration'
+description 'Managed your percona server, optimized for use with hiera.'

README.md

@@ -24,11 +24,11 @@ or
 ### Client and server
 
 ```puppet
-    class { 'apt': }
-    class { 'percona': server => true, }
+  class { 'apt': }
+  class { 'percona': server => true, }
 
-    Class['apt'] ->
-    Class['percona']
+  Class['apt'] ->
+  Class['percona']
 ```
 
 ### Configuration
@@ -166,9 +166,9 @@ 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 => '*'
+      priv     => 'select_priv',
+      host     => 'localhost',
+      database => '*',
       password => 'default',
     }
 

Rakefile

@@ -1,4 +1,5 @@
-require 'rake'
+require 'bundler'
+Bundler.require(:rake)
 require 'rspec/core/rake_task'
 require 'puppetlabs_spec_helper/rake_tasks'
 

lib/facter/mysql_facts.rb

@@ -1,4 +1,3 @@
-#  Copyright 2012 UnifiedPost
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

lib/puppet/provider/mysql_database/mysql.rb

@@ -10,6 +10,8 @@
   def mysql_args(*args)
     if @resource[:mgmt_cnf].is_a?(String)
       args.insert(0, "--defaults-file=#{@resource[:mgmt_cnf]}")
+    elsif File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      args.insert(0, "--defaults-file=#{Facter.value(:root_home)}/.my.cnf")
     end
     args
   end
@@ -36,7 +38,6 @@ def charset=(value)
     mysql(mysql_args('-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"))
   end
 
-
   def exists?
     begin
       mysql(mysql_args('-NBe', "show databases")).match(/^#{@resource[:name]}$/)

lib/puppet/provider/mysql_grant/mysql.rb

@@ -10,6 +10,8 @@
   def mysql_args(*args)
     if @resource and @resource[:mgmt_cnf].is_a?(String)
       args.insert(0, "--defaults-file=#{@resource[:mgmt_cnf]}")
+    elsif File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      args.insert(0, "--defaults-file=#{Facter.value(:root_home)}/.my.cnf")
     end
     args
   end
@@ -95,7 +97,7 @@ def row_exists?
     if name[:type] == :db
       fields << :db
     end
-    not mysql(mysql_args("mysql", "-NBe", 'SELECT "1" FROM %s WHERE %s' % [ name[:type], fields.map do |f| "%s=\"%s\"" % [f, name[f]] end.join(' AND ')])).empty?
+    not mysql(mysql_args("mysql", "-NBe", "SELECT '1' FROM %s WHERE %s" % [ name[:type], fields.map do |f| "%s=\"%s\"" % [f, name[f]] end.join(' AND ')])).empty?
   end
 
   def all_privs_set?
@@ -117,9 +119,9 @@ def privileges
 
     case name[:type]
     when :user
-      privs = mysql(mysql_args("mysql", "-Be", 'select * from user where user="%s" and host="%s"' % [ name[:user], name[:host] ]))
+      privs = mysql(mysql_args("mysql", "-Be", "select * from user where user='%s' and host='%s'" % [ name[:user], name[:host] ]))
     when :db
-      privs = mysql(mysql_args("mysql", "-Be", 'select * from db where user="%s" and host="%s" and db="%s"' % [ name[:user], name[:host], name[:db] ]))
+      privs = mysql(mysql_args("mysql", "-Be", "select * from db where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]))
     end
 
     if privs.match(/^$/)
@@ -148,11 +150,11 @@ def privileges=(privs)
     case name[:type]
     when :user
       stmt = 'update user set '
-      where = ' where user="%s" and host="%s"' % [ name[:user], name[:host] ]
+      where = " where user='%s' and host='%s'" % [ name[:user], name[:host] ]
       all_privs = user_privs
     when :db
       stmt = 'update db set '
-      where = ' where user="%s" and host="%s"' % [ name[:user], name[:host] ]
+      where = " where user='%s' and host='%s'" % [ name[:user], name[:host] ]
       all_privs = db_privs
     end
 

lib/puppet/provider/mysql_user/mysql.rb

@@ -10,6 +10,8 @@
   def mysql_args(*args)
     if @resource[:mgmt_cnf].is_a?(String)
       args.insert(0, "--defaults-file=#{@resource[:mgmt_cnf]}")
+    elsif File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      args.insert(0, "--defaults-file=#{Facter.value(:root_home)}/.my.cnf")
     end
     args
   end

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

@@ -17,7 +17,9 @@
   $config_replace   = $::percona::config_replace
   $config_skip      = $::percona::config_skip
 
+  $daemon_user      = $::percona::daemon_user
   $logdir           = $::percona::logdir
+  $logdir_group     = $::percona::logdir_group
   $server           = $::percona::server
   $service_name     = $::percona::service_name
   $service_restart  = $::percona::service_restart
@@ -134,6 +136,8 @@
   file { $logdir :
     ensure => 'directory',
     mode   => $config_dir_mode,
+    owner  => $daemon_user,
+    group  => $logdir_group,
   }
 
   if $config_skip != true {

manifests/init.pp

@@ -86,6 +86,7 @@
 
   $tmpdir           = $percona::params::tmpdir,
   $logdir           = $percona::params::logdir,
+  $logdir_group     = $percona::params::logdir_group,
   $socket           = $percona::params::socket,
   $datadir          = $percona::params::datadir,
   $targetdir        = $percona::params::targetdir,

manifests/module.pp

@@ -4,7 +4,7 @@
 #
 class percona::module {
 
-  $id = 'unifiedpost-puppet-percona'
-  $version = '1.2.0'
+  $id = 'vstone-puppet-percona'
+  $version = '1.2.1'
 
 }

manifests/params.pp

@@ -62,6 +62,7 @@
   $daemon_user       = 'mysql',
   $tmpdir            = undef,
   $logdir            = '/var/log/percona',
+  $logdir_group      = 'root',
   $socket            = '/var/lib/mysql/mysql.sock',
   $datadir           = '/var/lib/mysql',
   $targetdir         = '/data/backups/mysql/',

templates/mgmt_cnf.erb

@@ -2,6 +2,10 @@
 ## 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 %>
+
 [mysql]
   user = <%= user %>
   password = <%= password %>

templates/my.cnf.erb

@@ -2,7 +2,7 @@
 ### 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(':','|')}"),"") %>'
-<%= scope.function_percona_hash_print([options]) %>
+<%= scope.function_percona_hash_print([@options]) %>
 
 <% if defined?(@config_includedir) and @config_includedir != :undef -%>
 !includedir <%= @config_includedir %>