From e9f78f93eb38ca560a532d5b12282d96003333d5 Mon Sep 17 00:00:00 2001 From: mg Date: Sat, 2 Jan 2021 10:30:54 +0100 Subject: [PATCH] Ersetze ansible.builtin.apt module durch ansible.builtin.package (#20) Bugfix: acng ansible.builtin.apt --> ansible.builtin.package Co-authored-by: Michael Grote <38253905+quotengrote@users.noreply.github.com> Reviewed-on: https://git.mgrote.net/mg/ansible/pulls/20 Co-Authored-By: mg Co-Committed-By: mg --- playbooks/on-off/deinstall_cowsay.yml | 2 +- playbooks/on-off/deinstall_telegraf.yml | 2 +- playbooks/on-off/remove_ipmitool.yml | 2 +- roles/mgrote.acng/tasks/main.yml | 6 +++--- roles/mgrote.apcupsd/tasks/main.yml | 2 +- roles/mgrote.dokuwiki/tasks/main.yml | 2 +- roles/mgrote.ecc-rasdaemon/tasks/main.yml | 2 +- roles/mgrote.fail2ban/tasks/main.yml | 2 +- roles/mgrote.fileserver_smb/tasks/main.yml | 2 +- roles/mgrote.install_packages/tasks/main.yml | 10 +++++----- roles/mgrote.motd/tasks/main.yml | 4 ++-- roles/mgrote.postfix/tasks/main.yml | 2 +- roles/mgrote.restic/tasks/main.yml | 2 +- roles/mgrote.sanoid/tasks/main.yml | 2 +- roles/mgrote.smart/tasks/main.yml | 2 +- roles/mgrote.tmux/tasks/main.yml | 2 +- roles/mgrote.update_packages/tasks/main.yml | 2 +- roles/mgrote.zfs_tools/tasks/main.yml | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/playbooks/on-off/deinstall_cowsay.yml b/playbooks/on-off/deinstall_cowsay.yml index 60937430..25ea0fc1 100644 --- a/playbooks/on-off/deinstall_cowsay.yml +++ b/playbooks/on-off/deinstall_cowsay.yml @@ -3,6 +3,6 @@ tasks: - name: cowsay deinstallieren become: yes - ansible.builtin.apt: + ansible.builtin.package: name: cowsay state: absent diff --git a/playbooks/on-off/deinstall_telegraf.yml b/playbooks/on-off/deinstall_telegraf.yml index cfe5e696..56aa25b8 100644 --- a/playbooks/on-off/deinstall_telegraf.yml +++ b/playbooks/on-off/deinstall_telegraf.yml @@ -3,7 +3,7 @@ tasks: - name: telegraf deinstallieren become: yes - ansible.builtin.apt: + ansible.builtin.package: name: telegraf state: absent - name: telegraf-repository entfernen diff --git a/playbooks/on-off/remove_ipmitool.yml b/playbooks/on-off/remove_ipmitool.yml index 6cea4458..ae260e01 100644 --- a/playbooks/on-off/remove_ipmitool.yml +++ b/playbooks/on-off/remove_ipmitool.yml @@ -5,7 +5,7 @@ tasks: - name: remove Packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - hddtemp - ipmitool diff --git a/roles/mgrote.acng/tasks/main.yml b/roles/mgrote.acng/tasks/main.yml index 1b4228d0..45d614a4 100644 --- a/roles/mgrote.acng/tasks/main.yml +++ b/roles/mgrote.acng/tasks/main.yml @@ -1,10 +1,10 @@ - - name: apt-cacher-ng installieren + - name: install apt-cacher-ng packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: apt-cacher-ng state: present - - name: acng.conf kopieren + - name: templating acng.conf become: yes ansible.builtin.template: src: "acng.conf" diff --git a/roles/mgrote.apcupsd/tasks/main.yml b/roles/mgrote.apcupsd/tasks/main.yml index e0d35842..03523d6e 100644 --- a/roles/mgrote.apcupsd/tasks/main.yml +++ b/roles/mgrote.apcupsd/tasks/main.yml @@ -1,5 +1,5 @@ - name: apcupsd installieren - ansible.builtin.apt: + ansible.builtin.package: name: - apcupsd - apcupsd-cgi diff --git a/roles/mgrote.dokuwiki/tasks/main.yml b/roles/mgrote.dokuwiki/tasks/main.yml index 59eb0081..55cd0f06 100644 --- a/roles/mgrote.dokuwiki/tasks/main.yml +++ b/roles/mgrote.dokuwiki/tasks/main.yml @@ -1,6 +1,6 @@ - name: install packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - php - php-mbstring diff --git a/roles/mgrote.ecc-rasdaemon/tasks/main.yml b/roles/mgrote.ecc-rasdaemon/tasks/main.yml index 373da84b..4de32f33 100644 --- a/roles/mgrote.ecc-rasdaemon/tasks/main.yml +++ b/roles/mgrote.ecc-rasdaemon/tasks/main.yml @@ -1,6 +1,6 @@ - name: Install rasdaemon become: true - ansible.builtin.apt: + ansible.builtin.package: name: - rasdaemon - logrotate diff --git a/roles/mgrote.fail2ban/tasks/main.yml b/roles/mgrote.fail2ban/tasks/main.yml index 2e635e83..3549146c 100644 --- a/roles/mgrote.fail2ban/tasks/main.yml +++ b/roles/mgrote.fail2ban/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: install fail2ban-packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: fail2ban state: present diff --git a/roles/mgrote.fileserver_smb/tasks/main.yml b/roles/mgrote.fileserver_smb/tasks/main.yml index 020cc08f..43c4696b 100644 --- a/roles/mgrote.fileserver_smb/tasks/main.yml +++ b/roles/mgrote.fileserver_smb/tasks/main.yml @@ -1,6 +1,6 @@ - name: SAMBA installieren become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - samba - cifs-utils diff --git a/roles/mgrote.install_packages/tasks/main.yml b/roles/mgrote.install_packages/tasks/main.yml index 6f65db5a..de52cd18 100644 --- a/roles/mgrote.install_packages/tasks/main.yml +++ b/roles/mgrote.install_packages/tasks/main.yml @@ -1,32 +1,32 @@ - name: apt update become: yes - ansible.builtin.apt: + ansible.builtin.package: update_cache: yes cache_valid_time: 300 - name: install common-packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: "{{ programs_common }}" state: present - name: install extra-packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: "{{ programs_extra }}" state: present when: programs_extra is defined - name: install vm-packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: "{{ programs_only_vms }}" state: present when: ansible_virtualization_role == 'guest' - name: install physical-packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: "{{ programs_only_physical }}" state: present when: ansible_virtualization_role != 'guest' diff --git a/roles/mgrote.motd/tasks/main.yml b/roles/mgrote.motd/tasks/main.yml index 6e4ab24d..d7da6bea 100644 --- a/roles/mgrote.motd/tasks/main.yml +++ b/roles/mgrote.motd/tasks/main.yml @@ -1,6 +1,6 @@ - name: install fortune become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - fortune state: present @@ -8,7 +8,7 @@ - name: install packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - update-motd state: present diff --git a/roles/mgrote.postfix/tasks/main.yml b/roles/mgrote.postfix/tasks/main.yml index cfe46f66..b4baace6 100644 --- a/roles/mgrote.postfix/tasks/main.yml +++ b/roles/mgrote.postfix/tasks/main.yml @@ -2,7 +2,7 @@ - name: postfix + Hilfsprogramme installieren become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - postfix - mailutils diff --git a/roles/mgrote.restic/tasks/main.yml b/roles/mgrote.restic/tasks/main.yml index b10ac056..37860733 100644 --- a/roles/mgrote.restic/tasks/main.yml +++ b/roles/mgrote.restic/tasks/main.yml @@ -1,6 +1,6 @@ - name: install restic-packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - restic - logrotate diff --git a/roles/mgrote.sanoid/tasks/main.yml b/roles/mgrote.sanoid/tasks/main.yml index 461dd65a..458b9312 100644 --- a/roles/mgrote.sanoid/tasks/main.yml +++ b/roles/mgrote.sanoid/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install Required Packages become: true - ansible.builtin.apt: + ansible.builtin.package: name: - ca-certificates - apt-transport-https diff --git a/roles/mgrote.smart/tasks/main.yml b/roles/mgrote.smart/tasks/main.yml index 60cf9aca..90096903 100644 --- a/roles/mgrote.smart/tasks/main.yml +++ b/roles/mgrote.smart/tasks/main.yml @@ -1,7 +1,7 @@ #Blockdevice/Festplatten muessen haendisch in "templates" eingetragen werden - name: smartmontools installieren become: yes - ansible.builtin.apt: + ansible.builtin.package: name: smartmontools state: present diff --git a/roles/mgrote.tmux/tasks/main.yml b/roles/mgrote.tmux/tasks/main.yml index bf572519..60bf4d29 100644 --- a/roles/mgrote.tmux/tasks/main.yml +++ b/roles/mgrote.tmux/tasks/main.yml @@ -1,6 +1,6 @@ - name: install tmux packages become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - tmux state: present diff --git a/roles/mgrote.update_packages/tasks/main.yml b/roles/mgrote.update_packages/tasks/main.yml index 5a1a04d5..d9074972 100644 --- a/roles/mgrote.update_packages/tasks/main.yml +++ b/roles/mgrote.update_packages/tasks/main.yml @@ -6,5 +6,5 @@ - name: updated installed packages become: yes - ansible.builtin.apt: + ansible.builtin.package: upgrade: dist diff --git a/roles/mgrote.zfs_tools/tasks/main.yml b/roles/mgrote.zfs_tools/tasks/main.yml index fadc2bc8..da5716da 100644 --- a/roles/mgrote.zfs_tools/tasks/main.yml +++ b/roles/mgrote.zfs_tools/tasks/main.yml @@ -1,6 +1,6 @@ - name: zfs-tools installieren become: yes - ansible.builtin.apt: + ansible.builtin.package: name: - zfsutils - zfs-initramfs