facter 1.6.18 → 1.7.0.rc1

data/lib/facter/operatingsystem.rb

@@ -5,7 +5,7 @@
 # Resolution:
 #   If the kernel is a Linux kernel, check for the existence of a selection of
 #   files in /etc/ to find the specific flavour.
-#   On SunOS based kernels, return Solaris.
+#   On SunOS based kernels, attempt to determine the flavour, otherwise return Solaris.
 #   On systems other than Linux, use the kernel value.
 #
 # Caveats:
@@ -14,7 +14,16 @@
 Facter.add(:operatingsystem) do
   confine :kernel => :sunos
   setcode do
-    if FileTest.exists?("/etc/debian_version")
+    # Use uname -v because /etc/release can change in zones under SmartOS.
+    # It's apparently not trustworthy enough to rely on for this fact.
+    output = Facter::Util::Resolution.exec('uname -v')
+    if output =~ /^joyent_/
+      "SmartOS"
+    elsif output =~ /^oi_/
+      "OpenIndiana"
+    elsif output =~ /^omnios-/
+      "OmniOS"
+    elsif FileTest.exists?("/etc/debian_version")
       "Nexenta"
     else
       "Solaris"
@@ -29,6 +38,8 @@ Facter.add(:operatingsystem) do
        "Ubuntu"
     elsif FileTest.exists?("/etc/debian_version")
       "Debian"
+    elsif FileTest.exists?("/etc/openwrt_release")
+      "OpenWrt"
     elsif FileTest.exists?("/etc/gentoo-release")
       "Gentoo"
     elsif FileTest.exists?("/etc/fedora-release")
@@ -65,6 +76,8 @@ Facter.add(:operatingsystem) do
         "PSBM"
       elsif txt =~ /Ascendos/i
         "Ascendos"
+      elsif txt =~ /^XenServer/i
+        "XenServer"
       else
         "RedHat"
       end
@@ -87,6 +100,8 @@ Facter.add(:operatingsystem) do
       "Slackware"
     elsif FileTest.exists?("/etc/alpine-release")
       "Alpine"
+    elsif FileTest.exists?("/etc/mageia-release")
+      "Mageia"
     elsif FileTest.exists?("/etc/system-release")
       "Amazon"
     end

data/lib/facter/operatingsystemmajrelease.rb

@@ -0,0 +1,33 @@
+# Fact: operatingsystemmajrelease
+#
+# Purpose: Returns the major release of the operating system.
+#
+# Resolution: splits down the operatingsystemrelease fact at decimal point for
+#  osfamily RedHat derivatives and Debian.
+#
+# This should be the same as lsbmajdistrelease, but on minimal systems there
+# are too many dependencies to use LSB
+#
+# List of operatingsystems at time of writing:
+#"Alpine" "Amazon" "Archlinux" "Ascendos" "Bluewhite64" "CentOS" "CloudLinux" 
+#"Debian" "Fedora" "Gentoo" "Mandrake" "Mandriva" "MeeGo" "OEL" "OpenSuSE" 
+#"OracleLinux" "OVS" "PSBM" "RedHat" "Scientific" "Slackware" "Slamd64" "SLC"
+#"SLED" "SLES" "SuSE" "Ubuntu" "VMWareESX"
+Facter.add(:operatingsystemmajrelease) do
+  confine :operatingsystem => [
+    :Amazon,
+    :CentOS,
+    :CloudLinux,
+    :Debian,
+    :Fedora,
+    :OEL,
+    :OracleLinux,
+    :OVS,
+    :RedHat,
+    :Scientific,
+    :SLC
+  ]
+  setcode do
+    Facter.value('operatingsystemrelease').split('.').first
+  end
+end

data/lib/facter/operatingsystemrelease.rb

@@ -10,17 +10,20 @@
 #   information.
 #   On Slackware, parses '/etc/slackware-version'.
 #   On Amazon Linux, returns the 'lsbdistrelease' value.
+#   On Mageia, parses '/etc/mageia-release' for the release version.
 #
 #   On all remaining systems, returns the 'kernelrelease' value.
 #
 # Caveats:
 #
 
+require 'facter/util/file_read'
+
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC Ascendos CloudLinux PSBM}
   setcode do
     case Facter.value(:operatingsystem)
-    when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM"
+    when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "XenServer"
       releasefile = "/etc/redhat-release"
     when "Fedora"
       releasefile = "/etc/fedora-release"
@@ -33,12 +36,13 @@ Facter.add(:operatingsystemrelease) do
     when "OVS", "ovs"
       releasefile = "/etc/ovs-release"
     end
-    File::open(releasefile, "r") do |f|
-      line = f.readline.chomp
-      if line =~ /\(Rawhide\)$/
+
+    if release = Facter::Util::FileRead.read(releasefile)
+      line = release.split("\n").first.chomp
+      if match = /\(Rawhide\)$/.match(line)
         "Rawhide"
-      elsif line =~ /release (\d[\d.]*)/
-        $1
+      elsif match = /release (\d[\d.]*)/.match(line)
+        match[1]
       end
     end
   end
@@ -47,16 +51,22 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{Debian}
   setcode do
-    release = Facter::Util::Resolution.exec('cat /etc/debian_version')
+    if release = Facter::Util::FileRead.read('/etc/debian_version')
+      release.sub!(/\s*$/, '')
+      release
+    end
   end
 end
 
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{Ubuntu}
   setcode do
-    release = Facter::Util::Resolution.exec('cat /etc/issue')
-    if release =~ /Ubuntu (\d+.\d+)/
-      $1
+    if release = Facter::Util::FileRead.read('/etc/issue')
+      if match = release.match(/Ubuntu ((\d+.\d+)(\.(\d+))?)/)
+        # Return only the major and minor version numbers.  This behavior must
+        # be preserved for compatibility reasons.
+        match[2]
+      end
     end
   end
 end
@@ -64,19 +74,31 @@ end
 Facter.add(:operatingsystemrelease) do
   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
+    if release = Facter::Util::FileRead.read('/etc/SuSE-release')
+      if match = /^VERSION\s*=\s*(\d+)/.match(release)
+        releasemajor = match[1]
+        if match = /^PATCHLEVEL\s*=\s*(\d+)/.match(release)
+          releaseminor = match[1]
+        elsif match = /^VERSION\s=.*.(\d+)/.match(release)
+          releaseminor = match[1]
+        else
+          releaseminor = "0"
+        end
+        releasemajor + "." + releaseminor
       else
-        releaseminor = "0"
+        "unknown"
+      end
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{OpenWrt}
+  setcode do
+    if release = Facter::Util::FileRead.read('/etc/openwrt_version')
+      if match = /^(\d+\.\d+.*)/.match(release)
+        match[1]
       end
-      releasemajor + "." + releaseminor
-    else
-      "unknown"
     end
   end
 end
@@ -84,9 +106,21 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{Slackware}
   setcode do
-    release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
-    if release =~ /Slackware ([0-9.]+)/
-      $1
+    if release = Facter::Util::FileRead.read('/etc/slackware-version')
+      if match = /Slackware ([0-9.]+)/.match(release)
+        match[1]
+      end
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{Mageia}
+  setcode do
+    if release = Facter::Util::FileRead.read('/etc/mageia-release')
+      if match = /Mageia release ([0-9.]+)/.match(release)
+        match[1]
+      end
     end
   end
 end
@@ -94,11 +128,12 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{Bluewhite64}
   setcode do
-    releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
-    if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
-      $1 + "." + $2
-    else
-      "unknown"
+    if release = Facter::Util::FileRead.read('/etc/bluewhite64-version')
+      if match = /^\s*\w+\s+(\d+)\.(\d+)/.match(release)
+        match[1] + "." + match[2]
+      else
+        "unknown"
+      end
     end
   end
 end
@@ -107,8 +142,8 @@ Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{VMwareESX}
   setcode do
     release = Facter::Util::Resolution.exec('vmware -v')
-    if release =~ /VMware ESX .*?(\d.*)/
-      $1
+    if match = /VMware ESX .*?(\d.*)/.match(release)
+      match[1]
     end
   end
 end
@@ -116,11 +151,12 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{Slamd64}
   setcode do
-    releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
-    if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
-      $1 + "." + $2
-    else
-      "unknown"
+    if release = Facter::Util::FileRead.read('/etc/slamd64-version')
+      if match = /^\s*\w+\s+(\d+)\.(\d+)/.match(release)
+        match[1] + "." + match[2]
+      else
+        "unknown"
+      end
     end
   end
 end
@@ -128,7 +164,10 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => :Alpine
   setcode do
-    File.read('/etc/alpine-release')
+    if release = Facter::Util::FileRead.read('/etc/alpine-release')
+      release.sub!(/\s*$/, '')
+      release
+    end
   end
 end
 
@@ -137,6 +176,18 @@ Facter.add(:operatingsystemrelease) do
   setcode do Facter[:lsbdistrelease].value end
 end
 
+Facter.add(:operatingsystemrelease) do
+  confine :osfamily => :solaris
+  setcode do
+    if release = Facter::Util::FileRead.read('/etc/release')
+      line = release.split("\n").first.chomp
+      if match = /\s+s(\d+)[sx]?(_u\d+)?.*(?:SPARC|X86)/.match(line)
+        match.captures.join('')
+      end
+    end
+  end
+end
+
 Facter.add(:operatingsystemrelease) do
   setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/osfamily.rb

@@ -16,14 +16,18 @@ Facter.add(:osfamily) do
 
   setcode do
     case Facter.value(:operatingsystem)
-    when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL"
+    when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL", "Amazon", "XenServer"
       "RedHat"
     when "Ubuntu", "Debian"
       "Debian"
     when "SLES", "SLED", "OpenSuSE", "SuSE"
       "Suse"
-    when "Solaris", "Nexenta"
+    when "Solaris", "Nexenta", "OmniOS", "OpenIndiana", "SmartOS"
       "Solaris"
+    when "Gentoo"
+      "Gentoo"
+    when "Archlinux"
+      "Archlinux"
     else
       Facter.value("kernel")
     end

data/lib/facter/processor.rb

@@ -147,14 +147,14 @@ if Facter.value(:kernel) == "windows"
 end
 
 Facter.add("Processor") do
-  confine :kernel => :dragonfly
+  confine :kernel => [:dragonfly,:freebsd]
   setcode do
     Facter::Util::Resolution.exec("sysctl -n hw.model")
   end
 end
 
 Facter.add("ProcessorCount") do
-  confine :kernel => :dragonfly
+  confine :kernel => [:dragonfly,:freebsd]
   setcode do
     Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
   end

data/lib/facter/ps.rb

@@ -14,6 +14,11 @@ Facter.add(:ps) do
   setcode do 'ps -ef' end
 end
 
+Facter.add(:ps) do
+  confine :operatingsystem => :OpenWrt
+  setcode do 'ps www' end
+end
+
 Facter.add(:ps) do
   confine :operatingsystem => %w{FreeBSD NetBSD OpenBSD Darwin DragonFly}
   setcode do 'ps auxwww' end

data/lib/facter/ssh.rb

@@ -11,21 +11,59 @@
 ## Facts related to SSH
 ##
 
-["/etc/ssh","/usr/local/etc/ssh","/etc","/usr/local/etc"].each do |dir|
-  {"SSHDSAKey" => "ssh_host_dsa_key.pub", "SSHRSAKey" => "ssh_host_rsa_key.pub", "SSHECDSAKey" => "ssh_host_ecdsa_key.pub"}.each do |name,file|
-    Facter.add(name) do
-      setcode do
-        value = nil
-        filepath = File.join(dir,file)
+{"SSHDSAKey" => { :file => "ssh_host_dsa_key.pub", :sshfprrtype => 2 } , "SSHRSAKey" => { :file => "ssh_host_rsa_key.pub", :sshfprrtype => 1 }, "SSHECDSAKey" => { :file => "ssh_host_ecdsa_key.pub", :sshfprrtype => 3 } }.each do |name,key|
+  
+  Facter.add(name) do
+    setcode do
+      value = nil
+      
+      [ "/etc/ssh",
+        "/usr/local/etc/ssh",
+        "/etc",
+        "/usr/local/etc",
+        "/etc/opt/ssh",
+      ].each do |dir|
+      
+        filepath = File.join(dir,key[:file])
+      
         if FileTest.file?(filepath)
           begin
-            File.open(filepath) { |f| value = f.read.chomp.split(/\s+/)[1] }
+            value = File.read(filepath).chomp.split(/\s+/)[1]
+            break
           rescue
             value = nil
           end
         end
-        value
-      end # end of proc
-    end # end of add
-  end # end of hash each
-end # end of dir each
+      end
+      
+      value
+    end
+  end
+  
+  Facter.add('SSHFP_' + name[3..-4]) do
+    setcode do
+      ssh = Facter.fact(name).value
+      value = nil
+      
+      if ssh && key[:sshfprrtype]
+        begin
+          require 'digest/sha1'
+          require 'base64'
+          digest = Base64.decode64(ssh)
+          value = 'SSHFP ' + key[:sshfprrtype].to_s + ' 1 ' + Digest::SHA1.hexdigest(digest)
+          begin
+            require 'digest/sha2'
+            value += "\nSSHFP " + key[:sshfprrtype].to_s + ' 2 ' + Digest::SHA256.hexdigest(digest)
+          rescue
+          end
+        rescue
+          value = nil
+        end
+      end
+      
+      value
+    end
+    
+  end
+  
+end

data/lib/facter/util/cfpropertylist.rb

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+require File.join(File.dirname(__FILE__), 'cfpropertylist', 'lib', 'rbCFPropertyList.rb')
+
+
+# eof

data/lib/facter/util/cfpropertylist/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010 Christian Kruse, <cjk@wwwtech.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+