From be68f9ac0a66cda2e6d2ad9bac12dce21a1eab32 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 17 Jul 2017 14:46:01 +0200 Subject: [PATCH] remove a few useless "backup: yes" --- ansible-managed/tasks/main.yml | 1 - apt-repositories/tasks/backports.yml | 2 -- apt-repositories/tasks/basics.yml | 1 - apt-repositories/tasks/evolix_public.yml | 1 - evolinux-base/tasks/fstab.yml | 4 ---- evolinux-base/tasks/system.yml | 10 ++++------ newsyslog/tasks/openbsd.yml | 1 - 7 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ansible-managed/tasks/main.yml b/ansible-managed/tasks/main.yml index 7fcbc1fc..16e7b0d4 100644 --- a/ansible-managed/tasks/main.yml +++ b/ansible-managed/tasks/main.yml @@ -4,4 +4,3 @@ src: motd.j2 dest: /etc/motd force: yes - backup: yes diff --git a/apt-repositories/tasks/backports.yml b/apt-repositories/tasks/backports.yml index f079a35b..ad606fe8 100644 --- a/apt-repositories/tasks/backports.yml +++ b/apt-repositories/tasks/backports.yml @@ -12,7 +12,6 @@ src: '{{ ansible_distribution_release }}_backports.list.j2' dest: /etc/apt/sources.list.d/backports.list force: yes - backup: yes mode: "0640" notify: apt update tags: @@ -23,7 +22,6 @@ src: '{{ ansible_distribution_release }}_backports_preferences' dest: /etc/apt/preferences.d/0-backports-defaults force: yes - backup: yes mode: "0640" notify: apt update tags: diff --git a/apt-repositories/tasks/basics.yml b/apt-repositories/tasks/basics.yml index a6aa0f5c..78e16810 100644 --- a/apt-repositories/tasks/basics.yml +++ b/apt-repositories/tasks/basics.yml @@ -6,7 +6,6 @@ dest: /etc/apt/sources.list mode: "0644" force: yes - backup: yes notify: apt update tags: - apt-repositories diff --git a/apt-repositories/tasks/evolix_public.yml b/apt-repositories/tasks/evolix_public.yml index 282255ba..bd1e10ce 100644 --- a/apt-repositories/tasks/evolix_public.yml +++ b/apt-repositories/tasks/evolix_public.yml @@ -18,7 +18,6 @@ src: evolix_public.list.j2 dest: /etc/apt/sources.list.d/evolix_public.list force: yes - backup: yes mode: "0640" notify: apt update tags: diff --git a/evolinux-base/tasks/fstab.yml b/evolinux-base/tasks/fstab.yml index 42ebb79d..6c8b122a 100644 --- a/evolinux-base/tasks/fstab.yml +++ b/evolinux-base/tasks/fstab.yml @@ -14,7 +14,6 @@ dest: /etc/fstab regexp: '([^#]\s+/home\s+\S+\s+)([a-z,]+)(\s+)' replace: '\1{{ evolinux_fstab_home_options | mandatory }}\3' - backup: yes notify: remount /home when: - "' /home ' in fstab_content.stdout" @@ -25,7 +24,6 @@ dest: /etc/fstab regexp: '([^#]\s+/tmp\s+\S+\s+)([a-z,]+)(\s+)' replace: '\1{{ evolinux_fstab_tmp_options | mandatory }}\3' - backup: yes when: - "' /tmp ' in fstab_content.stdout" - evolinux_fstab_tmp @@ -35,7 +33,6 @@ dest: /etc/fstab regexp: '([^#]\s+/usr\s+\S+\s+)([a-z,]+)(\s+)' replace: '\1{{ evolinux_fstab_usr_options | mandatory }}\3' - backup: yes when: - "' /usr ' in fstab_content.stdout" - evolinux_fstab_usr @@ -45,7 +42,6 @@ dest: /etc/fstab regexp: '([^#]\s+/var\s+\S+\s+)([a-z,]+)(\s+)' replace: '\1{{ evolinux_fstab_var_options | mandatory }}\3' - backup: yes notify: remount /var when: - "' /var ' in fstab_content.stdout" diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml index 6c7766d5..a11049c4 100644 --- a/evolinux-base/tasks/system.yml +++ b/evolinux-base/tasks/system.yml @@ -104,12 +104,11 @@ dest: /etc/crontab regexp: "{{ item.regexp }}" replace: "{{ item.replace }}" - backup: "{{ item.backup }}" with_items: - - {regexp: '^17((\s*\*){4})', replace: '{{ 59|random(start=1) }}\1', backup: "yes"} - - {regexp: '^25\s*6((\s*\*){3})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1', backup: "no"} - - {regexp: '^47\s*6((\s*\*){2}\s*7)', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1', backup: "no"} - - {regexp: '^52\s*6(\s*1(\s*\*){2})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1', backup: "no"} + - { regexp: '^17((\s*\*){4})', replace: '{{ 59|random(start=1) }}\1' } + - { regexp: '^25\s*6((\s*\*){3})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } + - { regexp: '^47\s*6((\s*\*){2}\s*7)', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } + - { regexp: '^52\s*6(\s*1(\s*\*){2})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } when: evolinux_system_cron_random # NTP listen retriction @@ -127,7 +126,6 @@ dest: /etc/ntp.conf regexp: "^server .*$" replace: "server {{ evolinux_system_ntpserver }}" - backup: yes notify: restart ntp when: evolinux_system_set_ntpserver diff --git a/newsyslog/tasks/openbsd.yml b/newsyslog/tasks/openbsd.yml index 97926869..28be4862 100644 --- a/newsyslog/tasks/openbsd.yml +++ b/newsyslog/tasks/openbsd.yml @@ -7,7 +7,6 @@ owner: root group: wheel mode: "0644" - backup: yes tags: - log - newsyslog