summaryrefslogtreecommitdiff
path: root/lib/facter
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-08-10 20:56:02 +0200
committerMicah Anderson <micah@riseup.net>2013-08-10 20:56:02 +0200
commita70f43599a375c22f4c474ea9add49684efcda6b (patch)
treeb0e2d7dc5f05b70a0a7659ad93c5f2ff9e35cc02 /lib/facter
parent3ee1d666927fcb440b8ef22d35246a175277c605 (diff)
parentf568a45101e8ef78c9bd03f6a8f38b56f1398ded (diff)
Merge remote-tracking branch 'immerda/master' into leap
Diffstat (limited to 'lib/facter')
-rw-r--r--lib/facter/strongswan_ips.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/facter/strongswan_ips.rb b/lib/facter/strongswan_ips.rb
index 7fac37e..4382d07 100644
--- a/lib/facter/strongswan_ips.rb
+++ b/lib/facter/strongswan_ips.rb
@@ -1,10 +1,13 @@
Facter.add("strongswan_ips") do
setcode do
- result = nil
- if bin = ['/usr/sbin/ipsec', '/usr/sbin/strongswan'].find{|f| File.exists?(f) }
- output = Facter::Util::Resolution.exec("#{bin} statusall | grep -E '^ [0-9a-f]'").to_s.split("\n").collect(&:strip)
- result = output.join(',') unless output.empty?
+ bin = ['/usr/sbin/ipsec', '/usr/sbin/strongswan'].find do |f|
+ File.exists?(f)
+ end
+ if bin
+ output = Facter::Util::Resolution.exec(
+ "#{bin} statusall | grep -E '^ [0-9a-f]' | sort | uniq")
+ output = output.to_s.split("\n").collect(&:strip)
+ output.join(',') unless output.empty?
end
- result
end
end