facter 1.5.4 → 1.5.5

data/lib/facter.rb

@@ -27,14 +27,14 @@ module Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.5.4'
-	# = Facter
+    FACTERVERSION = '1.5.5'
+    # = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
     # returns them dynamically
 
-	# == Synopsis
-	#
+    # == Synopsis
+    #
     # Generally, treat <tt>Facter</tt> as a hash:
     # == Example
     # require 'facter'
@@ -49,7 +49,7 @@ module Facter
     RESET = ""
     @@debug = 0
 
-	# module methods
+    # module methods
 
     def self.collection
         unless defined?(@collection) and @collection
@@ -147,9 +147,9 @@ module Facter
         Facter.reset
     end
 
-	# Set debugging on or off.
-	def self.debugging(bit)
-		if bit
+    # Set debugging on or off.
+    def self.debugging(bit)
+        if bit
             case bit
             when TrueClass; @@debug = 1
             when FalseClass; @@debug = 0
@@ -168,10 +168,10 @@ module Facter
             else
                 @@debug = 0
             end
-		else
-			@@debug = 0
-		end
-	end
+        else
+            @@debug = 0
+        end
+    end
 
     # Remove them all.
     def self.reset

data/lib/facter/architecture.rb

@@ -4,9 +4,20 @@ Facter.add(:architecture) do
         model = Facter.value(:hardwaremodel)
         case model
         # most linuxen use "x86_64"
-        when 'x86_64'
-            Facter.value(:operatingsystem) == "Debian" ? "amd64" : model;
-        when /(i[3456]86|pentium)/; "i386"
+        when "x86_64"
+            case Facter.value(:operatingsystem)
+            when "Debian", "Gentoo"
+                "amd64"
+            else
+                model
+            end
+        when /(i[3456]86|pentium)/
+            case Facter.value(:operatingsystem)
+            when "Gentoo"
+                "x86"
+            else
+                "i386"
+            end
         else
             model
         end

data/lib/facter/ec2.rb

@@ -0,0 +1,35 @@
+# Changelog:
+# Original facts - Tim Dysinger
+# Updated and added can_connect? function - KurtBe
+
+require 'open-uri'
+require 'timeout'
+
+def can_connect?(ip,port,wait_sec=2)
+ Timeout::timeout(wait_sec) {open(ip, port)}
+ return true
+rescue
+  return false
+end
+
+
+def metadata(id = "")
+  open("http://169.254.169.254/2008-02-01/meta-data/#{id||=''}").read.
+    split("\n").each do |o|
+    key = "#{id}#{o.gsub(/\=.*$/, '/')}"
+    if key[-1..-1] != '/'
+      value = open("http://169.254.169.254/2008-02-01/meta-data/#{key}").read.
+        split("\n")
+      value = value.size>1 ? value : value.first
+      symbol = "ec2_#{key.gsub(/\-|\//, '_')}".to_sym
+      Facter.add(symbol) { setcode { value } }
+    else
+      metadata(key)
+    end
+  end
+end
+
+if can_connect?("169.254.169.254","80")
+  metadata
+end
+

data/lib/facter/hardwareisa.rb

@@ -1,4 +1,4 @@
 Facter.add(:hardwareisa) do
     setcode 'uname -p', '/bin/sh'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OVS}
 end

data/lib/facter/id.rb

@@ -1,5 +1,5 @@
 Facter.add(:id) do
-    confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
+    confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS}
     setcode "whoami"
 end
 

data/lib/facter/ipaddress.rb

@@ -1,44 +1,3 @@
-Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
-    setcode do
-        require 'resolv'
-
-        begin
-            if hostname = Facter.value(:hostname)
-                ip = Resolv.getaddress(hostname)
-                unless ip == "127.0.0.1"
-                    ip
-                end
-            else
-                nil
-            end
-        rescue Resolv::ResolvError
-            nil
-        rescue NoMethodError # i think this is a bug in resolv.rb?
-            nil
-        end
-    end
-end
-
-Facter.add(:ipaddress, :timeout => 2) do
-    setcode do
-        if hostname = Facter.value(:hostname)
-            # we need Hostname to exist for this to work
-            host = nil
-            if host = Facter::Util::Resolution.exec("host #{hostname}")
-                list = host.chomp.split(/\s/)
-                if defined? list[-1] and
-                        list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
-                    list[-1]
-                end
-            else
-                nil
-            end
-        else
-            nil
-        end
-    end
-end
-
 Facter.add(:ipaddress) do
     confine :kernel => :linux
     setcode do
@@ -168,3 +127,44 @@ Facter.add(:ipaddress) do
         ip
     end
 end
+
+Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
+    setcode do
+        require 'resolv'
+
+        begin
+            if hostname = Facter.value(:hostname)
+                ip = Resolv.getaddress(hostname)
+                unless ip == "127.0.0.1"
+                    ip
+                end
+            else
+                nil
+            end
+        rescue Resolv::ResolvError
+            nil
+        rescue NoMethodError # i think this is a bug in resolv.rb?
+            nil
+        end
+    end
+end
+
+Facter.add(:ipaddress, :timeout => 2) do
+    setcode do
+        if hostname = Facter.value(:hostname)
+            # we need Hostname to exist for this to work
+            host = nil
+            if host = Facter::Util::Resolution.exec("host #{hostname}")
+                list = host.chomp.split(/\s/)
+                if defined? list[-1] and
+                        list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
+                    list[-1]
+                end
+            else
+                nil
+            end
+        else
+            nil
+        end
+    end
+end

data/lib/facter/kernel.rb

@@ -2,8 +2,8 @@ Facter.add(:kernel) do
     setcode do
         require 'rbconfig'
         case Config::CONFIG['host_os']
-          when /mswin/i; 'windows'
-          else Facter::Util::Resolution.exec("uname -s")
+        when /mswin/i; 'windows'
+        else Facter::Util::Resolution.exec("uname -s")
         end
     end
 end

data/lib/facter/kernelmajversion.rb

@@ -0,0 +1,5 @@
+Facter.add("kernelmajversion") do
+    setcode do
+        Facter.value(:kernelversion).split('.')[0..1].join('.')
+    end
+end

data/lib/facter/lsb.rb

@@ -13,11 +13,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
 ##
 
-{   "LSBRelease" => %r{^LSB Version:\t(.*)$},
-    "LSBDistId" => %r{^Distributor ID:\t(.*)$},
-    "LSBDistRelease" => %r{^Release:\t(.*)$},
-    "LSBDistDescription" => %r{^Description:\t(.*)$},
-    "LSBDistCodeName" => %r{^Codename:\t(.*)$}
+{  "LSBRelease"         => %r{^LSB Version:\t(.*)$},
+   "LSBDistId"          => %r{^Distributor ID:\t(.*)$},
+   "LSBDistRelease"     => %r{^Release:\t(.*)$},
+   "LSBDistDescription" => %r{^Description:\t(.*)$},
+   "LSBDistCodeName"    => %r{^Codename:\t(.*)$}
 }.each do |fact, pattern|
     Facter.add(fact) do
         confine :kernel => :linux

data/lib/facter/lsbmajdistrelease.rb

@@ -3,7 +3,7 @@
 require 'facter'
 
 Facter.add("lsbmajdistrelease") do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo OEL OVS}
     setcode do
         if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
             result=$1

data/lib/facter/macaddress.rb

@@ -1,9 +1,9 @@
 Facter.add(:macaddress) do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu OEL OVS}
     setcode do
         ether = []
         output = %x{/sbin/ifconfig -a}
-        output.each do |s|
+        output.each_line do |s|
             ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
         end
         ether[0]
@@ -15,7 +15,7 @@ Facter.add(:macaddress) do
     setcode do
     ether = []
         output = %x{/sbin/ifconfig}
-        output.each do |s|
+        output.each_line do |s|
             if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
                 ether.push($1)
             end
@@ -47,12 +47,12 @@ Facter.add(:macaddress) do
         ether = []
         ip = nil
         output = %x{/usr/sbin/ifconfig -a}
-        output.each do |str|
+        output.each_line do |str|
             if str =~ /([a-z]+\d+): flags=/
                 devname = $1
                 unless devname =~ /lo0/
                     output2 = %x{/usr/bin/entstat #{devname}}
-                    output2.each do |str2|
+                    output2.each_line do |str2|
                         if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
                             ether.push($1)
                         end
@@ -69,7 +69,7 @@ Facter.add(:macaddress) do
     setcode do
         ether = []
         output = %x{ipconfig /all}
-        output.split(/\r\n/).each  do |str|
+        output.split(/\r\n/).each do |str|
             if str =~  /.*Physical Address.*: (\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2})/
                 ether.push($1.gsub(/-/, ":"))
             end

data/lib/facter/manufacturer.rb

@@ -6,14 +6,14 @@
 require 'facter/util/manufacturer'
 
 query = {
-	'[Ss]ystem [Ii]nformation' => [
-		{ 'Manufacturer:' => 'manufacturer' },
-		{ 'Product(?: Name)?:' => 'productname' },
-		{ 'Serial Number:' => 'serialnumber' }
-	],
-	'(Chassis Information|system enclosure or chassis)' => [
-		{ '(?:Chassis )?Type:' => 'type' }
-	]
+    '[Ss]ystem [Ii]nformation' => [
+        { 'Manufacturer:'      => 'manufacturer' },
+        { 'Product(?: Name)?:' => 'productname' },
+        { 'Serial Number:'     => 'serialnumber' }
+    ],
+    '(Chassis Information|system enclosure or chassis)' => [
+        { '(?:Chassis )?Type:' => 'type' }
+    ]
 }
 
 Facter::Manufacturer.dmi_find_system_info(query)

data/lib/facter/memory.rb

@@ -7,10 +7,11 @@
 #
 require 'facter/util/memory'
 
-{:MemorySize => "MemTotal",
- :MemoryFree => "MemFree",
- :SwapSize   => "SwapTotal",
- :SwapFree   => "SwapFree"}.each do |fact, name|
+{   :MemorySize => "MemTotal",
+    :MemoryFree => "MemFree",
+    :SwapSize   => "SwapTotal",
+    :SwapFree   => "SwapFree"
+}.each do |fact, name|
     Facter.add(fact) do
         confine :kernel => :linux
         setcode do

data/lib/facter/netmask.rb

@@ -9,9 +9,9 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-	confine :kernel => [ :sunos, :linux ]
-	setcode do
-		Facter::NetMask.get_netmask
-	end
+    confine :kernel => [ :sunos, :linux ]
+    setcode do
+        Facter::NetMask.get_netmask
+    end
 end
 

data/lib/facter/network.rb

@@ -1,10 +1,9 @@
 require 'facter/util/ip'
 
 Facter::Util::IP.get_interfaces.each do |interface|
-
-        Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
-            setcode do
-                Facter::Util::IP.get_network_value(interface)
-            end 
+    Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
+        setcode do
+            Facter::Util::IP.get_network_value(interface)
         end 
+    end 
 end

data/lib/facter/operatingsystem.rb

@@ -20,12 +20,16 @@ Facter.add(:operatingsystem) do
             "Mandriva"
         elsif FileTest.exists?("/etc/mandrake-release")
             "Mandrake"
-	elsif FileTest.exists?("/etc/arch-release")
-	    "Archlinux"
+        elsif FileTest.exists?("/etc/arch-release")
+            "Archlinux"
         elsif FileTest.exists?("/etc/enterprise-release")
-            "OEL"
-        elsif FileTest.exists?("/etc/ovs-release")
-            "OVS"
+            if FileTest.exists?("/etc/ovs-release")
+                "OVS"
+            else
+                "OEL"
+            end
+        elsif FileTest.exists?("/etc/arch-release")
+            "Arch"
         elsif FileTest.exists?("/etc/redhat-release")
             txt = File.read("/etc/redhat-release")
             if txt =~ /centos/i
@@ -37,8 +41,10 @@ Facter.add(:operatingsystem) do
             txt = File.read("/etc/SuSE-release")
             if txt =~ /^SUSE LINUX Enterprise Server/i
                 "SLES"
-	    elsif txt =~ /^openSUSE/i
-		"OpenSuSE"
+            elsif txt =~ /^SUSE LINUX Enterprise Desktop/i
+                "SLED"
+            elsif txt =~ /^openSUSE/i
+                "OpenSuSE"
             else
                 "SuSE"
             end

data/lib/facter/operatingsystemrelease.rb

@@ -53,8 +53,8 @@ end
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{CentOS}
     setcode do
-        centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \((Branch|Final)\)//' /etc/redhat-release")
-        if centos_release =~ /5/
+        centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \\((Branch|Final)\\)//' /etc/redhat-release")
+        if centos_release =~ /^5/
             release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2')
         else
             release = centos_release
@@ -80,15 +80,15 @@ Facter.add(:operatingsystemrelease) do
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{SLES OpenSuSE}
+    confine :operatingsystem => %w{SLES SLED OpenSuSE}
     setcode do
         releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
         if releasefile =~ /^VERSION\s*=\s*(\d+)/
             releasemajor = $1
             if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
                 releaseminor = $1
-	    elsif releasefile =~ /^VERSION\s=.*.(\d+)/
-		releaseminor = $1
+            elsif releasefile =~ /^VERSION\s=.*.(\d+)/
+                releaseminor = $1
             else
                 releaseminor = "0"
             end

data/lib/facter/selinux.rb

@@ -0,0 +1,45 @@
+# Fact for SElinux
+# Written by immerda admin team (admin(at)immerda.ch)
+
+Facter.add("selinux") do
+    confine :kernel => :linux
+
+    setcode do 
+        result = "false"
+        if FileTest.exists?("/selinux/enforce")
+            if FileTest.exists?("/proc/self/attr/current")
+                if (File.read("/proc/self/attr/current") != "kernel\0")
+                    result = "true"
+                end
+            end
+        end
+        result
+    end
+end
+
+Facter.add("selinux_enforced") do
+    confine :selinux => :true
+
+    setcode do
+        result = "false"
+        if FileTest.exists?("/selinux/enforce") and File.read("/selinux/enforce") =~ /1/i
+            result = "true"
+        end
+        result
+    end
+end
+
+Facter.add("selinux_policyversion") do
+    confine :selinux => :true
+    setcode do 
+        File.read("/selinux/policyvers")
+    end
+end
+
+Facter.add("selinux_mode") do
+    confine :selinux => :true
+    setcode do
+        %x{/usr/sbin/sestatus | /bin/grep "Policy from config file:" | awk '{print $5}'}        
+    end
+end
+