Remove aide_install phase and do it uncoditionally
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
This commit is contained in:
committed by
Sergei Petrosian
parent
c4e5a2d8f0
commit
75f11dfe94
@@ -55,14 +55,6 @@ Default: `files`
|
|||||||
|
|
||||||
Type: `string
|
Type: `string
|
||||||
|
|
||||||
### aide_install
|
|
||||||
|
|
||||||
With this variable the role ensures that the `aide` package is installed on the remote nodes
|
|
||||||
|
|
||||||
Default: `false`
|
|
||||||
|
|
||||||
Type: `bool`
|
|
||||||
|
|
||||||
### aide_init
|
### aide_init
|
||||||
|
|
||||||
Initializes the AIDE database.
|
Initializes the AIDE database.
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ aide_db_template: null
|
|||||||
# Examples of role input variables:
|
# Examples of role input variables:
|
||||||
aide_db_fetch_dir: files
|
aide_db_fetch_dir: files
|
||||||
|
|
||||||
# Enable install phase
|
|
||||||
aide_install: false
|
|
||||||
|
|
||||||
# Enable initialization of the database phase
|
# Enable initialization of the database phase
|
||||||
aide_init: false
|
aide_init: false
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
vars:
|
vars:
|
||||||
aide_db_template: /tmp/aide-custom.conf.j2
|
aide_db_template: /tmp/aide-custom.conf.j2
|
||||||
aide_db_fetch_dir: files
|
aide_db_fetch_dir: files
|
||||||
aide_install: true
|
|
||||||
aide_init: true
|
aide_init: true
|
||||||
aide_fetch_db: true
|
aide_fetch_db: true
|
||||||
aide_check: true
|
aide_check: true
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
- name: Include role aide
|
- name: Include role aide
|
||||||
vars:
|
vars:
|
||||||
aide_db_fetch_dir: files
|
aide_db_fetch_dir: files
|
||||||
aide_install: false
|
|
||||||
aide_init: false
|
aide_init: false
|
||||||
aide_fetch_db: false
|
aide_fetch_db: false
|
||||||
aide_check: false
|
aide_check: false
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
- name: Include role aide
|
- name: Include role aide
|
||||||
vars:
|
vars:
|
||||||
aide_db_fetch_dir: files
|
aide_db_fetch_dir: files
|
||||||
aide_install: true
|
|
||||||
aide_init: true
|
aide_init: true
|
||||||
aide_fetch_db: false
|
aide_fetch_db: false
|
||||||
aide_check: false
|
aide_check: false
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
- name: Include role aide
|
- name: Include role aide
|
||||||
vars:
|
vars:
|
||||||
aide_db_fetch_dir: files
|
aide_db_fetch_dir: files
|
||||||
aide_install: false
|
|
||||||
aide_init: false
|
aide_init: false
|
||||||
aide_fetch_db: false
|
aide_fetch_db: false
|
||||||
aide_check: true
|
aide_check: true
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
- name: Include role aide
|
- name: Include role aide
|
||||||
vars:
|
vars:
|
||||||
aide_db_fetch_dir: files
|
aide_db_fetch_dir: files
|
||||||
aide_install: false
|
|
||||||
aide_init: false
|
aide_init: false
|
||||||
aide_fetch_db: false
|
aide_fetch_db: false
|
||||||
aide_check: false
|
aide_check: false
|
||||||
|
|||||||
@@ -10,8 +10,6 @@
|
|||||||
state: present
|
state: present
|
||||||
use: "{{ (__aide_is_ostree | d(false)) |
|
use: "{{ (__aide_is_ostree | d(false)) |
|
||||||
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
|
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
|
||||||
when:
|
|
||||||
- aide_install | bool
|
|
||||||
|
|
||||||
- name: Ensure required services are enabled and started
|
- name: Ensure required services are enabled and started
|
||||||
ansible.builtin.service:
|
ansible.builtin.service:
|
||||||
|
|||||||
@@ -16,5 +16,11 @@
|
|||||||
- name: Assert that the file exists
|
- name: Assert that the file exists
|
||||||
ansible.builtin.assert:
|
ansible.builtin.assert:
|
||||||
that:
|
that:
|
||||||
- not file_check.stat.exists
|
- file_check.stat.exists
|
||||||
fail_msg: "The file does exist."
|
fail_msg: "The file does not exist."
|
||||||
|
|
||||||
|
- name: Check header for not present ansible_managed, fingerprint
|
||||||
|
include_tasks: tasks/check_not_present_header.yml
|
||||||
|
vars:
|
||||||
|
__file: /etc/aide.conf
|
||||||
|
__fingerprint: system_role:aide
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
roles:
|
roles:
|
||||||
- role: linux-system-roles.aide
|
- role: linux-system-roles.aide
|
||||||
vars:
|
vars:
|
||||||
aide_install: true
|
|
||||||
aide_init: true
|
aide_init: true
|
||||||
tasks:
|
tasks:
|
||||||
- name: Check header for ansible_managed, fingerprint
|
- name: Check header for ansible_managed, fingerprint
|
||||||
|
|||||||
Reference in New Issue
Block a user