Ensure that UUID directory is actually managed.

This isn't necessary, but is more correct. I realized how I could do
this, and have now implemented it.

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/facter/gluster_uuid.rb b/lib/facter/gluster_uuid.rb
index ed0bf70..fa99a40 100644
--- a/lib/facter/gluster_uuid.rb
+++ b/lib/facter/gluster_uuid.rb
@@ -63,12 +63,25 @@ end
 
 # generate uuid and parent directory if they don't already exist...
 if not(module_vardir.nil?) and File.directory?(module_vardir)
-	if not File.directory?(uuiddir)
-		Dir::mkdir(uuiddir)
+
+	create = false
+	if File.directory?(uuiddir)
+
+		if File.exist?(uuidfile)
+			test = File.open(uuidfile, 'r').read.strip.downcase	# read into str
+			# skip over uuid's of the wrong length or that don't match (security!!)
+			if test.length == 36 and regexp.match(test)
+				create = false
+			else
+				create = true
+			end
+		else
+			create = true
+		end
 	end
 
 	# create a uuid and store it in our vardir if it doesn't already exist!
-	if File.directory?(uuiddir) and (not File.exist?(uuidfile))
+	if create
 		result = system("/usr/bin/uuidgen > '" + uuidfile + "'")
 		if not(result)
 			# TODO: print warning