From b910bf5e3dc0c279edd41cdba51be7164227f4fc Mon Sep 17 00:00:00 2001 From: VC Date: Wed, 6 Nov 2024 13:34:03 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8:=20use=20ansible.builtin.package?= =?UTF-8?q?=20with=20update=5Fcache=20systematically?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/bittorrent/tasks/transmission.yml | 7 +-- roles/dovecot/tasks/main.yml | 9 ++- roles/elasticsearch/tasks/main.yml | 3 +- roles/ftp/tasks/main.yml | 1 + roles/haproxy/tasks/main.yml | 1 + roles/icecast2/tasks/main.yml | 1 + roles/mariadb/tasks/main.yml | 2 + roles/mastodon/tasks/main.yml | 58 ++++++++++---------- roles/mumble/tasks/main.yml | 1 + roles/munin_client/tasks/garage.yml | 10 ++-- roles/munin_client/tasks/hypervisors.yml | 1 + roles/munin_client/tasks/main.yml | 12 +++- roles/munin_client/tasks/physicalservers.yml | 6 -- roles/nfs/tasks/main.yml | 1 + roles/nginx/tasks/main.yml | 2 + roles/nodejs/tasks/main.yml | 2 +- roles/nsd/tasks/prerequisites.yml | 1 + roles/nut_client/tasks/main.yml | 1 + roles/nut_server/tasks/main.yml | 1 + roles/opendkim/tasks/main.yml | 8 +-- roles/opendmarc/tasks/main.yml | 1 + roles/peertube/tasks/main.yml | 1 + roles/peertube_runner/tasks/main.yml | 4 +- roles/php/tasks/main.yml | 2 + roles/postfix/tasks/main.yml | 12 ++-- roles/postgres/tasks/main.yml | 1 + roles/postgrey/tasks/main.yml | 1 + roles/redis/tasks/main.yml | 2 +- roles/rsyslog/tasks/main.yml | 1 + roles/smart/tasks/main.yml | 2 +- roles/smtprelay/tasks/main.yml | 1 + roles/smtprelay/tasks/stunnel.yml | 1 + roles/spamassassin/tasks/main.yml | 12 ++-- roles/system/tasks/main.yml | 5 +- roles/tuned/tasks/main.yml | 9 ++- roles/xmpp/tasks/main.yml | 8 +-- roles/yarn/tasks/main.yml | 2 +- roles/zfs/tasks/main.yml | 15 +++-- 38 files changed, 114 insertions(+), 94 deletions(-) delete mode 100644 roles/munin_client/tasks/physicalservers.yml diff --git a/roles/bittorrent/tasks/transmission.yml b/roles/bittorrent/tasks/transmission.yml index c70c51b..4ab8c77 100644 --- a/roles/bittorrent/tasks/transmission.yml +++ b/roles/bittorrent/tasks/transmission.yml @@ -2,11 +2,10 @@ - name: Install transmission ansible.builtin.package: - name: "{{ item }}" + name: + - transmission-daemon + - transmission-cli state: present - loop: - - transmission-daemon - - transmission-cli - name: Put transmission config file ansible.builtin.template: diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml index baa4d8c..f3ea90c 100644 --- a/roles/dovecot/tasks/main.yml +++ b/roles/dovecot/tasks/main.yml @@ -1,12 +1,11 @@ --- - name: Install dovecot ansible.builtin.package: - name: "{{ item }}" + name: + - dovecot-imapd + - dovecot-sieve + - dovecot-lmtpd state: present - loop: - - dovecot-imapd - - dovecot-sieve - - dovecot-lmtpd - name: Put main configuration file ansible.builtin.copy: diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 0cfda1c..a224556 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: openjdk-17-jre-headless state: present + update_cache: true - name: Get elasticsearch key ansible.builtin.get_url: @@ -19,7 +20,7 @@ mode: "0o644" - name: Install elasticsearch - ansible.builtin.apt: + ansible.builtin.package: name: elasticsearch state: present update_cache: true diff --git a/roles/ftp/tasks/main.yml b/roles/ftp/tasks/main.yml index 7ebc33a..aee72e0 100644 --- a/roles/ftp/tasks/main.yml +++ b/roles/ftp/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: vsftpd state: present + update_cache: true - name: Create ftp directory ansible.builtin.file: diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index d488cdf..5be600d 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: haproxy state: present + update_cache: true - name: Put haproxy config file ansible.builtin.template: diff --git a/roles/icecast2/tasks/main.yml b/roles/icecast2/tasks/main.yml index 8e2795f..8b70e19 100644 --- a/roles/icecast2/tasks/main.yml +++ b/roles/icecast2/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: icecast2 state: present + update_cache: true - name: Put icecast2 configuration file ansible.builtin.template: diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml index 6b1be57..dd371b0 100644 --- a/roles/mariadb/tasks/main.yml +++ b/roles/mariadb/tasks/main.yml @@ -6,6 +6,7 @@ - mariadb-server - mysqltuner state: present + update_cache: true - name: Create mysql directory ansible.builtin.file: @@ -46,6 +47,7 @@ ansible.builtin.package: name: python3-pymysql state: present + update_cache: true - name: Check if .my.cnf file exists ansible.builtin.stat: diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml index 28451ec..b045675 100644 --- a/roles/mastodon/tasks/main.yml +++ b/roles/mastodon/tasks/main.yml @@ -26,36 +26,36 @@ group: mastodon - name: Install prereq - ansible.builtin.apt: - name: "{{ item }}" + ansible.builtin.package: + name: + - imagemagick + - ffmpeg + - libpq-dev + - libxml2-dev + - libxslt1-dev + - file + - git-core + - g++ + - libprotobuf-dev + - protobuf-compiler + - pkg-config + - nodejs + - gcc + - autoconf + - bison + - build-essential + - libssl-dev + - libyaml-dev + - libreadline6-dev + - zlib1g-dev + - libncurses5-dev + - libffi-dev + - libgdbm-dev + - libidn11-dev + - libicu-dev + - libjemalloc-dev state: present - loop: - - imagemagick - - ffmpeg - - libpq-dev - - libxml2-dev - - libxslt1-dev - - file - - git-core - - g++ - - libprotobuf-dev - - protobuf-compiler - - pkg-config - - nodejs - - gcc - - autoconf - - bison - - build-essential - - libssl-dev - - libyaml-dev - - libreadline6-dev - - zlib1g-dev - - libncurses5-dev - - libffi-dev - - libgdbm-dev - - libidn11-dev - - libicu-dev - - libjemalloc-dev + update_cache: true - name: Install rbenv ansible.builtin.include_tasks: rbenv.yml diff --git a/roles/mumble/tasks/main.yml b/roles/mumble/tasks/main.yml index 6f2f6ab..7b902c6 100644 --- a/roles/mumble/tasks/main.yml +++ b/roles/mumble/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: mumble-server state: present + update_cache: true - name: Put configuration file ansible.builtin.copy: diff --git a/roles/munin_client/tasks/garage.yml b/roles/munin_client/tasks/garage.yml index bf3fa65..6516aad 100644 --- a/roles/munin_client/tasks/garage.yml +++ b/roles/munin_client/tasks/garage.yml @@ -1,12 +1,12 @@ --- - name: Ensure some packages are installed - ansible.builtin.apt: - name: "{{ item }}" + ansible.builtin.package: + name: + - curl + - jq state: present - loop: - - curl - - jq + update_cache: true - name: Put garage plugin configuration ansible.builtin.template: diff --git a/roles/munin_client/tasks/hypervisors.yml b/roles/munin_client/tasks/hypervisors.yml index 56f0ab9..0205a9d 100644 --- a/roles/munin_client/tasks/hypervisors.yml +++ b/roles/munin_client/tasks/hypervisors.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: nvme-cli state: present + update_cache: true - name: Put nvme plugin configuration ansible.builtin.template: diff --git a/roles/munin_client/tasks/main.yml b/roles/munin_client/tasks/main.yml index 4cf0416..1d6779c 100644 --- a/roles/munin_client/tasks/main.yml +++ b/roles/munin_client/tasks/main.yml @@ -20,6 +20,7 @@ ansible.builtin.package: name: "{{ item }}" state: present + update_cache: true loop: "{{ muninpkgs }}" - name: Put munin-node configuration file @@ -37,6 +38,7 @@ ansible.builtin.package: name: libwww-perl state: present + update_cache: true notify: - Restart munin-node when: "'webservers' in group_names or 'loadbalancers' in group_names" @@ -58,6 +60,7 @@ - libcache-cache-perl - libdbd-mysql-perl state: present + update_cache: true notify: - Restart munin-node when: "'mariadbservers' in group_names" @@ -67,6 +70,7 @@ ansible.builtin.package: name: libdbd-pg-perl state: present + update_cache: true notify: - Restart munin-node when: "'pgsqlservers' in group_names" @@ -114,8 +118,12 @@ ansible.builtin.include_tasks: zfs.yml when: "'zfsservers' in group_names" -- name: Execute specific physical servers’ commands - ansible.builtin.include_tasks: physicalservers.yml +# Adding modules for physical servers +- name: Install physical sensors + ansible.builtin.package: + name: lm-sensors + state: present + update_cache: true when: "'physicalservers' in group_names" # Specific LXC commands diff --git a/roles/munin_client/tasks/physicalservers.yml b/roles/munin_client/tasks/physicalservers.yml deleted file mode 100644 index 02c67a6..0000000 --- a/roles/munin_client/tasks/physicalservers.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- name: Install physical sensors - ansible.builtin.package: - name: lm-sensors - state: present diff --git a/roles/nfs/tasks/main.yml b/roles/nfs/tasks/main.yml index 38de6ff..7ad3daa 100644 --- a/roles/nfs/tasks/main.yml +++ b/roles/nfs/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: nfs-kernel-server state: present + update_cache: true - name: Export FS ansible.builtin.template: diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 89e86b6..c9219e0 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -4,11 +4,13 @@ ansible.builtin.package: name: nginx-full state: present + update_cache: true - name: Install nginx extra mods ansible.builtin.package: name: "libnginx-mod-http-{{ item }}" state: present + update_cache: true loop: "{{ nginx_extra_mods }}" - name: Create dhparam diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml index f5d1e7c..78b7e2b 100644 --- a/roles/nodejs/tasks/main.yml +++ b/roles/nodejs/tasks/main.yml @@ -24,7 +24,7 @@ mode: "0o644" - name: Install nodejs - ansible.builtin.apt: + ansible.builtin.package: name: nodejs state: present update_cache: true diff --git a/roles/nsd/tasks/prerequisites.yml b/roles/nsd/tasks/prerequisites.yml index 7bb993c..9315d1e 100644 --- a/roles/nsd/tasks/prerequisites.yml +++ b/roles/nsd/tasks/prerequisites.yml @@ -27,3 +27,4 @@ - ldnsutils - cron state: present + update_cache: true diff --git a/roles/nut_client/tasks/main.yml b/roles/nut_client/tasks/main.yml index 06bef77..bc2e8f1 100644 --- a/roles/nut_client/tasks/main.yml +++ b/roles/nut_client/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: nut-client state: present + update_cache: true - name: Put upsmon configuration file ansible.builtin.template: diff --git a/roles/nut_server/tasks/main.yml b/roles/nut_server/tasks/main.yml index bb0902c..dd07f37 100644 --- a/roles/nut_server/tasks/main.yml +++ b/roles/nut_server/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: nut-server state: present + update_cache: true - name: Put udev configuration file ansible.builtin.copy: diff --git a/roles/opendkim/tasks/main.yml b/roles/opendkim/tasks/main.yml index a61a240..8c7bbab 100644 --- a/roles/opendkim/tasks/main.yml +++ b/roles/opendkim/tasks/main.yml @@ -2,11 +2,11 @@ - name: Install opendkim ansible.builtin.package: - name: "{{ item }}" + name: + - opendkim + - opendkim-tools state: present - loop: - - opendkim - - opendkim-tools + update_cache: true - name: Put main configuration file ansible.builtin.template: diff --git a/roles/opendmarc/tasks/main.yml b/roles/opendmarc/tasks/main.yml index ed541bd..3e183e4 100644 --- a/roles/opendmarc/tasks/main.yml +++ b/roles/opendmarc/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: opendmarc state: present + update_cache: true - name: Put opendmarc configuration file ansible.builtin.copy: diff --git a/roles/peertube/tasks/main.yml b/roles/peertube/tasks/main.yml index 78af4e4..9088f39 100644 --- a/roles/peertube/tasks/main.yml +++ b/roles/peertube/tasks/main.yml @@ -10,6 +10,7 @@ - python3-pip - unzip state: present + update_cache: true - name: Create peertube user ansible.builtin.user: diff --git a/roles/peertube_runner/tasks/main.yml b/roles/peertube_runner/tasks/main.yml index 67dd2f5..6147be1 100644 --- a/roles/peertube_runner/tasks/main.yml +++ b/roles/peertube_runner/tasks/main.yml @@ -2,9 +2,9 @@ - name: Install prerequisites ansible.builtin.package: - name: - - ffmpeg + name: ffmpeg state: present + update_cache: true - name: Install peertube-runner via npm community.general.npm: diff --git a/roles/php/tasks/main.yml b/roles/php/tasks/main.yml index 08cdc32..b233786 100644 --- a/roles/php/tasks/main.yml +++ b/roles/php/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: php-fpm state: present + update_cache: true - name: Put php-fpm configuration files ansible.builtin.template: @@ -20,6 +21,7 @@ ansible.builtin.package: name: "php-{{ item }}" state: present + update_cache: true loop: "{{ php_modules }}" notify: - Restart php-fpm diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml index 84f5900..782f483 100644 --- a/roles/postfix/tasks/main.yml +++ b/roles/postfix/tasks/main.yml @@ -1,14 +1,12 @@ --- -- name: Install postfix +- name: Install postfix + mailutils ansible.builtin.package: - name: postfix - state: present - -- name: Install mailutils - ansible.builtin.package: - name: mailutils + name: + - postfix + - mailutils state: present + update_cache: true - name: Put main configuration files ansible.builtin.copy: diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml index f79b3f5..76f5785 100644 --- a/roles/postgres/tasks/main.yml +++ b/roles/postgres/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: postgresql state: present + update_cache: true - name: Create pgsql directory ansible.builtin.file: diff --git a/roles/postgrey/tasks/main.yml b/roles/postgrey/tasks/main.yml index 85019d5..3685d76 100644 --- a/roles/postgrey/tasks/main.yml +++ b/roles/postgrey/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: postgrey state: present + update_cache: true - name: Put main configuration files ansible.builtin.copy: diff --git a/roles/redis/tasks/main.yml b/roles/redis/tasks/main.yml index 551e6c6..be02afa 100644 --- a/roles/redis/tasks/main.yml +++ b/roles/redis/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install redis - ansible.builtin.apt: + ansible.builtin.package: name: redis state: present update_cache: true diff --git a/roles/rsyslog/tasks/main.yml b/roles/rsyslog/tasks/main.yml index 52dbfc6..f73427e 100644 --- a/roles/rsyslog/tasks/main.yml +++ b/roles/rsyslog/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: rsyslog state: present + update_cache: true - name: Put log configuration file ansible.builtin.copy: diff --git a/roles/smart/tasks/main.yml b/roles/smart/tasks/main.yml index 9608913..a3fab45 100644 --- a/roles/smart/tasks/main.yml +++ b/roles/smart/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install SMART - ansible.builtin.apt: + ansible.builtin.package: name: smartmontools state: present update_cache: true diff --git a/roles/smtprelay/tasks/main.yml b/roles/smtprelay/tasks/main.yml index 452e90c..76ec36c 100644 --- a/roles/smtprelay/tasks/main.yml +++ b/roles/smtprelay/tasks/main.yml @@ -15,6 +15,7 @@ - postfix - libsasl2-modules state: present + update_cache: true - name: Put sasl_passwd configuration file ansible.builtin.template: diff --git a/roles/smtprelay/tasks/stunnel.yml b/roles/smtprelay/tasks/stunnel.yml index 226ead6..43bf93b 100644 --- a/roles/smtprelay/tasks/stunnel.yml +++ b/roles/smtprelay/tasks/stunnel.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: stunnel4 state: present + update_cache: true - name: SMTP wrapper ansible.builtin.template: diff --git a/roles/spamassassin/tasks/main.yml b/roles/spamassassin/tasks/main.yml index 99a3bf5..7f113b0 100644 --- a/roles/spamassassin/tasks/main.yml +++ b/roles/spamassassin/tasks/main.yml @@ -2,13 +2,13 @@ - name: Install spamassassin ansible.builtin.package: - name: "{{ item }}" + name: + - spamassassin + - spamass-milter + - libmail-dkim-perl + - libmail-spf-perl state: present - loop: - - spamassassin - - spamass-milter - - libmail-dkim-perl - - libmail-spf-perl + update_cache: true - name: Put configuration files for spamassassin ansible.builtin.copy: diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml index 1f27a21..091c998 100644 --- a/roles/system/tasks/main.yml +++ b/roles/system/tasks/main.yml @@ -18,16 +18,17 @@ - wget - ncdu state: present + update_cache: true - name: Install hypervisors’ specific utilities - ansible.builtin.apt: + ansible.builtin.package: name: fuse-overlayfs state: present update_cache: true when: "'hypervisors' in group_names" - name: Install physical servers’ specific utilities - ansible.builtin.apt: + ansible.builtin.package: name: lshw state: present update_cache: true diff --git a/roles/tuned/tasks/main.yml b/roles/tuned/tasks/main.yml index 69acc39..718f903 100644 --- a/roles/tuned/tasks/main.yml +++ b/roles/tuned/tasks/main.yml @@ -1,13 +1,12 @@ --- - name: Install tuned - ansible.builtin.apt: - name: "{{ item }}" + ansible.builtin.package: + name: + - tuned + - tuned-utils state: present update_cache: true - loop: - - tuned - - tuned-utils - name: Put config files ansible.builtin.copy: diff --git a/roles/xmpp/tasks/main.yml b/roles/xmpp/tasks/main.yml index ab4f859..362620c 100644 --- a/roles/xmpp/tasks/main.yml +++ b/roles/xmpp/tasks/main.yml @@ -2,11 +2,11 @@ - name: Install prosody ansible.builtin.package: - name: "{{ item }}" + name: + - prosody + - prosody-modules state: present - loop: - - prosody - - prosody-modules + update_cache: true - name: Create dhparam ansible.builtin.command: diff --git a/roles/yarn/tasks/main.yml b/roles/yarn/tasks/main.yml index 61e2180..a67b0b9 100644 --- a/roles/yarn/tasks/main.yml +++ b/roles/yarn/tasks/main.yml @@ -19,7 +19,7 @@ mode: "0o644" - name: Install yarn - ansible.builtin.apt: + ansible.builtin.package: name: yarn state: present update_cache: true diff --git a/roles/zfs/tasks/main.yml b/roles/zfs/tasks/main.yml index 783858c..1a098f5 100644 --- a/roles/zfs/tasks/main.yml +++ b/roles/zfs/tasks/main.yml @@ -17,13 +17,12 @@ mode: "0o640" - name: Install ZFS - ansible.builtin.apt: - name: "{{ item }}" + ansible.builtin.package: + name: + - dpkg-dev + - linux-headers-generic + - linux-image-generic + - zfs-dkms + - zfsutils-linux state: present update_cache: true - loop: - - dpkg-dev - - linux-headers-generic - - linux-image-generic - - zfs-dkms - - zfsutils-linux