Merge pull request 'refresh-2024' (#1) from refresh-2024 into master

Reviewed-on: #1
2024-09-30 16:30:19 +02:00 · 2024-09-30 16:30:19 +02:00 · 56ddaab1fd
parent 745f3bd3a6 b7f9be38a4
commit 56ddaab1fd
24 changed files with 38 additions and 26 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,9 @@
+## v2.2.0
+
+### Enhancements
+* Use **comment** filter for ansible_managed, to allow multi-lines.
+* Update SSSD path for libs white list.
+
 ## v2.1.0

 ### Enhancements
--- a/defaults/main.yml
+++ b/defaults/main.yml
@ -90,13 +90,19 @@ xymon_cli__plug_libs_interval: '5m'
 xymon_cli__plug_libs_default_whitelist:
  /lib/systemd/systemd:
    - '.*'
-  /usr/lib/x86_64-linux-gnu/sssd/sssd_be:
+  /usr/libexec/sssd/sssd_autofs:
    - '.*'
-  /usr/lib/x86_64-linux-gnu/sssd/sssd_autofs:
+  /usr/libexec/sssd/sssd_be:
    - '.*'
-  /usr/lib/x86_64-linux-gnu/sssd/sssd_nss:
+  /usr/libexec/sssd/sssd_nss:
    - '.*'
-  /usr/lib/x86_64-linux-gnu/sssd/sssd_pam:
+  /usr/libexec/sssd/sssd_pac:
+    - '.*'
+  /usr/libexec/sssd/sssd_pam:
+    - '.*'
+  /usr/libexec/sssd/sssd_ssh:
+    - '.*'
+  /usr/libexec/sssd/sssd_sudo:
    - '.*'
  /usr/sbin/sssd:
    - '.*'
--- a/templates/etc/default/xymon-client.j2
+++ b/templates/etc/default/xymon-client.j2
@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role

 # Configure the Xymon client settings.
--- a/templates/etc/xymon/apt_no_repo_accept.j2
+++ b/templates/etc/xymon/apt_no_repo_accept.j2
@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 {% for package in xymon_cli__plug_apt_combined_whitelist %}
 {{ package }}
--- a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
@ -1,5 +1,5 @@
 [apt]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_apt_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
@ -1,5 +1,5 @@
 [ipmi]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ipmi_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/kern.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/kern.cfg.j2
@ -1,5 +1,5 @@
 [kern]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_kern_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
@ -1,5 +1,5 @@
 [libs]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_libs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2
@ -1,6 +1,6 @@
 # Requires megaclisas-status package from https://hwraid.le-vert.net/wiki/DebianPackages
 [megaraid]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_megaraid_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
@ -1,5 +1,5 @@
 [mq]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_mq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/net.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/net.cfg.j2
@ -1,5 +1,5 @@
 [net]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_net_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
@ -1,5 +1,5 @@
 [netstats]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_netstats_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2
@ -1,5 +1,5 @@
 [ntpq]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ntpq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/sge.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/sge.cfg.j2
@ -1,5 +1,5 @@
 [sge]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_sge_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/smart.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/smart.cfg.j2
@ -1,5 +1,5 @@
 [smart]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_smart_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2
@ -1,5 +1,5 @@
 [smartoverall]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_smartoverall_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/temp.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/temp.cfg.j2
@ -1,5 +1,5 @@
 [temp]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_temp_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
@ -1,5 +1,5 @@
 [zfs]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_zfs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
--- a/templates/etc/xymon/libs.local.yaml.j2
+++ b/templates/etc/xymon/libs.local.yaml.j2
@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 {% set inputmerged = xymon_cli__plug_libs_default_whitelist.copy() %}
 {% set _ = inputmerged.update(xymon_cli__plug_libs_whitelist) %}
--- a/templates/etc/xymon/net.yaml.j2
+++ b/templates/etc/xymon/net.yaml.j2
@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 {{ ansible_hostname }}:
  - {{ ansible_default_ipv4.interface }}
--- a/templates/usr/lib/xymon/client/ext/sge.sh.j2
+++ b/templates/usr/lib/xymon/client/ext/sge.sh.j2
@ -1,6 +1,6 @@
 #!/bin/sh

-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 # https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
 #
--- a/templates/usr/lib/xymon/client/ext/smart.j2
+++ b/templates/usr/lib/xymon/client/ext/smart.j2
@ -2,7 +2,7 @@
 # $Id: sensors 70 2011-11-25 09:21:18Z skazi $
 # Author: Jacek Tomasiak <jacek.tomasiak@gmail.com>

-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 # Thanks to Jacek Tomasiak − skazi0
 # https://github.com/skazi0/xymon-plugins/blob/master/client/ext/smart
--- a/templates/usr/lib/xymon/client/ext/smartoverall.j2
+++ b/templates/usr/lib/xymon/client/ext/smartoverall.j2
@ -1,7 +1,7 @@
 #!/bin/sh
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker

-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 # Source :
 # https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
--- a/templates/usr/lib/xymon/client/ext/zfs.j2
+++ b/templates/usr/lib/xymon/client/ext/zfs.j2
@ -1,6 +1,6 @@
 #!/bin/ksh

-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role

 # Revision History: