From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/rsyslog | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/rsyslog (limited to 'puppet/modules/rsyslog/lib') diff --git a/puppet/modules/rsyslog b/puppet/modules/rsyslog deleted file mode 160000 index b8ef11c2..00000000 --- a/puppet/modules/rsyslog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b8ef11c23949d12732ad5cdaebb3023ff39a297a -- cgit v1.2.3 From 1e1e25286b64790141c9627f81b50f579b13b719 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:46:28 -0400 Subject: git subrepo clone https://leap.se/git/puppet_rsyslog puppet/modules/rsyslog subrepo: subdir: "puppet/modules/rsyslog" merged: "b8ef11c" upstream: origin: "https://leap.se/git/puppet_rsyslog" branch: "master" commit: "b8ef11c" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "1e79595" Change-Id: Iee06502c6df609f1a261410742360cec8694dab5 --- .../modules/rsyslog/lib/facter/rsyslog_version.rb | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 puppet/modules/rsyslog/lib/facter/rsyslog_version.rb (limited to 'puppet/modules/rsyslog/lib') 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 -- cgit v1.2.3