Skip to content

Commit d9e9089

Browse files
committed
Use new repository-format, remove old .list, update sigining key
1 parent 864907e commit d9e9089

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.pyc
33
__pycache__
44
files/
5+
.idea

defaults/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ mariadb:
5353
application_event_log: /var/log/application_events/MariaDB-Backup.log
5454
repository:
5555
apt:
56-
key_url: https://mariadb.org/mariadb_release_signing_key.asc
57-
repository: "deb [arch={{ apt_arch }}] http://mirror.netcologne.de/mariadb/repo/{{ vars.mariadb.version }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }} main"
56+
key_url: https://mirror.netcologne.de/mariadb/PublicKey_v2
57+
repository: "http://mirror.netcologne.de/mariadb/repo/{{ vars.mariadb.version }}/{{ ansible_distribution | lower }}"
5858
mariadb_root_password: >-
5959
{%- if mariadb.galera.cluster and not mariadb.galera.initializer -%}
6060
{{- (mariadb_galera_cluster_nodes

tasks/install.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@
1111
- gpg
1212
- gpg-agent
1313

14-
- name: Add MariaDB repository key
15-
ansible.builtin.apt_key:
16-
url: "{{ mariadb.repository.apt.key_url }}"
14+
- name: Remove the legacy MariaDB repository
15+
ansible.builtin.file:
16+
dest: /etc/apt/sources.list.d/mariadb.list
17+
state: absent
1718

1819
- name: Add MariaDB repository
19-
loop:
20-
- /etc/apt/sources.list.d/mariadb.list
21-
ansible.builtin.copy:
22-
content: |
23-
{{ mariadb.repository.apt.repository }}
24-
dest: "{{ item }}"
25-
owner: root
26-
mode: "0644"
2720
register: mariadb_add_apt_repository
21+
ansible.builtin.deb822_repository:
22+
name: "mariadb"
23+
uris: "{{ mariadb.repository.apt.repository }}"
24+
signed_by: "{{ mariadb.repository.apt.key_url }}"
25+
types: [deb]
26+
components: [main]
27+
suites: '{{ ansible_distribution_release }}'
28+
state: present
29+
enabled: yes
2830

2931
- name: Update apt cache
3032
ansible.builtin.apt:

0 commit comments

Comments
 (0)