From 483f0c161440a018efe48bc96910dcb5834c32a1 Mon Sep 17 00:00:00 2001
From: Stephan Leemburg <sleemburg@it-functions.nl>
Date: Wed, 13 Jul 2022 14:50:17 +0200
Subject: [PATCH 1/4] add Check Point Gaia

---
 cdist/conf/explorer/lsb_codename    | 3 +++
 cdist/conf/explorer/lsb_description | 3 +++
 cdist/conf/explorer/lsb_id          | 3 +++
 cdist/conf/explorer/lsb_release     | 3 +++
 cdist/conf/explorer/os              | 7 +++++++
 cdist/conf/explorer/os_release      | 4 ++++
 cdist/conf/explorer/os_version      | 3 +++
 7 files changed, 26 insertions(+)

diff --git a/cdist/conf/explorer/lsb_codename b/cdist/conf/explorer/lsb_codename
index 26bb8e3d..c9fb5cdf 100755
--- a/cdist/conf/explorer/lsb_codename
+++ b/cdist/conf/explorer/lsb_codename
@@ -21,6 +21,9 @@
 
 set +e
 case "$("$__explorer/os")" in
+   checkpoint)
+       awk '{printf("%s\n", $(NF-1))}' /etc/cp-release
+   ;;
    openwrt)
       # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_CODENAME")
diff --git a/cdist/conf/explorer/lsb_description b/cdist/conf/explorer/lsb_description
index b1009627..7279a9c2 100755
--- a/cdist/conf/explorer/lsb_description
+++ b/cdist/conf/explorer/lsb_description
@@ -21,6 +21,9 @@
 
 set +e
 case "$("$__explorer/os")" in
+   checkpoint)
+       cat /etc/cp-release
+   ;;
    openwrt)
       # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION")
diff --git a/cdist/conf/explorer/lsb_id b/cdist/conf/explorer/lsb_id
index 82ff9977..1f91cc40 100755
--- a/cdist/conf/explorer/lsb_id
+++ b/cdist/conf/explorer/lsb_id
@@ -21,6 +21,9 @@
 
 set +e
 case "$("$__explorer/os")" in
+   checkpoint)
+       echo "CheckPoint"
+   ;;
    openwrt)
       # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_ID")
diff --git a/cdist/conf/explorer/lsb_release b/cdist/conf/explorer/lsb_release
index 5ebfff1a..d9100569 100755
--- a/cdist/conf/explorer/lsb_release
+++ b/cdist/conf/explorer/lsb_release
@@ -21,6 +21,9 @@
 
 set +e
 case "$("$__explorer/os")" in
+   checkpoint)
+       cat /etc/cp-release|sed -e 's/.* R\([1-9][0-9]*\)\.[0-9]*$/\1/'
+   ;;
    openwrt)
       # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
diff --git a/cdist/conf/explorer/os b/cdist/conf/explorer/os
index 46d87f3e..b9232ee4 100755
--- a/cdist/conf/explorer/os
+++ b/cdist/conf/explorer/os
@@ -116,6 +116,13 @@ if [ -f /etc/slackware-version ]; then
    exit 0
 fi
 
+# Appliances
+
+if grep -q '^Check Point Gaia' /etc/cp-release 2>/dev/null; then
+    echo checkpoint
+    exit 0
+fi
+
 uname_s="$(uname -s)"
 
 # Assume there is no tr on the client -> do lower case ourselves
diff --git a/cdist/conf/explorer/os_release b/cdist/conf/explorer/os_release
index 6489446b..ec85046f 100644
--- a/cdist/conf/explorer/os_release
+++ b/cdist/conf/explorer/os_release
@@ -34,5 +34,9 @@ elif test -f /var/run/os-release
 then
 	# FreeBSD (created by os-release service)
 	cat /var/run/os-release
+elif test -f /etc/cp-release
+then
+        # Checkpoint firewall or management (actually linux based)
+        cat /etc/cp-release
 fi
 
diff --git a/cdist/conf/explorer/os_version b/cdist/conf/explorer/os_version
index bbc9e4f0..430200ae 100755
--- a/cdist/conf/explorer/os_version
+++ b/cdist/conf/explorer/os_version
@@ -41,6 +41,9 @@ in
       # empty, but well...
       cat /etc/arch-release
    ;;
+   checkpoint)
+       awk '{version=$NF; printf("%s\n", substr(version, 2))}' /etc/cp-release
+    ;;
    debian)
       debian_version=$(cat /etc/debian_version)
       case $debian_version
-- 
2.45.2


From 624316564531cc7575d2ee0504e3a5f684c74e3d Mon Sep 17 00:00:00 2001
From: Stephan Leemburg <sleemburg@it-functions.nl>
Date: Thu, 28 Jul 2022 16:27:12 +0200
Subject: [PATCH 2/4] add create and ifexists to line type

---
 cdist/conf/type/__line/gencode-remote | 12 ++++++++++--
 cdist/conf/type/__line/man.rst        |  6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote
index a89886da..95c2360d 100755
--- a/cdist/conf/type/__line/gencode-remote
+++ b/cdist/conf/type/__line/gencode-remote
@@ -34,8 +34,16 @@ state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/state")"
 
 if [ -z "$state_is" ]; then
-   printf 'The file "%s" is missing. Please create it before using %s on it.\n' "$file" "${__type##*/}" >&2
-   exit 1
+   if [ -f "$__object/parameter/create" ]; then
+      echo "touch $file"
+   else
+      # only bark if the file should exists
+      if [ -f "$__object/parameter/ifexists" ]; then
+          exit 0
+      fi
+      printf 'The file "%s" is missing. Please create it before using %s on it.\n' "$file" "${__type##*/}" >&2
+      exit 1
+   fi
 fi
 
 if [ "$state_should" = "$state_is" ] || \
diff --git a/cdist/conf/type/__line/man.rst b/cdist/conf/type/__line/man.rst
index 70490f68..dd41fc40 100644
--- a/cdist/conf/type/__line/man.rst
+++ b/cdist/conf/type/__line/man.rst
@@ -21,6 +21,9 @@ OPTIONAL PARAMETERS
 after
     Insert the given line after this pattern.
 
+create
+    It the file does not exist then create an empty file
+
 before
     Insert the given line before this pattern.
 
@@ -28,6 +31,9 @@ file
     If supplied, use this as the destination file.
     Otherwise the object_id is used.
 
+ifexists
+    Only apply the line if the file exists.
+
 line
     Specifies the line which should be absent or present.
 
-- 
2.45.2


From 7d8fc8a5c38c47a36ea87cd98d798d22f91c3185 Mon Sep 17 00:00:00 2001
From: Stephan Leemburg <sleemburg@it-functions.nl>
Date: Thu, 28 Jul 2022 17:18:41 +0200
Subject: [PATCH 3/4] improve checkpoint sed, add __line changes

---
 cdist/conf/explorer/lsb_release                   | 2 +-
 cdist/conf/type/__line/parameter/boolean          | 2 ++
 cdist/conf/type/__line/parameter/default/create   | 1 +
 cdist/conf/type/__line/parameter/default/ifexists | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 cdist/conf/type/__line/parameter/boolean
 create mode 100644 cdist/conf/type/__line/parameter/default/create
 create mode 100644 cdist/conf/type/__line/parameter/default/ifexists

diff --git a/cdist/conf/explorer/lsb_release b/cdist/conf/explorer/lsb_release
index d9100569..0bb9f7fe 100755
--- a/cdist/conf/explorer/lsb_release
+++ b/cdist/conf/explorer/lsb_release
@@ -22,7 +22,7 @@
 set +e
 case "$("$__explorer/os")" in
    checkpoint)
-       cat /etc/cp-release|sed -e 's/.* R\([1-9][0-9]*\)\.[0-9]*$/\1/'
+       sed /etc/cp-release -e 's/.* R\([1-9][0-9]*\)\.[0-9]*$/\1/'
    ;;
    openwrt)
       # shellcheck disable=SC1091
diff --git a/cdist/conf/type/__line/parameter/boolean b/cdist/conf/type/__line/parameter/boolean
new file mode 100644
index 00000000..182a5da6
--- /dev/null
+++ b/cdist/conf/type/__line/parameter/boolean
@@ -0,0 +1,2 @@
+create
+ifexists
diff --git a/cdist/conf/type/__line/parameter/default/create b/cdist/conf/type/__line/parameter/default/create
new file mode 100644
index 00000000..c508d536
--- /dev/null
+++ b/cdist/conf/type/__line/parameter/default/create
@@ -0,0 +1 @@
+false
diff --git a/cdist/conf/type/__line/parameter/default/ifexists b/cdist/conf/type/__line/parameter/default/ifexists
new file mode 100644
index 00000000..c508d536
--- /dev/null
+++ b/cdist/conf/type/__line/parameter/default/ifexists
@@ -0,0 +1 @@
+false
-- 
2.45.2


From 17466452f0762fc3a259a66742a59943c5af2510 Mon Sep 17 00:00:00 2001
From: Stephan Leemburg <sleemburg@it-functions.nl>
Date: Thu, 28 Jul 2022 17:53:41 +0200
Subject: [PATCH 4/4] revert __line for clean PR history

---
 cdist/conf/type/__line/gencode-remote             | 12 ++----------
 cdist/conf/type/__line/man.rst                    |  6 ------
 cdist/conf/type/__line/parameter/boolean          |  2 --
 cdist/conf/type/__line/parameter/default/create   |  1 -
 cdist/conf/type/__line/parameter/default/ifexists |  1 -
 5 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 cdist/conf/type/__line/parameter/boolean
 delete mode 100644 cdist/conf/type/__line/parameter/default/create
 delete mode 100644 cdist/conf/type/__line/parameter/default/ifexists

diff --git a/cdist/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote
index 95c2360d..a89886da 100755
--- a/cdist/conf/type/__line/gencode-remote
+++ b/cdist/conf/type/__line/gencode-remote
@@ -34,16 +34,8 @@ state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/state")"
 
 if [ -z "$state_is" ]; then
-   if [ -f "$__object/parameter/create" ]; then
-      echo "touch $file"
-   else
-      # only bark if the file should exists
-      if [ -f "$__object/parameter/ifexists" ]; then
-          exit 0
-      fi
-      printf 'The file "%s" is missing. Please create it before using %s on it.\n' "$file" "${__type##*/}" >&2
-      exit 1
-   fi
+   printf 'The file "%s" is missing. Please create it before using %s on it.\n' "$file" "${__type##*/}" >&2
+   exit 1
 fi
 
 if [ "$state_should" = "$state_is" ] || \
diff --git a/cdist/conf/type/__line/man.rst b/cdist/conf/type/__line/man.rst
index dd41fc40..70490f68 100644
--- a/cdist/conf/type/__line/man.rst
+++ b/cdist/conf/type/__line/man.rst
@@ -21,9 +21,6 @@ OPTIONAL PARAMETERS
 after
     Insert the given line after this pattern.
 
-create
-    It the file does not exist then create an empty file
-
 before
     Insert the given line before this pattern.
 
@@ -31,9 +28,6 @@ file
     If supplied, use this as the destination file.
     Otherwise the object_id is used.
 
-ifexists
-    Only apply the line if the file exists.
-
 line
     Specifies the line which should be absent or present.
 
diff --git a/cdist/conf/type/__line/parameter/boolean b/cdist/conf/type/__line/parameter/boolean
deleted file mode 100644
index 182a5da6..00000000
--- a/cdist/conf/type/__line/parameter/boolean
+++ /dev/null
@@ -1,2 +0,0 @@
-create
-ifexists
diff --git a/cdist/conf/type/__line/parameter/default/create b/cdist/conf/type/__line/parameter/default/create
deleted file mode 100644
index c508d536..00000000
--- a/cdist/conf/type/__line/parameter/default/create
+++ /dev/null
@@ -1 +0,0 @@
-false
diff --git a/cdist/conf/type/__line/parameter/default/ifexists b/cdist/conf/type/__line/parameter/default/ifexists
deleted file mode 100644
index c508d536..00000000
--- a/cdist/conf/type/__line/parameter/default/ifexists
+++ /dev/null
@@ -1 +0,0 @@
-false
-- 
2.45.2