diff --git a/README.md b/README.md index 1ab698e..5c5832b 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/defaults/main.yml b/defaults/main.yml index 92cc167..f04914f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/examples/custom-template.yml b/examples/custom-template.yml index 2b9e19d..318b551 100644 --- a/examples/custom-template.yml +++ b/examples/custom-template.yml @@ -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 diff --git a/examples/default.yml b/examples/default.yml index 2c27811..8bcc5b2 100644 --- a/examples/default.yml +++ b/examples/default.yml @@ -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 diff --git a/examples/deploy.yml b/examples/deploy.yml index 5c7bfc9..589c241 100644 --- a/examples/deploy.yml +++ b/examples/deploy.yml @@ -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 diff --git a/examples/just_check.yml b/examples/just_check.yml index ec3c325..45f6253 100644 --- a/examples/just_check.yml +++ b/examples/just_check.yml @@ -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 diff --git a/examples/just_update.yml b/examples/just_update.yml index 1c6afbd..d337390 100644 --- a/examples/just_update.yml +++ b/examples/just_update.yml @@ -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 diff --git a/tasks/main.yml b/tasks/main.yml index baaf7a3..70ab28e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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: diff --git a/tests/tests_default.yml b/tests/tests_default.yml index c450dde..8385f8b 100644 --- a/tests/tests_default.yml +++ b/tests/tests_default.yml @@ -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 diff --git a/tests/tests_deploy.yml b/tests/tests_deploy.yml index d141281..5fcce4a 100644 --- a/tests/tests_deploy.yml +++ b/tests/tests_deploy.yml @@ -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