Skip to content

Commit

Permalink
Remove aide_install phase and do it uncoditionally
Browse files Browse the repository at this point in the history
Signed-off-by: Radovan Sroka <[email protected]>
  • Loading branch information
radosroka committed Nov 11, 2024
1 parent c850c6b commit 46db6ac
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 21 deletions.
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@ Default: `files`

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

Initializes the AIDE database.
Expand Down
3 changes: 0 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ aide_db_template: null
# Examples of role input variables:
aide_db_fetch_dir: files

# Enable install phase
aide_install: false

# Enable initialization of the database phase
aide_init: false

Expand Down
1 change: 0 additions & 1 deletion examples/custom-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
vars:
aide_db_template: /tmp/aide-custom.conf.j2
aide_db_fetch_dir: files
aide_install: true
aide_init: true
aide_fetch_db: true
aide_check: true
Expand Down
1 change: 0 additions & 1 deletion examples/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
- name: Include role aide
vars:
aide_db_fetch_dir: files
aide_install: false
aide_init: false
aide_fetch_db: false
aide_check: false
Expand Down
1 change: 0 additions & 1 deletion examples/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
- name: Include role aide
vars:
aide_db_fetch_dir: files
aide_install: true
aide_init: true
aide_fetch_db: false
aide_check: false
Expand Down
1 change: 0 additions & 1 deletion examples/just_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
- name: Include role aide
vars:
aide_db_fetch_dir: files
aide_install: false
aide_init: false
aide_fetch_db: false
aide_check: true
Expand Down
1 change: 0 additions & 1 deletion examples/just_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
- name: Include role aide
vars:
aide_db_fetch_dir: files
aide_install: false
aide_init: false
aide_fetch_db: false
aide_check: false
Expand Down
2 changes: 0 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
state: present
use: "{{ (__aide_is_ostree | d(false)) |
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
when:
- aide_install | bool

- name: Ensure required services are enabled and started
ansible.builtin.service:
Expand Down
10 changes: 8 additions & 2 deletions tests/tests_default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,11 @@
- name: Assert that the file exists
ansible.builtin.assert:
that:
- not file_check.stat.exists
fail_msg: "The file does exist."
- file_check.stat.exists
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
1 change: 0 additions & 1 deletion tests/tests_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
roles:
- role: linux-system-roles.aide
vars:
aide_install: true
aide_init: true
tasks:
- name: Check header for ansible_managed, fingerprint
Expand Down

0 comments on commit 46db6ac

Please sign in to comment.