From 4b4b34e8490ca4454eb804eb68033e714cfebcff Mon Sep 17 00:00:00 2001 From: David Prevot Date: Tue, 25 Jul 2023 10:59:53 +0200 Subject: [PATCH] Ensure {{ apt_keyring_dir }} directory exists --- apt/tasks/evolix_public.deb822.yml | 8 ++++++++ apt/tasks/evolix_public.oneline.yml | 8 ++++++++ docker-host/tasks/main.yml | 8 ++++++++ elasticsearch/tasks/apt_sources.yml | 10 +++++++++- evolinux-base/tasks/hardware.dell.yml | 8 ++++++++ evolinux-base/tasks/hardware.hp.yml | 8 ++++++++ filebeat/tasks/apt_sources.yml | 10 +++++++++- fluentd/tasks/main.yml | 8 ++++++++ jenkins/tasks/main.yml | 8 ++++++++ kibana/tasks/apt_sources.yml | 10 +++++++++- logstash/tasks/apt_sources.yml | 10 +++++++++- lxc-php/tasks/php80.yml | 8 ++++++++ lxc-php/tasks/php81.yml | 8 ++++++++ lxc-php/tasks/php82.yml | 8 ++++++++ metricbeat/tasks/apt_sources.yml | 10 +++++++++- mongodb/tasks/main_bullseye.yml | 8 ++++++++ mongodb/tasks/main_buster.yml | 8 ++++++++ newrelic/tasks/sources.yml | 10 +++++++++- nodejs/tasks/yarn.yml | 8 ++++++++ percona/tasks/main.yml | 8 ++++++++ php/tasks/sury_pre.yml | 8 ++++++++ postgresql/tasks/pgdg-repo.yml | 8 ++++++++ 22 files changed, 182 insertions(+), 6 deletions(-) diff --git a/apt/tasks/evolix_public.deb822.yml b/apt/tasks/evolix_public.deb822.yml index 84d193b3..0a91dddf 100644 --- a/apt/tasks/evolix_public.deb822.yml +++ b/apt/tasks/evolix_public.deb822.yml @@ -16,6 +16,14 @@ - apt when: _trusted_gpg_keyring.stat.exists +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add Evolix GPG key ansible.builtin.copy: src: pub_evolix.asc diff --git a/apt/tasks/evolix_public.oneline.yml b/apt/tasks/evolix_public.oneline.yml index deff0b7d..9501e595 100644 --- a/apt/tasks/evolix_public.oneline.yml +++ b/apt/tasks/evolix_public.oneline.yml @@ -16,6 +16,14 @@ - apt when: _trusted_gpg_keyring.stat.exists +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add Evolix GPG key ansible.builtin.copy: src: pub_evolix.asc diff --git a/docker-host/tasks/main.yml b/docker-host/tasks/main.yml index f4175297..92c6ab3e 100644 --- a/docker-host/tasks/main.yml +++ b/docker-host/tasks/main.yml @@ -22,6 +22,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add Docker's official GPG key ansible.builtin.copy: src: docker-debian.asc diff --git a/elasticsearch/tasks/apt_sources.yml b/elasticsearch/tasks/apt_sources.yml index e525ba4b..812c4303 100644 --- a/elasticsearch/tasks/apt_sources.yml +++ b/elasticsearch/tasks/apt_sources.yml @@ -5,6 +5,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Elastic GPG key is installed ansible.builtin.copy: src: elastic.asc @@ -33,4 +41,4 @@ - name: Update APT cache ansible.builtin.apt: update_cache: yes - when: elastic_sources is changed \ No newline at end of file + when: elastic_sources is changed diff --git a/evolinux-base/tasks/hardware.dell.yml b/evolinux-base/tasks/hardware.dell.yml index 532b3f58..7eeefc49 100644 --- a/evolinux-base/tasks/hardware.dell.yml +++ b/evolinux-base/tasks/hardware.dell.yml @@ -41,6 +41,14 @@ state: absent when: perc_hba11_search.rc == 0 +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: MegaCLI SAS package is present block: - name: HWRaid GPG key is installed diff --git a/evolinux-base/tasks/hardware.hp.yml b/evolinux-base/tasks/hardware.hp.yml index 62f6e0a0..baded38c 100644 --- a/evolinux-base/tasks/hardware.hp.yml +++ b/evolinux-base/tasks/hardware.hp.yml @@ -1,5 +1,13 @@ --- +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: HPE GPG key is installed ansible.builtin.copy: src: hpePublicKey2048_key1.asc diff --git a/filebeat/tasks/apt_sources.yml b/filebeat/tasks/apt_sources.yml index e525ba4b..812c4303 100644 --- a/filebeat/tasks/apt_sources.yml +++ b/filebeat/tasks/apt_sources.yml @@ -5,6 +5,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Elastic GPG key is installed ansible.builtin.copy: src: elastic.asc @@ -33,4 +41,4 @@ - name: Update APT cache ansible.builtin.apt: update_cache: yes - when: elastic_sources is changed \ No newline at end of file + when: elastic_sources is changed diff --git a/fluentd/tasks/main.yml b/fluentd/tasks/main.yml index 9f350bf4..de76320c 100644 --- a/fluentd/tasks/main.yml +++ b/fluentd/tasks/main.yml @@ -1,5 +1,13 @@ --- +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add Fluentd GPG key ansible.builtin.copy: src: treasuredata.asc diff --git a/jenkins/tasks/main.yml b/jenkins/tasks/main.yml index 835d3a3e..2ea8ece4 100644 --- a/jenkins/tasks/main.yml +++ b/jenkins/tasks/main.yml @@ -5,6 +5,14 @@ # http://mirrors.jenkins.io/.* # http://jenkins.mirror.isppower.de/.* +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add Jenkins GPG key ansible.builtin.copy: src: jenkins.asc diff --git a/kibana/tasks/apt_sources.yml b/kibana/tasks/apt_sources.yml index e525ba4b..812c4303 100644 --- a/kibana/tasks/apt_sources.yml +++ b/kibana/tasks/apt_sources.yml @@ -5,6 +5,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Elastic GPG key is installed ansible.builtin.copy: src: elastic.asc @@ -33,4 +41,4 @@ - name: Update APT cache ansible.builtin.apt: update_cache: yes - when: elastic_sources is changed \ No newline at end of file + when: elastic_sources is changed diff --git a/logstash/tasks/apt_sources.yml b/logstash/tasks/apt_sources.yml index e525ba4b..812c4303 100644 --- a/logstash/tasks/apt_sources.yml +++ b/logstash/tasks/apt_sources.yml @@ -5,6 +5,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Elastic GPG key is installed ansible.builtin.copy: src: elastic.asc @@ -33,4 +41,4 @@ - name: Update APT cache ansible.builtin.apt: update_cache: yes - when: elastic_sources is changed \ No newline at end of file + when: elastic_sources is changed diff --git a/lxc-php/tasks/php80.yml b/lxc-php/tasks/php80.yml index 043c0174..1fd37dea 100644 --- a/lxc-php/tasks/php80.yml +++ b/lxc-php/tasks/php80.yml @@ -27,6 +27,14 @@ - "deb [signed-by={{ lxc_apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main" - "deb [signed-by={{ lxc_apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php80 main" +- name: "Ensure {{ lxc_rootfs }}{{ apt_keyring_dir }} directory exists" + file: + path: "{{ lxc_rootfs }}{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: copy pub.evolix.net GPG key ansible.builtin.copy: src: pub_evolix.asc diff --git a/lxc-php/tasks/php81.yml b/lxc-php/tasks/php81.yml index a1e9c71b..b9460215 100644 --- a/lxc-php/tasks/php81.yml +++ b/lxc-php/tasks/php81.yml @@ -26,6 +26,14 @@ - "deb [signed-by={{ lxc_apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main" - "deb [signed-by={{ lxc_apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php81 main" +- name: "Ensure {{ lxc_rootfs }}{{ apt_keyring_dir }} directory exists" + file: + path: "{{ lxc_rootfs }}{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: copy pub.evolix.net GPG key ansible.builtin.copy: src: pub_evolix.asc diff --git a/lxc-php/tasks/php82.yml b/lxc-php/tasks/php82.yml index 1fb81851..a40af195 100644 --- a/lxc-php/tasks/php82.yml +++ b/lxc-php/tasks/php82.yml @@ -26,6 +26,14 @@ - "deb [signed-by={{ apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main" - "deb [signed-by={{ apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php82 main" +- name: "Ensure {{ lxc_rootfs }}{{ apt_keyring_dir }} directory exists" + file: + path: "{{ lxc_rootfs }}{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: copy pub.evolix.net GPG key ansible.builtin.copy: src: pub_evolix.asc diff --git a/metricbeat/tasks/apt_sources.yml b/metricbeat/tasks/apt_sources.yml index e525ba4b..812c4303 100644 --- a/metricbeat/tasks/apt_sources.yml +++ b/metricbeat/tasks/apt_sources.yml @@ -5,6 +5,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Elastic GPG key is installed ansible.builtin.copy: src: elastic.asc @@ -33,4 +41,4 @@ - name: Update APT cache ansible.builtin.apt: update_cache: yes - when: elastic_sources is changed \ No newline at end of file + when: elastic_sources is changed diff --git a/mongodb/tasks/main_bullseye.yml b/mongodb/tasks/main_bullseye.yml index 0cfebf20..7c83a618 100644 --- a/mongodb/tasks/main_bullseye.yml +++ b/mongodb/tasks/main_bullseye.yml @@ -6,6 +6,14 @@ - ansible_distribution_release == "bullseye" - mongodb_version is version('5.2', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add MongoDB GPG key ansible.builtin.copy: src: "server-{{ mongodb_version }}.asc" diff --git a/mongodb/tasks/main_buster.yml b/mongodb/tasks/main_buster.yml index 7d47ed25..ae4f27eb 100644 --- a/mongodb/tasks/main_buster.yml +++ b/mongodb/tasks/main_buster.yml @@ -12,6 +12,14 @@ state: absent when: _trusted_gpg_keyring.stat.exists +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add MongoDB GPG key ansible.builtin.copy: src: "server-{{ mongodb_version }}.asc" diff --git a/newrelic/tasks/sources.yml b/newrelic/tasks/sources.yml index 3f745db9..3314c1c8 100644 --- a/newrelic/tasks/sources.yml +++ b/newrelic/tasks/sources.yml @@ -1,5 +1,13 @@ --- +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add NewRelic GPG key ansible.builtin.copy: src: newrelic.asc @@ -28,4 +36,4 @@ - name: Update APT cache ansible.builtin.apt: update_cache: yes - when: newrelic_sources is changed \ No newline at end of file + when: newrelic_sources is changed diff --git a/nodejs/tasks/yarn.yml b/nodejs/tasks/yarn.yml index 645f8f90..4cf34988 100644 --- a/nodejs/tasks/yarn.yml +++ b/nodejs/tasks/yarn.yml @@ -1,5 +1,13 @@ --- +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Yarn GPG key is installed ansible.builtin.copy: src: yarn.asc diff --git a/percona/tasks/main.yml b/percona/tasks/main.yml index 069956d0..e415ece6 100644 --- a/percona/tasks/main.yml +++ b/percona/tasks/main.yml @@ -15,6 +15,14 @@ state: absent when: _trusted_gpg_keyring.stat.exists +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add Percona GPG key ansible.builtin.copy: src: percona.asc diff --git a/php/tasks/sury_pre.yml b/php/tasks/sury_pre.yml index 1f04b661..ab51d4ed 100644 --- a/php/tasks/sury_pre.yml +++ b/php/tasks/sury_pre.yml @@ -6,6 +6,14 @@ state: present when: ansible_distribution_major_version is version('10', '<') +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: copy pub.evolix.org GPG key ansible.builtin.copy: src: pub_evolix.asc diff --git a/postgresql/tasks/pgdg-repo.yml b/postgresql/tasks/pgdg-repo.yml index b988618a..2aa2f8a9 100644 --- a/postgresql/tasks/pgdg-repo.yml +++ b/postgresql/tasks/pgdg-repo.yml @@ -8,6 +8,14 @@ - ansible.builtin.meta: flush_handlers +- name: "Ensure {{ apt_keyring_dir }} directory exists" + file: + path: "{{ apt_keyring_dir }}" + state: directory + mode: "755" + owner: root + group: root + - name: Add PGDG GPG key ansible.builtin.copy: src: postgresql.asc