[Mageia-sysadm] [339] Merge remote branch 'vm_valstar/master'

[root at mageia.org]

Revision: 339
Author:   misc
Date:     2010-11-20 12:15:06 +0100 (Sat, 20 Nov 2010)
Log Message:
-----------
Merge remote branch 'vm_valstar/master'

Added Paths:
-----------
    puppet/modules/facter/
    puppet/modules/facter/lib/
    puppet/modules/facter/lib/facter/
    puppet/modules/facter/lib/facter/dc_suffix.rb
    puppet/modules/facter/lib/facter/libdir.rb

Added: puppet/modules/facter/lib/facter/dc_suffix.rb
===================================================================
--- puppet/modules/facter/lib/facter/dc_suffix.rb	                        (rev 0)
+++ puppet/modules/facter/lib/facter/dc_suffix.rb	2010-11-20 11:15:06 UTC (rev 339)
@@ -0,0 +1,10 @@
+Facter.add("dc_suffix") do
+    setcode do
+        begin
+            Facter.domain
+        rescue 
+            Facter.loadfacts()
+        end
+        dc_suffix = 'dc=' + Facter.value('domain').gsub('.',',dc=')
+    end
+end    

Added: puppet/modules/facter/lib/facter/libdir.rb
===================================================================
--- puppet/modules/facter/lib/facter/libdir.rb	                        (rev 0)
+++ puppet/modules/facter/lib/facter/libdir.rb	2010-11-20 11:15:06 UTC (rev 339)
@@ -0,0 +1,10 @@
+Facter.add("libdir") do
+    setcode do
+        begin
+            Facter.architecture
+        rescue 
+            Facter.loadfacts()
+        end
+        '/usr/lib' + ( Facter.value('architecture') == "x86_64" ? '64' : '') + '/'
+    end
+end    
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101120/5fbc9d72/attachment.html>