From 2d16aeb41e9ec31288afbef25d75a49f7f78110d Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 11 Oct 2022 13:37:21 +0200 Subject: [PATCH] evolinux-base: utils.yml can be excluded --- CHANGELOG.md | 1 + evolinux-base/defaults/main.yml | 3 +++ evolinux-base/tasks/main.yml | 5 +---- evolinux-base/tasks/utils.yml | 13 ++++++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd4d1a33..613439ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed +* evolinux-base: utils.yml can be excluded * evolinux-user: Add sudoers privilege for chck php\_fpm81 * java: use default JRE package when version is not specified * lxc-solr: download URL according to Solr Version diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml index ee307015..80db9d3b 100644 --- a/evolinux-base/defaults/main.yml +++ b/evolinux-base/defaults/main.yml @@ -224,3 +224,6 @@ evolinux_cron_checkhpraid_frequency: daily # Motd evolinux_motd_include: True + +# Utils +evolinux_utils_include: True \ No newline at end of file diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml index dba5e97b..ecbfe069 100644 --- a/evolinux-base/tasks/main.yml +++ b/evolinux-base/tasks/main.yml @@ -102,6 +102,7 @@ when: evolinux_motd_include | bool - include: utils.yml + when: evolinux_utils_include | bool - name: Munin include_role: @@ -132,7 +133,3 @@ include_role: name: evolix/generate-ldif when: evolinux_generateldif_include | bool - -- include: top.yml - -- include: htop.yml diff --git a/evolinux-base/tasks/utils.yml b/evolinux-base/tasks/utils.yml index 2fd4b0c1..c8aa58e8 100644 --- a/evolinux-base/tasks/utils.yml +++ b/evolinux-base/tasks/utils.yml @@ -37,4 +37,15 @@ # force: True # owner: root # group: root -# mode: "0755" \ No newline at end of file +# mode: "0755" + +- name: Deploy htop configuration + copy: + src: htoprc + dest: /etc/htoprc + mode: "0644" + +- name: Deploy top configuration file + file: + path: /etc/topdefaultrc + state: absent