From fd690bd339b1c299dff690b1a61fa9e267785beb Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 21 Jul 2010 07:04:11 +0200
Subject: some minor updates to the providers

---
 lib/puppet/provider/mysql_user/mysql.rb | 118 ++++++++++++++++----------------
 1 file changed, 59 insertions(+), 59 deletions(-)

(limited to 'lib/puppet/provider/mysql_user/mysql.rb')

diff --git a/lib/puppet/provider/mysql_user/mysql.rb b/lib/puppet/provider/mysql_user/mysql.rb
index adc46c3..e3908be 100644
--- a/lib/puppet/provider/mysql_user/mysql.rb
+++ b/lib/puppet/provider/mysql_user/mysql.rb
@@ -1,76 +1,76 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:mysql_user).provide(:mysql,
-		# T'is funny business, this code is quite generic
-		:parent => Puppet::Provider::Package) do
+  # T'is funny business, this code is quite generic
+  :parent => Puppet::Provider::Package) do
 
-	desc "Use mysql as database."
-	commands :mysql => '/usr/bin/mysql'
-	commands :mysqladmin => '/usr/bin/mysqladmin'
+  desc "Use mysql as database."
+  commands :mysql => '/usr/bin/mysql'
+  commands :mysqladmin => '/usr/bin/mysqladmin'
 
-	# retrieve the current set of mysql users
-	def self.instances
-		users = []
+  # retrieve the current set of mysql users
+  def self.instances
+    users = []
 
-		cmd = "#{command(:mysql)} mysql -NBe 'select concat(user, \"@\", host), password from user'"
-		execpipe(cmd) do |process|
-			process.each do |line|
-				users << new( query_line_to_hash(line) )
-			end
-		end
-		return users
-	end
+    cmd = "#{command(:mysql)} mysql -NBe 'select concat(user, \"@\", host), password from user'"
+    execpipe(cmd) do |process|
+      process.each do |line|
+        users << new( query_line_to_hash(line) )
+      end
+    end
+    return users
+  end
 
-	def self.query_line_to_hash(line)
-		fields = line.chomp.split(/\t/)
-		{
-			:name => fields[0],
-			:password_hash => fields[1],
-			:ensure => :present
-		}
-	end
+  def self.query_line_to_hash(line)
+    fields = line.chomp.split(/\t/)
+    {
+      :name => fields[0],
+      :password_hash => fields[1],
+      :ensure => :present
+    }
+  end
 
-	def mysql_flush 
-		mysqladmin "flush-privileges"
-	end
+  def mysql_flush 
+    mysqladmin "flush-privileges"
+  end
 
-	def query
-		result = {}
+  def query
+    result = {}
 
-		cmd = "#{command(:mysql)} -NBe 'select concat(user, \"@\", host), password from user where concat(user, \"@\", host) = \"%s\"'" % @resource[:name]
-		execpipe(cmd) do |process|
-			process.each do |line|
-				unless result.empty?
-					raise Puppet::Error,
-						"Got multiple results for user '%s'" % @resource[:name]
-				end
-				result = query_line_to_hash(line)
-			end
-		end
-		result
-	end
+    cmd = "#{command(:mysql)} -NBe 'select concat(user, \"@\", host), password from user where concat(user, \"@\", host) = \"%s\"'" % @resource[:name]
+    execpipe(cmd) do |process|
+      process.each do |line|
+        unless result.empty?
+          raise Puppet::Error,
+            "Got multiple results for user '%s'" % @resource[:name]
+        end
+        result = query_line_to_hash(line)
+      end
+    end
+    result
+  end
 
-	def create
-		mysql "mysql", "-e", "create user '%s' identified by PASSWORD '%s'" % [ @resource[:name].sub("@", "'@'"), @resource.should(:password_hash) ]
-		mysql_flush
-	end
+  def create
+    mysql "mysql", "-e", "create user '%s' identified by PASSWORD '%s'" % [ @resource[:name].sub("@", "'@'"), @resource.should(:password_hash) ]
+    mysql_flush
+  end
 
-	def destroy
-		mysql "mysql", "-e", "drop user '%s'" % @resource[:name].sub("@", "'@'")
-		mysql_flush
-	end
+  def destroy
+    mysql "mysql", "-e", "drop user '%s'" % @resource[:name].sub("@", "'@'")
+    mysql_flush
+  end
 
-	def exists?
-		not mysql("mysql", "-NBe", "select '1' from user where CONCAT(user, '@', host) = '%s'" % @resource[:name]).empty?
-	end
+  def exists?
+    not mysql("mysql", "-NBe", "select '1' from user where CONCAT(user, '@', host) = '%s'" % @resource[:name]).empty?
+  end
 
-	def password_hash
-		@property_hash[:password_hash]
-	end
+  def password_hash
+    @property_hash[:password_hash]
+  end
 
-	def password_hash=(string)
-		mysql "mysql", "-e", "SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub("@", "'@'"), string ]
-		mysql_flush
-	end
+  def password_hash=(string)
+    mysql "mysql", "-e", "SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub("@", "'@'"), string ]
+    mysql_flush
+  end
 end
 
-- 
cgit v1.2.3