Merge branch 'develop'

2 files changed, 38 insertions, 0 deletions

diff --git a/puppet/modules/rsyslog b/puppet/modules/rsyslog
deleted file mode 160000
-Subproject b8ef11c23949d12732ad5cdaebb3023ff39a297
diff --git a/puppet/modules/rsyslog/lib/facter/rsyslog_version.rb b/puppet/modules/rsyslog/lib/facter/rsyslog_version.rb
new file mode 100644
index 00000000..de8531e8
--- /dev/null
+++ b/puppet/modules/rsyslog/lib/facter/rsyslog_version.rb
@@ -0,0 +1,38 @@
+# Fact: :syslog_package
+#
+# Purpose: retrieve installed rsyslog version
+#
+
+Facter.add(:rsyslog_version) do
+    setcode do
+        osfamily = Facter.value('osfamily')
+        case osfamily
+        when "Debian"
+            command='/usr/bin/dpkg-query -f \'${Status};${Version};\' -W rsyslog 2>/dev/null'
+            version = Facter::Util::Resolution.exec(command)
+            if version =~ /.*install ok installed;([^;]+);.*/
+                $1
+            else
+                nil
+            end
+        when "RedHat", "Suse"
+            command='rpm -qa --qf "%{VERSION}" "rsyslog"'
+            version = Facter::Util::Resolution.exec(command)
+            if version =~ /^(.+)$/
+                $1
+            else
+                nil
+            end
+        when "FreeBSD"
+          command='pkg query %v rsyslog'
+          version = Facter::Util::Resolution.exec(command)
+          if version =~ /^(.+)$/
+            $1
+          else
+            nil
+          end
+        else
+            nil
+        end
+    end
+end