From 3b623df1f88adf2a177829dacae822dec2c3c7d0 Mon Sep 17 00:00:00 2001
From: Lebedev Vadim <abraham1901@gmail.com>
Date: Wed, 29 Jun 2016 18:54:03 +0300
Subject: * add shorewal version facter

---
 lib/facter/shorewall_major_version.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 lib/facter/shorewall_major_version.rb

(limited to 'lib')

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
new file mode 100644
index 0000000..a733842
--- /dev/null
+++ b/lib/facter/shorewall_major_version.rb
@@ -0,0 +1,5 @@
+Facter.add("shorewall_major_version") do
+  setcode do
+    Facter::Util::Resolution.exec('shorewall version').split('.')[0]    || nil
+  end
+end
-- 
cgit v1.2.3


From 4557aa6dff84fe6189a1ea7af39bbc63c2c00628 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 13 Jan 2017 16:40:38 +0100
Subject: mory rubyism

---
 lib/facter/shorewall_major_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
index a733842..0068b48 100644
--- a/lib/facter/shorewall_major_version.rb
+++ b/lib/facter/shorewall_major_version.rb
@@ -1,5 +1,5 @@
 Facter.add("shorewall_major_version") do
   setcode do
-    Facter::Util::Resolution.exec('shorewall version').split('.')[0]    || nil
+    Facter::Util::Resolution.exec('shorewall version').split('.').first || nil
   end
 end
-- 
cgit v1.2.3


From 69eac26f08e65eb288e526abd85e34e639369fb0 Mon Sep 17 00:00:00 2001
From: Lebedev Vadim <abraham1901@gmail.com>
Date: Wed, 29 Jun 2016 18:54:03 +0300
Subject: * add shorewal version facter

---
 lib/facter/shorewall_major_version.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 lib/facter/shorewall_major_version.rb

(limited to 'lib')

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
new file mode 100644
index 0000000..a733842
--- /dev/null
+++ b/lib/facter/shorewall_major_version.rb
@@ -0,0 +1,5 @@
+Facter.add("shorewall_major_version") do
+  setcode do
+    Facter::Util::Resolution.exec('shorewall version').split('.')[0]    || nil
+  end
+end
-- 
cgit v1.2.3


From e6a2b00207b0ec495b81e44e8d90acffcf1bb166 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 13 Jan 2017 16:40:38 +0100
Subject: mory rubyism

---
 lib/facter/shorewall_major_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
index a733842..0068b48 100644
--- a/lib/facter/shorewall_major_version.rb
+++ b/lib/facter/shorewall_major_version.rb
@@ -1,5 +1,5 @@
 Facter.add("shorewall_major_version") do
   setcode do
-    Facter::Util::Resolution.exec('shorewall version').split('.')[0]    || nil
+    Facter::Util::Resolution.exec('shorewall version').split('.').first || nil
   end
 end
-- 
cgit v1.2.3


From 70bba04533e2b01584775448a3d04a76e0a1c12c Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Fri, 10 Feb 2017 14:25:11 -0800
Subject: new shorewall_version fact, switch shorewall_major_version to use it

from https://0xacab.org/riseup-puppet-recipes/shorewall/commit/0cd2a305f7fd9ba830a1fa3de25428ffa71d39f7#note_92590
---
 lib/facter/shorewall_major_version.rb | 3 ++-
 lib/facter/shorewall_version.rb       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 lib/facter/shorewall_version.rb

(limited to 'lib')

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
index 0068b48..9b4c9a2 100644
--- a/lib/facter/shorewall_major_version.rb
+++ b/lib/facter/shorewall_major_version.rb
@@ -1,5 +1,6 @@
 Facter.add("shorewall_major_version") do
+  confine :shorewall_version => /\d/
   setcode do
-    Facter::Util::Resolution.exec('shorewall version').split('.').first || nil
+    Facter.value(:shorewall_version).split('.').first
   end
 end
diff --git a/lib/facter/shorewall_version.rb b/lib/facter/shorewall_version.rb
new file mode 100644
index 0000000..3c1cc67
--- /dev/null
+++ b/lib/facter/shorewall_version.rb
@@ -0,0 +1,3 @@
+Facter.add("shorewall_version") do
+  setcode 'shorewall version'
+end
-- 
cgit v1.2.3


From af0e6b36d7c5c52f7eaa2d1827d51befd9971e98 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Apr 2017 12:55:24 +0200
Subject: add a full version fact and derive the maj from that one and make the
 fact work, even if there is no shorewall installed

---
 lib/facter/shorewall_major_version.rb | 3 ++-
 lib/facter/shorewall_version.rb       | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 lib/facter/shorewall_version.rb

(limited to 'lib')

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
index 0068b48..e247fc4 100644
--- a/lib/facter/shorewall_major_version.rb
+++ b/lib/facter/shorewall_major_version.rb
@@ -1,5 +1,6 @@
 Facter.add("shorewall_major_version") do
   setcode do
-    Facter::Util::Resolution.exec('shorewall version').split('.').first || nil
+    v = Facter.value('shorewall_version')
+    v.nil? ? nil : v.split('.').first
   end
 end
diff --git a/lib/facter/shorewall_version.rb b/lib/facter/shorewall_version.rb
new file mode 100644
index 0000000..2a28828
--- /dev/null
+++ b/lib/facter/shorewall_version.rb
@@ -0,0 +1,5 @@
+Facter.add('shorewall_version') do
+  setcode do
+    Facter::Util::Resolution.exec('shorewall version')
+  end
+end
-- 
cgit v1.2.3