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

Reviewed-on: #1

CHANGELOG.md

@@ -1,5 +1,33 @@
+## v1.2.0
 
-## v1.0
+### Fix
+* Replace flatten jinja filter with **list**.
+* Call module with FQCN.
+
+### Enhancements
+* Use comment jinja filter with ansible_managed to allow multi-lines comment.
+
+## v1.1.2
+
+### Enhancements
+* Use to_nice_json to manage packages list.
+
+## v1.1.1
+
+### Fix
+* Set empty dependencies line to fix Galaxy warning.
+* Fix small warnings from linter.
+* Fix E405 Remote package tasks should have a retry.
+
+## v1.1.0
+
+### Fix
+* Ensure to keep permissions for configuration files.
+
+### Enhancements
+* Allow possibility to add symlinks in Xymon configuration.
+
+## v1.0.0
 
 ### Features
 * Install `xymon` packages for Debian based distros.

README.md

@@ -82,7 +82,7 @@ Jérémy Gardais
 * [IPR][ipr website] (Institut de Physique de Rennes)
 
 [gogs to github hook]: https://stackoverflow.com/a/21998477
-[xymon_server source]: https://git.ipr.univ-rennes1.fr/cellinfo/ansible.xymon_server
+[xymon_server source]: https://git.ipr.univ-rennes.fr/cellinfo/ansible.xymon_server
 [xymon_server github]: https://github.com/ipr-cnrs/xymon_server
 [wtfpl website]: http://www.wtfpl.net/about/
 [ipr website]: https://ipr.univ-rennes1.fr/

defaults/main.yml

@@ -11,7 +11,7 @@
 #
 # List of base packages to install.
 xymon_server__base_packages:
-  - 'xymon'
+  - xymon
 
                                                                    # ]]]
 # .. envvar:: xymon_server__deploy_state [[[

handlers/main.yml

@@ -7,4 +7,3 @@
                             (xymon_server__service_manage | d(True) | bool))
           else "stopped" }}'
     enabled: '{{ xymon_server__service_manage | d(True) | bool }}'
-

meta/main.yml

@@ -1,9 +1,13 @@
+---
+
+dependencies: []
+
 galaxy_info:
   author: "Jérémy Gardais"
   description: "Manage Xymon server configuration"
   license: WTFPL
   company: IPR
-  issue_tracker_url: https://git.ipr.univ-rennes1.fr/cellinfo/ansible.xymon_server/issues
+  issue_tracker_url: https://git.ipr.univ-rennes.fr/cellinfo/ansible.xymon_server/issues
   min_ansible_version: 2.4
   platforms:
   - name: Debian

tasks/main.yml

@@ -5,39 +5,50 @@
 
 # Server Manage required system packages [[[1
 - name: Ensure required packages are in there desired state
-  package:
+  ansible.builtin.package:
-    name: '{{ item }}'
+    name: '{{ xymon_server__base_packages | list }}'
     state: '{{ "present" if (xymon_server__deploy_state == "present") else "absent" }}'
     install_recommends: False
-  with_flattened:
+  register: server_pkg_result
-    - '{{ xymon_server__base_packages }}'
+  until: server_pkg_result is success
 
 # Server Manage /etc configuration files [[[1
 
 - name: Ensure /etc directory structure exists
-  file:
+  ansible.builtin.file:
     path: '/etc/xymon/{{ item.path }}'
     state: directory
   with_filetree: '{{ xymon_server__etc_src }}'
   when: item.state == 'directory'
   notify: ['restart xymon server service']
 
-- name: Ensure /etc files are populated from templates
+- name: Generate Xymon configuration files
-  template:
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: "/etc/xymon/{{ item.path | replace('.j2','') }}"
+    mode: '{{ item.mode }}'
   with_filetree: '{{ xymon_server__etc_src }}'
   when: item.state == 'file'
   notify: ['restart xymon server service']
 
+- name: Generate Xymon configuration symlinks
+  ansible.builtin.template:
+    src: '{{ item.src }}'
+    dest: "/etc/xymon/{{ item.path }}"
+    mode: '{{ item.mode }}'
+    state: 'link'
+    force: true
+  with_filetree: '{{ xymon_server__etc_src }}'
+  when: item.state == 'link'
+  notify: ['restart xymon server service']
+
 # Manage service [[[1
 
 - name: Manage Xymon server service
-  service:
+  ansible.builtin.service:
     name: '{{ xymon_server__service_name }}'
     state: '{{ "started" if (xymon_server__deploy_state == "present" and
                             (xymon_server__service_manage | d(True) | bool))
           else "stopped" }}'
     enabled: '{{ (xymon_server__deploy_state == "present") and
                  (xymon_server__service_manage | d(True) | bool) }}'
-

templates/etc/xymon/hosts.cfg.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 #
 # Master configuration file for Xymon
 #
@@ -20,6 +20,6 @@
 
 #page common Common
 
-#group-except sslcert|bbd|xymond|xymongen|xymonnet|xymonproxy <font size="+1">Test</font>⏎
+#group-except sslcert|bbd|xymond|xymongen|xymonnet|xymonproxy <font size="+1">Test</font>
-#include hosts.d/common.cfg⏎
+#include hosts.d/common.cfg
 

templates/etc/xymon/hosts.d/common.cfg.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 
 #192.168.0.1      www.{{ ansible_domain }}                  # apt libs SSH apache https://www.{{ ansible_domain }}
 #192.168.0.2      pxe.{{ ansible_domain }}                  # apt libs SSH DESCR:PXE CLIENT:deploy