diff --git a/CHANGELOG.md b/CHANGELOG.md index 5080b525..31ce19c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,8 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Removed +* evocheck: package install is not supported anymore + ### Security ## [21.09] 2021-09-29 diff --git a/evocheck/README.md b/evocheck/README.md index ce9999c0..6739bef8 100644 --- a/evocheck/README.md +++ b/evocheck/README.md @@ -16,6 +16,4 @@ A separate `exec.yml` file can be imported manually in playbooks or roles to exe ## Variables We can force install via : -* `evocheck_force_install: local` : will copy the script provided by the role -* `evocheck_force_install: package` : will install the package via repositories * `evocheck_update_crontab` : will update the crontab (default: `True`) diff --git a/evocheck/defaults/main.yml b/evocheck/defaults/main.yml index e2d80c2a..6dc43677 100644 --- a/evocheck/defaults/main.yml +++ b/evocheck/defaults/main.yml @@ -1,4 +1,4 @@ --- -evocheck_force_install: False + evocheck_update_crontab: True evocheck_bin_dir: /usr/share/scripts diff --git a/evocheck/tasks/install_local.yml b/evocheck/tasks/install.yml similarity index 100% rename from evocheck/tasks/install_local.yml rename to evocheck/tasks/install.yml diff --git a/evocheck/tasks/install_package.yml b/evocheck/tasks/install_package.yml deleted file mode 100644 index 34e672e5..00000000 --- a/evocheck/tasks/install_package.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: install evocheck from package - apt: - name: evocheck - state: present diff --git a/evocheck/tasks/main.yml b/evocheck/tasks/main.yml index 87e2d636..9f6732ac 100644 --- a/evocheck/tasks/main.yml +++ b/evocheck/tasks/main.yml @@ -1,10 +1,11 @@ --- -- include: install_local.yml - when: evocheck_force_install == "local" - -- include: install_package.yml +- name: Package install is not supported anymore + fail: + msg: Package install is not supported anymore when: evocheck_force_install == "package" +- include: install.yml + - include: cron.yml when: evocheck_update_crontab | bool diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml index 05830845..28aa3786 100644 --- a/evolinux-base/defaults/main.yml +++ b/evolinux-base/defaults/main.yml @@ -208,7 +208,6 @@ evolinux_fail2ban_include: False # Evocheck evolinux_evocheck_include: True -evolinux_evocheck_force_install: "local" # Listupgrade diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml index 590de7d7..49e816ee 100644 --- a/evolinux-base/tasks/main.yml +++ b/evolinux-base/tasks/main.yml @@ -118,8 +118,6 @@ - name: Evocheck include_role: name: evolix/evocheck - vars: - evocheck_force_install: "{{ evolinux_evocheck_force_install }}" when: evolinux_evocheck_include | bool - name: Listupgrade