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

Reviewed-on: #1
This commit is contained in:
Jeremy Gardais 2024-09-30 17:10:30 +02:00
commit 82564f655e
5 changed files with 19 additions and 11 deletions

View File

@ -1,3 +1,11 @@
## v1.2.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

View File

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

View File

@ -5,8 +5,8 @@
# Server Manage required system packages [[[1
- name: Ensure required packages are in there desired state
package:
name: '{{ xymon_server__base_packages | flatten }}'
ansible.builtin.package:
name: '{{ xymon_server__base_packages | list }}'
state: '{{ "present" if (xymon_server__deploy_state == "present") else "absent" }}'
install_recommends: False
register: server_pkg_result
@ -15,7 +15,7 @@
# 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 }}'
@ -23,7 +23,7 @@
notify: ['restart xymon server service']
- name: Generate Xymon configuration files
template:
ansible.builtin.template:
src: '{{ item.src }}'
dest: "/etc/xymon/{{ item.path | replace('.j2','') }}"
mode: '{{ item.mode }}'
@ -32,7 +32,7 @@
notify: ['restart xymon server service']
- name: Generate Xymon configuration symlinks
template:
ansible.builtin.template:
src: '{{ item.src }}'
dest: "/etc/xymon/{{ item.path }}"
mode: '{{ item.mode }}'
@ -45,7 +45,7 @@
# 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))

View File

@ -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>
#include hosts.d/common.cfg
#group-except sslcert|bbd|xymond|xymongen|xymonnet|xymonproxy <font size="+1">Test</font>
#include hosts.d/common.cfg

View File

@ -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